Skip to contentSkip to conversation

scsi-block: Fix error handling with r/werror=stop

PATCH Superseded Kevin Wolf 2 participants 10 messages Jul 29, 2024 – Jul 30, 2024

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
author
#1 lore raw

PATCH 1/4 scsi-disk: Use positive return value for status in dma_readv/writev

In reply to Kevin Wolf

In some error cases, scsi_block_sgio_complete() never calls the passed callback, but directly completes the request. This leads to bugs because its error paths are not exact copies of what the callback would normally do.

In preparation to fix this, allow passing positive return values to the callbacks that represent the status code that should be used to complete the request.

scsi_handle_rw_error() already handles positive values for its ret parameter because scsi_block_sgio_complete() calls directly into it.

---
 hw/scsi/scsi-disk.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
hw/scsi/scsi-disk.c +14 -7
index a67092db6a..3ff6798bde 100644
@@ -65,6 +65,10 @@ OBJECT_DECLARE_TYPE(SCSIDiskState, SCSIDiskClass, SCSI_DISK_BASE)
 
 struct SCSIDiskClass {
     SCSIDeviceClass parent_class;
+    /*
+     * Callbacks receive ret == 0 for success. Errors are represented either as
+     * negative errno values, or as positive SAM status codes.
+     */
     DMAIOFunc       *dma_readv;
     DMAIOFunc       *dma_writev;
     bool            (*need_fua_emulation)(SCSICommand *cmd);
@@ -283,7 +287,7 @@ static bool scsi_disk_req_check_error(SCSIDiskReq *r, int ret, bool acct_failed)
         return true;
     }
 
-    if (ret < 0) {
+    if (ret != 0) {
         return scsi_handle_rw_error(r, ret, acct_failed);
     }
 
@@ -360,7 +364,7 @@ static void scsi_write_do_fua(SCSIDiskReq *r)
 static void scsi_dma_complete_noio(SCSIDiskReq *r, int ret)
 {
     assert(r->req.aiocb == NULL);
-    if (scsi_disk_req_check_error(r, ret, false)) {
+    if (scsi_disk_req_check_error(r, ret, ret > 0)) {
         goto done;
     }
 
@@ -385,9 +389,10 @@ static void scsi_dma_complete(void *opaque, int ret)
     assert(r->req.aiocb != NULL);
     r->req.aiocb = NULL;
 
+    /* ret > 0 is accounted for in scsi_disk_req_check_error() */
     if (ret < 0) {
         block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct);
-    } else {
+    } else if (ret == 0) {
         block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
     }
     scsi_dma_complete_noio(r, ret);
@@ -403,7 +408,7 @@ static void scsi_read_complete_noio(SCSIDiskReq *r, int ret)
            qemu_get_current_aio_context());
 
     assert(r->req.aiocb == NULL);
-    if (scsi_disk_req_check_error(r, ret, false)) {
+    if (scsi_disk_req_check_error(r, ret, ret > 0)) {
         goto done;
     }
 
@@ -424,9 +429,10 @@ static void scsi_read_complete(void *opaque, int ret)
     assert(r->req.aiocb != NULL);
     r->req.aiocb = NULL;
 
+    /* ret > 0 is accounted for in scsi_disk_req_check_error() */
     if (ret < 0) {
         block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct);
-    } else {
+    } else if (ret == 0) {
         block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
         trace_scsi_disk_read_complete(r->req.tag, r->qiov.size);
     }
@@ -534,7 +540,7 @@ static void scsi_write_complete_noio(SCSIDiskReq *r, int ret)
            qemu_get_current_aio_context());
 
     assert (r->req.aiocb == NULL);
-    if (scsi_disk_req_check_error(r, ret, false)) {
+    if (scsi_disk_req_check_error(r, ret, ret > 0)) {
         goto done;
     }
 
@@ -562,9 +568,10 @@ static void scsi_write_complete(void * opaque, int ret)
     assert (r->req.aiocb != NULL);
     r->req.aiocb = NULL;
 
+    /* ret > 0 is accounted for in scsi_disk_req_check_error() */
     if (ret < 0) {
         block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct);
-    } else {
+    } else if (ret == 0) {
         block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
     }
     scsi_write_complete_noio(r, ret);
