From nobody Tue Feb 10 09:57:53 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615028485; cv=none; d=zohomail.com; s=zohoarc; b=csCqGDzo2vovKiKrQEbEt0z1kIPO1JG10KL/GhZnBqyjfjHwrlo6DDIfGdL5X25Y9O9g/LFewBDJCxIMW2eYN/gAiH4kGkOFAGkkFADvq02miSHj045bw2JovrgLP/LP+yq9ooIjO9XdQWFR+9XXIG0frfAUtMZ80JrpVy9x2Wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615028485; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UIYd14lz7UHJRjF1bu94Jg7Tf5lE7IMtqw4bi8iqiNI=; b=YjFaLNVffrRK43lviuoN4HiX9WNFrf0P9kd0iZzeApL/r7yISYKFno8dKffucK5DDeobo3sCMyTlfTsSwp+M5GVtCQpvub7F0naydgJAPj0/eqMx/khUyI0TMbxxMitFvxyG9jYl1TaShAtcA/Ety2MXf9Hw6LW6cRWk9WLpkGA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615028485111185.14424710787068; Sat, 6 Mar 2021 03:01:25 -0800 (PST) Received: from localhost ([::1]:57110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIUgW-0006lT-08 for importer@patchew.org; Sat, 06 Mar 2021 06:01:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIUZz-00061S-TU for qemu-devel@nongnu.org; Sat, 06 Mar 2021 05:54:41 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:35566) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIUZx-0008CX-QV for qemu-devel@nongnu.org; Sat, 06 Mar 2021 05:54:39 -0500 Received: by mail-wr1-x42e.google.com with SMTP id l12so5216309wry.2 for ; Sat, 06 Mar 2021 02:54:36 -0800 (PST) Received: from avogadro.redhat.com ([93.56.170.5]) by smtp.gmail.com with ESMTPSA id i26sm9326472wmb.18.2021.03.06.02.54.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 02:54:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UIYd14lz7UHJRjF1bu94Jg7Tf5lE7IMtqw4bi8iqiNI=; b=q5qc8qGtvCjDi/k6cyipubQxnNK9PiPMuz6xhsCrpEsCFdPrYp5e3ct666yFEEKW0A cM9FgNNq7Q8Ut8wWJJEjXY2cQUrCL7zYkOGHlZt0bJq1otIiEDv7IP6JA5oVOh8F3tJi E1Jzb6rKQtwhSCtZgdnKGIBZoNlatWO0IIhN8leIIyCCeC3aga1HfUnis5dTPR2eO1Sw reXkk5paTQfDAyzXk/zHQ3510UFkKEGXly2/gcTBUvwIPshggiKujfDH/0pPtQhUQJH3 5pGbOjQ+94nhqWWV7LEc28RbxSK9Sv6oxEk5XinlQcmYBI+I8TKdBL2KWUn/J5MtA7UZ OD1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UIYd14lz7UHJRjF1bu94Jg7Tf5lE7IMtqw4bi8iqiNI=; b=hZa8E9aZQTS+mw7h7EQKrI04MQIzPW0V0GqRupM6Ukw55Xz+OQFYZO5OYOZ0OfR+sg Ah1Dq540PsunNZImk+xC2ZEwUUk/i2PGoyTPF1K9dX4dcEXlu+QVPNVDODdGSse8DxH/ HTXJGwAxnZBHTon4I+8sL1Y3bZK+XKMWuwqNDgnMjhKhLkmKKqWD7OfF89OfaKpz7XbO mXhkegsSxjeo7zoQCBO90eX52eeIqsSV1ewmchNRZvAcQxtOJMtvWbR5fOrwnS2QWk2w 1wXcHmS1JKV4dMKvppl4DqTR2sxxSaP6Vrl1/64YlbHBiKX8BS0hqbiKE4eHZLotlu6H IjvQ== X-Gm-Message-State: AOAM533JxXl6V77ZUge1xzF8H3gfDuQo8zgiXvHXyUBl5qZndbxfrCnC WJJmv+6g/pYMdgAQc+kOo3aNdsPcLJ0= X-Google-Smtp-Source: ABdhPJzCEvBbZQwtlXpuHyG8uwbKlgPcSjjH03Yx2hjLnk56MavAWLFAOZeaaLKsZ+rx8C5pIONihw== X-Received: by 2002:adf:f144:: with SMTP id y4mr13746336wro.408.1615028075503; Sat, 06 Mar 2021 02:54:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 17/23] scsi: move host_status handling into SCSI drivers Date: Sat, 6 Mar 2021 11:54:13 +0100 Message-Id: <20210306105419.110503-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210306105419.110503-1-pbonzini@redhat.com> References: <20210306105419.110503-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hannes Reinecke Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Hannes Reinecke Some SCSI drivers like virtio have an internal mapping for the host_status. This patch moves the host_status translation into the SCSI drivers to allow those drivers to set up the correct values. Signed-off-by: Hannes Reinecke . [Added default handling to avoid touching all drivers. - Paolo] Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-bus.c | 33 ++++++++++++++++++++++++++++-- hw/scsi/scsi-disk.c | 12 +++++------ hw/scsi/scsi-generic.c | 6 ++---- hw/scsi/virtio-scsi.c | 46 ++++++++++++++++++++++++++++++++++++++++++ hw/scsi/vmw_pvscsi.c | 39 +++++++++++++++++++++++++++++++++++ include/hw/scsi/scsi.h | 5 ++++- 6 files changed, 128 insertions(+), 13 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index dc4141ec8d..2d674f94d7 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -692,6 +692,7 @@ SCSIRequest *scsi_req_alloc(const SCSIReqOps *reqops, S= CSIDevice *d, req->lun =3D lun; req->hba_private =3D hba_private; req->status =3D -1; + req->host_status =3D -1; req->ops =3D reqops; object_ref(OBJECT(d)); object_ref(OBJECT(qbus->parent)); @@ -1455,10 +1456,38 @@ void scsi_req_print(SCSIRequest *req) } } =20 +void scsi_req_complete_failed(SCSIRequest *req, int host_status) +{ + SCSISense sense; + int status; + + assert(req->status =3D=3D -1 && req->host_status =3D=3D -1); + assert(req->ops !=3D &reqops_unit_attention); + + if (!req->bus->info->fail) { + status =3D scsi_sense_from_host_status(req->host_status, &sense); + if (status =3D=3D CHECK_CONDITION) { + scsi_req_build_sense(req, sense); + } + scsi_req_complete(req, status); + return; + } + + req->host_status =3D host_status; + scsi_req_ref(req); + scsi_req_dequeue(req); + req->bus->info->fail(req); + + /* Cancelled requests might end up being completed instead of cancelle= d */ + notifier_list_notify(&req->cancel_notifiers, req); + scsi_req_unref(req); +} + void scsi_req_complete(SCSIRequest *req, int status) { - assert(req->status =3D=3D -1); + assert(req->status =3D=3D -1 && req->host_status =3D=3D -1); req->status =3D status; + req->host_status =3D SCSI_HOST_OK; =20 assert(req->sense_len <=3D sizeof(req->sense)); if (status =3D=3D GOOD) { @@ -1646,7 +1675,7 @@ static int put_scsi_requests(QEMUFile *f, void *pv, s= ize_t size, =20 QTAILQ_FOREACH(req, &s->requests, next) { assert(!req->io_canceled); - assert(req->status =3D=3D -1); + assert(req->status =3D=3D -1 && req->host_status =3D=3D -1); assert(req->enqueued); =20 qemu_put_sbyte(f, req->retry ? 1 : 2); diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index ceaf78b423..bd7103cd0e 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2704,15 +2704,15 @@ static void scsi_block_sgio_complete(void *opaque, = int ret) SCSIDiskReq *r =3D &req->req; SCSIDevice *s =3D r->req.dev; sg_io_hdr_t *io_hdr =3D &req->io_header; - SCSISense sense; =20 if (ret =3D=3D 0) { if (io_hdr->host_status !=3D SCSI_HOST_OK) { - ret =3D scsi_sense_from_host_status(io_hdr->host_status, &sens= e); - if (ret =3D=3D CHECK_CONDITION) { - scsi_req_build_sense(&r->req, sense); - } - } else if (io_hdr->driver_status & SG_ERR_DRIVER_TIMEOUT) { + scsi_req_complete_failed(&r->req, io_hdr->host_status); + scsi_req_unref(&r->req); + return; + } + + if (io_hdr->driver_status & SG_ERR_DRIVER_TIMEOUT) { ret =3D BUSY; } else { ret =3D io_hdr->status; diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 02b87819e5..98c30c5d5c 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -89,10 +89,8 @@ static void scsi_command_complete_noio(SCSIGenericReq *r= , int ret) scsi_req_build_sense(&r->req, sense); } } else if (io_hdr->host_status !=3D SCSI_HOST_OK) { - status =3D scsi_sense_from_host_status(io_hdr->host_status, &sense= ); - if (status =3D=3D CHECK_CONDITION) { - scsi_req_build_sense(&r->req, sense); - } + scsi_req_complete_failed(&r->req, io_hdr->host_status); + goto done; } else if (io_hdr->driver_status & SG_ERR_DRIVER_TIMEOUT) { status =3D BUSY; } else { diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 358c0e70b0..6d80730287 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -500,6 +500,51 @@ static void virtio_scsi_complete_cmd_req(VirtIOSCSIReq= *req) virtio_scsi_complete_req(req); } =20 +static void virtio_scsi_command_failed(SCSIRequest *r) +{ + VirtIOSCSIReq *req =3D r->hba_private; + + if (r->io_canceled) { + return; + } + + req->resp.cmd.status =3D GOOD; + switch (r->host_status) { + case SCSI_HOST_NO_LUN: + req->resp.cmd.response =3D VIRTIO_SCSI_S_INCORRECT_LUN; + break; + case SCSI_HOST_BUSY: + req->resp.cmd.response =3D VIRTIO_SCSI_S_BUSY; + break; + case SCSI_HOST_TIME_OUT: + case SCSI_HOST_ABORTED: + req->resp.cmd.response =3D VIRTIO_SCSI_S_ABORTED; + break; + case SCSI_HOST_BAD_RESPONSE: + req->resp.cmd.response =3D VIRTIO_SCSI_S_BAD_TARGET; + break; + case SCSI_HOST_RESET: + req->resp.cmd.response =3D VIRTIO_SCSI_S_RESET; + break; + case SCSI_HOST_TRANSPORT_DISRUPTED: + req->resp.cmd.response =3D VIRTIO_SCSI_S_TRANSPORT_FAILURE; + break; + case SCSI_HOST_TARGET_FAILURE: + req->resp.cmd.response =3D VIRTIO_SCSI_S_TARGET_FAILURE; + break; + case SCSI_HOST_RESERVATION_ERROR: + req->resp.cmd.response =3D VIRTIO_SCSI_S_NEXUS_FAILURE; + break; + case SCSI_HOST_ALLOCATION_FAILURE: + case SCSI_HOST_MEDIUM_ERROR: + case SCSI_HOST_ERROR: + default: + req->resp.cmd.response =3D VIRTIO_SCSI_S_FAILURE; + break; + } + virtio_scsi_complete_cmd_req(req); +} + static void virtio_scsi_command_complete(SCSIRequest *r, size_t resid) { VirtIOSCSIReq *req =3D r->hba_private; @@ -908,6 +953,7 @@ static struct SCSIBusInfo virtio_scsi_scsi_info =3D { .max_lun =3D VIRTIO_SCSI_MAX_LUN, =20 .complete =3D virtio_scsi_command_complete, + .fail =3D virtio_scsi_command_failed, .cancel =3D virtio_scsi_request_cancelled, .change =3D virtio_scsi_change, .parse_cdb =3D virtio_scsi_parse_cdb, diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 0da378ed50..1f30cb020a 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -510,6 +510,44 @@ pvscsi_write_sense(PVSCSIRequest *r, uint8_t *sense, i= nt len) cpu_physical_memory_write(r->req.senseAddr, sense, r->cmp.senseLen); } =20 +static void +pvscsi_command_failed(SCSIRequest *req) +{ + PVSCSIRequest *pvscsi_req =3D req->hba_private; + PVSCSIState *s; + + if (!pvscsi_req) { + trace_pvscsi_command_complete_not_found(req->tag); + return; + } + s =3D pvscsi_req->dev; + + switch (req->host_status) { + case SCSI_HOST_NO_LUN: + pvscsi_req->cmp.hostStatus =3D BTSTAT_LUNMISMATCH; + break; + case SCSI_HOST_BUSY: + pvscsi_req->cmp.hostStatus =3D BTSTAT_ABORTQUEUE; + break; + case SCSI_HOST_TIME_OUT: + case SCSI_HOST_ABORTED: + pvscsi_req->cmp.hostStatus =3D BTSTAT_SENTRST; + break; + case SCSI_HOST_BAD_RESPONSE: + pvscsi_req->cmp.hostStatus =3D BTSTAT_SELTIMEO; + break; + case SCSI_HOST_RESET: + pvscsi_req->cmp.hostStatus =3D BTSTAT_BUSRESET; + break; + default: + pvscsi_req->cmp.hostStatus =3D BTSTAT_HASOFTWARE; + break; + } + pvscsi_req->cmp.scsiStatus =3D GOOD; + qemu_sglist_destroy(&pvscsi_req->sgl); + pvscsi_complete_request(s, pvscsi_req); +} + static void pvscsi_command_complete(SCSIRequest *req, size_t resid) { @@ -1103,6 +1141,7 @@ static const struct SCSIBusInfo pvscsi_scsi_info =3D { .get_sg_list =3D pvscsi_get_sg_list, .complete =3D pvscsi_command_complete, .cancel =3D pvscsi_request_cancelled, + .fail =3D pvscsi_command_failed, }; =20 static void diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 5d992e6e1d..0b726bc78c 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -27,7 +27,8 @@ struct SCSIRequest { uint32_t refcount; uint32_t tag; uint32_t lun; - uint32_t status; + int16_t status; + int16_t host_status; void *hba_private; size_t resid; SCSICommand cmd; @@ -123,6 +124,7 @@ struct SCSIBusInfo { int (*parse_cdb)(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf, void *hba_private); void (*transfer_data)(SCSIRequest *req, uint32_t arg); + void (*fail)(SCSIRequest *req); void (*complete)(SCSIRequest *req, size_t resid); void (*cancel)(SCSIRequest *req); void (*change)(SCSIBus *bus, SCSIDevice *dev, SCSISense sense); @@ -177,6 +179,7 @@ void scsi_req_print(SCSIRequest *req); void scsi_req_continue(SCSIRequest *req); void scsi_req_data(SCSIRequest *req, int len); void scsi_req_complete(SCSIRequest *req, int status); +void scsi_req_complete_failed(SCSIRequest *req, int host_status); uint8_t *scsi_req_get_buf(SCSIRequest *req); int scsi_req_get_sense(SCSIRequest *req, uint8_t *buf, int len); void scsi_req_cancel_complete(SCSIRequest *req); --=20 2.29.2