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 11/35] scsi: sd: Convert to scsi_exec_req
Date: Sat, 22 Oct 2022 22:03:39 -0500 [thread overview]
Message-ID: <20221023030403.33845-12-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: Martin Wilck <mwilck@suse.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/sd.c | 102 ++++++++++++++++++++++++++++++++++------------
1 file changed, 76 insertions(+), 26 deletions(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index eb76ba055021..37eafa968116 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -671,9 +671,16 @@ static int sd_sec_submit(void *data, u16 spsp, u8 secp, void *buffer,
put_unaligned_be16(spsp, &cdb[2]);
put_unaligned_be32(len, &cdb[6]);
- ret = scsi_execute(sdev, cdb, send ? DMA_TO_DEVICE : DMA_FROM_DEVICE,
- buffer, len, NULL, NULL, SD_TIMEOUT, sdkp->max_retries, 0,
- RQF_PM, NULL);
+ ret = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdev,
+ .cmd = cdb,
+ .data_dir = send ?
+ DMA_TO_DEVICE : DMA_FROM_DEVICE,
+ .buf = buffer,
+ .buf_len = len,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries,
+ .req_flags = RQF_PM }));
return ret <= 0 ? ret : -EIO;
}
#endif /* CONFIG_BLK_SED_OPAL */
@@ -1594,8 +1601,14 @@ static int sd_sync_cache(struct scsi_disk *sdkp, struct scsi_sense_hdr *sshdr)
* Leave the rest of the command zero to indicate
* flush everything.
*/
- res = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, sshdr,
- timeout, sdkp->max_retries, 0, RQF_PM, NULL);
+ res = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdp,
+ .cmd = cmd,
+ .data_dir = DMA_NONE,
+ .sshdr = sshdr,
+ .timeout = timeout,
+ .retries = sdkp->max_retries,
+ .req_flags = RQF_PM }));
if (res == 0)
break;
}
@@ -1720,8 +1733,15 @@ static int sd_pr_command(struct block_device *bdev, u8 sa,
put_unaligned_be64(sa_key, &data[8]);
data[20] = flags;
- result = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE, &data, sizeof(data),
- &sshdr, SD_TIMEOUT, sdkp->max_retries, NULL);
+ result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdev,
+ .cmd = cmd,
+ .data_dir = DMA_TO_DEVICE,
+ .buf = &data,
+ .buf_len = sizeof(data),
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries }));
if (scsi_status_is_check_condition(result) &&
scsi_sense_valid(&sshdr)) {
@@ -2062,10 +2082,13 @@ sd_spinup_disk(struct scsi_disk *sdkp)
cmd[0] = TEST_UNIT_READY;
memset((void *) &cmd[1], 0, 9);
- the_result = scsi_execute_req(sdkp->device, cmd,
- DMA_NONE, NULL, 0,
- &sshdr, SD_TIMEOUT,
- sdkp->max_retries, NULL);
+ the_result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdkp->device,
+ .cmd = cmd,
+ .data_dir = DMA_NONE,
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries }));
/*
* If the drive has indicated to us that it
@@ -2122,10 +2145,13 @@ sd_spinup_disk(struct scsi_disk *sdkp)
cmd[4] = 1; /* Start spin cycle */
if (sdkp->device->start_stop_pwr_cond)
cmd[4] |= 1 << 4;
- scsi_execute_req(sdkp->device, cmd, DMA_NONE,
- NULL, 0, &sshdr,
- SD_TIMEOUT, sdkp->max_retries,
- NULL);
+ scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdkp->device,
+ .cmd = cmd,
+ .data_dir = DMA_NONE,
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries }));
spintime_expire = jiffies + 100 * HZ;
spintime = 1;
}
@@ -2272,9 +2298,15 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
cmd[13] = RC16_LEN;
memset(buffer, 0, RC16_LEN);
- the_result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE,
- buffer, RC16_LEN, &sshdr,
- SD_TIMEOUT, sdkp->max_retries, NULL);
+ the_result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdp,
+ .cmd = cmd,
+ .data_dir = DMA_FROM_DEVICE,
+ .buf = buffer,
+ .buf_len = RC16_LEN,
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries }));
if (media_not_present(sdkp, &sshdr))
return -ENODEV;
@@ -2357,9 +2389,15 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,
memset(&cmd[1], 0, 9);
memset(buffer, 0, 8);
- the_result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE,
- buffer, 8, &sshdr,
- SD_TIMEOUT, sdkp->max_retries, NULL);
+ the_result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdp,
+ .cmd = cmd,
+ .data_dir = DMA_FROM_DEVICE,
+ .buf = buffer,
+ .buf_len = 8,
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries }));
if (media_not_present(sdkp, &sshdr))
return -ENODEV;
@@ -3608,8 +3646,14 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start)
if (!scsi_device_online(sdp))
return -ENODEV;
- res = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, &sshdr,
- SD_TIMEOUT, sdkp->max_retries, 0, RQF_PM, NULL);
+ res = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdp,
+ .cmd = cmd,
+ .data_dir = DMA_NONE,
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries,
+ .req_flags = RQF_PM }));
if (res) {
sd_print_result(sdkp, "Start/Stop Unit failed", res);
if (res > 0 && scsi_sense_valid(&sshdr)) {
@@ -3740,6 +3784,7 @@ static int sd_resume_runtime(struct device *dev)
{
struct scsi_disk *sdkp = dev_get_drvdata(dev);
struct scsi_device *sdp;
+ int result;
if (!sdkp) /* E.g.: runtime resume at the start of sd_probe() */
return 0;
@@ -3750,9 +3795,14 @@ static int sd_resume_runtime(struct device *dev)
/* clear the device's sense data */
static const u8 cmd[10] = { REQUEST_SENSE };
- if (scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL,
- NULL, sdp->request_queue->rq_timeout, 1, 0,
- RQF_PM, NULL))
+ result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdp,
+ .cmd = cmd,
+ .data_dir = DMA_NONE,
+ .timeout = sdp->request_queue->rq_timeout,
+ .retries = 1,
+ .req_flags = RQF_PM }));
+ if (result)
sd_printk(KERN_NOTICE, sdkp,
"Failed to clear sense data\n");
}
--
2.25.1
next prev parent reply other threads:[~2022-10-23 3:06 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 ` [PATCH v5 08/35] scsi: scsi_dh: " Mike Christie
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 ` Mike Christie [this message]
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-12-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