Signature · 1 line
2.45.2
author
#3 lore raw

PATCH 3/4 scsi-disk: Add warning comments that host_status errors take a shortcut

In reply to Kevin Wolf

scsi_block_sgio_complete() has surprising behaviour in that there are error cases in which it directly completes the request and never calls the passed callback. In the current state of the code, this doesn't seem to result in bugs, but with future code changes, we must be careful to never rely on the callback doing some cleanup until this code smell is fixed. For now, just add warnings to make people aware of the trap.

---
 hw/scsi/scsi-disk.c | 7 +++++++
 1 file changed, 7 insertions(+)
hw/scsi/scsi-disk.c +7 -0
index 6e1a5c98df..69a195177e 100644
@@ -68,6 +68,9 @@ struct SCSIDiskClass {
     /*
      * Callbacks receive ret == 0 for success. Errors are represented either as
      * negative errno values, or as positive SAM status codes.
+     *
+     * Beware: For errors returned in host_status, the function may directly
+     * complete the request and never call the callback.
      */
     DMAIOFunc       *dma_readv;
     DMAIOFunc       *dma_writev;
@@ -381,6 +384,7 @@ done:
     scsi_req_unref(&r->req);
 }
 
+/* May not be called in all error cases, don't rely on cleanup here */
 static void scsi_dma_complete(void *opaque, int ret)
 {
     SCSIDiskReq *r = (SCSIDiskReq *)opaque;
@@ -421,6 +425,7 @@ done:
     scsi_req_unref(&r->req);
 }
 
+/* May not be called in all error cases, don't rely on cleanup here */
 static void scsi_read_complete(void *opaque, int ret)
 {
     SCSIDiskReq *r = (SCSIDiskReq *)opaque;
@@ -560,6 +565,7 @@ done:
     scsi_req_unref(&r->req);
 }
 
+/* May not be called in all error cases, don't rely on cleanup here */
 static void scsi_write_complete(void * opaque, int ret)
 {
     SCSIDiskReq *r = (SCSIDiskReq *)opaque;
@@ -2821,6 +2827,7 @@ static void scsi_block_sgio_complete(void *opaque, int ret)
     sg_io_hdr_t *io_hdr = &req->io_header;
 
     if (ret == 0) {
+        /* FIXME This skips calling req->cb() and any cleanup in it */
         if (io_hdr->host_status != SCSI_HOST_OK) {
             scsi_req_complete_failed(&r->req, io_hdr->host_status);
             scsi_req_unref(&r->req);
Signature · 1 line
2.45.2
author
#2 lore raw

PATCH 2/4 scsi-block: Don't skip callback for sgio error status/driver_status

In reply to Kevin Wolf

Instead of calling into scsi_handle_rw_error() directly from scsi_block_sgio_complete() and skipping the normal callback, go through the normal cleanup path by calling the callback with a positive error value.

The important difference here is not only that the code path is cleaner, but that the callbacks set r->req.aiocb = NULL. If we skip setting this and the error action is BLOCK_ERROR_ACTION_STOP, resuming the VM runs into an assertion failure in scsi_read_data() or scsi_write_data() because the dangling aiocb pointer is unexpected.

Fixes a108557bbf ("scsi: inline sg_io_sense_from_errno() into the callers.")
---
 hw/scsi/scsi-disk.c | 10 ----------
 1 file changed, 10 deletions(-)
hw/scsi/scsi-disk.c +0 -10
index 3ff6798bde..6e1a5c98df 100644
@@ -2832,16 +2832,6 @@ static void scsi_block_sgio_complete(void *opaque, int ret)
         } else {
             ret = io_hdr->status;
         }
-
-        if (ret > 0) {
-            if (scsi_handle_rw_error(r, ret, true)) {
-                scsi_req_unref(&r->req);
-                return;
-            }
-
-            /* Ignore error.  */
-            ret = 0;
-        }
     }
 
     req->cb(req->cb_opaque, ret);
Signature · 1 line
2.45.2

Kevin Wolf

author
#0 lore raw

cover scsi-block: Fix error handling with r/werror=stop

Running validation tests in Windows 2019's Failover Cluster Manager fails in two different ways when run with rerror/werror=stop:

1. It runs into an assertion failure because the sgio-based I/O path takes shortcuts in its error handling that skip necessary cleanup

2. RESERVATION_CONFLICT is treated as a host error and stops the VM, which in some cases can't be resumed at all because nothing will make the error go away on retry. The error should always go to the guest instead, it's an invalid request from the guest.

This series fixes these problems.

Kevin Wolf (4):
scsi-disk: Use positive return value for status in dma_readv/writev
scsi-block: Don't skip callback for sgio error status/driver_status
scsi-disk: Add warning comments that host_status errors take a
shortcut
scsi-disk: Always report RESERVATION_CONFLICT to guest

 hw/scsi/scsi-disk.c | 53 +++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 21 deletions(-)
Signature · 1 line
2.45.2
author
#4 lore raw

PATCH 4/4 scsi-disk: Always report RESERVATION_CONFLICT to guest

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, 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.

---
 hw/scsi/scsi-disk.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
hw/scsi/scsi-disk.c +11 -4
index 69a195177e..e173b238de 100644
@@ -235,11 +235,17 @@ 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 */
+            break;
+        default:
             error = EINVAL;
+            break;
         }
     }
 
