From: mwilck@suse.com
To: Mike Snitzer <snitzer@redhat.com>,
Alasdair G Kergon <agk@redhat.com>,
Bart Van Assche <Bart.VanAssche@sandisk.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org, dm-devel@redhat.com,
Hannes Reinecke <hare@suse.de>
Cc: Daniel Wagner <dwagner@suse.de>,
emilne@redhat.com, Martin Wilck <mwilck@suse.com>,
linux-block@vger.kernel.org, nkoenig@redhat.com,
Paolo Bonzini <pbonzini@redhat.com>,
Christoph Hellwig <hch@lst.de>
Subject: [dm-devel] [PATCH v4 1/3] scsi: scsi_ioctl: export __scsi_result_to_blk_status()
Date: Mon, 28 Jun 2021 11:52:08 +0200 [thread overview]
Message-ID: <20210628095210.26249-2-mwilck@suse.com> (raw)
In-Reply-To: <20210628095210.26249-1-mwilck@suse.com>
From: Martin Wilck <mwilck@suse.com>
This makes it possible to use scsi_result_to_blk_status() from
code that shouldn't depend on scsi_mod (e.g. device mapper).
scsi_ioctl.c is selected by CONFIG_BLK_SCSI_REQUEST, which is automatically
selected by CONFIG_SCSI.
Signed-off-by: Martin Wilck <mwilck@suse.com>
---
block/scsi_ioctl.c | 47 +++++++++++++++++++++++++++++++++++++++++
drivers/scsi/scsi_lib.c | 24 +--------------------
include/linux/blkdev.h | 1 +
3 files changed, 49 insertions(+), 23 deletions(-)
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index fa6df11b8bdd..19b63b64ecbc 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -882,6 +882,53 @@ void scsi_req_init(struct scsi_request *req)
}
EXPORT_SYMBOL(scsi_req_init);
+/* See set_host_byte() in include/scsi/scsi_cmnd.h */
+static void __set_host_byte(int *result, char status)
+{
+ *result = (*result & 0xff00ffff) | (status << 16);
+}
+
+/**
+ * __scsi_result_to_blk_status - translate a SCSI result code into blk_status_t
+ * @cmd: SCSI command
+ * @cmd_result: pointer to scsi cmnd result code to be possibly changed
+ *
+ * Translate a SCSI result code into a blk_status_t value. May reset the host
+ * byte of @cmd_result.
+ */
+blk_status_t __scsi_result_to_blk_status(int *cmd_result, int result)
+{
+ switch (host_byte(result)) {
+ case DID_OK:
+ /*
+ * Also check the other bytes than the status byte in result
+ * to handle the case when a SCSI LLD sets result to
+ * DRIVER_SENSE << 24 without setting SAM_STAT_CHECK_CONDITION.
+ */
+ if (scsi_status_is_good(result))
+ return BLK_STS_OK;
+ return BLK_STS_IOERR;
+ case DID_TRANSPORT_FAILFAST:
+ case DID_TRANSPORT_MARGINAL:
+ return BLK_STS_TRANSPORT;
+ case DID_TARGET_FAILURE:
+ __set_host_byte(cmd_result, DID_OK);
+ return BLK_STS_TARGET;
+ case DID_NEXUS_FAILURE:
+ __set_host_byte(cmd_result, DID_OK);
+ return BLK_STS_NEXUS;
+ case DID_ALLOC_FAILURE:
+ __set_host_byte(cmd_result, DID_OK);
+ return BLK_STS_NOSPC;
+ case DID_MEDIUM_ERROR:
+ __set_host_byte(cmd_result, DID_OK);
+ return BLK_STS_MEDIUM;
+ default:
+ return BLK_STS_IOERR;
+ }
+}
+EXPORT_SYMBOL(__scsi_result_to_blk_status);
+
static int __init blk_scsi_ioctl_init(void)
{
blk_set_cmd_filter_defaults(&blk_default_cmd_filter);
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 6b994baf87c2..2c0eca3693af 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -589,29 +589,7 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
*/
static blk_status_t scsi_result_to_blk_status(struct scsi_cmnd *cmd, int result)
{
- switch (host_byte(result)) {
- case DID_OK:
- if (scsi_status_is_good(result))
- return BLK_STS_OK;
- return BLK_STS_IOERR;
- case DID_TRANSPORT_FAILFAST:
- case DID_TRANSPORT_MARGINAL:
- return BLK_STS_TRANSPORT;
- case DID_TARGET_FAILURE:
- set_host_byte(cmd, DID_OK);
- return BLK_STS_TARGET;
- case DID_NEXUS_FAILURE:
- set_host_byte(cmd, DID_OK);
- return BLK_STS_NEXUS;
- case DID_ALLOC_FAILURE:
- set_host_byte(cmd, DID_OK);
- return BLK_STS_NOSPC;
- case DID_MEDIUM_ERROR:
- set_host_byte(cmd, DID_OK);
- return BLK_STS_MEDIUM;
- default:
- return BLK_STS_IOERR;
- }
+ return __scsi_result_to_blk_status(&cmd->result, result);
}
/* Helper for scsi_io_completion() when "reprep" action required. */
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 1255823b2bc0..48497a77428d 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -2021,4 +2021,5 @@ int fsync_bdev(struct block_device *bdev);
int freeze_bdev(struct block_device *bdev);
int thaw_bdev(struct block_device *bdev);
+blk_status_t __scsi_result_to_blk_status(int *cmd_result, int result);
#endif /* _LINUX_BLKDEV_H */
--
2.32.0
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2021-06-28 9:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-28 9:52 [dm-devel] [PATCH v4 0/3] scsi/dm: dm_blk_ioctl(): implement failover for SG_IO on dm-multipath mwilck
2021-06-28 9:52 ` mwilck [this message]
2021-06-28 9:53 ` [dm-devel] [PATCH v4 1/3] scsi: scsi_ioctl: export __scsi_result_to_blk_status() Christoph Hellwig
2021-06-28 14:57 ` Martin Wilck
2021-06-29 12:59 ` Christoph Hellwig
2021-06-29 19:23 ` Martin Wilck
2021-06-29 21:23 ` Keith Busch
2021-06-30 8:12 ` Martin Wilck
2021-06-30 16:01 ` Mike Snitzer
2021-06-30 16:54 ` Martin Wilck
2021-06-30 22:08 ` Bart Van Assche
2021-07-01 6:19 ` Christoph Hellwig
2021-07-06 16:40 ` Paolo Bonzini
2021-06-28 9:52 ` [dm-devel] [PATCH v4 2/3] scsi: scsi_ioctl: add sg_io_to_blk_status() mwilck
2021-06-28 14:39 ` kernel test robot
2021-06-29 7:00 ` [dm-devel] [kbuild] " Dan Carpenter
2021-06-28 9:52 ` [dm-devel] [PATCH v4 3/3] dm mpath: add CONFIG_DM_MULTIPATH_SG_IO - failover for SG_IO mwilck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210628095210.26249-2-mwilck@suse.com \
--to=mwilck@suse.com \
--cc=Bart.VanAssche@sandisk.com \
--cc=agk@redhat.com \
--cc=dm-devel@redhat.com \
--cc=dwagner@suse.de \
--cc=emilne@redhat.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=nkoenig@redhat.com \
--cc=pbonzini@redhat.com \
--cc=snitzer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).