|
 |
4841a6 |
From a9a4dfdd6312e192e9134d46edfac4c1b1bfa63d Mon Sep 17 00:00:00 2001
|
|
|
46b604 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
46b604 |
Date: Mon, 22 Aug 2022 14:53:20 +0200
|
|
|
46b604 |
Subject: [PATCH] scsi-generic: Fix emulated block limits VPD page
|
|
|
46b604 |
|
|
|
46b604 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
4841a6 |
RH-MergeRequest: 212: scsi-generic: Fix emulated block limits VPD page
|
|
|
4841a6 |
RH-Commit: [1/1] d3ba6b2e03039043716ddc6b7d4a424d92249081
|
|
|
4841a6 |
RH-Bugzilla: 2120279
|
|
|
4841a6 |
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
|
46b604 |
RH-Acked-by: Hanna Reitz <hreitz@redhat.com>
|
|
|
4841a6 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
46b604 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
46b604 |
|
|
|
46b604 |
Commits 01ef8185b80 amd 24b36e9813e updated the way that the maximum
|
|
|
46b604 |
transfer length is calculated for patching block limits VPD page in an
|
|
|
46b604 |
INQUIRY response.
|
|
|
46b604 |
|
|
|
46b604 |
The same updates also need to be made for the case where the host device
|
|
|
46b604 |
does not support the block limits VPD page at all and we emulate the
|
|
|
46b604 |
whole page.
|
|
|
46b604 |
|
|
|
46b604 |
Without this fix, on host block devices a maximum transfer length of
|
|
|
46b604 |
(INT_MAX - sector_size) bytes is advertised to the guest, resulting in
|
|
|
46b604 |
I/O errors when a request that exceeds the host limits is made by the
|
|
|
46b604 |
guest. (Prior to commit 24b36e9813e, this code path would use the
|
|
|
46b604 |
max_transfer value from the host instead of INT_MAX, but still miss the
|
|
|
46b604 |
fix from 01ef8185b80 where max_transfer is also capped to max_iov
|
|
|
46b604 |
host pages, so it would be less wrong, but still wrong.)
|
|
|
46b604 |
|
|
|
46b604 |
Cc: qemu-stable@nongnu.org
|
|
|
46b604 |
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2096251
|
|
|
46b604 |
Fixes: 01ef8185b809af9d287e1a03a3f9d8ea8231118a
|
|
|
46b604 |
Fixes: 24b36e9813ec15da7db62e3b3621730710c5f020
|
|
|
46b604 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
46b604 |
Message-Id: <20220822125320.48257-1-kwolf@redhat.com>
|
|
|
46b604 |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
46b604 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
46b604 |
(cherry picked from commit 51e15194b0a091e5c40aab2eb234a1d36c5c58ee)
|
|
|
46b604 |
|
|
|
46b604 |
Resolved conflict: qemu_real_host_page_size() is a getter function in
|
|
|
46b604 |
current upstream, but still just a public global variable downstream.
|
|
|
46b604 |
|
|
|
46b604 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
46b604 |
---
|
|
|
46b604 |
hw/scsi/scsi-generic.c | 21 ++++++++++++++-------
|
|
|
46b604 |
1 file changed, 14 insertions(+), 7 deletions(-)
|
|
|
46b604 |
|
|
|
46b604 |
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
|
|
|
46b604 |
index 0306ccc7b1..3742899839 100644
|
|
|
46b604 |
--- a/hw/scsi/scsi-generic.c
|
|
|
46b604 |
+++ b/hw/scsi/scsi-generic.c
|
|
|
46b604 |
@@ -147,6 +147,18 @@ static int execute_command(BlockBackend *blk,
|
|
|
46b604 |
return 0;
|
|
|
46b604 |
}
|
|
|
46b604 |
|
|
|
46b604 |
+static uint64_t calculate_max_transfer(SCSIDevice *s)
|
|
|
46b604 |
+{
|
|
|
46b604 |
+ uint64_t max_transfer = blk_get_max_hw_transfer(s->conf.blk);
|
|
|
46b604 |
+ uint32_t max_iov = blk_get_max_hw_iov(s->conf.blk);
|
|
|
46b604 |
+
|
|
|
46b604 |
+ assert(max_transfer);
|
|
|
46b604 |
+ max_transfer = MIN_NON_ZERO(max_transfer,
|
|
|
46b604 |
+ max_iov * qemu_real_host_page_size);
|
|
|
46b604 |
+
|
|
|
46b604 |
+ return max_transfer / s->blocksize;
|
|
|
46b604 |
+}
|
|
|
46b604 |
+
|
|
|
46b604 |
static int scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s, int len)
|
|
|
46b604 |
{
|
|
|
46b604 |
uint8_t page, page_idx;
|
|
|
46b604 |
@@ -179,12 +191,7 @@ static int scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s, int len)
|
|
|
46b604 |
(r->req.cmd.buf[1] & 0x01)) {
|
|
|
46b604 |
page = r->req.cmd.buf[2];
|
|
|
46b604 |
if (page == 0xb0) {
|
|
|
46b604 |
- uint64_t max_transfer = blk_get_max_hw_transfer(s->conf.blk);
|
|
|
46b604 |
- uint32_t max_iov = blk_get_max_hw_iov(s->conf.blk);
|
|
|
46b604 |
-
|
|
|
46b604 |
- assert(max_transfer);
|
|
|
46b604 |
- max_transfer = MIN_NON_ZERO(max_transfer, max_iov * qemu_real_host_page_size)
|
|
|
46b604 |
- / s->blocksize;
|
|
|
46b604 |
+ uint64_t max_transfer = calculate_max_transfer(s);
|
|
|
46b604 |
stl_be_p(&r->buf[8], max_transfer);
|
|
|
46b604 |
/* Also take care of the opt xfer len. */
|
|
|
46b604 |
stl_be_p(&r->buf[12],
|
|
|
46b604 |
@@ -230,7 +237,7 @@ static int scsi_generic_emulate_block_limits(SCSIGenericReq *r, SCSIDevice *s)
|
|
|
46b604 |
uint8_t buf[64];
|
|
|
46b604 |
|
|
|
46b604 |
SCSIBlockLimits bl = {
|
|
|
46b604 |
- .max_io_sectors = blk_get_max_transfer(s->conf.blk) / s->blocksize
|
|
|
46b604 |
+ .max_io_sectors = calculate_max_transfer(s),
|
|
|
46b604 |
};
|
|
|
46b604 |
|
|
|
46b604 |
memset(r->buf, 0, r->buflen);
|
|
|
46b604 |
--
|
|
|
4841a6 |
2.35.3
|
|
|
46b604 |
|