@@ -249,8 +255,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 {
Signature · 1 line
2.45.2
author
#6 lore raw

Re: [PATCH 4/4] scsi-disk: Always report RESERVATION_CONFLICT to guest

In reply to Paolo Bonzini

Am 29.07.2024 um 13:55 hat Paolo Bonzini geschrieben:

Quoted 7 lines · Kevin Wolf
Quoted 3 lines

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.

This is only true of scsi-block (though your patch is okay here - scsi-disk would see an EBADE and go down the ret < 0 path).

Right, in the scsi-disk case, we probably do want to consider it a host-side error because the guest can't see or influence what happens on the backend.

I can change the commit message accordingly.

Quoted 5 lines

In general, for scsi-block I'd expect people to use report instead of stop. I agree that this is the best behavior for the case where you have a pr-manager, but it may also be better to stop the VM if a pr-manager has not been set up. That's probably a bit hackish, so I guess it's okay to add a FIXME or TODO comment instead?

Apparently both oVirt and Kubevirt unconditionally use the stop policy, so I'm afraid in this case we must acknowledge that our expectations don't match reality.

If I understand correctly, not having a pr-manager could mean that QEMU itself is sufficiently privileged and then the same logic would apply.

But even if it means that we can't change any persistent reservations from the VM, what use would stopping the VM be? You would run into the exact case I'm describing in the commit message: You try to resume the VM and it immediately stops again because the request still doesn't get through. Or do you expect the host admin to take some manual action then?

And what would you do about the Windows cluster validation case that intentionally sends a request which reservations don't and shouldn't allow? There is nothing on the host side to fix there. The guest is only happy when it gets an error back.

Quoted 10 lines

hw/scsi/scsi-disk.c static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed) · line 244

Quoted 9 lines
hw/scsi/scsi-disk.c +5 -2
-        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 */
Quoted 2 lines

This is the only case where you get error == 0. Maybe remove it from the initializer, and set it here?

Not sure why the initialiser was added in the first place, but yes, I can do that.

Kevin

Quoted 62 lines · Kevin Wolf
Quoted 60 lines

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, 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.

---
 hw/scsi/scsi-disk.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
hw/scsi/scsi-disk.c +11 -5
index 69a195177e..e173b238de 100644
@@ -235,11 +235,17 @@ 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 */
+            break;
+        default:
             error = EINVAL;
+            break;
         }
     }
 
@@ -249,8 +255,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

#7 lore raw

Re: [PATCH 4/4] scsi-disk: Always report RESERVATION_CONFLICT to guest

