107 lines
4.2 KiB
Diff
107 lines
4.2 KiB
Diff
From 620d646367a38ff9908de811e1f0a24a3f105529 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Mon, 8 Mar 2021 10:49:01 -0500
|
|
Subject: [PATCH 04/15] scsi-disk: pass SCSI status to scsi_handle_rw_error
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
Message-id: <20210308104902.149906-5-pbonzini@redhat.com>
|
|
Patchwork-id: 101310
|
|
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH 4/5] scsi-disk: pass SCSI status to scsi_handle_rw_error
|
|
Bugzilla: 1927530
|
|
RH-Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
|
Instead of fishing it from *r->status, just pass the SCSI status
|
|
as a positive value of the second parameter and an errno as a
|
|
negative value.
|
|
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit f63c68bc0f514694a958b2e84a204b7792d28b17)
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/scsi/scsi-disk.c | 38 +++++++++++++++++++++++++++-----------
|
|
1 file changed, 27 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
|
|
index 7393f33ee2..c545f0b674 100644
|
|
--- a/hw/scsi/scsi-disk.c
|
|
+++ b/hw/scsi/scsi-disk.c
|
|
@@ -186,34 +186,48 @@ static void scsi_disk_load_request(QEMUFile *f, SCSIRequest *req)
|
|
* scsi_handle_rw_error always manages its reference counts, independent
|
|
* of the return value.
|
|
*/
|
|
-static bool scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_failed)
|
|
+static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed)
|
|
{
|
|
bool is_read = (r->req.cmd.mode == SCSI_XFER_FROM_DEV);
|
|
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
|
|
SCSIDiskClass *sdc = (SCSIDiskClass *) object_get_class(OBJECT(s));
|
|
- BlockErrorAction action = blk_get_error_action(s->qdev.conf.blk,
|
|
- is_read, error);
|
|
- SCSISense sense;
|
|
+ SCSISense sense = SENSE_CODE(NO_SENSE);
|
|
+ int error = 0;
|
|
+ bool req_has_sense = false;
|
|
+ BlockErrorAction action;
|
|
+ int status;
|
|
|
|
+ if (ret < 0) {
|
|
+ status = scsi_sense_from_errno(-ret, &sense);
|
|
+ error = -ret;
|
|
+ } else {
|
|
+ /* A passthrough command has completed with nonzero status. */
|
|
+ status = ret;
|
|
+ if (status == CHECK_CONDITION) {
|
|
+ req_has_sense = true;
|
|
+ error = scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.sense));
|
|
+ } else {
|
|
+ error = EINVAL;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ action = blk_get_error_action(s->qdev.conf.blk, is_read, error);
|
|
if (action == BLOCK_ERROR_ACTION_REPORT) {
|
|
if (acct_failed) {
|
|
block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct);
|
|
}
|
|
- if (error == 0) {
|
|
+ if (req_has_sense) {
|
|
/* A passthrough command has run and has produced sense data; check
|
|
* whether the error has to be handled by the guest or should rather
|
|
* pause the host.
|
|
*/
|
|
- assert(r->status && *r->status);
|
|
if (scsi_sense_buf_is_guest_recoverable(r->req.sense, sizeof(r->req.sense))) {
|
|
/* These errors are handled by guest. */
|
|
sdc->update_sense(&r->req);
|
|
- scsi_req_complete(&r->req, *r->status);
|
|
+ scsi_req_complete(&r->req, status);
|
|
return true;
|
|
}
|
|
- error = scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.sense));
|
|
} else {
|
|
- int status = scsi_sense_from_errno(error, &sense);
|
|
if (status == CHECK_CONDITION) {
|
|
scsi_req_build_sense(&r->req, sense);
|
|
}
|
|
@@ -239,8 +253,10 @@ static bool scsi_disk_req_check_error(SCSIDiskReq *r, int ret, bool acct_failed)
|
|
return true;
|
|
}
|
|
|
|
- if (ret < 0 || (r->status && *r->status)) {
|
|
- return scsi_handle_rw_error(r, -ret, acct_failed);
|
|
+ if (ret < 0) {
|
|
+ return scsi_handle_rw_error(r, ret, acct_failed);
|
|
+ } else if (r->status && *r->status) {
|
|
+ return scsi_handle_rw_error(r, *r->status, acct_failed);
|
|
}
|
|
|
|
return false;
|
|
--
|
|
2.27.0
|
|
|