From: Mike Christie <michael.christie@oracle.com>
To: bvanassche@acm.org, mwilck@suse.com, hch@lst.de,
martin.petersen@oracle.com, linux-scsi@vger.kernel.org,
james.bottomley@hansenpartnership.com
Cc: Mike Christie <michael.christie@oracle.com>
Subject: [PATCH v5 08/35] scsi: scsi_dh: Convert to scsi_exec_req
Date: Sat, 22 Oct 2022 22:03:36 -0500 [thread overview]
Message-ID: <20221023030403.33845-9-michael.christie@oracle.com> (raw)
In-Reply-To: <20221023030403.33845-1-michael.christie@oracle.com>
scsi_execute* is going to be removed. Convert to scsi_exec_req so
we pass all args in a scsi_exec_args struct.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/device_handler/scsi_dh_alua.c | 26 ++++++++++++++++-----
drivers/scsi/device_handler/scsi_dh_emc.c | 13 ++++++++---
drivers/scsi/device_handler/scsi_dh_hp_sw.c | 20 ++++++++++++----
drivers/scsi/device_handler/scsi_dh_rdac.c | 15 +++++++++---
4 files changed, 58 insertions(+), 16 deletions(-)
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 610a51538f03..e4825da21d05 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -139,9 +139,16 @@ static int submit_rtpg(struct scsi_device *sdev, unsigned char *buff,
cdb[1] = MI_REPORT_TARGET_PGS;
put_unaligned_be32(bufflen, &cdb[6]);
- return scsi_execute(sdev, cdb, DMA_FROM_DEVICE, buff, bufflen, NULL,
- sshdr, ALUA_FAILOVER_TIMEOUT * HZ,
- ALUA_FAILOVER_RETRIES, req_flags, 0, NULL);
+ return scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdev,
+ .cmd = cdb,
+ .data_dir = DMA_FROM_DEVICE,
+ .buf = buff,
+ .buf_len = bufflen,
+ .sshdr = sshdr,
+ .timeout = ALUA_FAILOVER_TIMEOUT * HZ,
+ .retries = ALUA_FAILOVER_RETRIES,
+ .op_flags = req_flags }));
}
/*
@@ -171,9 +178,16 @@ static int submit_stpg(struct scsi_device *sdev, int group_id,
cdb[1] = MO_SET_TARGET_PGS;
put_unaligned_be32(stpg_len, &cdb[6]);
- return scsi_execute(sdev, cdb, DMA_TO_DEVICE, stpg_data, stpg_len, NULL,
- sshdr, ALUA_FAILOVER_TIMEOUT * HZ,
- ALUA_FAILOVER_RETRIES, req_flags, 0, NULL);
+ return scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdev,
+ .cmd = cdb,
+ .data_dir = DMA_TO_DEVICE,
+ .buf = stpg_data,
+ .buf_len = stpg_len,
+ .sshdr = sshdr,
+ .timeout = ALUA_FAILOVER_TIMEOUT * HZ,
+ .retries = ALUA_FAILOVER_RETRIES,
+ .op_flags = req_flags }));
}
static struct alua_port_group *alua_find_get_pg(char *id_str, size_t id_size,
diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index 2e21ab447873..0ad6163dc426 100644
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -263,9 +263,16 @@ static int send_trespass_cmd(struct scsi_device *sdev,
BUG_ON((len > CLARIION_BUFFER_SIZE));
memcpy(csdev->buffer, page22, len);
- err = scsi_execute(sdev, cdb, DMA_TO_DEVICE, csdev->buffer, len, NULL,
- &sshdr, CLARIION_TIMEOUT * HZ, CLARIION_RETRIES,
- req_flags, 0, NULL);
+ err = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdev,
+ .cmd = cdb,
+ .data_dir = DMA_TO_DEVICE,
+ .buf = csdev->buffer,
+ .buf_len = len,
+ .sshdr = &sshdr,
+ .timeout = CLARIION_TIMEOUT * HZ,
+ .retries = CLARIION_RETRIES,
+ .op_flags = req_flags }));
if (err) {
if (scsi_sense_valid(&sshdr))
res = trespass_endio(sdev, &sshdr);
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
index 0d2cfa60aa06..adcbe3b883b7 100644
--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -87,8 +87,14 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h)
REQ_FAILFAST_DRIVER;
retry:
- res = scsi_execute(sdev, cmd, DMA_NONE, NULL, 0, NULL, &sshdr,
- HP_SW_TIMEOUT, HP_SW_RETRIES, req_flags, 0, NULL);
+ res = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdev,
+ .cmd = cmd,
+ .data_dir = DMA_NONE,
+ .sshdr = &sshdr,
+ .timeout = HP_SW_TIMEOUT,
+ .retries = HP_SW_RETRIES,
+ .op_flags = req_flags }));
if (res) {
if (scsi_sense_valid(&sshdr))
ret = tur_done(sdev, h, &sshdr);
@@ -125,8 +131,14 @@ static int hp_sw_start_stop(struct hp_sw_dh_data *h)
REQ_FAILFAST_DRIVER;
retry:
- res = scsi_execute(sdev, cmd, DMA_NONE, NULL, 0, NULL, &sshdr,
- HP_SW_TIMEOUT, HP_SW_RETRIES, req_flags, 0, NULL);
+ res = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdev,
+ .cmd = cmd,
+ .data_dir = DMA_NONE,
+ .sshdr = &sshdr,
+ .timeout = HP_SW_TIMEOUT,
+ .retries = HP_SW_RETRIES,
+ .op_flags = req_flags }));
if (res) {
if (!scsi_sense_valid(&sshdr)) {
sdev_printk(KERN_WARNING, sdev,
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index bf8754741f85..c4d1830512ca 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -538,6 +538,7 @@ static void send_mode_select(struct work_struct *work)
unsigned int data_size;
blk_opf_t req_flags = REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |
REQ_FAILFAST_DRIVER;
+ int result;
spin_lock(&ctlr->ms_lock);
list_splice_init(&ctlr->ms_head, &list);
@@ -555,9 +556,17 @@ static void send_mode_select(struct work_struct *work)
(char *) h->ctlr->array_name, h->ctlr->index,
(retry_cnt == RDAC_RETRY_COUNT) ? "queueing" : "retrying");
- if (scsi_execute(sdev, cdb, DMA_TO_DEVICE, &h->ctlr->mode_select,
- data_size, NULL, &sshdr, RDAC_TIMEOUT * HZ,
- RDAC_RETRIES, req_flags, 0, NULL)) {
+ result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdev,
+ .cmd = cdb,
+ .data_dir = DMA_TO_DEVICE,
+ .buf = &h->ctlr->mode_select,
+ .buf_len = data_size,
+ .sshdr = &sshdr,
+ .timeout = RDAC_TIMEOUT * HZ,
+ .retries = RDAC_RETRIES,
+ .op_flags = req_flags }));
+ if (result) {
err = mode_select_handle_sense(sdev, &sshdr);
if (err == SCSI_DH_RETRY && retry_cnt--)
goto retry;
--
2.25.1
next prev parent reply other threads:[~2022-10-23 3:07 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-23 3:03 [PATCH v5 00/35] Allow scsi_execute users to control retries Mike Christie
2022-10-23 3:03 ` [PATCH v5 01/35] scsi: Add helper to prep sense during error handling Mike Christie
2022-10-23 3:03 ` [PATCH v5 02/35] scsi: Allow passthrough to override what errors to retry Mike Christie
2022-10-23 3:03 ` [PATCH v5 03/35] scsi: Add struct for args to execution functions Mike Christie
2022-10-23 3:03 ` [PATCH v5 04/35] scsi: Add scsi_failure field to scsi_exec_args Mike Christie
2022-10-23 3:03 ` [PATCH v5 05/35] scsi: libata: Convert to scsi_exec_req Mike Christie
2022-10-23 3:03 ` [PATCH v5 06/35] hwmon: drivetemp: " Mike Christie
2022-10-23 3:03 ` [PATCH v5 07/35] scsi: ch: " Mike Christie
2022-10-23 3:03 ` Mike Christie [this message]
2022-10-23 3:03 ` [PATCH v5 09/35] scsi: core: " Mike Christie
2022-10-23 3:03 ` [PATCH v5 10/35] scsi: spi: " Mike Christie
2022-10-23 3:03 ` [PATCH v5 11/35] scsi: sd: " Mike Christie
2022-10-23 3:03 ` [PATCH v5 12/35] scsi: zbc: " Mike Christie
2022-10-23 3:03 ` [PATCH v5 13/35] scsi: ses: " Mike Christie
2022-10-23 3:03 ` [PATCH v5 14/35] scsi: sr: " Mike Christie
2022-10-23 3:03 ` [PATCH v5 15/35] scsi: virtio_scsi: " Mike Christie
2022-10-23 3:03 ` [PATCH v5 16/35] scsi: target_core_pscsi: " Mike Christie
2022-10-23 3:03 ` [PATCH v5 17/35] scsi: ufshcd: " Mike Christie
2022-10-23 3:03 ` [PATCH v5 18/35] scsi: cxlflash: " Mike Christie
2022-10-23 3:03 ` [PATCH v5 19/35] scsi: Remove scsi_execute functions Mike Christie
2022-10-23 3:03 ` [PATCH v5 20/35] scsi: Have scsi-ml retry scsi_probe_lun errors Mike Christie
2022-10-23 3:03 ` [PATCH v5 21/35] scsi: retry INQUIRY after timeout Mike Christie
2022-10-23 3:03 ` [PATCH v5 22/35] scsi: Have scsi-ml retry read_capacity_16 errors Mike Christie
2022-10-23 3:03 ` [PATCH v5 23/35] scsi: Have scsi-ml retry sd_spinup_disk errors Mike Christie
2022-10-23 3:03 ` [PATCH v5 24/35] scsi: hp_sw: Have scsi-ml retry scsi_exec_req errors Mike Christie
2022-10-23 3:03 ` [PATCH v5 25/35] scsi: rdac: Have scsi-ml retry send_mode_select errors Mike Christie
2022-10-23 3:03 ` [PATCH v5 26/35] scsi: spi: Have scsi-ml retry spi_execute errors Mike Christie
2022-10-23 3:03 ` [PATCH v5 27/35] scsi: sd: Have scsi-ml retry sd_sync_cache errors Mike Christie
2022-10-23 3:03 ` [PATCH v5 28/35] scsi: ch: Have scsi-ml retry ch_do_scsi errors Mike Christie
2022-10-23 3:03 ` [PATCH v5 29/35] scsi: Have scsi-ml retry scsi_mode_sense errors Mike Christie
2022-10-23 3:03 ` [PATCH v5 30/35] scsi: Have scsi-ml retry scsi_report_lun_scan errors Mike Christie
2022-10-23 3:03 ` [PATCH v5 31/35] scsi: sd: Have sd_pr_command retry UAs Mike Christie
2022-10-23 3:04 ` [PATCH v5 32/35] scsi: sd: Have scsi-ml retry read_capacity_10 errors Mike Christie
2022-10-23 3:04 ` [PATCH v5 33/35] scsi: ses: Have scsi-ml retry scsi_exec_req errors Mike Christie
2022-10-23 3:04 ` [PATCH v5 34/35] scsi: sr: Have scsi-ml retry get_sectorsize errors Mike Christie
2022-10-23 3:04 ` [PATCH v5 35/35] scsi: Add kunit tests for scsi_check_passthrough Mike Christie
2022-10-23 6:32 ` kernel test robot
2022-10-24 18:39 ` Mike Christie
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=20221023030403.33845-9-michael.christie@oracle.com \
--to=michael.christie@oracle.com \
--cc=bvanassche@acm.org \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mwilck@suse.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