Skip to contentSkip to conversation

Simplify ufshcd_execute_start_stop()

PATCH Superseded Bart Van Assche 3 participants 8 messages Feb 2, 2023 – Feb 7, 2023

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Bart Van Assche

author reviewer
#0 lore raw

cover Simplify ufshcd_execute_start_stop()

Hi Martin,

This patch series simplifies ufshcd_execute_start_stop() by using the new scsi_execute_cmd() function instead of open-coding it. Please consider this patch for the next merge window.

Thanks,

Bart.

Bart Van Assche (2):
scsi: core: Extend struct scsi_exec_args
scsi: ufs: Simplify ufshcd_execute_start_stop()

 drivers/scsi/scsi_lib.c    |  3 ++-
 drivers/ufs/core/ufshcd.c  | 36 +++++++++---------------------------
 include/scsi/scsi_device.h |  2 ++
 3 files changed, 13 insertions(+), 28 deletions(-)
author reviewer
#1 lore raw

PATCH 1/2 scsi: core: Extend struct scsi_exec_args

Allow SCSI LLDs to specify RQF_* and SCMD_* flags.

---
 drivers/scsi/scsi_lib.c    | 3 ++-
 include/scsi/scsi_device.h | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/scsi_lib.c +2 -1
index abe93ec8b7d0..5feb8be6d956 100644
@@ -229,8 +229,9 @@ int scsi_execute_cmd(struct scsi_device *sdev, const unsigned char *cmd,
 	scmd->cmd_len = COMMAND_SIZE(cmd[0]);
 	memcpy(scmd->cmnd, cmd, scmd->cmd_len);
 	scmd->allowed = retries;
+	scmd->flags |= args->scmd_flags;
 	req->timeout = timeout;
-	req->rq_flags |= RQF_QUIET;
+	req->rq_flags |= args->rq_flags | RQF_QUIET;
 
 	/*
 	 * head injection *required* here otherwise quiesce won't work
include/scsi/scsi_device.h +2 -0
index 7e95ec45138f..79260e98774f 100644
@@ -462,6 +462,8 @@ struct scsi_exec_args {
 	unsigned int sense_len;		/* sense buffer len */
 	struct scsi_sense_hdr *sshdr;	/* decoded sense header */
 	blk_mq_req_flags_t req_flags;	/* BLK_MQ_REQ flags */
+	req_flags_t rq_flags;		/* RQF flags */
+	unsigned int scmd_flags;	/* SCMD flags */
 	int *resid;			/* residual length */
 };
 
#3 lore raw

Re: [PATCH 1/2] scsi: core: Extend struct scsi_exec_args

In reply to Bart Van Assche
Quoted 1 line · Bart Van Assche

Allow SCSI LLDs to specify RQF_* and SCMD_* flags.

