Messages in this thread | | | Subject | Re: [PATCH AUTOSEL 5.9 22/33] vhost scsi: add lun parser helper | From | Paolo Bonzini <> | Date | Wed, 25 Nov 2020 18:48:21 +0100 |
| |
On 25/11/20 16:35, Sasha Levin wrote: > From: Mike Christie <michael.christie@oracle.com> > > [ Upstream commit 18f1becb6948cd411fd01968a0a54af63732e73c ] > > 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> > Acked-by: Jason Wang <jasowang@redhat.com> > Link: https://lore.kernel.org/r/1604986403-4931-5-git-send-email-michael.christie@oracle.com > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > Acked-by: Stefan Hajnoczi <stefanha@redhat.com> > Signed-off-by: Sasha Levin <sashal@kernel.org>
This doesn't seem like stable material, does it?
Paolo
> --- > 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 5d8850f5aef16..ed7dc6b998f65 100644 > --- a/drivers/vhost/scsi.c > +++ b/drivers/vhost/scsi.c > @@ -898,6 +898,11 @@ vhost_scsi_get_req(struct vhost_virtqueue *vq, struct vhost_scsi_ctx *vc, > 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) > { > @@ -1036,12 +1041,12 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) > 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 >
| |