Commit 1112679f authored by Dariusz Stojaczyk's avatar Dariusz Stojaczyk Committed by Daniel Verkamp
Browse files

vhost_scsi: pass scsi_dev_num directly to eventq_enqueue 



This simplifies eventq API greatly. Since vhost supports only a single
LUN per device, lun parameter in eventq isn't required for now.

Change-Id: I1c41a3f509aca96f2de8de6563a3cac5c4dd1b8b
Signed-off-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/371118


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 4c4492dc

lib/vhost/vhost_scsi.c

+26 −27
Original line number Diff line number Diff line
@@ -157,36 +157,16 @@ process_removed_devs(struct spdk_vhost_scsi_dev *svdev) 
}



static void

eventq_enqueue(struct spdk_vhost_scsi_dev *svdev, const struct spdk_scsi_dev *dev,

	       const struct spdk_scsi_lun *lun, uint32_t event,

eventq_enqueue(struct spdk_vhost_scsi_dev *svdev, unsigned scsi_dev_num, uint32_t event,

	       uint32_t reason)

{

	int dev_id, lun_id;

	struct rte_vhost_vring *vq;

	struct vring_desc *desc;

	struct virtio_scsi_event *desc_ev;

	uint32_t req_size;

	uint16_t req;



	if (dev == NULL) {

		SPDK_ERRLOG("%s: eventq device cannot be NULL.\n", svdev->vdev.name);

		return;

	}



	for (dev_id = 0; dev_id < SPDK_VHOST_SCSI_CTRLR_MAX_DEVS; dev_id++) {

		if (svdev->scsi_dev[dev_id] == dev) {

			break;

		}

	}



	if (dev_id == SPDK_VHOST_SCSI_CTRLR_MAX_DEVS) {

		SPDK_ERRLOG("Dev %s is not a part of vhost scsi controller '%s'.\n", spdk_scsi_dev_get_name(dev),

			    svdev->vdev.name);

		return;

	}



	/* some events may apply to the entire device via lun id set to 0 */

	lun_id = lun == NULL ? 0 : spdk_scsi_lun_get_id(lun);

	assert(scsi_dev_num < SPDK_VHOST_SCSI_CTRLR_MAX_DEVS);



	vq = &svdev->vdev.virtqueue[VIRTIO_SCSI_EVENTQ];
@@ -205,9 +185,12 @@ eventq_enqueue(struct spdk_vhost_scsi_dev *svdev, const struct spdk_scsi_dev *de 
	} else {

		desc_ev->event = event;

		desc_ev->lun[0] = 1;

		desc_ev->lun[1] = dev_id;

		desc_ev->lun[2] = lun_id >> 8; /* relies on linux kernel implementation */

		desc_ev->lun[3] = lun_id & 0xFF;

		desc_ev->lun[1] = scsi_dev_num;

		/* virtio LUN id 0 can refer either to the entire device

		 * or actual LUN 0 (the only supported by vhost for now)

		 */

		desc_ev->lun[2] = 0 >> 8;

		desc_ev->lun[3] = 0 & 0xFF;

		/* virtio doesn't specify any strict format for LUN id (bytes 2 and 3)

		 * current implementation relies on linux kernel sources

		 */
@@ -680,6 +663,8 @@ static void 
spdk_vhost_scsi_lun_hotremove(const struct spdk_scsi_lun *lun, void *arg)

{

	struct spdk_vhost_scsi_dev *svdev = arg;

	const struct spdk_scsi_dev *scsi_dev;

	unsigned scsi_dev_num;



	assert(lun != NULL);

	assert(svdev != NULL);
@@ -688,7 +673,21 @@ spdk_vhost_scsi_lun_hotremove(const struct spdk_scsi_lun *lun, void *arg) 
		return;

	}



	eventq_enqueue(svdev, spdk_scsi_lun_get_dev(lun), lun, VIRTIO_SCSI_T_TRANSPORT_RESET,

	scsi_dev = spdk_scsi_lun_get_dev(lun);

	for (scsi_dev_num = 0; scsi_dev_num < SPDK_VHOST_SCSI_CTRLR_MAX_DEVS; scsi_dev_num++) {

		if (svdev->scsi_dev[scsi_dev_num] == scsi_dev) {

			break;

		}

	}



	if (scsi_dev_num == SPDK_VHOST_SCSI_CTRLR_MAX_DEVS) {

		SPDK_ERRLOG("Dev %s is not a part of vhost scsi controller '%s'.\n",

			    spdk_scsi_dev_get_name(scsi_dev),

			    svdev->vdev.name);

		return;

	}



	eventq_enqueue(svdev, scsi_dev_num, VIRTIO_SCSI_T_TRANSPORT_RESET,

		       VIRTIO_SCSI_EVT_RESET_REMOVED);

}
@@ -794,7 +793,7 @@ spdk_vhost_scsi_dev_remove_dev(struct spdk_vhost_dev *vdev, unsigned scsi_dev_nu 
	}



	svdev->removed_dev[scsi_dev_num] = true;

	eventq_enqueue(svdev, scsi_dev, NULL, VIRTIO_SCSI_T_TRANSPORT_RESET, VIRTIO_SCSI_EVT_RESET_REMOVED);

	eventq_enqueue(svdev, scsi_dev_num, VIRTIO_SCSI_T_TRANSPORT_RESET, VIRTIO_SCSI_EVT_RESET_REMOVED);



	SPDK_NOTICELOG("%s: queued 'Dev %u' for hot-detach.\n", vdev->name, scsi_dev_num);

	return 0;