As I see, if BLK_MQ_REQ_PM is set for scsi_exec_args.req_flags, then RQF_PM gets set automatically in blk_mq_rq_ctx_init() for request.rq_flags. Christoph previously mentioned that we are required to set both (BLK_MQ_REQ_PM and RQF_PM). So where does it matter that we need to set RQF_PM (that setting BLK_MQ_REQ_PM doesn't cover)?

It would be nice to mention the reason in the commit description.

Thanks,
John

Quoted 36 lines
---
  drivers/scsi/scsi_lib.c    | 3 ++-
  include/scsi/scsi_device.h | 2 ++
  2 files changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/scsi_lib.c +2 -1
index abe93ec8b7d0..5feb8be6d956 100644
@@ -229,8 +229,9 @@ int scsi_execute_cmd(struct scsi_device *sdev, const unsigned char *cmd,
  	scmd->cmd_len = COMMAND_SIZE(cmd[0]);
  	memcpy(scmd->cmnd, cmd, scmd->cmd_len);
  	scmd->allowed = retries;
+	scmd->flags |= args->scmd_flags;
  	req->timeout = timeout;
-	req->rq_flags |= RQF_QUIET;
+	req->rq_flags |= args->rq_flags | RQF_QUIET;
 
  	/*
  	 * head injection *required* here otherwise quiesce won't work
include/scsi/scsi_device.h +2 -0
index 7e95ec45138f..79260e98774f 100644
@@ -462,6 +462,8 @@ struct scsi_exec_args {
  	unsigned int sense_len;		/* sense buffer len */
  	struct scsi_sense_hdr *sshdr;	/* decoded sense header */
  	blk_mq_req_flags_t req_flags;	/* BLK_MQ_REQ flags */
+	req_flags_t rq_flags;		/* RQF flags */
+	unsigned int scmd_flags;	/* SCMD flags */
  	int *resid;			/* residual length */
  };
 
author reviewer
#4 lore raw

Re: [PATCH 1/2] scsi: core: Extend struct scsi_exec_args

Quoted 4 lines · John Garry
Quoted 1 line · Bart Van Assche

Allow SCSI LLDs to specify RQF_* and SCMD_* flags.

As I see, if BLK_MQ_REQ_PM is set for scsi_exec_args.req_flags, then RQF_PM gets set automatically in blk_mq_rq_ctx_init() for request.rq_flags. Christoph previously mentioned that we are required to set both (BLK_MQ_REQ_PM and RQF_PM). So where does it matter that we need to set RQF_PM (that setting BLK_MQ_REQ_PM doesn't cover)?

I will rework this patch such that both flags are set instead of only one of the two.

Thanks,

Bart.

#5 lore raw

Re: [PATCH 1/2] scsi: core: Extend struct scsi_exec_args

Quoted 6 lines · Bart Van Assche
Quoted 4 lines · Bart Van Assche
Quoted 1 line

Allow SCSI LLDs to specify RQF_* and SCMD_* flags.

As I see, if BLK_MQ_REQ_PM is set for scsi_exec_args.req_flags, then RQF_PM gets set automatically in blk_mq_rq_ctx_init() for request.rq_flags. Christoph previously mentioned that we are required to set both (BLK_MQ_REQ_PM and RQF_PM). So where does it matter that we need to set RQF_PM (that setting BLK_MQ_REQ_PM doesn't cover)?

I will rework this patch such that both flags are set instead of only one of the two.

You are setting both flags (BLK_MQ_REQ_PM and RQF_PM) in this series, which is what I was curious about. However that is not a change in behavior for ufshcd_execute_start_stop().

Thanks,
John

author reviewer
#6 lore raw

PATCH 2/2 scsi: ufs: Simplify ufshcd_execute_start_stop()

In reply to Bart Van Assche

Use scsi_execute_cmd() instead of open-coding it.

---
 drivers/ufs/core/ufshcd.c | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)
drivers/ufs/core/ufshcd.c +9 -27
index 89a78a0f794c..bf3cb12ef02f 100644
@@ -9121,34 +9121,16 @@ static int ufshcd_execute_start_stop(struct scsi_device *sdev,
 				     enum ufs_dev_pwr_mode pwr_mode,
 				     struct scsi_sense_hdr *sshdr)
 {
-	unsigned char cdb[6] = { START_STOP, 0, 0, 0, pwr_mode << 4, 0 };
-	struct request *req;
-	struct scsi_cmnd *scmd;
-	int ret;
-
-	req = scsi_alloc_request(sdev->request_queue, REQ_OP_DRV_IN,
-				 BLK_MQ_REQ_PM);
-	if (IS_ERR(req))
-		return PTR_ERR(req);
-
-	scmd = blk_mq_rq_to_pdu(req);
-	scmd->cmd_len = COMMAND_SIZE(cdb[0]);
-	memcpy(scmd->cmnd, cdb, scmd->cmd_len);
-	scmd->allowed = 0/*retries*/;
-	scmd->flags |= SCMD_FAIL_IF_RECOVERING;
-	req->timeout = 1 * HZ;
-	req->rq_flags |= RQF_PM | RQF_QUIET;
-
-	blk_execute_rq(req, /*at_head=*/true);
-
-	if (sshdr)
-		scsi_normalize_sense(scmd->sense_buffer, scmd->sense_len,
-				     sshdr);
-	ret = scmd->result;
-
-	blk_mq_free_request(req);
+	const unsigned char cdb[6] = { START_STOP, 0, 0, 0, pwr_mode << 4, 0 };
+	const struct scsi_exec_args args = {
+		.sshdr = sshdr,
+		.req_flags = BLK_MQ_REQ_PM,
+		.rq_flags = RQF_PM,
+		.scmd_flags = SCMD_FAIL_IF_RECOVERING,
+	};
 
-	return ret;
+	return scsi_execute_cmd(sdev, cdb, REQ_OP_DRV_IN, /*buffer=*/NULL, 0,
+			 /*timeout=*/HZ, /*retries=*/0, &args);
 }
 
 /**