From: Mike Christie <michael.christie@oracle.com> To: martin.petersen@oracle.com, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, mst@redhat.com, jasowang@redhat.com, pbonzini@redhat.com, stefanha@redhat.com, virtualization@lists.linux-foundation.org Subject: [PATCH 01/17] vhost scsi: add lun parser helper Date: Thu, 22 Oct 2020 00:34:47 +0000 Message-ID: <1603326903-27052-2-git-send-email-michael.christie@oracle.com> (raw) In-Reply-To: <1603326903-27052-1-git-send-email-michael.christie@oracle.com> Move code to parse lun from req's lun_buf to helper, so tmf code can use it in the next patch. Signed-off-by: Mike Christie <michael.christie@oracle.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> --- drivers/vhost/scsi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index b22adf0..0ea78d0 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -907,6 +907,11 @@ static void vhost_scsi_submission_work(struct work_struct *work) return ret; } +static u16 vhost_buf_to_lun(u8 *lun_buf) +{ + return ((lun_buf[2] << 8) | lun_buf[3]) & 0x3FFF; +} + static void vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) { @@ -1045,12 +1050,12 @@ static void vhost_scsi_submission_work(struct work_struct *work) tag = vhost64_to_cpu(vq, v_req_pi.tag); task_attr = v_req_pi.task_attr; cdb = &v_req_pi.cdb[0]; - lun = ((v_req_pi.lun[2] << 8) | v_req_pi.lun[3]) & 0x3FFF; + lun = vhost_buf_to_lun(v_req_pi.lun); } else { tag = vhost64_to_cpu(vq, v_req.tag); task_attr = v_req.task_attr; cdb = &v_req.cdb[0]; - lun = ((v_req.lun[2] << 8) | v_req.lun[3]) & 0x3FFF; + lun = vhost_buf_to_lun(v_req.lun); } /* * Check that the received CDB size does not exceeded our -- 1.8.3.1
next prev parent reply index Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-22 0:34 [PATCH 00/17 V3] vhost: fix scsi cmd handling and cgroup support Mike Christie 2020-10-22 0:34 ` Mike Christie [this message] 2020-10-26 3:33 ` [PATCH 01/17] vhost scsi: add lun parser helper Jason Wang 2020-10-22 0:34 ` [PATCH 02/17] vhost: remove work arg from vhost_work_flush Mike Christie 2020-10-22 0:51 ` Chaitanya Kulkarni 2020-10-22 0:34 ` [PATCH 03/17] vhost net: use goto error handling in open Mike Christie 2020-10-22 0:45 ` Chaitanya Kulkarni 2020-10-26 3:34 ` Jason Wang 2020-10-22 0:34 ` [PATCH 04/17] vhost: prep vhost_dev_init users to handle failures Mike Christie 2020-10-22 5:22 ` kernel test robot 2020-10-23 16:15 ` Mike Christie 2020-11-02 5:57 ` Jason Wang 2020-11-03 10:04 ` Dan Carpenter 2020-10-22 0:34 ` [PATCH 05/17] vhost: move vq iovec allocation to dev init time Mike Christie 2020-10-22 0:34 ` [PATCH 06/17] vhost: support delayed vq creation Mike Christie 2020-10-22 0:34 ` [PATCH 07/17] vhost scsi: support delayed IO " Mike Christie 2020-10-26 3:51 ` Jason Wang 2020-10-27 5:47 ` Mike Christie 2020-10-28 1:55 ` Jason Wang 2020-10-30 8:47 ` Michael S. Tsirkin 2020-10-30 16:30 ` Mike Christie 2020-10-30 17:26 ` Mike Christie 2020-11-01 22:06 ` Mike Christie 2020-11-02 6:36 ` Jason Wang 2020-11-02 6:49 ` Jason Wang 2020-11-02 16:19 ` Mike Christie 2020-10-22 0:34 ` [PATCH 08/17] vhost scsi: alloc cmds per vq instead of session Mike Christie 2020-10-22 0:34 ` [PATCH 09/17] vhost scsi: fix cmd completion race Mike Christie 2020-10-27 13:07 ` Maurizio Lombardi 2020-10-30 8:51 ` Michael S. Tsirkin 2020-10-30 16:04 ` Paolo Bonzini 2020-10-22 0:34 ` [PATCH 10/17] vhost scsi: Add support for LUN resets Mike Christie 2020-10-22 0:34 ` [PATCH 11/17] vhost scsi: remove extra flushes Mike Christie 2020-10-22 0:34 ` [PATCH 12/17] vhost poll: fix coding style Mike Christie 2020-10-22 0:39 ` Chaitanya Kulkarni 2020-10-22 0:34 ` [PATCH 13/17] vhost: support multiple worker threads Mike Christie 2020-10-22 0:35 ` [PATCH 14/17] vhost: poll support support multiple workers Mike Christie 2020-10-22 0:35 ` [PATCH 15/17] host: support delayed vq creation Mike Christie 2020-10-22 0:50 ` Mike Christie 2020-10-22 0:35 ` [PATCH 16/17] vhost scsi: multiple worker support Mike Christie 2020-10-22 0:35 ` [PATCH 17/17] vhost scsi: drop submission workqueue Mike Christie 2020-10-29 21:47 ` [PATCH 00/17 V3] vhost: fix scsi cmd handling and cgroup support Michael S. Tsirkin 2020-10-29 22:19 ` Mike Christie
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1603326903-27052-2-git-send-email-michael.christie@oracle.com \ --to=michael.christie@oracle.com \ --cc=jasowang@redhat.com \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ --cc=mst@redhat.com \ --cc=pbonzini@redhat.com \ --cc=stefanha@redhat.com \ --cc=target-devel@vger.kernel.org \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Target-devel archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/target-devel/0 target-devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 target-devel target-devel/ https://lore.kernel.org/target-devel \ target-devel@vger.kernel.org public-inbox-index target-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.target-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git