From 10691e04e91679346930338eb9f1d3311871baa5 Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Mon, 6 Mar 2023 08:41:37 +0100 Subject: [PATCH] add patch fixing Linux boot failures with megasas SCSI A regression in 7.2 and easily reproduced. Signed-off-by: Fiona Ebner --- ...as-Internal-cdbs-have-16-byte-length.patch | 69 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 70 insertions(+) create mode 100644 debian/patches/extra/0010-scsi-megasas-Internal-cdbs-have-16-byte-length.patch diff --git a/debian/patches/extra/0010-scsi-megasas-Internal-cdbs-have-16-byte-length.patch b/debian/patches/extra/0010-scsi-megasas-Internal-cdbs-have-16-byte-length.patch new file mode 100644 index 0000000..20ec053 --- /dev/null +++ b/debian/patches/extra/0010-scsi-megasas-Internal-cdbs-have-16-byte-length.patch @@ -0,0 +1,69 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Guenter Roeck +Date: Tue, 28 Feb 2023 09:11:29 -0800 +Subject: [PATCH] scsi: megasas: Internal cdbs have 16-byte length +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Host drivers do not necessarily set cdb_len in megasas io commands. +With commits 6d1511cea0 ("scsi: Reject commands if the CDB length +exceeds buf_len") and fe9d8927e2 ("scsi: Add buf_len parameter to +scsi_req_new()"), this results in failures to boot Linux from affected +SCSI drives because cdb_len is set to 0 by the host driver. +Set the cdb length to its actual size to solve the problem. + +Signed-off-by: Guenter Roeck +Reviewed-by: Philippe Mathieu-Daudé +(picked-up from https://lists.nongnu.org/archive/html/qemu-devel/2023-02/msg08653.html) +Signed-off-by: Fiona Ebner +--- + hw/scsi/megasas.c | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c +index 9cbbb16121..d624866bb6 100644 +--- a/hw/scsi/megasas.c ++++ b/hw/scsi/megasas.c +@@ -1780,7 +1780,7 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd) + uint8_t cdb[16]; + int len; + struct SCSIDevice *sdev = NULL; +- int target_id, lun_id, cdb_len; ++ int target_id, lun_id; + + lba_count = le32_to_cpu(cmd->frame->io.header.data_len); + lba_start_lo = le32_to_cpu(cmd->frame->io.lba_lo); +@@ -1789,7 +1789,6 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd) + + target_id = cmd->frame->header.target_id; + lun_id = cmd->frame->header.lun_id; +- cdb_len = cmd->frame->header.cdb_len; + + if (target_id < MFI_MAX_LD && lun_id == 0) { + sdev = scsi_device_find(&s->bus, 0, target_id, lun_id); +@@ -1804,15 +1803,6 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd) + return MFI_STAT_DEVICE_NOT_FOUND; + } + +- if (cdb_len > 16) { +- trace_megasas_scsi_invalid_cdb_len( +- mfi_frame_desc(frame_cmd), 1, target_id, lun_id, cdb_len); +- megasas_write_sense(cmd, SENSE_CODE(INVALID_OPCODE)); +- cmd->frame->header.scsi_status = CHECK_CONDITION; +- s->event_count++; +- return MFI_STAT_SCSI_DONE_WITH_ERROR; +- } +- + cmd->iov_size = lba_count * sdev->blocksize; + if (megasas_map_sgl(s, cmd, &cmd->frame->io.sgl)) { + megasas_write_sense(cmd, SENSE_CODE(TARGET_FAILURE)); +@@ -1823,7 +1813,7 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd) + + megasas_encode_lba(cdb, lba_start, lba_count, is_write); + cmd->req = scsi_req_new(sdev, cmd->index, +- lun_id, cdb, cdb_len, cmd); ++ lun_id, cdb, sizeof(cdb), cmd); + if (!cmd->req) { + trace_megasas_scsi_req_alloc_failed( + mfi_frame_desc(frame_cmd), target_id, lun_id); diff --git a/debian/patches/series b/debian/patches/series index 7a85c63..c1d23b5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,6 +7,7 @@ extra/0006-virtio-rng-pci-fix-migration-compat-for-vectors.patch extra/0007-block-fix-detect-zeroes-with-BDRV_REQ_REGISTERED_BUF.patch extra/0008-memory-prevent-dma-reentracy-issues.patch extra/0009-block-iscsi-fix-double-free-on-BUSY-or-similar-statu.patch +extra/0010-scsi-megasas-Internal-cdbs-have-16-byte-length.patch bitmap-mirror/0001-drive-mirror-add-support-for-sync-bitmap-mode-never.patch bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch bitmap-mirror/0003-mirror-add-check-for-bitmap-mode-without-bitmap.patch