Re: [PATCHv2] virtio_scsi: do not overwrite SCSI status
From: Guenter Roeck <linux@roeck-us.net>
Date: 2021-07-03 18:35:16
Hi, On Tue, Jun 22, 2021 at 11:11:53AM +0200, Hannes Reinecke wrote:
When a sense code is present we should not override the scsi status;
the driver already sets it based on the response from the hypervisor.
Fixes: 464a00c9e0ad ("scsi: core: Kill DRIVER_SENSE")
Signed-off-by: Hannes Reinecke <hare@suse.de>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Jiri Slaby <jirislaby@kernel.org>
Tested-by: Christian Borntraeger <redacted>This patch didn't make it into mainline, but commit 464a00c9e0ad is there. This means that virtio_scsi is now broken in mainline (as of v5.13-9356-g4b820e167bf6). Did it get lost, or is it still queued somewhere ? Thanks, Guenter
quoted hunk ↗ jump to hunk
--- drivers/scsi/virtio_scsi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index fd69a03d6137..ad78bf631900 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c@@ -156,12 +156,11 @@ static void virtscsi_complete_cmd(struct virtio_scsi *vscsi, void *buf) WARN_ON(virtio32_to_cpu(vscsi->vdev, resp->sense_len) > VIRTIO_SCSI_SENSE_SIZE); - if (sc->sense_buffer) { + if (resp->sense_len) { memcpy(sc->sense_buffer, resp->sense, min_t(u32, virtio32_to_cpu(vscsi->vdev, resp->sense_len), VIRTIO_SCSI_SENSE_SIZE)); - set_status_byte(sc, SAM_STAT_CHECK_CONDITION); } sc->scsi_done(sc);