Il lun 29 lug 2024, 14:20 Kevin Wolf <[email protected]> ha scritto:

Quoted 4 lines

Apparently both oVirt and Kubevirt unconditionally use the stop policy, so I'm afraid in this case we must acknowledge that our expectations don't match reality.

Yeah, of course.

If I understand correctly, not having a pr-manager could mean that QEMU

Quoted 9 lines

itself is sufficiently privileged and then the same logic would apply.

But even if it means that we can't change any persistent reservations from the VM, what use would stopping the VM be? You would run into the exact case I'm describing in the commit message: You try to resume the VM and it immediately stops again because the request still doesn't get through. Or do you expect the host admin to take some manual action then?

Yes, if the PR operation is not allowed then the host admin would probably get a notification and release the PR (or perhaps shutdown the VM with an error) itself.

And what would you do about the Windows cluster validation case that

Quoted 4 lines

intentionally sends a request which reservations don't and shouldn't allow? There is nothing on the host side to fix there. The guest is only happy when it gets an error back.

Yes, in that case (which is the most common one) there is nothing you can do, so the patch is a good idea even if the case without a PR manager is a bit murky.

Paolo

Quoted 94 lines
Quoted 5 lines

- if (status == CHECK_CONDITION) {

Quoted 4 lines
hw/scsi/scsi-disk.c +2 -0
+        switch (status) {
+        case CHECK_CONDITION:
             req_has_sense = true;
             error = scsi_sense_buf_to_errno(r->req.sense,

sizeof(r->req.sense));

Quoted 4 lines

hw/scsi/scsi-disk.c static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed)

Quoted 4 lines
hw/scsi/scsi-disk.c +3 -1
-        } else {
+            break;
+        case RESERVATION_CONFLICT:
+            /* Don't apply the error policy, always report to the

guest */

Quoted 3 lines

This is the only case where you get error == 0. Maybe remove it from the initializer, and set it here?

Not sure why the initialiser was added in the first place, but yes, I can do that.

Kevin

Quoted 4 lines · Kevin Wolf
Quoted 3 lines

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

Quoted 9 lines
Quoted 9 lines

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, 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

Quoted 1 line
Quoted 1 line

Manager, which intentionally tries to execute invalid requests to see

if

Quoted 8 lines
Quoted 8 lines

they are properly rejected.

---
 hw/scsi/scsi-disk.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
Quoted 5 lines

hw/scsi/scsi-disk.c static bool scsi_handle_rw_error(SCSIDiskReq *r,

Quoted 5 lines
hw/scsi/scsi-disk.c +0 -0
index 69a195177e..e173b238de 100644
@@ -235,11 +235,17 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r,

int ret, bool acct_failed)

Quoted 2 lines

hw/scsi/scsi-disk.c static bool scsi_handle_rw_error(SCSIDiskReq *r, · line 236

Quoted 2 lines
hw/scsi/scsi-disk.c +0 -0
     } else {
         /* A passthrough command has completed with nonzero status.

*/

Quoted 6 lines

hw/scsi/scsi-disk.c static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed)

Quoted 6 lines
hw/scsi/scsi-disk.c +2 -1
         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));

Quoted 4 lines

hw/scsi/scsi-disk.c static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed)

Quoted 4 lines
hw/scsi/scsi-disk.c +3 -1
-        } else {
+            break;
+        case RESERVATION_CONFLICT:
+            /* Don't apply the error policy, always report to the

guest */

Quoted 8 lines

hw/scsi/scsi-disk.c static bool scsi_handle_rw_error(SCSIDiskReq *r,

Quoted 8 lines
hw/scsi/scsi-disk.c +3 -0
+            break;
+        default:
             error = EINVAL;
+            break;
         }
     }
 
@@ -249,8 +255,9 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r,

int ret, bool acct_failed)

Quoted 5 lines

hw/scsi/scsi-disk.c static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed)

Quoted 5 lines
hw/scsi/scsi-disk.c +0 -2
      * 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))) {

Quoted 3 lines

hw/scsi/scsi-disk.c static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed)

