bf251437e9
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
70 lines
2.9 KiB
Diff
70 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Guenter Roeck <linux@roeck-us.net>
|
|
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 <linux@roeck-us.net>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
(picked-up from https://lists.nongnu.org/archive/html/qemu-devel/2023-02/msg08653.html)
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
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);
|