[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/13] scsi-disk: Always report RESERVATION_CONFLICT to guest
|
From: |
Kevin Wolf |
|
Subject: |
[PULL 07/13] scsi-disk: Always report RESERVATION_CONFLICT to guest |
|
Date: |
Mon, 5 Aug 2024 23:08:45 +0200 |
In the case of scsi-block, RESERVATION_CONFLICT is not a backend error,
but indicates that the guest tried to make a request that it isn't
allowed to execute. Pass the error to the guest so that it can decide
what to do with it.
Without this, if we stop the VM in response to a RESERVATION_CONFLICT
(as is the default policy in management software such as oVirt or
KubeVirt), it can happen that the VM cannot be resumed any more because
every attempt to resume it immediately runs into the same error and
stops the VM again.
One case that expects RESERVATION_CONFLICT errors to be visible in the
guest is running the validation tests in Windows 2019's Failover Cluster
Manager, which intentionally tries to execute invalid requests to see if
they are properly rejected.
Buglink: https://issues.redhat.com/browse/RHEL-50000
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20240731123207.27636-5-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
hw/scsi/scsi-disk.c | 35 ++++++++++++++++++++++++++++++-----
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 69a195177e..4d94b2b816 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -224,7 +224,7 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret,
bool acct_failed)
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
SCSIDiskClass *sdc = (SCSIDiskClass *) object_get_class(OBJECT(s));
SCSISense sense = SENSE_CODE(NO_SENSE);
- int error = 0;
+ int error;
bool req_has_sense = false;
BlockErrorAction action;
int status;
@@ -235,11 +235,35 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret,
bool acct_failed)
} else {
/* A passthrough command has completed with nonzero status. */
status = ret;
- if (status == CHECK_CONDITION) {
+ switch (status) {
+ case CHECK_CONDITION:
req_has_sense = true;
error = scsi_sense_buf_to_errno(r->req.sense,
sizeof(r->req.sense));
- } else {
+ break;
+ case RESERVATION_CONFLICT:
+ /*
+ * Don't apply the error policy, always report to the guest.
+ *
+ * This is a passthrough code path, so it's not a backend error,
but
+ * a response to an invalid guest request.
+ *
+ * Windows Failover Cluster validation intentionally sends invalid
+ * requests to verify that reservations work as intended. It is
+ * crucial that it sees the resulting errors.
+ *
+ * Treating a reservation conflict as a guest-side error is obvious
+ * when a pr-manager is in use. Without one, the situation is less
+ * clear, but there might be nothing that can be fixed on the host
+ * (like in the above example), and we don't want to be stuck in a
+ * loop where resuming the VM and retrying the request immediately
+ * stops it again. So always reporting is still the safer option in
+ * this case, too.
+ */
+ error = 0;
+ break;
+ default:
error = EINVAL;
+ break;
}
}
@@ -249,8 +273,9 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret,
bool acct_failed)
* are usually retried immediately, so do not post them to QMP and
* do not account them as failed I/O.
*/
- if (req_has_sense &&
- scsi_sense_buf_is_guest_recoverable(r->req.sense,
sizeof(r->req.sense))) {
+ if (!error || (req_has_sense &&
+ scsi_sense_buf_is_guest_recoverable(r->req.sense,
+ sizeof(r->req.sense))))
{
action = BLOCK_ERROR_ACTION_REPORT;
acct_failed = false;
} else {
--
2.45.2
- [PULL 00/13] Block layer patches, Kevin Wolf, 2024/08/05
- [PULL 01/13] qapi-block-core: Clean up blockdev-snapshot-internal-sync doc, Kevin Wolf, 2024/08/05
- [PULL 02/13] block-copy: Fix missing graph lock, Kevin Wolf, 2024/08/05
- [PULL 05/13] scsi-block: Don't skip callback for sgio error status/driver_status, Kevin Wolf, 2024/08/05
- [PULL 06/13] scsi-disk: Add warning comments that host_status errors take a shortcut, Kevin Wolf, 2024/08/05
- [PULL 03/13] block/graph-lock: Make WITH_GRAPH_RDLOCK_GUARD() fully checked, Kevin Wolf, 2024/08/05
- [PULL 04/13] scsi-disk: Use positive return value for status in dma_readv/writev, Kevin Wolf, 2024/08/05
- [PULL 08/13] vvfat: Fix bug in writing to middle of file, Kevin Wolf, 2024/08/05
- [PULL 07/13] scsi-disk: Always report RESERVATION_CONFLICT to guest,
Kevin Wolf <=
- [PULL 10/13] vvfat: Fix wrong checks for cluster mappings invariant, Kevin Wolf, 2024/08/05
- [PULL 09/13] vvfat: Fix usage of `info.file.offset`, Kevin Wolf, 2024/08/05
- [PULL 13/13] iotests/024: exclude 'backing file format' field from the output, Kevin Wolf, 2024/08/05
- [PULL 11/13] vvfat: Fix reading files with non-continuous clusters, Kevin Wolf, 2024/08/05
- [PULL 12/13] iotests: Add `vvfat` tests, Kevin Wolf, 2024/08/05
- Re: [PULL 00/13] Block layer patches, Richard Henderson, 2024/08/06