Commit 6ec29cb8 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen
Browse files

scsi: target: vhost-scsi: Use LIO wq cmd submission helper 

Convert vhost-scsi to use the LIO wq cmd submission helper.

Link: https://lore.kernel.org/r/20210227170006.5077-18-michael.christie@oracle.com


Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent eb44ce8c

drivers/vhost/scsi.c

+6 −30
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct vhost_scsi_cmd { 
	/* The number of scatterlists associated with this cmd */

	u32 tvc_sgl_count;

	u32 tvc_prot_sgl_count;

	/* Saved unpacked SCSI LUN for vhost_scsi_submission_work() */

	/* Saved unpacked SCSI LUN for vhost_scsi_target_queue_cmd() */

	u32 tvc_lun;

	/* Pointer to the SGL formatted memory from virtio-scsi */

	struct scatterlist *tvc_sgl;
@@ -101,8 +101,6 @@ struct vhost_scsi_cmd { 
	struct vhost_scsi_nexus *tvc_nexus;

	/* The TCM I/O descriptor that is accessed via container_of() */

	struct se_cmd tvc_se_cmd;

	/* work item used for cmwq dispatch to vhost_scsi_submission_work() */

	struct work_struct work;

	/* Copy of the incoming SCSI command descriptor block (CDB) */

	unsigned char tvc_cdb[VHOST_SCSI_MAX_CDB_SIZE];

	/* Sense buffer that will be mapped into outgoing status */
@@ -240,8 +238,6 @@ struct vhost_scsi_ctx { 
	struct iov_iter out_iter;

};



static struct workqueue_struct *vhost_scsi_workqueue;



/* Global spinlock to protect vhost_scsi TPG list for vhost IOCTL access */

static DEFINE_MUTEX(vhost_scsi_mutex);

static LIST_HEAD(vhost_scsi_list);
@@ -782,12 +778,10 @@ static int vhost_scsi_to_tcm_attr(int attr) 
	return TCM_SIMPLE_TAG;

}



static void vhost_scsi_submission_work(struct work_struct *work)

static void vhost_scsi_target_queue_cmd(struct vhost_scsi_cmd *cmd)

{

	struct vhost_scsi_cmd *cmd =

		container_of(work, struct vhost_scsi_cmd, work);

	struct vhost_scsi_nexus *tv_nexus;

	struct se_cmd *se_cmd = &cmd->tvc_se_cmd;

	struct vhost_scsi_nexus *tv_nexus;

	struct scatterlist *sg_ptr, *sg_prot_ptr = NULL;



	/* FIXME: BIDI operation */
@@ -814,7 +808,7 @@ static void vhost_scsi_submission_work(struct work_struct *work) 
			       cmd->tvc_prot_sgl_count, GFP_KERNEL))

		return;



	target_submit(se_cmd);

	target_queue_submission(se_cmd);

}



static void
@@ -1130,14 +1124,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) 
		 * vhost_scsi_queue_data_in() and vhost_scsi_queue_status()

		 */

		cmd->tvc_vq_desc = vc.head;

		/*

		 * Dispatch cmd descriptor for cmwq execution in process

		 * context provided by vhost_scsi_workqueue.  This also ensures

		 * cmd is executed on the same kworker CPU as this vhost

		 * thread to gain positive L2 cache locality effects.

		 */

		INIT_WORK(&cmd->work, vhost_scsi_submission_work);

		queue_work(vhost_scsi_workqueue, &cmd->work);

		vhost_scsi_target_queue_cmd(cmd);

		ret = 0;

err:

		/*
@@ -2484,17 +2471,9 @@ static int __init vhost_scsi_init(void) 
		" on "UTS_RELEASE"\n", VHOST_SCSI_VERSION, utsname()->sysname,

		utsname()->machine);



	/*

	 * Use our own dedicated workqueue for submitting I/O into

	 * target core to avoid contention within system_wq.

	 */

	vhost_scsi_workqueue = alloc_workqueue("vhost_scsi", 0, 0);

	if (!vhost_scsi_workqueue)

		goto out;



	ret = vhost_scsi_register();

	if (ret < 0)

		goto out_destroy_workqueue;

		goto out;



	ret = target_register_template(&vhost_scsi_ops);

	if (ret < 0)
@@ -2504,8 +2483,6 @@ static int __init vhost_scsi_init(void) 


out_vhost_scsi_deregister:

	vhost_scsi_deregister();

out_destroy_workqueue:

	destroy_workqueue(vhost_scsi_workqueue);

out:

	return ret;

};
@@ -2514,7 +2491,6 @@ static void vhost_scsi_exit(void) 
{

	target_unregister_template(&vhost_scsi_ops);

	vhost_scsi_deregister();

	destroy_workqueue(vhost_scsi_workqueue);

};



MODULE_DESCRIPTION("VHOST_SCSI series fabric driver");