Quoted 3 lines
hw/scsi/scsi-disk.c +3 -0
+    if (!error || (req_has_sense &&
+                   scsi_sense_buf_is_guest_recoverable(r->req.sense,
+

sizeof(r->req.sense)))) {

Quoted 7 lines
Quoted 6 lines
hw/scsi/scsi-disk.c +0 -1
         action = BLOCK_ERROR_ACTION_REPORT;
         acct_failed = false;
     } else {
--

2.45.2

#5 lore raw

Re: [PATCH 4/4] scsi-disk: Always report RESERVATION_CONFLICT to guest

In reply to Kevin Wolf
Quoted 3 lines · Kevin Wolf

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.

This is only true of scsi-block (though your patch is okay here - scsi-disk would see an EBADE and go down the ret < 0 path).

In general, for scsi-block I'd expect people to use report instead of stop. I agree that this is the best behavior for the case where you have a pr-manager, but it may also be better to stop the VM if a pr-manager has not been set up. That's probably a bit hackish, so I guess it's okay to add a FIXME or TODO comment instead?

hw/scsi/scsi-disk.c static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed) · line 244

Quoted 9 lines
hw/scsi/scsi-disk.c +5 -2
-        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 the only case where you get error == 0. Maybe remove it from the initializer, and set it here?

Paolo

Quoted 60 lines · Kevin Wolf

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, 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.

---
 hw/scsi/scsi-disk.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
hw/scsi/scsi-disk.c +11 -5
index 69a195177e..e173b238de 100644
@@ -235,11 +235,17 @@ 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 */
+            break;
+        default:
             error = EINVAL;
+            break;
         }
     }
 
@@ -249,8 +255,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

author
#8 lore raw

Re: [PATCH 4/4] scsi-disk: Always report RESERVATION_CONFLICT to guest

In reply to Paolo Bonzini

Am 29.07.2024 um 14:26 hat Paolo Bonzini geschrieben:

Quoted 25 lines

Il lun 29 lug 2024, 14:20 Kevin Wolf <[email protected]> ha scritto:

Quoted 4 lines

Apparently both oVirt and Kubevirt unconditionally use the stop policy, so I'm afraid in this case we must acknowledge that our expectations don't match reality.

Yeah, of course.

If I understand correctly, not having a pr-manager could mean that QEMU

Quoted 9 lines

itself is sufficiently privileged and then the same logic would apply.

But even if it means that we can't change any persistent reservations from the VM, what use would stopping the VM be? You would run into the exact case I'm describing in the commit message: You try to resume the VM and it immediately stops again because the request still doesn't get through. Or do you expect the host admin to take some manual action then?

Yes, if the PR operation is not allowed then the host admin would probably get a notification and release the PR (or perhaps shutdown the VM with an error) itself.

And what would you do about the Windows cluster validation case that

Quoted 8 lines
Quoted 4 lines

intentionally sends a request which reservations don't and shouldn't allow? There is nothing on the host side to fix there. The guest is only happy when it gets an error back.

Yes, in that case (which is the most common one) there is nothing you can do, so the patch is a good idea even if the case without a PR manager is a bit murky.

Ok, so modifying the commit message and removing the 'error' initialisation it is. Maybe mention the cluster validation case in the comment here to explain why we do this even for non-pr-manager cases, but not as a FIXME or TODO because it's not a problem with the implementation, but we don't have any other choice. Right?

Should I send a v2 for this or is it okay to do this only while applying the patch?

Kevin

#9 lore raw

Re: [PATCH 4/4] scsi-disk: Always report RESERVATION_CONFLICT to guest

Quoted 5 lines · Kevin Wolf

Ok, so modifying the commit message and removing the 'error' initialisation it is. Maybe mention the cluster validation case in the comment here to explain why we do this even for non-pr-manager cases, but not as a FIXME or TODO because it's not a problem with the implementation, but we don't have any other choice. Right?

Yep, go ahead and do it.

Paolo

Quoted 5 lines

Should I send a v2 for this or is it okay to do this only while applying the patch?

Kevin