From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>,
Hannes Reinecke <hare@suse.com>, Ming Lei <ming.lei@redhat.com>,
Christoph Hellwig <hch@lst.de>,
"James E.J. Bottomley" <jejb@linux.ibm.com>
Subject: [PATCH 01/84] scsi: core: Use a member variable to track the SCSI command submitter
Date: Fri, 17 Sep 2021 17:04:44 -0700 [thread overview]
Message-ID: <20210918000607.450448-2-bvanassche@acm.org> (raw)
In-Reply-To: <20210918000607.450448-1-bvanassche@acm.org>
Conditional statements are faster than indirect calls. Use a member variable
to track the SCSI command submitter such that later patches can call
scsi_done(scmd) instead of scmd->scsi_done(scmd).
The asymmetric behavior that scsi_send_eh_cmnd() sets the submission
context to the SCSI error handler and that it does not restore the
submission context to the SCSI core is retained.
Cc: Hannes Reinecke <hare@suse.com>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/scsi_error.c | 18 +++++++-----------
drivers/scsi/scsi_lib.c | 9 +++++++++
drivers/scsi/scsi_priv.h | 1 +
include/scsi/scsi_cmnd.h | 7 +++++++
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index b6c86cce57bf..f5841aa4a5a1 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -50,8 +50,6 @@
#include <asm/unaligned.h>
-static void scsi_eh_done(struct scsi_cmnd *scmd);
-
/*
* These should *probably* be handled by the host itself.
* Since it is allowed to sleep, it probably should.
@@ -520,7 +518,8 @@ enum scsi_disposition scsi_check_sense(struct scsi_cmnd *scmd)
/* handler does not care. Drop down to default handling */
}
- if (scmd->cmnd[0] == TEST_UNIT_READY && scmd->scsi_done != scsi_eh_done)
+ if (scmd->cmnd[0] == TEST_UNIT_READY &&
+ scmd->submitter != SCSI_ERROR_HANDLER)
/*
* nasty: for mid-layer issued TURs, we need to return the
* actual sense data without any recovery attempt. For eh
@@ -782,7 +781,7 @@ static enum scsi_disposition scsi_eh_completed_normally(struct scsi_cmnd *scmd)
* scsi_eh_done - Completion function for error handling.
* @scmd: Cmd that is done.
*/
-static void scsi_eh_done(struct scsi_cmnd *scmd)
+void scsi_eh_done(struct scsi_cmnd *scmd)
{
struct completion *eh_action;
@@ -986,6 +985,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses,
ses->prot_op = scmd->prot_op;
ses->eh_eflags = scmd->eh_eflags;
+ WARN_ON_ONCE(scmd->submitter != BLOCK_LAYER);
scmd->prot_op = SCSI_PROT_NORMAL;
scmd->eh_eflags = 0;
scmd->cmnd = ses->eh_cmnd;
@@ -1082,7 +1082,7 @@ static enum scsi_disposition scsi_send_eh_cmnd(struct scsi_cmnd *scmd,
shost->eh_action = &done;
scsi_log_send(scmd);
- scmd->scsi_done = scsi_eh_done;
+ scmd->submitter = SCSI_ERROR_HANDLER;
/*
* Lock sdev->state_mutex to avoid that scsi_device_quiesce() can
@@ -1109,6 +1109,7 @@ static enum scsi_disposition scsi_send_eh_cmnd(struct scsi_cmnd *scmd,
if (rtn) {
if (timeleft > stall_for) {
scsi_eh_restore_cmnd(scmd, &ses);
+
timeleft -= stall_for;
msleep(jiffies_to_msecs(stall_for));
goto retry;
@@ -2338,11 +2339,6 @@ void scsi_report_device_reset(struct Scsi_Host *shost, int channel, int target)
}
EXPORT_SYMBOL(scsi_report_device_reset);
-static void
-scsi_reset_provider_done_command(struct scsi_cmnd *scmd)
-{
-}
-
/**
* scsi_ioctl_reset: explicitly reset a host/bus/target/device
* @dev: scsi_device to operate on
@@ -2379,7 +2375,7 @@ scsi_ioctl_reset(struct scsi_device *dev, int __user *arg)
scsi_init_command(dev, scmd);
scmd->cmnd = scsi_req(rq)->cmd;
- scmd->scsi_done = scsi_reset_provider_done_command;
+ scmd->submitter = SCSI_RESET_IOCTL;
memset(&scmd->sdb, 0, sizeof(scmd->sdb));
scmd->cmd_len = 0;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 572673873ddf..ba6d748a0246 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1577,6 +1577,15 @@ static blk_status_t scsi_prepare_cmd(struct request *req)
static void scsi_mq_done(struct scsi_cmnd *cmd)
{
+ switch (cmd->submitter) {
+ case BLOCK_LAYER:
+ break;
+ case SCSI_ERROR_HANDLER:
+ return scsi_eh_done(cmd);
+ case SCSI_RESET_IOCTL:
+ return;
+ }
+
if (unlikely(blk_should_fake_timeout(scsi_cmd_to_rq(cmd)->q)))
return;
if (unlikely(test_and_set_bit(SCMD_STATE_COMPLETE, &cmd->state)))
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 6d9152031a40..b7f963149352 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -84,6 +84,7 @@ void scsi_eh_ready_devs(struct Scsi_Host *shost,
int scsi_eh_get_sense(struct list_head *work_q,
struct list_head *done_q);
int scsi_noretry_cmd(struct scsi_cmnd *scmd);
+void scsi_eh_done(struct scsi_cmnd *scmd);
/* scsi_lib.c */
extern int scsi_maybe_unblock_host(struct scsi_device *sdev);
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index eaf04c9a1dfc..365d47a66c18 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -65,6 +65,12 @@ struct scsi_pointer {
#define SCMD_STATE_COMPLETE 0
#define SCMD_STATE_INFLIGHT 1
+enum scsi_cmnd_submitter {
+ BLOCK_LAYER = 0,
+ SCSI_ERROR_HANDLER = 1,
+ SCSI_RESET_IOCTL = 2,
+} __packed;
+
struct scsi_cmnd {
struct scsi_request req;
struct scsi_device *device;
@@ -90,6 +96,7 @@ struct scsi_cmnd {
unsigned char prot_op;
unsigned char prot_type;
unsigned char prot_flags;
+ enum scsi_cmnd_submitter submitter;
unsigned short cmd_len;
enum dma_data_direction sc_data_direction;
next prev parent reply other threads:[~2021-09-18 0:06 UTC|newest]
Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 0:04 [PATCH 00/84] Call scsi_done() directly Bart Van Assche
2021-09-18 0:04 ` Bart Van Assche [this message]
2021-09-24 9:36 ` [PATCH 01/84] scsi: core: Use a member variable to track the SCSI command submitter Benjamin Block
2021-09-25 3:38 ` Bart Van Assche
2021-09-27 19:55 ` Benjamin Block
2021-09-28 16:54 ` Benjamin Block
2021-09-28 18:51 ` Bart Van Assche
2021-09-18 0:04 ` [PATCH 02/84] scsi: core: Rename scsi_mq_done() into scsi_done() and export it Bart Van Assche
2021-09-20 9:42 ` John Garry
2021-09-20 16:28 ` Bart Van Assche
2021-09-20 16:47 ` John Garry
2021-09-28 16:57 ` Benjamin Block
2021-09-18 0:04 ` [PATCH 03/84] scsi: core: Call scsi_done directly Bart Van Assche
2021-09-28 16:59 ` Benjamin Block
2021-09-18 0:04 ` [PATCH 04/84] ata: Call scsi_done() directly Bart Van Assche
2021-09-21 1:02 ` Damien Le Moal
2021-09-18 0:04 ` [PATCH 05/84] firewire: sbp2: " Bart Van Assche
2021-09-18 0:04 ` [PATCH 06/84] ib_srp: " Bart Van Assche
2021-09-18 0:04 ` [PATCH 07/84] message: fusion: " Bart Van Assche
2021-09-18 0:04 ` [PATCH 08/84] zfcp_scsi: " Bart Van Assche
2021-09-28 17:01 ` Benjamin Block
2021-09-18 0:04 ` [PATCH 09/84] 3w-9xxx: " Bart Van Assche
2021-09-18 0:04 ` [PATCH 10/84] 3w-sas: " Bart Van Assche
2021-09-18 0:04 ` [PATCH 11/84] 3w-xxxx: " Bart Van Assche
2021-09-18 0:04 ` [PATCH 12/84] 53c700: " Bart Van Assche
2021-09-18 0:04 ` [PATCH 13/84] BusLogic: " Bart Van Assche
2021-09-18 0:04 ` [PATCH 14/84] NCR5380: " Bart Van Assche
2021-09-18 0:04 ` [PATCH 15/84] a100u2w: " Bart Van Assche
2021-09-18 0:04 ` [PATCH 16/84] aacraid: Introduce aac_scsi_done() Bart Van Assche
2021-09-18 0:05 ` [PATCH 17/84] aacraid: Call scsi_done() directly Bart Van Assche
2021-09-18 0:05 ` [PATCH 18/84] acornscsi: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 19/84] advansys: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 20/84] aha152x: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 21/84] aha1542: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 22/84] aic7xxx: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 23/84] arcmsr: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 24/84] atp870u: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 25/84] bfa: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 26/84] bnx2fc: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 27/84] csiostor: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 28/84] cxlflash: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 29/84] dc395x: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 30/84] dpt_i2o: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 31/84] esas2r: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 32/84] esp_scsi: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 33/84] fas216: " Bart Van Assche
2021-09-18 0:25 ` Russell King (Oracle)
2021-09-19 2:25 ` Bart Van Assche
2021-09-18 0:05 ` [PATCH 34/84] fdomain: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 35/84] fnic: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 36/84] hpsa: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 37/84] hptiop: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 38/84] ibmvscsi: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 39/84] imm: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 40/84] initio: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 41/84] ipr: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 42/84] ips: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 43/84] libfc: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 44/84] libiscsi: " Bart Van Assche
2021-09-18 18:34 ` Lee Duncan
2021-09-18 0:05 ` [PATCH 45/84] libsas: " Bart Van Assche
2021-09-22 17:26 ` John Garry
2021-09-18 0:05 ` [PATCH 46/84] lpfc: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 47/84] mac53c94: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 48/84] megaraid: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 49/84] " Bart Van Assche
2021-09-18 0:05 ` [PATCH 50/84] mesh: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 51/84] mpi3mr: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 52/84] mpt3sas: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 53/84] mvumi: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 54/84] myrb: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 55/84] myrs: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 56/84] ncr53c8xx: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 57/84] nsp32: " Bart Van Assche
2021-09-18 1:10 ` Masanori Goto
2021-09-18 3:08 ` Bart Van Assche
2021-09-18 0:05 ` [PATCH 58/84] pcmcia: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 59/84] pmcraid: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 60/84] ppa: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 61/84] ps3rom: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 62/84] qedf: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 63/84] qla1280: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 64/84] qla2xxx: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 65/84] qla4xxx: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 66/84] qlogicfas408: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 67/84] qlogicpti: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 68/84] scsi_debug: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 69/84] smartpqi: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 70/84] snic: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 71/84] stex: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 72/84] storvsc_drv: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 73/84] sym53c8xx_2: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 74/84] ufs: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 75/84] virtio_scsi: " Bart Van Assche
2021-09-18 0:05 ` [PATCH 76/84] vmw_pvscsi: " Bart Van Assche
2021-09-18 0:06 ` [PATCH 77/84] wd33c93: " Bart Van Assche
2021-09-18 0:06 ` [PATCH 78/84] wd719x: " Bart Van Assche
2021-09-22 16:25 ` [PATCH 79/84] xen-scsifront: " Bart Van Assche
2021-09-22 16:25 ` [PATCH 80/84] staging: rts5208: " Bart Van Assche
2021-09-23 6:49 ` Greg Kroah-Hartman
2021-09-22 16:25 ` [PATCH 81/84] staging: unisys: visorhba: " Bart Van Assche
2021-09-22 16:26 ` [PATCH 82/84] target/tcm_loop: " Bart Van Assche
2021-09-22 16:26 ` [PATCH 83/84] usb: " Bart Van Assche
2021-09-22 16:26 ` [PATCH 84/84] scsi_lib: " Bart Van Assche
2021-09-28 17:04 ` Benjamin Block
2021-09-23 8:15 ` [PATCH 79/84] xen-scsifront: " Juergen Gross
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=20210918000607.450448-2-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=hare@suse.com \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@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).