From nobody Mon Feb 9 18:44:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1651132433; cv=none; d=zohomail.com; s=zohoarc; b=UK2QAMtO2mwVjfU+zqXwfmyuChLUoNYYqbsbDQFSRkcU24AiX88WkDOZBVY3j5m9ek0xsKmNTNrVcNsh/IqudgPdnVI7iRtmWMVKdcl6cqWfdwzOOGRxlPdEAu1gipc/auVLIyOTPayMZyJG+2AXFRa1XjxCW2av5uiR5s+M37I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651132433; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=e7smBjs6Cs54j9gtj63aB2bUTDoqIo4j1UzSK6xvBWg=; b=ZkBrBl5U9O/6/JLmFrGg4xcWJbOVAzRQBhyHzdVoBWget9S2zt1/sOhp7Z7rmneAa3HzvlX8w3Qxh31FuVE1R8Fsx7/FD7mHF8dHU1fOZ1ayOXAXbt7j5TGI4crKUuaiaiRgvZXJxXfu/ghlEQHI8v0MAxmFI+HNBmH3vaOsn3g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1651132433077188.00540535851917; Thu, 28 Apr 2022 00:53:53 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.316083.534818 (Exim 4.92) (envelope-from ) id 1njyxv-0003zp-9h; Thu, 28 Apr 2022 07:53:31 +0000 Received: by outflank-mailman (output) from mailman id 316083.534818; Thu, 28 Apr 2022 07:53:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1njyxv-0003zi-6P; Thu, 28 Apr 2022 07:53:31 +0000 Received: by outflank-mailman (input) for mailman id 316083; Thu, 28 Apr 2022 07:53:29 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1njyxt-0003js-47 for xen-devel@lists.xenproject.org; Thu, 28 Apr 2022 07:53:29 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 49eb4655-c6c8-11ec-a405-831a346695d4; Thu, 28 Apr 2022 09:53:28 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id AACEE21870; Thu, 28 Apr 2022 07:53:27 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 7707F13AF8; Thu, 28 Apr 2022 07:53:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QDOoG/dHamIoHAAAMHmgww (envelope-from ); Thu, 28 Apr 2022 07:53:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 49eb4655-c6c8-11ec-a405-831a346695d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1651132407; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e7smBjs6Cs54j9gtj63aB2bUTDoqIo4j1UzSK6xvBWg=; b=rpwyrV9E6S/d9bU0Olq3d0lZ/V4hx2lhfq8AigAGZwgiad+EOGLOiKyt3wOw0lACnEj/Gr 7XLQTGdTp6LuN7zjo3FEYVQEXr1TbhFcR68hqxGB320Bs6nK+htjcjCLxPBzEmSU/kYSB3 PFGspBJj5GfMqbXPksQC1qLa2e2SWs0= From: Juergen Gross To: xen-devel@lists.xenproject.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Juergen Gross , Boris Ostrovsky , Stefano Stabellini Subject: [PATCH v2 2/4] xen/scsiback: use new command result macros Date: Thu, 28 Apr 2022 09:53:21 +0200 Message-Id: <20220428075323.12853-3-jgross@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220428075323.12853-1-jgross@suse.com> References: <20220428075323.12853-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1651132435102100009 Content-Type: text/plain; charset="utf-8" Instead of using the kernel's values for the result of PV scsi operations use the values of the interface definition. Signed-off-by: Juergen Gross --- V2: - fix scsiback_result() to pass through lowest 16 bits of result - use XEN_VSCSIIF_RSLT_HOST() instead of open coding it (Boris Ostrovsky) --- drivers/xen/xen-scsiback.c | 82 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 3 deletions(-) diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c index 0c5e565aa8cf..7a0c93acc2c5 100644 --- a/drivers/xen/xen-scsiback.c +++ b/drivers/xen/xen-scsiback.c @@ -280,6 +280,82 @@ static void scsiback_free_translation_entry(struct kre= f *kref) kfree(entry); } =20 +static int32_t scsiback_result(int32_t result) +{ + int32_t host_status; + + switch (XEN_VSCSIIF_RSLT_HOST(result)) { + case DID_OK: + host_status =3D XEN_VSCSIIF_RSLT_HOST_OK; + break; + case DID_NO_CONNECT: + host_status =3D XEN_VSCSIIF_RSLT_HOST_NO_CONNECT; + break; + case DID_BUS_BUSY: + host_status =3D XEN_VSCSIIF_RSLT_HOST_BUS_BUSY; + break; + case DID_TIME_OUT: + host_status =3D XEN_VSCSIIF_RSLT_HOST_TIME_OUT; + break; + case DID_BAD_TARGET: + host_status =3D XEN_VSCSIIF_RSLT_HOST_BAD_TARGET; + break; + case DID_ABORT: + host_status =3D XEN_VSCSIIF_RSLT_HOST_ABORT; + break; + case DID_PARITY: + host_status =3D XEN_VSCSIIF_RSLT_HOST_PARITY; + break; + case DID_ERROR: + host_status =3D XEN_VSCSIIF_RSLT_HOST_ERROR; + break; + case DID_RESET: + host_status =3D XEN_VSCSIIF_RSLT_HOST_RESET; + break; + case DID_BAD_INTR: + host_status =3D XEN_VSCSIIF_RSLT_HOST_BAD_INTR; + break; + case DID_PASSTHROUGH: + host_status =3D XEN_VSCSIIF_RSLT_HOST_PASSTHROUGH; + break; + case DID_SOFT_ERROR: + host_status =3D XEN_VSCSIIF_RSLT_HOST_SOFT_ERROR; + break; + case DID_IMM_RETRY: + host_status =3D XEN_VSCSIIF_RSLT_HOST_IMM_RETRY; + break; + case DID_REQUEUE: + host_status =3D XEN_VSCSIIF_RSLT_HOST_REQUEUE; + break; + case DID_TRANSPORT_DISRUPTED: + host_status =3D XEN_VSCSIIF_RSLT_HOST_TRANSPORT_DISRUPTED; + break; + case DID_TRANSPORT_FAILFAST: + host_status =3D XEN_VSCSIIF_RSLT_HOST_TRANSPORT_FAILFAST; + break; + case DID_TARGET_FAILURE: + host_status =3D XEN_VSCSIIF_RSLT_HOST_TARGET_FAILURE; + break; + case DID_NEXUS_FAILURE: + host_status =3D XEN_VSCSIIF_RSLT_HOST_NEXUS_FAILURE; + break; + case DID_ALLOC_FAILURE: + host_status =3D XEN_VSCSIIF_RSLT_HOST_ALLOC_FAILURE; + break; + case DID_MEDIUM_ERROR: + host_status =3D XEN_VSCSIIF_RSLT_HOST_MEDIUM_ERROR; + break; + case DID_TRANSPORT_MARGINAL: + host_status =3D XEN_VSCSIIF_RSLT_HOST_TRANSPORT_MARGINAL; + break; + default: + host_status =3D XEN_VSCSIIF_RSLT_HOST_ERROR; + break; + } + + return (host_status << 16) | (result & 0x00ffff); +} + static void scsiback_send_response(struct vscsibk_info *info, char *sense_buffer, int32_t result, uint32_t resid, uint16_t rqid) @@ -295,7 +371,7 @@ static void scsiback_send_response(struct vscsibk_info = *info, ring_res =3D RING_GET_RESPONSE(&info->ring, info->ring.rsp_prod_pvt); info->ring.rsp_prod_pvt++; =20 - ring_res->rslt =3D result; + ring_res->rslt =3D scsiback_result(result); ring_res->rqid =3D rqid; =20 if (sense_buffer !=3D NULL && @@ -555,7 +631,7 @@ static void scsiback_device_action(struct vscsibk_pend = *pending_req, struct scsiback_nexus *nexus =3D tpg->tpg_nexus; struct se_cmd *se_cmd =3D &pending_req->se_cmd; u64 unpacked_lun =3D pending_req->v2p->lun; - int rc, err =3D FAILED; + int rc, err =3D XEN_VSCSIIF_RSLT_RESET_FAILED; =20 init_completion(&pending_req->tmr_done); =20 @@ -569,7 +645,7 @@ static void scsiback_device_action(struct vscsibk_pend = *pending_req, wait_for_completion(&pending_req->tmr_done); =20 err =3D (se_cmd->se_tmr_req->response =3D=3D TMR_FUNCTION_COMPLETE) ? - SUCCESS : FAILED; + XEN_VSCSIIF_RSLT_RESET_SUCCESS : XEN_VSCSIIF_RSLT_RESET_FAILED; =20 scsiback_do_resp_with_sense(NULL, err, 0, pending_req); transport_generic_free_cmd(&pending_req->se_cmd, 0); --=20 2.34.1