Merge branch 'fixes-rc1' into fixes

[linux-2.6-microblaze.git] / drivers / vhost / scsi.c

diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 5de21ad..d16c04d 100644 (file)
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -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);
@@ -614,7 +610,7 @@ vhost_scsi_get_cmd(struct vhost_virtqueue *vq, struct vhost_scsi_tpg *tpg,
                return ERR_PTR(-EIO);
        }
 
-       tag = sbitmap_get(&svq->scsi_tags, 0, false);
+       tag = sbitmap_get(&svq->scsi_tags);
        if (tag < 0) {
                pr_err("Unable to obtain tag for vhost_scsi_cmd\n");
                return ERR_PTR(-ENOMEM);
@@ -782,14 +778,11 @@ 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;
-       int rc;
 
        /* FIXME: BIDI operation */
        if (cmd->tvc_sgl_count) {
@@ -805,18 +798,17 @@ static void vhost_scsi_submission_work(struct work_struct *work)
        tv_nexus = cmd->tvc_nexus;
 
        se_cmd->tag = 0;
-       rc = target_submit_cmd_map_sgls(se_cmd, tv_nexus->tvn_se_sess,
-                       cmd->tvc_cdb, &cmd->tvc_sense_buf[0],
+       target_init_cmd(se_cmd, tv_nexus->tvn_se_sess, &cmd->tvc_sense_buf[0],
                        cmd->tvc_lun, cmd->tvc_exp_data_len,
                        vhost_scsi_to_tcm_attr(cmd->tvc_task_attr),
-                       cmd->tvc_data_direction, TARGET_SCF_ACK_KREF,
-                       sg_ptr, cmd->tvc_sgl_count, NULL, 0, sg_prot_ptr,
-                       cmd->tvc_prot_sgl_count);
-       if (rc < 0) {
-               transport_send_check_condition_and_sense(se_cmd,
-                               TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE, 0);
-               transport_generic_free_cmd(se_cmd, 0);
-       }
+                       cmd->tvc_data_direction, TARGET_SCF_ACK_KREF);
+
+       if (target_submit_prep(se_cmd, cmd->tvc_cdb, sg_ptr,
+                              cmd->tvc_sgl_count, NULL, 0, sg_prot_ptr,
+                              cmd->tvc_prot_sgl_count, GFP_KERNEL))
+               return;
+
+       target_queue_submission(se_cmd);
 }
 
 static void
@@ -1132,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:
                /*
@@ -1512,7 +1497,7 @@ static int vhost_scsi_setup_vq_cmds(struct vhost_virtqueue *vq, int max_cmds)
                return 0;
 
        if (sbitmap_init_node(&svq->scsi_tags, max_cmds, -1, GFP_KERNEL,
-                             NUMA_NO_NODE))
+                             NUMA_NO_NODE, false, true))
                return -ENOMEM;
        svq->max_cmds = max_cmds;
 
@@ -2486,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)
@@ -2506,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;
 };
@@ -2516,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");