remove struct scsi_request v2
Subsystems (9)
Hi Martin,
with the recent removal of the REQ_OP_SCSI_{IN,OUT} based passthrough from non-scsi drivers, the need for the scsi_request structure went away as well. As all submitters of SCSI passthrough requests are using the SCSI midlayer now they can just fill out the scsi_cmnd directly.
Changes since v1:
- fix a few commit message typos
- remove an extra clearing of scmd->flags
- cleanup sense handling in sg_scsi_ioctl
- split the last patch
Diffstat:
b/drivers/ata/libata-scsi.c | 4 - b/drivers/block/pktcdvd.c | 8 +- b/drivers/cdrom/cdrom.c | 1 b/drivers/scsi/scsi_bsg.c | 42 +++++------- b/drivers/scsi/scsi_debugfs.c | 6 - b/drivers/scsi/scsi_error.c | 38 +++++----- b/drivers/scsi/scsi_ioctl.c | 76 +++++++++------------ b/drivers/scsi/scsi_lib.c | 118 +++++++++++++--------------------- b/drivers/scsi/scsi_logging.c | 5 - b/drivers/scsi/scsi_transport_sas.c | 1 b/drivers/scsi/sd.c | 28 -------- b/drivers/scsi/sg.c | 44 ++++-------- b/drivers/scsi/sr.c | 30 ++++---- b/drivers/scsi/st.c | 30 ++++---- b/drivers/scsi/ufs/ufshpb.c | 22 ++---- b/drivers/target/target_core_pscsi.c | 67 +++++++------------ b/drivers/target/target_core_pscsi.h | 4 - b/drivers/usb/storage/cypress_atacb.c | 1 b/drivers/usb/storage/isd200.c | 4 - b/include/linux/bsg-lib.h | 1 b/include/scsi/scsi_cmnd.h | 16 +--- b/include/scsi/scsi_eh.h | 4 - include/scsi/scsi_request.h | 31 -------- 23 files changed, 224 insertions(+), 357 deletions(-)
PATCH 1/8 target/pscsi: remove struct pscsi_plugin_task
Copy directly from the se_cmd CDB to the one in the scsi_request. This temporarily limits the pscsi backend to supporting only up to 16 byte CDBs, but this restriction will be lifted later in this series.
--- drivers/target/target_core_pscsi.c | 51 ++++++++++-------------------- drivers/target/target_core_pscsi.h | 4 --- 2 files changed, 17 insertions(+), 38 deletions(-)
drivers/target/target_core_pscsi.c +17 -34
@@ -593,16 +593,14 @@ static void pscsi_complete_cmd(struct se_cmd *cmd, u8 scsi_status, {struct pscsi_dev_virt *pdv =PSCSI_DEV (cmd->se_dev);struct scsi_device *sd = pdv->pdv_sd; -struct pscsi_plugin_task *pt = cmd->priv; -unsigned char *cdb; +unsigned char *cdb = cmd->priv; +/* -* Special case for REPORT_LUNs handling where pscsi_plugin_task has -* not been allocated because TCM is handling the emulation directly. +* Special case for REPORT_LUNs which is emulated and not passed on. */ -if (!pt) +if (!cdb)return ; - cdb = &pt->pscsi_cdb[0 ];/* * Hack to make sure that Write-Protect modepage is set if R/O mode is * forced.
@@ -963,30 +961,14 @@ pscsi_execute_cmd(struct se_cmd *cmd)struct scatterlist *sgl = cmd->t_data_sg;u32 sgl_nents = cmd->t_data_nents;struct pscsi_dev_virt *pdv =PSCSI_DEV (cmd->se_dev); -struct pscsi_plugin_task *pt;struct request *req;sense_reason_t ret; -/* -* Dynamically alloc cdb space, since it may be larger than -* TCM_MAX_COMMAND_SIZE -*/ - pt =kzalloc (sizeof (*pt) +scsi_command_size (cmd->t_task_cdb),GFP_KERNEL ); -if (!pt) { -return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ; - } - cmd->priv = pt; - -memcpy (pt->pscsi_cdb, cmd->t_task_cdb, -scsi_command_size (cmd->t_task_cdb)); - req =scsi_alloc_request (pdv->pdv_sd->request_queue, cmd->data_direction ==DMA_TO_DEVICE ?REQ_OP_DRV_OUT :REQ_OP_DRV_IN ,0 ); -if (IS_ERR (req)) { - ret =TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ; - goto fail; - } +if (IS_ERR (req)) +return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ;if (sgl) { ret =pscsi_map_sg (cmd, sgl, sgl_nents, req);
@@ -996,8 +978,12 @@ pscsi_execute_cmd(struct se_cmd *cmd) req->end_io = pscsi_req_done; req->end_io_data = cmd; -scsi_req (req)->cmd_len =scsi_command_size (pt->pscsi_cdb); -scsi_req (req)->cmd = &pt->pscsi_cdb[0 ]; +scsi_req (req)->cmd_len =scsi_command_size (cmd->t_task_cdb); +if (scsi_req (req)->cmd_len >BLK_MAX_CDB ) { + ret =TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ; + goto fail_put_request; + } +memcpy (scsi_req (req)->cmd, cmd->t_task_cdb,scsi_req (req)->cmd_len);if (pdv->pdv_sd->type ==TYPE_DISK || pdv->pdv_sd->type ==TYPE_ZBC ) req->timeout =PS_TIMEOUT_DISK ;
@@ -1005,6 +991,8 @@ pscsi_execute_cmd(struct se_cmd *cmd) req->timeout =PS_TIMEOUT_OTHER ;scsi_req (req)->retries =PS_RETRY ; + cmd->priv =scsi_req (req)->cmd; +blk_execute_rq_nowait (req, cmd->sam_task_attr ==TCM_HEAD_TAG , pscsi_req_done);
@@ -1012,8 +1000,6 @@ pscsi_execute_cmd(struct se_cmd *cmd) fail_put_request:blk_mq_free_request (req); -fail: -kfree (pt);return ret; }
@@ -1041,14 +1027,13 @@ static sector_t pscsi_get_blocks(struct se_device *dev)static void pscsi_req_done (struct request *req,blk_status_t status) {struct se_cmd *cmd = req->end_io_data; -struct pscsi_plugin_task *pt = cmd->priv;int result =scsi_req (req)->result;enum sam_status scsi_status = result &0xff ; +u8 *cdb = cmd->priv;if (scsi_status !=SAM_STAT_GOOD ) {pr_debug ("PSCSI Status Byte exception at cmd: %p CDB:" -" 0x%02x Result: 0x%08x\n" , cmd, pt->pscsi_cdb[0 ], - result); +" 0x%02x Result: 0x%08x\n" , cmd, cdb[0 ], result); }pscsi_complete_cmd (cmd, scsi_status,scsi_req (req)->sense);
@@ -1060,14 +1045,12 @@ static void pscsi_req_done(struct request *req, blk_status_t status)break ;default :pr_debug ("PSCSI Host Byte exception at cmd: %p CDB:" -" 0x%02x Result: 0x%08x\n" , cmd, pt->pscsi_cdb[0 ], - result); +" 0x%02x Result: 0x%08x\n" , cmd, cdb[0 ], result);target_complete_cmd (cmd,SAM_STAT_CHECK_CONDITION );break ; }blk_mq_free_request (req); -kfree (pt); }static const struct target_backend_ops pscsi_ops = {
drivers/target/target_core_pscsi.h +0 -4
@@ -23,10 +23,6 @@ struct block_device;struct scsi_device ;struct Scsi_Host ; -struct pscsi_plugin_task { -unsigned char pscsi_cdb[0 ]; -}____cacheline_aligned ; -#define PDF_HAS_CHANNEL_ID 0x01#define PDF_HAS_TARGET_ID 0x02#define PDF_HAS_LUN_ID 0x04
Signature · 1 line
2.30.2
PATCH 2/8 scsi: don't memset the entire scsi_cmnd in scsi_init_command
In reply to Christoph HellwigReplace the big fat memset that requires saving and restoring various fields with just initializing those fields that need initialization.
All the clearing to 0 is moved to scsi_prepare_cmd as scsi_ioctl_reset alreadly uses kzalloc to allocate a pre-zeroed command.
This is still conservative and can probably be optimized further.
--- drivers/scsi/scsi_lib.c | 60 +++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 32 deletions(-)
drivers/scsi/scsi_lib.c +28 -32
@@ -1163,45 +1163,16 @@ static void scsi_cleanup_rq(struct request *rq)/* Called before a request is prepared. See also scsi_mq_prep_fn(). */ void scsi_init_command (struct scsi_device *dev,struct scsi_cmnd *cmd) { -void *buf = cmd->sense_buffer; -void *prot = cmd->prot_sdb;struct request *rq =scsi_cmd_to_rq (cmd); -unsigned int flags = cmd->flags &SCMD_PRESERVED_FLAGS ; -unsigned long jiffies_at_alloc; -int retries, to_clear; -bool in_flight; -int budget_token = cmd->budget_token; - -if (!blk_rq_is_passthrough (rq) && !(flags &SCMD_INITIALIZED )) { - flags |=SCMD_INITIALIZED ; + +if (!blk_rq_is_passthrough (rq) && !(cmd->flags &SCMD_INITIALIZED )) { + cmd->flags |=SCMD_INITIALIZED ;scsi_initialize_rq (rq); } - jiffies_at_alloc = cmd->jiffies_at_alloc; - retries = cmd->retries; - in_flight =test_bit (SCMD_STATE_INFLIGHT , &cmd->state); -/* -* Zero out the cmd, except for the embedded scsi_request. Only clear -* the driver-private command data if the LLD does not supply a -* function to initialize that data. -*/ - to_clear =sizeof (*cmd) -sizeof (cmd->req); -if (!dev->host->hostt->init_cmd_priv) - to_clear += dev->host->hostt->cmd_size; -memset ((char *)cmd +sizeof (cmd->req),0 , to_clear); - cmd->device = dev; - cmd->sense_buffer = buf; - cmd->prot_sdb = prot; - cmd->flags = flags;INIT_LIST_HEAD (&cmd->eh_entry);INIT_DELAYED_WORK (&cmd->abort_work, scmd_eh_abort_handler); - cmd->jiffies_at_alloc = jiffies_at_alloc; - cmd->retries = retries; -if (in_flight) -__set_bit (SCMD_STATE_INFLIGHT , &cmd->state); - cmd->budget_token = budget_token; - } static blk_status_t scsi_setup_scsi_cmnd(struct scsi_device *sdev,
@@ -1586,10 +1557,35 @@ static blk_status_t scsi_prepare_cmd(struct request *req)struct scsi_cmnd *cmd =blk_mq_rq_to_pdu (req);struct scsi_device *sdev = req->q->queuedata;struct Scsi_Host *shost = sdev->host; +bool in_flight =test_bit (SCMD_STATE_INFLIGHT , &cmd->state);struct scatterlist *sg;scsi_init_command (sdev, cmd); + cmd->eh_eflags =0 ; + cmd->allowed =0 ; + cmd->prot_type =0 ; + cmd->prot_flags =0 ; + cmd->submitter =0 ; + cmd->cmd_len =0 ; + cmd->cmnd =NULL ; +memset (&cmd->sdb,0 ,sizeof (cmd->sdb)); + cmd->underflow =0 ; + cmd->transfersize =0 ; + cmd->host_scribble =NULL ; + cmd->result =0 ; + cmd->extra_len =0 ; + cmd->state =0 ; +if (in_flight) +__set_bit (SCMD_STATE_INFLIGHT , &cmd->state); + +/* +* Only clear the driver-private command data if the LLD does not supply +* a function to initialize that data. +*/ +if (!shost->hostt->init_cmd_priv) +memset (cmd +1 ,0 , shost->hostt->cmd_size); + cmd->prot_op =SCSI_PROT_NORMAL ;if (blk_rq_bytes (req)) cmd->sc_data_direction =rq_dma_dir (req);
Signature · 1 line
2.30.2
PATCH 3/8 scsi: remove the cmd field from struct scsi_request
In reply to Christoph HellwigNow that each scsi_request is backed by a scsi_cmnd, there is no need to indirect the CDB storage. Change all submitters of SCSI passthrough requests to store the CDB information directly in the scsi_cmnd, and while doing so allocate the full 32 bytes that cover all Linux supported SCSI hosts instead of requiring dynamic allocation for > 16 byte CDBs. On 64-bit systems this does not change the size of the scsi_cmnd at all, while on 32-bit systems it slightly increases it for now, but that increase will be made up by the removal of the remaining scsi_request fields.
--- drivers/ata/libata-scsi.c | 4 +++- drivers/block/pktcdvd.c | 6 +++-- drivers/scsi/scsi_bsg.c | 23 +++++++++--------- drivers/scsi/scsi_debugfs.c | 4 +--- drivers/scsi/scsi_error.c | 28 +++++++++++----------- drivers/scsi/scsi_ioctl.c | 37 +++++++++++++---------------- drivers/scsi/scsi_lib.c | 19 +++++++-------- drivers/scsi/scsi_logging.c | 5 +--- drivers/scsi/sd.c | 28 +--------------------- drivers/scsi/sg.c | 30 +++++++++-------------- drivers/scsi/sr.c | 24 ++++++++++--------- drivers/scsi/st.c | 12 ++++++---- drivers/scsi/ufs/ufshpb.c | 22 ++++++++--------- drivers/target/target_core_pscsi.c | 12 ++++++---- drivers/usb/storage/cypress_atacb.c | 1 - drivers/usb/storage/isd200.c | 4 ++-- include/scsi/scsi_cmnd.h | 7 +----- include/scsi/scsi_eh.h | 4 +--- include/scsi/scsi_request.h | 11 --------- 19 files changed, 113 insertions(+), 168 deletions(-)
drivers/ata/libata-scsi.c +3 -1
@@ -1022,7 +1022,9 @@ void ata_scsi_sdev_config(struct scsi_device *sdev)*/ bool ata_scsi_dma_need_drain (struct request *rq) { -return atapi_cmd_type (scsi_req (rq)->cmd[0 ]) ==ATAPI_MISC ; +struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (rq); + +return atapi_cmd_type (scmd->cmnd[0 ]) ==ATAPI_MISC ; }EXPORT_SYMBOL_GPL (ata_scsi_dma_need_drain);
drivers/block/pktcdvd.c +4 -2
@@ -693,6 +693,7 @@ static void pkt_rbtree_insert(struct pktcdvd_device *pd, struct pkt_rb_node *nodstatic int pkt_generic_packet (struct pktcdvd_device *pd,struct packet_command *cgc) {struct request_queue *q =bdev_get_queue (pd->bdev); +struct scsi_cmnd *scmd;struct request *rq;int ret =0 ;
@@ -700,6 +701,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * REQ_OP_DRV_OUT : REQ_OP_DRV_IN, 0);if (IS_ERR (rq))return PTR_ERR (rq); + scmd =blk_mq_rq_to_pdu (rq);if (cgc->buflen) { ret = blk_rq_map_kern(q, rq, cgc->buffer, cgc->buflen,
@@ -708,8 +710,8 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * goto out; } -scsi_req (rq)->cmd_len =COMMAND_SIZE (cgc->cmd[0 ]); -memcpy (scsi_req (rq)->cmd, cgc->cmd,CDROM_PACKET_SIZE ); + scmd->cmd_len =COMMAND_SIZE (cgc->cmd[0 ]); +memcpy (scmd->cmnd, cgc->cmd,CDROM_PACKET_SIZE ); rq->timeout =60 *HZ ;if (cgc->quiet)
drivers/scsi/scsi_bsg.c +11 -12
@@ -13,6 +13,7 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr, fmode_t mode, unsigned int timeout) {struct scsi_request *sreq; +struct scsi_cmnd *scmd;struct request *rq;struct bio *bio;int ret;
@@ -33,19 +34,19 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr, ret = -ENOMEM ; sreq =scsi_req (rq); - sreq->cmd_len = hdr->request_len; -if (sreq->cmd_len >BLK_MAX_CDB ) { - sreq->cmd =kzalloc (sreq->cmd_len,GFP_KERNEL ); -if (!sreq->cmd) - goto out_put_request; + scmd =blk_mq_rq_to_pdu (rq); + scmd->cmd_len = hdr->request_len; +if (scmd->cmd_len >sizeof (scmd->cmnd)) { + ret = -EINVAL ; + goto out_put_request; } ret = -EFAULT ; -if (copy_from_user (sreq->cmd,uptr64 (hdr->request), sreq->cmd_len)) - goto out_free_cmd; +if (copy_from_user (scmd->cmnd,uptr64 (hdr->request), scmd->cmd_len)) + goto out_put_request; ret = -EPERM ; -if (!scsi_cmd_allowed (sreq->cmd, mode)) - goto out_free_cmd; +if (!scsi_cmd_allowed (scmd->cmnd, mode)) + goto out_put_request; ret =0 ;if (hdr->dout_xfer_len) {
@@ -57,7 +58,7 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr, }if (ret) - goto out_free_cmd; + goto out_put_request; bio = rq->bio;blk_execute_rq (rq, !(hdr->flags &BSG_FLAG_Q_AT_TAIL ));
@@ -92,8 +93,6 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr,blk_rq_unmap_user (bio); -out_free_cmd: -scsi_req_free_cmd (scsi_req (rq)); out_put_request:blk_mq_free_request (rq);return ret;
drivers/scsi/scsi_debugfs.c +1 -3
@@ -36,11 +36,9 @@ void scsi_show_rq(struct seq_file *m, struct request *rq)struct scsi_cmnd *cmd =container_of (scsi_req (rq),typeof (*cmd), req);int alloc_ms =jiffies_to_msecs (jiffies - cmd->jiffies_at_alloc);int timeout_ms =jiffies_to_msecs (rq->timeout); -const u8 *const cdb =READ_ONCE (cmd->cmnd);char buf[80 ] ="(?)" ; -if (cdb) -__scsi_format_command (buf,sizeof (buf), cdb, cmd->cmd_len); +__scsi_format_command (buf,sizeof (buf), cmd->cmnd, cmd->cmd_len);seq_printf (m,", .cmd=%s, .retries=%d, .result = %#x, .flags=" , buf, cmd->retries, cmd->result); scsi_flags_show(m, cmd->flags, scsi_cmd_flags,
drivers/scsi/scsi_error.c +14 -14
@@ -980,7 +980,7 @@ static void scsi_abort_eh_cmnd(struct scsi_cmnd *scmd)* @scmd: SCSI command structure to hijack * @ses: structure to save restore information * @cmnd: CDB to send. Can be NULL if no new cmnd is needed -* @cmnd_size: size in bytes of @cmnd (must be <= BLK_MAX_CDB) +* @cmnd_size: size in bytes of @cmnd (must be <= MAX_COMMAND_SIZE) * @sense_bytes: size of sense data to copy. or 0 (if != 0 @cmnd is ignored) * * This function is used to save a scsi command information before re-execution
@@ -1002,7 +1002,6 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses,* command. */ ses->cmd_len = scmd->cmd_len; - ses->cmnd = scmd->cmnd; ses->data_direction = scmd->sc_data_direction; ses->sdb = scmd->sdb; ses->result = scmd->result;
@@ -1013,8 +1012,8 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses, scmd->prot_op =SCSI_PROT_NORMAL ; scmd->eh_eflags =0 ; - scmd->cmnd = ses->eh_cmnd; -memset (scmd->cmnd,0 ,BLK_MAX_CDB ); +memcpy (ses->cmnd, scmd->cmnd,sizeof (ses->cmnd)); +memset (scmd->cmnd,0 ,sizeof (scmd->cmnd));memset (&scmd->sdb,0 ,sizeof (scmd->sdb)); scmd->result =0 ; scmd->req.resid_len =0 ;
@@ -1033,7 +1032,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses, }else { scmd->sc_data_direction =DMA_NONE ;if (cmnd) { -BUG_ON (cmnd_size >BLK_MAX_CDB ); +BUG_ON (cmnd_size >sizeof (scmd->cmnd));memcpy (scmd->cmnd, cmnd, cmnd_size); scmd->cmd_len =COMMAND_SIZE (scmd->cmnd[0 ]); }
@@ -1066,7 +1065,7 @@ void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd, struct scsi_eh_save *ses)* Restore original data */ scmd->cmd_len = ses->cmd_len; - scmd->cmnd = ses->cmnd; +memcpy (scmd->cmnd, ses->cmnd,sizeof (ses->cmnd)); scmd->sc_data_direction = ses->data_direction; scmd->sdb = ses->sdb; scmd->result = ses->result;
@@ -2022,6 +2021,7 @@ static void eh_lock_door_done(struct request *req, blk_status_t status)*/ static void scsi_eh_lock_door (struct scsi_device *sdev) { +struct scsi_cmnd *scmd;struct request *req;struct scsi_request *rq;
@@ -2029,14 +2029,15 @@ static void scsi_eh_lock_door(struct scsi_device *sdev)if (IS_ERR (req))return ; rq =scsi_req (req); + scmd =blk_mq_rq_to_pdu (req); - rq->cmd[0 ] =ALLOW_MEDIUM_REMOVAL ; - rq->cmd[1 ] =0 ; - rq->cmd[2 ] =0 ; - rq->cmd[3 ] =0 ; - rq->cmd[4 ] =SCSI_REMOVAL_PREVENT ; - rq->cmd[5 ] =0 ; - rq->cmd_len =COMMAND_SIZE (rq->cmd[0 ]); + scmd->cmnd[0 ] =ALLOW_MEDIUM_REMOVAL ; + scmd->cmnd[1 ] =0 ; + scmd->cmnd[2 ] =0 ; + scmd->cmnd[3 ] =0 ; + scmd->cmnd[4 ] =SCSI_REMOVAL_PREVENT ; + scmd->cmnd[5 ] =0 ; + scmd->cmd_len =COMMAND_SIZE (scmd->cmnd[0 ]); req->rq_flags |=RQF_QUIET ; req->timeout =10 *HZ ;
@@ -2399,7 +2400,6 @@ scsi_ioctl_reset(struct scsi_device *dev, int __user *arg) scmd = (struct scsi_cmnd *)(rq +1 );scsi_init_command (dev, scmd); - scmd->cmnd =scsi_req (rq)->cmd; scmd->submitter =SUBMITTED_BY_SCSI_RESET_IOCTL ;memset (&scmd->sdb,0 ,sizeof (scmd->sdb));
drivers/scsi/scsi_ioctl.c +17 -20
@@ -345,19 +345,15 @@ EXPORT_SYMBOL(scsi_cmd_allowed);static int scsi_fill_sghdr_rq (struct scsi_device *sdev,struct request *rq,struct sg_io_hdr *hdr,fmode_t mode) { -struct scsi_request *req =scsi_req (rq); +struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (rq);if (hdr->cmd_len <6 )return -EMSGSIZE ; -if (copy_from_user (req->cmd, hdr->cmdp, hdr->cmd_len)) +if (copy_from_user (scmd->cmnd, hdr->cmdp, hdr->cmd_len))return -EFAULT ; -if (!scsi_cmd_allowed (req->cmd, mode)) +if (!scsi_cmd_allowed (scmd->cmnd, mode))return -EPERM ; - -/* -* fill in request structure -*/ - req->cmd_len = hdr->cmd_len; + scmd->cmd_len = hdr->cmd_len; rq->timeout =msecs_to_jiffies (hdr->timeout);if (!rq->timeout)
@@ -416,6 +412,7 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode)int at_head =0 ;struct request *rq;struct scsi_request *req; +struct scsi_cmnd *scmd;struct bio *bio;if (hdr->interface_id !='S' )
@@ -444,16 +441,16 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode)if (IS_ERR (rq))return PTR_ERR (rq); req =scsi_req (rq); + scmd =blk_mq_rq_to_pdu (rq); -if (hdr->cmd_len >BLK_MAX_CDB ) { - req->cmd =kzalloc (hdr->cmd_len,GFP_KERNEL ); -if (!req->cmd) - goto out_put_request; +if (hdr->cmd_len >sizeof (scmd->cmnd)) { + ret = -EINVAL ; + goto out_put_request; } ret =scsi_fill_sghdr_rq (sdev, rq, hdr, mode);if (ret <0 ) - goto out_free_cdb; + goto out_put_request; ret =0 ;if (hdr->iovec_count) {
@@ -463,7 +460,7 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode) ret =import_iovec (rq_data_dir (rq), hdr->dxferp, hdr->iovec_count,0 , &iov, &i);if (ret <0 ) - goto out_free_cdb; + goto out_put_request;/* SG_IO howto says that the shorter of the two wins */ iov_iter_truncate (&i, hdr->dxfer_len);
@@ -475,7 +472,7 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode) hdr->dxfer_len, GFP_KERNEL);if (ret) - goto out_free_cdb; + goto out_put_request; bio = rq->bio; req->retries =0 ;
@@ -488,8 +485,6 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode) ret =scsi_complete_sghdr_rq (rq, hdr, bio); -out_free_cdb: -scsi_req_free_cmd (req); out_put_request:blk_mq_free_request (rq);return ret;
@@ -530,6 +525,7 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode,struct scsi_request *req;int err;unsigned int in_len, out_len, bytes, opcode, cmdlen; +struct scsi_cmnd *scmd;char *buffer =NULL ;if (!sic)
@@ -561,6 +557,7 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode, goto error_free_buffer; } req =scsi_req (rq); + scmd =blk_mq_rq_to_pdu (rq); cmdlen =COMMAND_SIZE (opcode);
@@ -568,15 +565,15 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode,* get command and data to send to device, if any */ err = -EFAULT ; - req->cmd_len = cmdlen; -if (copy_from_user (req->cmd, sic->data, cmdlen)) + scmd->cmd_len = cmdlen; +if (copy_from_user (scmd->cmnd, sic->data, cmdlen)) goto error;if (in_len &©_from_user (buffer, sic->data + cmdlen, in_len)) goto error; err = -EPERM ; -if (!scsi_cmd_allowed (req->cmd, mode)) +if (!scsi_cmd_allowed (scmd->cmnd, mode)) goto error;/* default. possible overridden later */
drivers/scsi/scsi_lib.c +8 -11
@@ -214,6 +214,7 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, {struct request *req;struct scsi_request *rq; +struct scsi_cmnd *scmd;int ret; req = scsi_alloc_request(sdev->request_queue,
@@ -231,8 +232,9 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,if (ret) goto out; } - rq->cmd_len =COMMAND_SIZE (cmd[0 ]); -memcpy (rq->cmd, cmd, rq->cmd_len); + scmd =blk_mq_rq_to_pdu (req); + scmd->cmd_len =COMMAND_SIZE (cmd[0 ]); +memcpy (scmd->cmnd, cmd, scmd->cmd_len); rq->retries = retries; req->timeout = timeout; req->cmd_flags |= flags;
@@ -1126,9 +1128,9 @@ static void scsi_initialize_rq(struct request *rq)struct scsi_cmnd *cmd =blk_mq_rq_to_pdu (rq);struct scsi_request *req = &cmd->req; -memset (req->__cmd,0 ,sizeof (req->__cmd)); - req->cmd = req->__cmd; - req->cmd_len =BLK_MAX_CDB ; +memset (cmd->cmnd,0 ,sizeof (cmd->cmnd)); + cmd->cmd_len =MAX_COMMAND_SIZE ; + req->sense_len =0 ;init_rcu_head (&cmd->rcu);
@@ -1196,8 +1198,6 @@ static blk_status_t scsi_setup_scsi_cmnd(struct scsi_device *sdev,memset (&cmd->sdb,0 ,sizeof (cmd->sdb)); } - cmd->cmd_len =scsi_req (req)->cmd_len; - cmd->cmnd =scsi_req (req)->cmd; cmd->transfersize =blk_rq_bytes (req); cmd->allowed =scsi_req (req)->retries;return BLK_STS_OK ;
@@ -1567,8 +1567,6 @@ static blk_status_t scsi_prepare_cmd(struct request *req) cmd->prot_type =0 ; cmd->prot_flags =0 ; cmd->submitter =0 ; - cmd->cmd_len =0 ; - cmd->cmnd =NULL ;memset (&cmd->sdb,0 ,sizeof (cmd->sdb)); cmd->underflow =0 ; cmd->transfersize =0 ;
@@ -1616,8 +1614,7 @@ static blk_status_t scsi_prepare_cmd(struct request *req)return ret; } - cmd->cmnd =scsi_req (req)->cmd =scsi_req (req)->__cmd; -memset (cmd->cmnd,0 ,BLK_MAX_CDB ); +memset (cmd->cmnd,0 ,sizeof (cmd->cmnd));return scsi_cmd_to_driver (cmd)->init_command (cmd); }
drivers/scsi/scsi_logging.c +1 -4
@@ -87,7 +87,7 @@ void scmd_printk(const char *level, const struct scsi_cmnd *scmd,char *logbuf;size_t off =0 , logbuf_len; -if (!scmd || !scmd->cmnd) +if (!scmd)return ; logbuf =scsi_log_reserve_buffer (&logbuf_len);
@@ -183,9 +183,6 @@ void scsi_print_command(struct scsi_cmnd *cmd)char *logbuf;size_t off, logbuf_len; -if (!cmd->cmnd) -return ; - logbuf =scsi_log_reserve_buffer (&logbuf_len);if (!logbuf)return ;
drivers/scsi/sd.c +1 -27
@@ -128,7 +128,6 @@ static DEFINE_IDA(sd_index_ida);static DEFINE_MUTEX (sd_ref_mutex);static struct kmem_cache *sd_cdb_cache; -static mempool_t *sd_cdb_pool;static mempool_t *sd_page_pool;static struct lock_class_key sd_bio_compl_lkclass;
@@ -1075,13 +1074,7 @@ static blk_status_t sd_setup_rw32_cmnd(struct scsi_cmnd *cmd, bool write, sector_t lba, unsigned int nr_blocks, unsigned char flags) { - cmd->cmnd = mempool_alloc(sd_cdb_pool, GFP_ATOMIC); -if (unlikely (cmd->cmnd ==NULL )) -return BLK_STS_RESOURCE ; - cmd->cmd_len = SD_EXT_CDB_SIZE; -memset (cmd->cmnd,0 , cmd->cmd_len); - cmd->cmnd[0 ] =VARIABLE_LENGTH_CMD ; cmd->cmnd[7 ] =0x18 ;/* Additional CDB len */ cmd->cmnd[9 ] = write ?WRITE_32 :READ_32 ;
@@ -1313,17 +1306,9 @@ static blk_status_t sd_init_command(struct scsi_cmnd *cmd)static void sd_uninit_command (struct scsi_cmnd *SCpnt) {struct request *rq =scsi_cmd_to_rq (SCpnt); -u8 *cmnd;if (rq->rq_flags &RQF_SPECIAL_PAYLOAD )mempool_free (rq->special_vec.bv_page, sd_page_pool); - -if (SCpnt->cmnd !=scsi_req (rq)->cmd) { - cmnd = SCpnt->cmnd; - SCpnt->cmnd =NULL ; - SCpnt->cmd_len =0 ; -mempool_free (cmnd, sd_cdb_pool); - } } static bool sd_need_revalidate(struct block_device *bdev,
@@ -3819,18 +3804,11 @@ static int __init init_sd(void) goto err_out_class; } - sd_cdb_pool =mempool_create_slab_pool (SD_MEMPOOL_SIZE , sd_cdb_cache); -if (!sd_cdb_pool) { -printk (KERN_ERR "sd: can't init extended cdb pool\n" ); - err = -ENOMEM ; - goto err_out_cache; - } - sd_page_pool =mempool_create_page_pool (SD_MEMPOOL_SIZE ,0 );if (!sd_page_pool) {printk (KERN_ERR "sd: can't init discard page pool\n" ); err = -ENOMEM ; - goto err_out_ppool; + goto err_out_cache; } err =scsi_register_driver (&sd_template.gendrv);
@@ -3842,9 +3820,6 @@ static int __init init_sd(void) err_out_driver:mempool_destroy (sd_page_pool); -err_out_ppool: -mempool_destroy (sd_cdb_pool); - err_out_cache:kmem_cache_destroy (sd_cdb_cache);
@@ -3868,7 +3843,6 @@ static void __exit exit_sd(void)SCSI_LOG_HLQUEUE (3 ,printk ("exit_sd: exiting sd driver\n" ));scsi_unregister_driver (&sd_template.gendrv); -mempool_destroy (sd_cdb_pool);mempool_destroy (sd_page_pool);kmem_cache_destroy (sd_cdb_cache);
drivers/scsi/sg.c +11 -19
@@ -818,7 +818,6 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp, }if (atomic_read (&sdp->detaching)) {if (srp->bio) { -scsi_req_free_cmd (scsi_req (srp->rq));blk_mq_free_request (srp->rq); srp->rq =NULL ; }
@@ -1393,7 +1392,6 @@ sg_rq_end_io(struct request *rq, blk_status_t status)* blk_rq_unmap_user() can be called from user context. */ srp->rq =NULL ; -scsi_req_free_cmd (scsi_req (rq));blk_mq_free_request (rq);write_lock_irqsave (&sfp->rq_list_lock, iflags);
@@ -1738,18 +1736,12 @@ sg_start_req(Sg_request *srp, unsigned char *cmd)struct request_queue *q = sfp->parentdp->device->request_queue;struct rq_map_data *md, map_data;int rw = hp->dxfer_direction ==SG_DXFER_TO_DEV ?WRITE :READ ; -unsigned char *long_cmdp =NULL ; +struct scsi_cmnd *scmd;SCSI_LOG_TIMEOUT (4 ,sg_printk (KERN_INFO , sfp->parentdp,"sg_start_req: dxfer_len=%d\n" , dxfer_len)); -if (hp->cmd_len >BLK_MAX_CDB ) { - long_cmdp =kzalloc (hp->cmd_len,GFP_KERNEL ); -if (!long_cmdp) -return -ENOMEM ; - } -/* * NOTE *
@@ -1763,16 +1755,18 @@ sg_start_req(Sg_request *srp, unsigned char *cmd)*/ rq =scsi_alloc_request (q, hp->dxfer_direction ==SG_DXFER_TO_DEV ?REQ_OP_DRV_OUT :REQ_OP_DRV_IN ,0 ); -if (IS_ERR (rq)) { -kfree (long_cmdp); +if (IS_ERR (rq))return PTR_ERR (rq); - } + scmd =blk_mq_rq_to_pdu (rq); req =scsi_req (rq); -if (hp->cmd_len >BLK_MAX_CDB ) - req->cmd = long_cmdp; -memcpy (req->cmd, cmd, hp->cmd_len); - req->cmd_len = hp->cmd_len; +if (hp->cmd_len >sizeof (scmd->cmnd)) { +blk_mq_free_request (rq); +return -EINVAL ; + } + +memcpy (scmd->cmnd, cmd, hp->cmd_len); + scmd->cmd_len = hp->cmd_len; srp->rq = rq; rq->end_io_data = srp;
@@ -1865,10 +1859,8 @@ sg_finish_rem_req(Sg_request *srp)if (srp->bio) ret =blk_rq_unmap_user (srp->bio); -if (srp->rq) { -scsi_req_free_cmd (scsi_req (srp->rq)); +if (srp->rq)blk_mq_free_request (srp->rq); - }if (srp->res_used)sg_unlink_reserve (sfp, srp);
drivers/scsi/sr.c +13 -11
@@ -966,6 +966,7 @@ static int sr_read_cdda_bpc(struct cdrom_device_info *cdi, void __user *ubuf,struct gendisk *disk = cdi->disk;u32 len = nr *CD_FRAMESIZE_RAW ;struct scsi_request *req; +struct scsi_cmnd *scmd;struct request *rq;struct bio *bio;int ret;
@@ -974,22 +975,23 @@ static int sr_read_cdda_bpc(struct cdrom_device_info *cdi, void __user *ubuf,if (IS_ERR (rq))return PTR_ERR (rq); req =scsi_req (rq); + scmd =blk_mq_rq_to_pdu (rq); ret =blk_rq_map_user (disk->queue, rq,NULL , ubuf, len,GFP_KERNEL );if (ret) goto out_put_request; - req->cmd[0 ] =GPCMD_READ_CD ; - req->cmd[1 ] =1 <<2 ; - req->cmd[2 ] = (lba >>24 ) &0xff ; - req->cmd[3 ] = (lba >>16 ) &0xff ; - req->cmd[4 ] = (lba >>8 ) &0xff ; - req->cmd[5 ] = lba &0xff ; - req->cmd[6 ] = (nr >>16 ) &0xff ; - req->cmd[7 ] = (nr >>8 ) &0xff ; - req->cmd[8 ] = nr &0xff ; - req->cmd[9 ] =0xf8 ; - req->cmd_len =12 ; + scmd->cmnd[0 ] =GPCMD_READ_CD ; + scmd->cmnd[1 ] =1 <<2 ; + scmd->cmnd[2 ] = (lba >>24 ) &0xff ; + scmd->cmnd[3 ] = (lba >>16 ) &0xff ; + scmd->cmnd[4 ] = (lba >>8 ) &0xff ; + scmd->cmnd[5 ] = lba &0xff ; + scmd->cmnd[6 ] = (nr >>16 ) &0xff ; + scmd->cmnd[7 ] = (nr >>8 ) &0xff ; + scmd->cmnd[8 ] = nr &0xff ; + scmd->cmnd[9 ] =0xf8 ; + scmd->cmd_len =12 ; rq->timeout =60 *HZ ; bio = rq->bio;
drivers/scsi/st.c +7 -5
@@ -472,10 +472,11 @@ static void st_release_request(struct st_request *streq)static void st_do_stats (struct scsi_tape *STp,struct request *req) { +struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (req);ktime_t now; now =ktime_get (); -if (scsi_req (req)->cmd[0 ] ==WRITE_6 ) { +if (scmd->cmnd[0 ] ==WRITE_6 ) { now =ktime_sub (now, STp->stats->write_time);atomic64_add (ktime_to_ns (now), &STp->stats->tot_write_time);atomic64_add (ktime_to_ns (now), &STp->stats->tot_io_time);
@@ -489,7 +490,7 @@ static void st_do_stats(struct scsi_tape *STp, struct request *req) }else atomic64_add (atomic_read (&STp->stats->last_write_size), &STp->stats->write_byte_cnt); - }else if (scsi_req (req)->cmd[0 ] ==READ_6 ) { + }else if (scmd->cmnd[0 ] ==READ_6 ) { now =ktime_sub (now, STp->stats->read_time);atomic64_add (ktime_to_ns (now), &STp->stats->tot_read_time);atomic64_add (ktime_to_ns (now), &STp->stats->tot_io_time);
@@ -542,12 +543,14 @@ static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd,struct rq_map_data *mdata = &SRpnt->stp->buffer->map_data;int err =0 ;struct scsi_tape *STp = SRpnt->stp; +struct scsi_cmnd *scmd; req =scsi_alloc_request (SRpnt->stp->device->request_queue, data_direction ==DMA_TO_DEVICE ?REQ_OP_DRV_OUT :REQ_OP_DRV_IN ,0 );if (IS_ERR (req))return PTR_ERR (req); + scmd =blk_mq_rq_to_pdu (req); rq =scsi_req (req); req->rq_flags |=RQF_QUIET ;
@@ -574,9 +577,8 @@ static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd, } SRpnt->bio = req->bio; - rq->cmd_len =COMMAND_SIZE (cmd[0 ]); -memset (rq->cmd,0 ,BLK_MAX_CDB ); -memcpy (rq->cmd, cmd, rq->cmd_len); + scmd->cmd_len =COMMAND_SIZE (cmd[0 ]); +memcpy (scmd->cmnd, cmd, scmd->cmd_len); req->timeout = timeout; rq->retries = retries; req->end_io_data = SRpnt;
drivers/scsi/ufs/ufshpb.c +10 -12
@@ -666,15 +666,14 @@ static void ufshpb_execute_umap_req(struct ufshpb_lu *hpb,struct ufshpb_req *umap_req, struct ufshpb_region *rgn) { - struct request *req; -struct scsi_request *rq; + struct request *req = umap_req->req; +struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (req); - req = umap_req->req; req->timeout =0 ; - req->end_io_data = (void *)umap_req; - rq =scsi_req (req); -ufshpb_set_unmap_cmd (rq->cmd, rgn); - rq->cmd_len =HPB_WRITE_BUFFER_CMD_LENGTH ; + req->end_io_data = umap_req; + +ufshpb_set_unmap_cmd (scmd->cmnd, rgn); + scmd->cmd_len =HPB_WRITE_BUFFER_CMD_LENGTH ;blk_execute_rq_nowait (req, true, ufshpb_umap_req_compl_fn);
@@ -686,7 +685,7 @@ static int ufshpb_execute_map_req(struct ufshpb_lu *hpb, {struct request_queue *q;struct request *req; -struct scsi_request *rq; +struct scsi_cmnd *scmd;int mem_size = hpb->srgn_mem_size;int ret =0 ;int i;
@@ -709,14 +708,13 @@ static int ufshpb_execute_map_req(struct ufshpb_lu *hpb, req->end_io_data = map_req; - rq =scsi_req (req); -if (unlikely (last)) mem_size = hpb->last_srgn_entries *HPB_ENTRY_SIZE ; -ufshpb_set_read_buf_cmd (rq->cmd, map_req->rb.rgn_idx, + scmd =blk_mq_rq_to_pdu (req); +ufshpb_set_read_buf_cmd (scmd->cmnd, map_req->rb.rgn_idx, map_req->rb.srgn_idx, mem_size); - rq->cmd_len =HPB_READ_BUFFER_CMD_LENGTH ; + scmd->cmd_len =HPB_READ_BUFFER_CMD_LENGTH ;blk_execute_rq_nowait (req, true, ufshpb_map_req_compl_fn);
drivers/target/target_core_pscsi.c +8 -4
@@ -961,6 +961,7 @@ pscsi_execute_cmd(struct se_cmd *cmd)struct scatterlist *sgl = cmd->t_data_sg;u32 sgl_nents = cmd->t_data_nents;struct pscsi_dev_virt *pdv =PSCSI_DEV (cmd->se_dev); +struct scsi_cmnd *scmd;struct request *req;sense_reason_t ret;
@@ -978,12 +979,15 @@ pscsi_execute_cmd(struct se_cmd *cmd) req->end_io = pscsi_req_done; req->end_io_data = cmd; -scsi_req (req)->cmd_len =scsi_command_size (cmd->t_task_cdb); -if (scsi_req (req)->cmd_len >BLK_MAX_CDB ) { + + scmd =blk_mq_rq_to_pdu (req); + scmd->cmd_len =scsi_command_size (cmd->t_task_cdb); +if (scmd->cmd_len >sizeof (scmd->cmnd)) { ret =TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ; goto fail_put_request; } -memcpy (scsi_req (req)->cmd, cmd->t_task_cdb,scsi_req (req)->cmd_len); +memcpy (scmd->cmnd, cmd->t_task_cdb, scmd->cmd_len); +if (pdv->pdv_sd->type ==TYPE_DISK || pdv->pdv_sd->type ==TYPE_ZBC ) req->timeout =PS_TIMEOUT_DISK ;
@@ -991,7 +995,7 @@ pscsi_execute_cmd(struct se_cmd *cmd) req->timeout =PS_TIMEOUT_OTHER ;scsi_req (req)->retries =PS_RETRY ; - cmd->priv =scsi_req (req)->cmd; + cmd->priv = scmd->cmnd;blk_execute_rq_nowait (req, cmd->sam_task_attr ==TCM_HEAD_TAG , pscsi_req_done);
drivers/usb/storage/cypress_atacb.c +0 -1
@@ -177,7 +177,6 @@ static void cypress_atacb_passthrough(struct scsi_cmnd *srb, struct us_data *us)* but reading register selected in srb->cmnd[4] */ srb->cmd_len =16 ; - srb->cmnd = ses.cmnd; srb->cmnd[2 ] =1 ;usb_stor_transparent_scsi_command (srb, us);
drivers/usb/storage/isd200.c +2 -2
@@ -326,7 +326,7 @@ struct isd200_info {/* maximum number of LUNs supported */ unsigned char MaxLUNs; -unsigned char cmnd[BLK_MAX_CDB ]; +unsigned char cmnd[MAX_COMMAND_SIZE ];struct scsi_cmnd srb;struct scatterlist sg; };
@@ -485,7 +485,7 @@ static int isd200_action( struct us_data *us, int action,int status;memset (&ata,0 ,sizeof (ata)); - srb->cmnd = info->cmnd; +memcpy (srb->cmnd, info->cmnd,MAX_COMMAND_SIZE ); srb->device = &srb_dev; ata.generic.SignatureByte0 = info->ConfigData.ATAMajorCommand;
include/scsi/scsi_cmnd.h +1 -6
@@ -28,9 +28,6 @@ struct scsi_driver;* supports without specifying a cmd_len by ULD's */ #define MAX_COMMAND_SIZE 16 -#if (MAX_COMMAND_SIZE >BLK_MAX_CDB ) -# error MAX_COMMAND_SIZE can not be bigger than BLK_MAX_CDB -#endif struct scsi_data_buffer {struct sg_table table;
@@ -100,9 +97,7 @@ struct scsi_cmnd {unsigned short cmd_len;enum dma_data_direction sc_data_direction; -/* These elements define the operation we are about to perform */ -unsigned char *cmnd; - +unsigned char cmnd[32 ];/* SCSI CDB */ /* These elements define the operation we ultimately want to perform */ struct scsi_data_buffer sdb;
include/scsi/scsi_eh.h +1 -3
@@ -38,10 +38,8 @@ struct scsi_eh_save {unsigned underflow;unsigned char cmd_len;unsigned char prot_op; -unsigned char *cmnd; +unsigned char cmnd[32 ];struct scsi_data_buffer sdb; -/* new command support */ -unsigned char eh_cmnd[BLK_MAX_CDB ];struct scatterlist sense_sgl; };
include/scsi/scsi_request.h +0 -11
@@ -4,12 +4,7 @@#include <linux/blk-mq.h> -#define BLK_MAX_CDB 16 -struct scsi_request { -unsigned char __cmd[BLK_MAX_CDB ]; -unsigned char *cmd; -unsigned short cmd_len;int result;unsigned int sense_len;unsigned int resid_len;/* residual count */
@@ -22,10 +17,4 @@ static inline struct scsi_request *scsi_req(struct request *rq) return blk_mq_rq_to_pdu(rq); } -static inline void scsi_req_free_cmd (struct scsi_request *req) -{ -if (req->cmd != req->__cmd) -kfree (req->cmd); -} -#endif /* _SCSI_SCSI_REQUEST_H */
Signature · 1 line
2.30.2
Re: [PATCH 3/8] scsi: remove the cmd field from struct scsi_request
Quoted 10 lines · Christoph Hellwig
Now that each
scsi_requestis backed by ascsi_cmnd, there is no need to indirect the CDB storage. Change all submitters of SCSI passthrough requests to store the CDB information directly in thescsi_cmnd, and while doing so allocate the full 32 bytes that cover all Linux supported SCSI hosts instead of requiring dynamic allocation for > 16 byte CDBs. On 64-bit systems this does not change the size of thescsi_cmndat all, while on 32-bit systems it slightly increases it for now, but that increase will be made up by the removal of the remainingscsi_requestfields.
Quoted 2 lines
Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Bart Van Assche <[email protected]>
I had just finished going through the v1 of this patch and this seems identical, so, FWIW:
Just a minor comment below (feel free to ignore).
Quoted 82 lines
--- drivers/ata/libata-scsi.c | 4 +++- drivers/block/pktcdvd.c | 6 +++-- drivers/scsi/scsi_bsg.c | 23 +++++++++--------- drivers/scsi/scsi_debugfs.c | 4 +--- drivers/scsi/scsi_error.c | 28 +++++++++++----------- drivers/scsi/scsi_ioctl.c | 37 +++++++++++++---------------- drivers/scsi/scsi_lib.c | 19 +++++++-------- drivers/scsi/scsi_logging.c | 5 +--- drivers/scsi/sd.c | 28 +--------------------- drivers/scsi/sg.c | 30 +++++++++-------------- drivers/scsi/sr.c | 24 ++++++++++--------- drivers/scsi/st.c | 12 ++++++---- drivers/scsi/ufs/ufshpb.c | 22 ++++++++--------- drivers/target/target_core_pscsi.c | 12 ++++++---- drivers/usb/storage/cypress_atacb.c | 1 - drivers/usb/storage/isd200.c | 4 ++-- include/scsi/scsi_cmnd.h | 7 +----- include/scsi/scsi_eh.h | 4 +--- include/scsi/scsi_request.h | 11 --------- 19 files changed, 113 insertions(+), 168 deletions(-)drivers/ata/libata-scsi.c +3
-1@@ -1022,7 +1022,9 @@ void ata_scsi_sdev_config(struct scsi_device *sdev)*/ bool ata_scsi_dma_need_drain (struct request *rq) { -return atapi_cmd_type (scsi_req (rq)->cmd[0 ]) ==ATAPI_MISC ; +struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (rq); + +return atapi_cmd_type (scmd->cmnd[0 ]) ==ATAPI_MISC ; }EXPORT_SYMBOL_GPL (ata_scsi_dma_need_drain);drivers/block/pktcdvd.c +4
-2@@ -693,6 +693,7 @@ static void pkt_rbtree_insert(struct pktcdvd_device *pd, struct pkt_rb_node *nodstatic int pkt_generic_packet (struct pktcdvd_device *pd,struct packet_command *cgc) {struct request_queue *q =bdev_get_queue (pd->bdev); +struct scsi_cmnd *scmd;struct request *rq;int ret =0 ;@@ -700,6 +701,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * REQ_OP_DRV_OUT : REQ_OP_DRV_IN, 0);if (IS_ERR (rq))return PTR_ERR (rq); + scmd =blk_mq_rq_to_pdu (rq);if (cgc->buflen) { ret = blk_rq_map_kern(q, rq, cgc->buffer, cgc->buflen,@@ -708,8 +710,8 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * goto out; } -scsi_req (rq)->cmd_len =COMMAND_SIZE (cgc->cmd[0 ]); -memcpy (scsi_req (rq)->cmd, cgc->cmd,CDROM_PACKET_SIZE ); + scmd->cmd_len =COMMAND_SIZE (cgc->cmd[0 ]); +memcpy (scmd->cmnd, cgc->cmd,CDROM_PACKET_SIZE ); rq->timeout =60 *HZ ;if (cgc->quiet)drivers/scsi/scsi_bsg.c +1
-0@@ -13,6 +13,7 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr, fmode_t mode, unsigned int timeout) {struct scsi_request *sreq; +struct scsi_cmnd *scmd;struct request *rq;struct bio *bio;int ret;@@ -33,19 +34,19 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr,
drivers/scsi/scsi_bsg.c static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr, · line 39
Quoted 10 lines
drivers/scsi/scsi_bsg.c +3
-5ret = -ENOMEM ; sreq =scsi_req (rq); - sreq->cmd_len = hdr->request_len; -if (sreq->cmd_len >BLK_MAX_CDB ) { - sreq->cmd =kzalloc (sreq->cmd_len,GFP_KERNEL ); -if (!sreq->cmd) - goto out_put_request; + scmd =blk_mq_rq_to_pdu (rq); + scmd->cmd_len = hdr->request_len; +if (scmd->cmd_len >sizeof (scmd->cmnd)) {
You might be able to move this check earlier (before the request allocation), but no big deal.
PATCH 4/8 scsi: remove the sense and sense_len fields from struct scsi_request
In reply to Christoph HellwigJust use the sense_buffer field in struct scsi_cmnd for the sense data and move the sense_len field over to struct scsi_cmnd.
--- drivers/scsi/scsi_bsg.c | 7 ++++--- drivers/scsi/scsi_ioctl.c | 16 ++++++++-------- drivers/scsi/scsi_lib.c | 18 +++++++----------- drivers/scsi/sg.c | 7 ++++--- drivers/scsi/sr.c | 2 +- drivers/scsi/st.c | 5 +++-- drivers/target/target_core_pscsi.c | 3 ++- include/scsi/scsi_cmnd.h | 1 + include/scsi/scsi_request.h | 2 -- 9 files changed, 30 insertions(+), 31 deletions(-)
drivers/scsi/scsi_bsg.c +4 -3
@@ -76,11 +76,12 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr, hdr->info |=SG_INFO_CHECK ; hdr->response_len =0 ; -if (sreq->sense_len && hdr->response) { +if (scmd->sense_len && hdr->response) { int len = min_t(unsigned int, hdr->max_response_len, - sreq->sense_len); + scmd->sense_len); -if (copy_to_user (uptr64 (hdr->response), sreq->sense, len)) +if (copy_to_user (uptr64 (hdr->response), scmd->sense_buffer, + len)) ret = -EFAULT ;else hdr->response_len = len;
drivers/scsi/scsi_ioctl.c +8 -8
@@ -369,6 +369,7 @@ static int scsi_fill_sghdr_rq(struct scsi_device *sdev, struct request *rq,static int scsi_complete_sghdr_rq (struct request *rq,struct sg_io_hdr *hdr,struct bio *bio) { +struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (rq);struct scsi_request *req =scsi_req (rq);int r, ret =0 ;
@@ -388,10 +389,10 @@ static int scsi_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, hdr->resid = req->resid_len; hdr->sb_len_wr =0 ; -if (req->sense_len && hdr->sbp) { -int len =min ((unsigned int ) hdr->mx_sb_len, req->sense_len); +if (scmd->sense_len && hdr->sbp) { +int len =min ((unsigned int ) hdr->mx_sb_len, scmd->sense_len); -if (!copy_to_user (hdr->sbp, req->sense, len)) +if (!copy_to_user (hdr->sbp, scmd->sense_buffer, len)) hdr->sb_len_wr = len;else ret = -EFAULT ;
@@ -520,7 +521,6 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode)static int sg_scsi_ioctl (struct request_queue *q,fmode_t mode,struct scsi_ioctl_command __user *sic) { -enum {OMAX_SB_LEN =16 };/* For backward compatibility */ struct request *rq;struct scsi_request *req;int err;
@@ -613,10 +613,10 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode, err = req->result &0xff ;/* only 8 bit SCSI status */ if (err) { -if (req->sense_len && req->sense) { - bytes = (OMAX_SB_LEN > req->sense_len) ? - req->sense_len :OMAX_SB_LEN ; -if (copy_to_user (sic->data, req->sense, bytes)) +if (scmd->sense_len && scmd->sense_buffer) { +/* limit sense len for backward compatibility */ +if (copy_to_user (sic->data, scmd->sense_buffer, +min (scmd->sense_len,16U ))) err = -EFAULT ; } }else {
drivers/scsi/scsi_lib.c +7 -11
@@ -256,10 +256,11 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,if (resid) *resid = rq->resid_len; -if (sense && rq->sense_len) -memcpy (sense, rq->sense,SCSI_SENSE_BUFFERSIZE ); +if (sense && scmd->sense_len) +memcpy (sense, scmd->sense_buffer,SCSI_SENSE_BUFFERSIZE );if (sshdr) -scsi_normalize_sense (rq->sense, rq->sense_len, sshdr); +scsi_normalize_sense (scmd->sense_buffer, scmd->sense_len, + sshdr); ret = rq->result; out:blk_mq_free_request (req);
@@ -876,9 +877,8 @@ static int scsi_io_completion_nz_result(struct scsi_cmnd *cmd, int result,/* * SG_IO wants current and deferred errors */ -scsi_req (req)->sense_len = -min (8 + cmd->sense_buffer[7 ], -SCSI_SENSE_BUFFERSIZE ); + cmd->sense_len =min (8 + cmd->sense_buffer[7 ], +SCSI_SENSE_BUFFERSIZE ); }if (sense_current) *blk_statp =scsi_result_to_blk_status (cmd, result);
@@ -1126,13 +1126,10 @@ EXPORT_SYMBOL(scsi_alloc_sgtables);static void scsi_initialize_rq (struct request *rq) {struct scsi_cmnd *cmd =blk_mq_rq_to_pdu (rq); -struct scsi_request *req = &cmd->req;memset (cmd->cmnd,0 ,sizeof (cmd->cmnd)); cmd->cmd_len =MAX_COMMAND_SIZE ; - - req->sense_len =0 ; - + cmd->sense_len =0 ;init_rcu_head (&cmd->rcu); cmd->jiffies_at_alloc = jiffies; cmd->retries =0 ;
@@ -1824,7 +1821,6 @@ static int scsi_mq_init_request(struct blk_mq_tag_set *set, struct request *rq,kmem_cache_alloc_node (scsi_sense_cache,GFP_KERNEL , numa_node);if (!cmd->sense_buffer)return -ENOMEM ; - cmd->req.sense = cmd->sense_buffer;if (scsi_host_get_prot (shost)) { sg = (void *)cmd + sizeof(struct scsi_cmnd) +
drivers/scsi/sg.c +4 -3
@@ -1323,6 +1323,7 @@ sg_rq_end_io_usercontext(struct work_struct *work)static void sg_rq_end_io (struct request *rq,blk_status_t status) { +struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (rq);struct sg_request *srp = rq->end_io_data;struct scsi_request *req =scsi_req (rq);Sg_device *sdp;
@@ -1343,7 +1344,7 @@ sg_rq_end_io(struct request *rq, blk_status_t status)if (unlikely (atomic_read (&sdp->detaching)))pr_info ("%s: device detaching\n" , __func__); - sense = req->sense; + sense = scmd->sense_buffer; result = req->result; resid = req->resid_len;
@@ -1380,8 +1381,8 @@ sg_rq_end_io(struct request *rq, blk_status_t status) } } -if (req->sense_len) -memcpy (srp->sense_b, req->sense,SCSI_SENSE_BUFFERSIZE ); +if (scmd->sense_len) +memcpy (srp->sense_b, scmd->sense_buffer,SCSI_SENSE_BUFFERSIZE );/* Rely on write phase to clean out srp status values, so no "else" */
drivers/scsi/sr.c +1 -1
@@ -999,7 +999,7 @@ static int sr_read_cdda_bpc(struct cdrom_device_info *cdi, void __user *ubuf,if (scsi_req (rq)->result) {struct scsi_sense_hdr sshdr; -scsi_normalize_sense (req->sense, req->sense_len, +scsi_normalize_sense (scmd->sense_buffer, scmd->sense_len, &sshdr); *last_sense = sshdr.sense_key; ret = -EIO ;
drivers/scsi/st.c +3 -2
@@ -514,6 +514,7 @@ static void st_do_stats(struct scsi_tape *STp, struct request *req)static void st_scsi_execute_end (struct request *req,blk_status_t status) { +struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (req);struct st_request *SRpnt = req->end_io_data;struct scsi_request *rq =scsi_req (req);struct scsi_tape *STp = SRpnt->stp;
@@ -525,8 +526,8 @@ static void st_scsi_execute_end(struct request *req, blk_status_t status)st_do_stats (STp, req); tmp = SRpnt->bio; -if (rq->sense_len) -memcpy (SRpnt->sense, rq->sense,SCSI_SENSE_BUFFERSIZE ); +if (scmd->sense_len) +memcpy (SRpnt->sense, scmd->sense_buffer,SCSI_SENSE_BUFFERSIZE );if (SRpnt->waiting)complete (SRpnt->waiting);
drivers/target/target_core_pscsi.c +2 -1
@@ -1031,6 +1031,7 @@ static sector_t pscsi_get_blocks(struct se_device *dev)static void pscsi_req_done (struct request *req,blk_status_t status) {struct se_cmd *cmd = req->end_io_data; +struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (req);int result =scsi_req (req)->result;enum sam_status scsi_status = result &0xff ;u8 *cdb = cmd->priv;
@@ -1040,7 +1041,7 @@ static void pscsi_req_done(struct request *req, blk_status_t status) " 0x%02x Result: 0x%08x\n", cmd, cdb[0], result); } -pscsi_complete_cmd (cmd, scsi_status,scsi_req (req)->sense); +pscsi_complete_cmd (cmd, scsi_status, scmd->sense_buffer);switch (host_byte (result)) {case DID_OK :
include/scsi/scsi_cmnd.h +1 -0
@@ -112,6 +112,7 @@ struct scsi_cmnd {reconnects. Probably == sector size */ +unsigned sense_len;unsigned char *sense_buffer;/* obtained by REQUEST SENSE when * CHECK CONDITION is received on original
include/scsi/scsi_request.h +0 -2
@@ -6,10 +6,8 @@struct scsi_request {int result; -unsigned int sense_len;unsigned int resid_len;/* residual count */ int retries; -void *sense; };static inline struct scsi_request *scsi_req (struct request *rq)
Signature · 1 line
2.30.2
Re: [PATCH 4/8] scsi: remove the sense and sense_len fields from struct scsi_request
Quoted 5 lines · Christoph Hellwig
Just use the
sense_bufferfield in structscsi_cmndfor the sense data and move thesense_lenfield over to structscsi_cmnd.Signed-off-by Christoph Hellwig<[email protected]>Reviewed-by Bart Van Assche<[email protected]>
FWIW:
PATCH 5/8 scsi: move the resid_len field from struct scsi_request to struct scsi_cmnd
In reply to Christoph HellwigPrepare for removing the scsi_request structure by moving the resid_len field to struct scsi_cmnd.
--- drivers/scsi/scsi_bsg.c | 4 ++-- drivers/scsi/scsi_error.c | 6 +++--- drivers/scsi/scsi_ioctl.c | 2 +- drivers/scsi/scsi_lib.c | 6 +++--- drivers/scsi/sg.c | 2 +- drivers/scsi/st.c | 2 +- drivers/target/target_core_pscsi.c | 2 +- include/scsi/scsi_cmnd.h | 6 +++--- include/scsi/scsi_request.h | 1 - 9 files changed, 15 insertions(+), 16 deletions(-)
drivers/scsi/scsi_bsg.c +2 -2
@@ -88,9 +88,9 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr, }if (rq_data_dir (rq) ==READ ) - hdr->din_resid = sreq->resid_len; + hdr->din_resid = scmd->resid_len;else - hdr->dout_resid = sreq->resid_len; + hdr->dout_resid = scmd->resid_len;blk_rq_unmap_user (bio);
drivers/scsi/scsi_error.c +3 -3
@@ -1005,7 +1005,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses, ses->data_direction = scmd->sc_data_direction; ses->sdb = scmd->sdb; ses->result = scmd->result; - ses->resid_len = scmd->req.resid_len; + ses->resid_len = scmd->resid_len; ses->underflow = scmd->underflow; ses->prot_op = scmd->prot_op; ses->eh_eflags = scmd->eh_eflags;
@@ -1016,7 +1016,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses,memset (scmd->cmnd,0 ,sizeof (scmd->cmnd));memset (&scmd->sdb,0 ,sizeof (scmd->sdb)); scmd->result =0 ; - scmd->req.resid_len =0 ; + scmd->resid_len =0 ;if (sense_bytes) { scmd->sdb.length = min_t(unsigned, SCSI_SENSE_BUFFERSIZE,
@@ -1069,7 +1069,7 @@ void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd, struct scsi_eh_save *ses) scmd->sc_data_direction = ses->data_direction; scmd->sdb = ses->sdb; scmd->result = ses->result; - scmd->req.resid_len = ses->resid_len; + scmd->resid_len = ses->resid_len; scmd->underflow = ses->underflow; scmd->prot_op = ses->prot_op; scmd->eh_eflags = ses->eh_eflags;
drivers/scsi/scsi_ioctl.c +1 -1
@@ -386,7 +386,7 @@ static int scsi_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, hdr->info =0 ;if (hdr->masked_status || hdr->host_status || hdr->driver_status) hdr->info |=SG_INFO_CHECK ; - hdr->resid = req->resid_len; + hdr->resid = scmd->resid_len; hdr->sb_len_wr =0 ;if (scmd->sense_len && hdr->sbp) {
drivers/scsi/scsi_lib.c +3 -3
@@ -251,11 +251,11 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,* is invalid. Prevent the garbage from being misinterpreted * and prevent security leaks by zeroing out the excess data. */ -if (unlikely (rq->resid_len >0 && rq->resid_len <= bufflen)) -memset (buffer + (bufflen - rq->resid_len),0 , rq->resid_len); +if (unlikely (scmd->resid_len >0 && scmd->resid_len <= bufflen)) +memset (buffer + bufflen - scmd->resid_len,0 , scmd->resid_len);if (resid) - *resid = rq->resid_len; + *resid = scmd->resid_len;if (sense && scmd->sense_len)memcpy (sense, scmd->sense_buffer,SCSI_SENSE_BUFFERSIZE );if (sshdr)
drivers/scsi/sg.c +1 -1
@@ -1346,7 +1346,7 @@ sg_rq_end_io(struct request *rq, blk_status_t status) sense = scmd->sense_buffer; result = req->result; - resid = req->resid_len; + resid = scmd->resid_len; SCSI_LOG_TIMEOUT(4, sg_printk(KERN_INFO, sdp, "sg_cmd_done: pack_id=%d, res=0x%x\n",
drivers/scsi/st.c +1 -1
@@ -521,7 +521,7 @@ static void st_scsi_execute_end(struct request *req, blk_status_t status)struct bio *tmp; STp->buffer->cmdstat.midlevel_result = SRpnt->result = rq->result; - STp->buffer->cmdstat.residual = rq->resid_len; + STp->buffer->cmdstat.residual = scmd->resid_len;st_do_stats (STp, req);
drivers/target/target_core_pscsi.c +1 -1
@@ -1046,7 +1046,7 @@ static void pscsi_req_done(struct request *req, blk_status_t status)switch (host_byte (result)) {case DID_OK :target_complete_cmd_with_length (cmd, scsi_status, - cmd->data_length -scsi_req (req)->resid_len); + cmd->data_length - scmd->resid_len);break ;default : pr_debug("PSCSI Host Byte exception at cmd: %p CDB:"
include/scsi/scsi_cmnd.h +3 -3
@@ -111,7 +111,7 @@ struct scsi_cmnd {(ie, between disconnect / reconnects. Probably == sector size */ - +unsigned resid_len;/* residual count */ unsigned sense_len;unsigned char *sense_buffer;/* obtained by REQUEST SENSE when
@@ -200,12 +200,12 @@ static inline unsigned scsi_bufflen(struct scsi_cmnd *cmd)static inline void scsi_set_resid (struct scsi_cmnd *cmd,unsigned int resid) { - cmd->req.resid_len = resid; + cmd->resid_len = resid; }static inline unsigned int scsi_get_resid (struct scsi_cmnd *cmd) { -return cmd->req.resid_len; +return cmd->resid_len; }#define scsi_for_each_sg (cmd, sg, nseg, __i) \
include/scsi/scsi_request.h +0 -1
@@ -6,7 +6,6 @@struct scsi_request {int result; -unsigned int resid_len;/* residual count */ int retries; };
Signature · 1 line
2.30.2
Re: [PATCH 5/8] scsi: move the resid_len field from struct scsi_request to struct scsi_cmnd
Quoted 5 lines · Christoph Hellwig
Prepare for removing the
scsi_requeststructure by moving theresid_lenfield to structscsi_cmnd.Signed-off-by Christoph Hellwig<[email protected]>Reviewed-by Bart Van Assche<[email protected]>
FWIW,
PATCH 6/8 scsi: move the result field from struct scsi_request to struct scsi_cmnd
In reply to Christoph HellwigPrepare for removing the scsi_request structure by moving the result field to struct scsi_cmnd.
--- drivers/block/pktcdvd.c | 2 +- drivers/scsi/scsi_bsg.c | 8 +++----- drivers/scsi/scsi_ioctl.c | 9 ++++----- drivers/scsi/scsi_lib.c | 15 ++++----------- drivers/scsi/sg.c | 3 +-- drivers/scsi/sr.c | 2 +- drivers/scsi/st.c | 7 +++---- drivers/target/target_core_pscsi.c | 9 ++++----- include/scsi/scsi_request.h | 1 - 9 files changed, 21 insertions(+), 35 deletions(-)
drivers/block/pktcdvd.c +1 -1
@@ -718,7 +718,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * rq->rq_flags |=RQF_QUIET ;blk_execute_rq (rq, false); -if (scsi_req (rq)->result) +if (scmd->result) ret = -EIO ; out:blk_mq_free_request (rq);
drivers/scsi/scsi_bsg.c +3 -5
@@ -12,7 +12,6 @@static int scsi_bsg_sg_io_fn (struct request_queue *q,struct sg_io_v4 *hdr,fmode_t mode,unsigned int timeout) { -struct scsi_request *sreq;struct scsi_cmnd *scmd;struct request *rq;struct bio *bio;
@@ -33,7 +32,6 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr, rq->timeout = timeout; ret = -ENOMEM ; - sreq =scsi_req (rq); scmd =blk_mq_rq_to_pdu (rq); scmd->cmd_len = hdr->request_len;if (scmd->cmd_len >sizeof (scmd->cmnd)) {
@@ -66,10 +64,10 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr,/* * fill in all the output members */ - hdr->device_status = sreq->result &0xff ; - hdr->transport_status =host_byte (sreq->result); + hdr->device_status = scmd->result &0xff ; + hdr->transport_status =host_byte (scmd->result); hdr->driver_status =0 ; -if (scsi_status_is_check_condition (sreq->result)) +if (scsi_status_is_check_condition (scmd->result)) hdr->driver_status =DRIVER_SENSE ; hdr->info =0 ;if (hdr->device_status || hdr->transport_status || hdr->driver_status)
drivers/scsi/scsi_ioctl.c +4 -5
@@ -370,16 +370,15 @@ static int scsi_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, struct bio *bio) {struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (rq); -struct scsi_request *req =scsi_req (rq);int r, ret =0 ;/* * fill in all the output members */ - hdr->status = req->result &0xff ; - hdr->masked_status =status_byte (req->result); + hdr->status = scmd->result &0xff ; + hdr->masked_status =status_byte (scmd->result); hdr->msg_status =COMMAND_COMPLETE ; - hdr->host_status =host_byte (req->result); + hdr->host_status =host_byte (scmd->result); hdr->driver_status =0 ;if (scsi_status_is_check_condition (hdr->status)) hdr->driver_status =DRIVER_SENSE ;
@@ -611,7 +610,7 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode,blk_execute_rq (rq, false); - err = req->result &0xff ;/* only 8 bit SCSI status */ + err = scmd->result &0xff ;/* only 8 bit SCSI status */ if (err) {if (scmd->sense_len && scmd->sense_buffer) {/* limit sense len for backward compatibility */
drivers/scsi/scsi_lib.c +4 -11
@@ -261,7 +261,7 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,if (sshdr)scsi_normalize_sense (scmd->sense_buffer, scmd->sense_len, sshdr); - ret = rq->result; + ret = scmd->result; out:blk_mq_free_request (req);
@@ -959,13 +959,6 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)if (unlikely (result))/* a nz result may or may not be an error */ result =scsi_io_completion_nz_result (cmd, result, &blk_stat); -if (unlikely (blk_rq_is_passthrough (req))) { -/* -* scsi_result_to_blk_status may have reset the host_byte -*/ -scsi_req (req)->result = cmd->result; - } -/* * Next deal with any sectors which we were able to correctly * handle.
@@ -1779,15 +1772,15 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx, ret =BLK_STS_DEV_RESOURCE ;break ;case BLK_STS_AGAIN : -scsi_req (req)->result =DID_BUS_BUSY <<16 ; + cmd->result =DID_BUS_BUSY <<16 ;if (req->rq_flags &RQF_DONTPREP )scsi_mq_uninit_cmd (cmd);break ;default :if (unlikely (!scsi_device_online (sdev))) -scsi_req (req)->result =DID_NO_CONNECT <<16 ; + cmd->result =DID_NO_CONNECT <<16 ;else -scsi_req (req)->result =DID_ERROR <<16 ; + cmd->result =DID_ERROR <<16 ;/* * Make sure to release all allocated resources when * we hit an error, as we will never see this command
drivers/scsi/sg.c +1 -2
@@ -1325,7 +1325,6 @@ sg_rq_end_io(struct request *rq, blk_status_t status) {struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (rq);struct sg_request *srp = rq->end_io_data; -struct scsi_request *req =scsi_req (rq);Sg_device *sdp;Sg_fd *sfp;unsigned long iflags;
@@ -1345,7 +1344,7 @@ sg_rq_end_io(struct request *rq, blk_status_t status)pr_info ("%s: device detaching\n" , __func__); sense = scmd->sense_buffer; - result = req->result; + result = scmd->result; resid = scmd->resid_len; SCSI_LOG_TIMEOUT(4, sg_printk(KERN_INFO, sdp,
drivers/scsi/sr.c +1 -1
@@ -996,7 +996,7 @@ static int sr_read_cdda_bpc(struct cdrom_device_info *cdi, void __user *ubuf, bio = rq->bio;blk_execute_rq (rq, false); -if (scsi_req (rq)->result) { +if (scmd->result) {struct scsi_sense_hdr sshdr; scsi_normalize_sense(scmd->sense_buffer, scmd->sense_len,
drivers/scsi/st.c +3 -4
@@ -481,7 +481,7 @@ static void st_do_stats(struct scsi_tape *STp, struct request *req)atomic64_add (ktime_to_ns (now), &STp->stats->tot_write_time);atomic64_add (ktime_to_ns (now), &STp->stats->tot_io_time);atomic64_inc (&STp->stats->write_cnt); -if (scsi_req (req)->result) { +if (scmd->result) {atomic64_add (atomic_read (&STp->stats->last_write_size) - STp->buffer->cmdstat.residual, &STp->stats->write_byte_cnt);
@@ -495,7 +495,7 @@ static void st_do_stats(struct scsi_tape *STp, struct request *req)atomic64_add (ktime_to_ns (now), &STp->stats->tot_read_time);atomic64_add (ktime_to_ns (now), &STp->stats->tot_io_time);atomic64_inc (&STp->stats->read_cnt); -if (scsi_req (req)->result) { +if (scmd->result) {atomic64_add (atomic_read (&STp->stats->last_read_size) - STp->buffer->cmdstat.residual, &STp->stats->read_byte_cnt);
@@ -516,11 +516,10 @@ static void st_scsi_execute_end(struct request *req, blk_status_t status) {struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (req);struct st_request *SRpnt = req->end_io_data; -struct scsi_request *rq =scsi_req (req);struct scsi_tape *STp = SRpnt->stp;struct bio *tmp; - STp->buffer->cmdstat.midlevel_result = SRpnt->result = rq->result; + STp->buffer->cmdstat.midlevel_result = SRpnt->result = scmd->result; STp->buffer->cmdstat.residual = scmd->resid_len;st_do_stats (STp, req);
drivers/target/target_core_pscsi.c +4 -5
@@ -1032,25 +1032,24 @@ static void pscsi_req_done(struct request *req, blk_status_t status) {struct se_cmd *cmd = req->end_io_data;struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (req); -int result =scsi_req (req)->result; -enum sam_status scsi_status = result &0xff ; +enum sam_status scsi_status = scmd->result &0xff ;u8 *cdb = cmd->priv;if (scsi_status !=SAM_STAT_GOOD ) {pr_debug ("PSCSI Status Byte exception at cmd: %p CDB:" -" 0x%02x Result: 0x%08x\n" , cmd, cdb[0 ], result); +" 0x%02x Result: 0x%08x\n" , cmd, cdb[0 ], scmd->result); }pscsi_complete_cmd (cmd, scsi_status, scmd->sense_buffer); -switch (host_byte (result)) { +switch (host_byte (scmd->result)) {case DID_OK :target_complete_cmd_with_length (cmd, scsi_status, cmd->data_length - scmd->resid_len);break ;default :pr_debug ("PSCSI Host Byte exception at cmd: %p CDB:" -" 0x%02x Result: 0x%08x\n" , cmd, cdb[0 ], result); +" 0x%02x Result: 0x%08x\n" , cmd, cdb[0 ], scmd->result);target_complete_cmd (cmd,SAM_STAT_CHECK_CONDITION );break ; }
include/scsi/scsi_request.h +0 -1
@@ -5,7 +5,6 @@#include <linux/blk-mq.h> struct scsi_request { -int result;int retries; };
Signature · 1 line
2.30.2
Re: [PATCH 6/8] scsi: move the result field from struct scsi_request to struct scsi_cmnd
Quoted 2 lines · Christoph Hellwig
Prepare for removing the
scsi_requeststructure by moving the result field to structscsi_cmnd.
Hmm..it seems that we are just using the pre-existing scsi_cmnd result field.
Quoted 3 lines
Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Bart Van Assche <[email protected]>
Anyway, FWIW,
PATCH 7/8 scsi: remove struct scsi_request
In reply to Christoph HellwigLet submitters initialize the scmd->allowed field directly instead of indirecting through struct scsi_request and remove the now superflous structure.
--- drivers/scsi/scsi_debugfs.c | 2 +- drivers/scsi/scsi_error.c | 4 +--- drivers/scsi/scsi_ioctl.c | 12 ++++-------- drivers/scsi/scsi_lib.c | 6 +----- drivers/scsi/sg.c | 4 +--- drivers/scsi/sr.c | 2 -- drivers/scsi/st.c | 4 +--- drivers/target/target_core_pscsi.c | 2 +- include/scsi/scsi_cmnd.h | 1 - include/scsi/scsi_request.h | 9 --------- 10 files changed, 10 insertions(+), 36 deletions(-)
drivers/scsi/scsi_debugfs.c +1 -1
@@ -33,7 +33,7 @@ static int scsi_flags_show(struct seq_file *m, const unsigned long flags,void scsi_show_rq (struct seq_file *m,struct request *rq) { -struct scsi_cmnd *cmd =container_of (scsi_req (rq),typeof (*cmd), req); +struct scsi_cmnd *cmd =blk_mq_rq_to_pdu (rq);int alloc_ms =jiffies_to_msecs (jiffies - cmd->jiffies_at_alloc);int timeout_ms =jiffies_to_msecs (rq->timeout);char buf[80 ] ="(?)" ;
drivers/scsi/scsi_error.c +1 -3
@@ -2023,12 +2023,10 @@ static void scsi_eh_lock_door(struct scsi_device *sdev) {struct scsi_cmnd *scmd;struct request *req; -struct scsi_request *rq; req =scsi_alloc_request (sdev->request_queue,REQ_OP_DRV_IN ,0 );if (IS_ERR (req))return ; - rq =scsi_req (req); scmd =blk_mq_rq_to_pdu (req); scmd->cmnd[0 ] =ALLOW_MEDIUM_REMOVAL ;
@@ -2041,7 +2039,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev) req->rq_flags |=RQF_QUIET ; req->timeout =10 *HZ ; - rq->retries =5 ; + scmd->allowed =5 ;blk_execute_rq_nowait (req, true, eh_lock_door_done); }
drivers/scsi/scsi_ioctl.c +4 -8
@@ -411,7 +411,6 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode)int writing =0 ;int at_head =0 ;struct request *rq; -struct scsi_request *req;struct scsi_cmnd *scmd;struct bio *bio;
@@ -440,7 +439,6 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode) REQ_OP_DRV_OUT : REQ_OP_DRV_IN, 0);if (IS_ERR (rq))return PTR_ERR (rq); - req =scsi_req (rq); scmd =blk_mq_rq_to_pdu (rq);if (hdr->cmd_len >sizeof (scmd->cmnd)) {
@@ -475,7 +473,7 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode) goto out_put_request; bio = rq->bio; - req->retries =0 ; + scmd->allowed =0 ; start_time = jiffies;
@@ -521,7 +519,6 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode, struct scsi_ioctl_command __user *sic) {struct request *rq; -struct scsi_request *req;int err;unsigned int in_len, out_len, bytes, opcode, cmdlen;struct scsi_cmnd *scmd;
@@ -555,7 +552,6 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode, err =PTR_ERR (rq); goto error_free_buffer; } - req =scsi_req (rq); scmd =blk_mq_rq_to_pdu (rq); cmdlen =COMMAND_SIZE (opcode);
@@ -576,13 +572,13 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode, goto error;/* default. possible overridden later */ - req->retries =5 ; + scmd->allowed =5 ;switch (opcode) {case SEND_DIAGNOSTIC :case FORMAT_UNIT : rq->timeout =FORMAT_UNIT_TIMEOUT ; - req->retries =1 ; + scmd->allowed =1 ;break ;case START_STOP : rq->timeout =START_STOP_TIMEOUT ;
@@ -595,7 +591,7 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode,break ;case READ_DEFECT_DATA : rq->timeout =READ_DEFECT_DATA_TIMEOUT ; - req->retries =1 ; + scmd->allowed =1 ;break ;default : rq->timeout =BLK_DEFAULT_SG_TIMEOUT ;
drivers/scsi/scsi_lib.c +1 -5
@@ -213,7 +213,6 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, int *resid) {struct request *req; -struct scsi_request *rq;struct scsi_cmnd *scmd;int ret;
@@ -224,8 +223,6 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,if (IS_ERR (req))return PTR_ERR (req); - rq =scsi_req (req); -if (bufflen) { ret =blk_rq_map_kern (sdev->request_queue, req, buffer, bufflen,GFP_NOIO );
@@ -235,7 +232,7 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, scmd =blk_mq_rq_to_pdu (req); scmd->cmd_len =COMMAND_SIZE (cmd[0 ]);memcpy (scmd->cmnd, cmd, scmd->cmd_len); - rq->retries = retries; + scmd->allowed = retries; req->timeout = timeout; req->cmd_flags |= flags; req->rq_flags |= rq_flags |RQF_QUIET ;
@@ -1189,7 +1186,6 @@ static blk_status_t scsi_setup_scsi_cmnd(struct scsi_device *sdev, } cmd->transfersize =blk_rq_bytes (req); - cmd->allowed =scsi_req (req)->retries;return BLK_STS_OK ; }
drivers/scsi/sg.c +1 -3
@@ -1725,7 +1725,6 @@ sg_start_req(Sg_request *srp, unsigned char *cmd) {int res;struct request *rq; -struct scsi_request *req;Sg_fd *sfp = srp->parentfp;sg_io_hdr_t *hp = &srp->header;int dxfer_len = (int ) hp->dxfer_len;
@@ -1758,7 +1757,6 @@ sg_start_req(Sg_request *srp, unsigned char *cmd)if (IS_ERR (rq))return PTR_ERR (rq); scmd =blk_mq_rq_to_pdu (rq); - req =scsi_req (rq);if (hp->cmd_len >sizeof (scmd->cmnd)) {blk_mq_free_request (rq);
@@ -1770,7 +1768,7 @@ sg_start_req(Sg_request *srp, unsigned char *cmd) srp->rq = rq; rq->end_io_data = srp; - req->retries =SG_DEFAULT_RETRIES ; + scmd->allowed =SG_DEFAULT_RETRIES ;if ((dxfer_len <=0 ) || (dxfer_dir ==SG_DXFER_NONE ))return 0 ;
drivers/scsi/sr.c +0 -2
@@ -965,7 +965,6 @@ static int sr_read_cdda_bpc(struct cdrom_device_info *cdi, void __user *ubuf, {struct gendisk *disk = cdi->disk;u32 len = nr *CD_FRAMESIZE_RAW ; -struct scsi_request *req;struct scsi_cmnd *scmd;struct request *rq;struct bio *bio;
@@ -974,7 +973,6 @@ static int sr_read_cdda_bpc(struct cdrom_device_info *cdi, void __user *ubuf, rq =scsi_alloc_request (disk->queue,REQ_OP_DRV_IN ,0 );if (IS_ERR (rq))return PTR_ERR (rq); - req =scsi_req (rq); scmd =blk_mq_rq_to_pdu (rq); ret =blk_rq_map_user (disk->queue, rq,NULL , ubuf, len,GFP_KERNEL );
drivers/scsi/st.c +1 -3
@@ -539,7 +539,6 @@ static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd, int timeout, int retries) {struct request *req; -struct scsi_request *rq;struct rq_map_data *mdata = &SRpnt->stp->buffer->map_data;int err =0 ;struct scsi_tape *STp = SRpnt->stp;
@@ -551,7 +550,6 @@ static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd,if (IS_ERR (req))return PTR_ERR (req); scmd =blk_mq_rq_to_pdu (req); - rq =scsi_req (req); req->rq_flags |=RQF_QUIET ; mdata->null_mapped =1 ;
@@ -580,7 +578,7 @@ static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd, scmd->cmd_len =COMMAND_SIZE (cmd[0 ]);memcpy (scmd->cmnd, cmd, scmd->cmd_len); req->timeout = timeout; - rq->retries = retries; + scmd->allowed = retries; req->end_io_data = SRpnt;blk_execute_rq_nowait (req, true, st_scsi_execute_end);
drivers/target/target_core_pscsi.c +1 -1
@@ -993,7 +993,7 @@ pscsi_execute_cmd(struct se_cmd *cmd) req->timeout =PS_TIMEOUT_DISK ; else req->timeout = PS_TIMEOUT_OTHER; -scsi_req (req)->retries =PS_RETRY ; + scmd->allowed =PS_RETRY ; cmd->priv = scmd->cmnd;
include/scsi/scsi_cmnd.h +0 -1
@@ -68,7 +68,6 @@ enum scsi_cmnd_submitter { } __packed;struct scsi_cmnd { -struct scsi_request req;struct scsi_device *device;struct list_head eh_entry;/* entry for the host eh_abort_list/eh_cmd_q */ struct delayed_work abort_work;
include/scsi/scsi_request.h +0 -9
@@ -4,13 +4,4 @@#include <linux/blk-mq.h> -struct scsi_request { -int retries; -}; - -static inline struct scsi_request *scsi_req (struct request *rq) -{ -return blk_mq_rq_to_pdu (rq); -} -#endif /* _SCSI_SCSI_REQUEST_H */
Signature · 1 line
2.30.2
Re: [PATCH 7/8] scsi: remove struct scsi_request
Quoted 6 lines · Christoph Hellwig
Let submitters initialize the
scmd->allowedfield directly instead of indirecting through structscsi_requestand remove the now superflous structure.Signed-off-by Christoph Hellwig<[email protected]>Reviewed-by Bart Van Assche<[email protected]>
FWIW,
PATCH 8/8 scsi: remove <scsi/scsi_request.h>
In reply to Christoph HellwigThis header is empty now except for an include of <linux/blk-mq.h>, so remove it.
--- drivers/cdrom/cdrom.c | 1 - drivers/scsi/scsi_transport_sas.c | 1 - include/linux/bsg-lib.h | 1 - include/scsi/scsi_cmnd.h | 1 - include/scsi/scsi_request.h | 7 ------- 5 files changed, 11 deletions(-) delete mode 100644 include/scsi/scsi_request.h
drivers/cdrom/cdrom.c +0 -1
@@ -284,7 +284,6 @@#include <linux/times.h> #include <linux/uaccess.h> #include <scsi/scsi_common.h> -#include <scsi/scsi_request.h> /* used to tell the module to turn on full debugging messages */ static bool debug;
drivers/scsi/scsi_transport_sas.c +0 -1
@@ -34,7 +34,6 @@#include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> -#include <scsi/scsi_request.h> #include <scsi/scsi_device.h> #include <scsi/scsi_host.h> #include <scsi/scsi_transport.h>
include/linux/bsg-lib.h +0 -1
@@ -10,7 +10,6 @@#define _BLK_BSG_#include <linux/blkdev.h> -#include <scsi/scsi_request.h> struct bsg_job ;struct request ;
include/scsi/scsi_cmnd.h +0 -1
@@ -10,7 +10,6 @@#include <linux/timer.h> #include <linux/scatterlist.h> #include <scsi/scsi_device.h> -#include <scsi/scsi_request.h> struct Scsi_Host ;struct scsi_driver ;
include/scsi/scsi_request.h deleted +0 -7
@@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _SCSI_SCSI_REQUEST_H -#define _SCSI_SCSI_REQUEST_H - -#include <linux/blk-mq.h> - -#endif /* _SCSI_SCSI_REQUEST_H */
Signature · 1 line
2.30.2
Re: [PATCH 8/8] scsi: remove <scsi/scsi_request.h>
Quoted 2 lines · Christoph Hellwig
This header is empty now except for an include of <
linux/blk-mq.h>, so remove it.
Re: [PATCH 8/8] scsi: remove <scsi/scsi_request.h>
In reply to Christoph HellwigQuoted 4 lines · Christoph Hellwig
This header is empty now except for an include of <
linux/blk-mq.h>, so remove it.Signed-off-by Christoph Hellwig<[email protected]>
FWIW,
Martin K. Petersen
AppliedChristoph,
Quoted 5 lines
with the recent removal of the REQ_OP_SCSI_{IN,OUT} based passthrough from non-scsi drivers, the need for the
scsi_requeststructure went away as well. As all submitters of SCSI passthrough requests are using the SCSI midlayer now they can just fill out thescsi_cmnddirectly.
Applied to 5.18/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 5 lines · Christoph Hellwig
with the recent removal of the REQ_OP_SCSI_{IN,OUT} based passthrough from non-scsi drivers, the need for the
scsi_requeststructure went away as well. As all submitters of SCSI passthrough requests are using the SCSI midlayer now they can just fill out thescsi_cmnddirectly.
Quoted 7 lines
Changes since v1:
- fix a few commit message typos
- remove an extra clearing ofscmd->flags
- cleanup sense handling insg_scsi_ioctl
- split the last patch[...]
Applied to 5.18/scsi-queue, thanks!
[1/8] target/pscsi: remove struct pscsi_plugin_task
https://git.kernel.org/mkp/scsi/c/c49ff72cff4c [2/8] scsi: don't memset the entire scsi_cmnd in scsi_init_command https://git.kernel.org/mkp/scsi/c/71bada345b33 [3/8] scsi: remove the cmd field from struct scsi_request https://git.kernel.org/mkp/scsi/c/ce70fd9a551a [4/8] scsi: remove the sense and sense_len fields from struct scsi_request https://git.kernel.org/mkp/scsi/c/5b794f98074a [5/8] scsi: move the resid_len field from struct scsi_request to struct scsi_cmnd https://git.kernel.org/mkp/scsi/c/a9a4ea1166d6 [6/8] scsi: move the result field from struct scsi_request to struct scsi_cmnd https://git.kernel.org/mkp/scsi/c/dbb4c84d87af [7/8] scsi: remove struct scsi_request https://git.kernel.org/mkp/scsi/c/6aded12b10e0 [8/8] scsi: remove <scsi/scsi_request.h> https://git.kernel.org/mkp/scsi/c/264403033105
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering