block: remove REQ_OP_SCSI_{IN,OUT}
Subsystems (10)
Christoph Hellwig
maintainerPATCH 1/2 block: remove REQ_OP_SCSI_{IN,OUT}
With the legacy IDE driver gone drivers now use either REQ_OP_DRV_* or REQ_OP_SCSI_*, so unify the two concepts of passthrough requests into a single one.
--- block/blk-core.c | 2 -- block/bsg-lib.c | 2 +- block/bsg.c | 2 +- block/scsi_ioctl.c | 6 +++--- drivers/block/pktcdvd.c | 2 +- drivers/cdrom/cdrom.c | 2 +- drivers/scsi/scsi_error.c | 2 +- drivers/scsi/scsi_lib.c | 8 ++++---- drivers/scsi/sg.c | 2 +- drivers/scsi/st.c | 2 +- drivers/target/target_core_pscsi.c | 2 +- fs/nfsd/blocklayout.c | 2 +- include/linux/blk_types.h | 3 --- include/linux/blkdev.h | 33 +++--------------------------- 14 files changed, 19 insertions(+), 51 deletions(-)
block/blk-core.c +0 -2
@@ -142,8 +142,6 @@ static const char *const blk_op_name[] = {REQ_OP_NAME (ZONE_APPEND ),REQ_OP_NAME (WRITE_SAME ),REQ_OP_NAME (WRITE_ZEROES ), -REQ_OP_NAME (SCSI_IN ), -REQ_OP_NAME (SCSI_OUT ),REQ_OP_NAME (DRV_IN ), REQ_OP_NAME(DRV_OUT), };
block/bsg-lib.c +1 -1
@@ -45,7 +45,7 @@ static int bsg_transport_fill_hdr(struct request *rq, struct sg_io_v4 *hdr,return PTR_ERR (job->request);if (hdr->dout_xfer_len && hdr->din_xfer_len) { - job->bidi_rq =blk_get_request (rq->q,REQ_OP_SCSI_IN ,0 ); + job->bidi_rq =blk_get_request (rq->q,REQ_OP_DRV_IN ,0 );if (IS_ERR (job->bidi_rq)) { ret =PTR_ERR (job->bidi_rq); goto out;
block/bsg.c +1 -1
@@ -152,7 +152,7 @@ static int bsg_sg_io(struct request_queue *q, fmode_t mode, void __user *uarg)return ret; rq =blk_get_request (q, hdr.dout_xfer_len ? -REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN ,0 ); +REQ_OP_DRV_OUT :REQ_OP_DRV_IN ,0 );if (IS_ERR (rq))return PTR_ERR (rq);
block/scsi_ioctl.c +3 -3
@@ -311,7 +311,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, at_head =1 ; ret = -ENOMEM ; - rq =blk_get_request (q, writing ?REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN ,0 ); + rq =blk_get_request (q, writing ?REQ_OP_DRV_OUT :REQ_OP_DRV_IN ,0 );if (IS_ERR (rq))return PTR_ERR (rq); req =scsi_req (rq);
@@ -433,7 +433,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, } - rq =blk_get_request (q, in_len ?REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN ,0 ); + rq =blk_get_request (q, in_len ?REQ_OP_DRV_OUT :REQ_OP_DRV_IN ,0 );if (IS_ERR (rq)) { err =PTR_ERR (rq); goto error_free_buffer;
@@ -521,7 +521,7 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk,struct request *rq;int err; - rq =blk_get_request (q,REQ_OP_SCSI_OUT ,0 ); + rq =blk_get_request (q,REQ_OP_DRV_OUT ,0 );if (IS_ERR (rq))return PTR_ERR (rq); rq->timeout =BLK_DEFAULT_SG_TIMEOUT ;
drivers/block/pktcdvd.c +1 -1
@@ -704,7 +704,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *int ret =0 ; rq =blk_get_request (q, (cgc->data_direction ==CGC_DATA_WRITE ) ? -REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN ,0 ); +REQ_OP_DRV_OUT :REQ_OP_DRV_IN ,0 );if (IS_ERR (rq))return PTR_ERR (rq);
drivers/cdrom/cdrom.c +1 -1
@@ -2186,7 +2186,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, len = nr *CD_FRAMESIZE_RAW ; - rq =blk_get_request (q,REQ_OP_SCSI_IN ,0 ); + rq =blk_get_request (q,REQ_OP_DRV_IN ,0 );if (IS_ERR (rq)) { ret =PTR_ERR (rq);break ;
drivers/scsi/scsi_error.c +1 -1
@@ -2011,7 +2011,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev)struct request *req;struct scsi_request *rq; - req =blk_get_request (sdev->request_queue,REQ_OP_SCSI_IN ,0 ); + req =blk_get_request (sdev->request_queue,REQ_OP_DRV_IN ,0 );if (IS_ERR (req))return ; rq =scsi_req (req);
drivers/scsi/scsi_lib.c +4 -4
@@ -215,7 +215,7 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, req =blk_get_request (sdev->request_queue, data_direction ==DMA_TO_DEVICE ? -REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN , +REQ_OP_DRV_OUT :REQ_OP_DRV_IN , rq_flags &RQF_PM ?BLK_MQ_REQ_PM :0 );if (IS_ERR (req))return ret;
@@ -540,7 +540,7 @@ static bool scsi_end_request(struct request *req, blk_status_t error,if (blk_queue_add_random (q))add_disk_randomness (req->rq_disk); -if (!blk_rq_is_scsi (req)) { +if (!blk_rq_is_passthrough (req)) {WARN_ON_ONCE (!(cmd->flags &SCMD_INITIALIZED )); cmd->flags &= ~SCMD_INITIALIZED ; }
@@ -1115,7 +1115,7 @@ void scsi_init_command(struct scsi_device *dev, struct scsi_cmnd *cmd)bool in_flight;int budget_token = cmd->budget_token; -if (!blk_rq_is_scsi (rq) && !(flags &SCMD_INITIALIZED )) { +if (!blk_rq_is_passthrough (rq) && !(flags &SCMD_INITIALIZED )) { flags |=SCMD_INITIALIZED ;scsi_initialize_rq (rq); }
@@ -1556,7 +1556,7 @@ static blk_status_t scsi_prepare_cmd(struct request *req)* Special handling for passthrough commands, which don't go to the ULP * at all: */ -if (blk_rq_is_scsi (req)) +if (blk_rq_is_passthrough (req))return scsi_setup_scsi_cmnd (sdev, req);if (sdev->handler && sdev->handler->prep_fn) {
drivers/scsi/sg.c +1 -1
@@ -1756,7 +1756,7 @@ sg_start_req(Sg_request *srp, unsigned char *cmd)* not expect an EWOULDBLOCK from this condition. */ rq =blk_get_request (q, hp->dxfer_direction ==SG_DXFER_TO_DEV ? -REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN ,0 ); +REQ_OP_DRV_OUT :REQ_OP_DRV_IN ,0 );if (IS_ERR (rq)) {kfree (long_cmdp);return PTR_ERR (rq);
drivers/scsi/st.c +1 -1
@@ -549,7 +549,7 @@ static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd, req =blk_get_request (SRpnt->stp->device->request_queue, data_direction ==DMA_TO_DEVICE ? -REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN ,0 ); +REQ_OP_DRV_OUT :REQ_OP_DRV_IN ,0 );if (IS_ERR (req))return DRIVER_ERROR <<24 ; rq =scsi_req (req);
drivers/target/target_core_pscsi.c +1 -1
@@ -982,7 +982,7 @@ pscsi_execute_cmd(struct se_cmd *cmd) req =blk_get_request (pdv->pdv_sd->request_queue, cmd->data_direction ==DMA_TO_DEVICE ? -REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN ,0 ); +REQ_OP_DRV_OUT :REQ_OP_DRV_IN ,0 );if (IS_ERR (req)) {pr_err ("PSCSI: blk_get_request() failed\n" ); ret =TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ;
fs/nfsd/blocklayout.c +1 -1
@@ -236,7 +236,7 @@ static int nfsd4_scsi_identify_device(struct block_device *bdev,if (!buf)return -ENOMEM ; - rq =blk_get_request (q,REQ_OP_SCSI_IN ,0 ); + rq =blk_get_request (q,REQ_OP_DRV_IN ,0 );if (IS_ERR (rq)) { error = -ENOMEM ; goto out_free_buf;
include/linux/blk_types.h +0 -3
@@ -350,9 +350,6 @@ enum req_opf {/* reset all the zone present on the device */ REQ_OP_ZONE_RESET_ALL =17 , -/* SCSI passthrough using struct scsi_request */ -REQ_OP_SCSI_IN =32 , -REQ_OP_SCSI_OUT =33 ,/* Driver private requests */ REQ_OP_DRV_IN =34 , REQ_OP_DRV_OUT = 35,
include/linux/blkdev.h +3 -30
@@ -240,42 +240,15 @@ struct request {void *end_io_data; }; -static inline bool blk_op_is_scsi (unsigned int op) -{ -return op ==REQ_OP_SCSI_IN || op ==REQ_OP_SCSI_OUT ; -} - -static inline bool blk_op_is_private (unsigned int op) +static inline bool blk_op_is_passthrough (unsigned int op) { + op &=REQ_OP_MASK ;return op ==REQ_OP_DRV_IN || op ==REQ_OP_DRV_OUT ; } -static inline bool blk_rq_is_scsi (struct request *rq) -{ -return blk_op_is_scsi (req_op (rq)); -} - -static inline bool blk_rq_is_private (struct request *rq) -{ -return blk_op_is_private (req_op (rq)); -} -static inline bool blk_rq_is_passthrough (struct request *rq) { -return blk_rq_is_scsi (rq) ||blk_rq_is_private (rq); -} - -static inline bool bio_is_passthrough (struct bio *bio) -{ -unsigned op =bio_op (bio); - -return blk_op_is_scsi (op) ||blk_op_is_private (op); -} - -static inline bool blk_op_is_passthrough (unsigned int op) -{ -return (blk_op_is_scsi (op &REQ_OP_MASK ) || -blk_op_is_private (op &REQ_OP_MASK )); +return blk_op_is_passthrough (req_op (rq)); }static inline unsigned short req_get_ioprio (struct request *req)
Signature · 1 line
2.30.2
Christoph Hellwig
maintainerPATCH 2/2 nvme
--- drivers/nvme/host/core.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-)
drivers/nvme/host/core.c +10 -21
@@ -3740,31 +3740,24 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,if (!ns) goto out_free_id; - ns->queue =blk_mq_init_queue (ctrl->tagset); -if (IS_ERR (ns->queue)) + disk =blk_mq_alloc_disk (ctrl->tagset, ns); +if (IS_ERR (disk)) goto out_free_ns; -if (ctrl->opts && ctrl->opts->data_digest) -blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , ns->queue); -blk_queue_flag_set (QUEUE_FLAG_NONROT , ns->queue);if (ctrl->ops->flags &NVME_F_PCI_P2PDMA )blk_queue_flag_set (QUEUE_FLAG_PCI_P2PDMA , ns->queue); +if (ctrl->opts && ctrl->opts->data_digest) +blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , ns->queue); - ns->queue->queuedata = ns; ns->ctrl = ctrl;kref_init (&ns->kref);if (nvme_init_ns_head (ns, nsid, ids, id->nmic &NVME_NS_NMIC_SHARED )) - goto out_free_queue; - - disk =alloc_disk_node (0 , node); -if (!disk) - goto out_unlink_ns; + goto out_cleanup_disk; disk->fops = &nvme_bdev_ops; disk->private_data = ns; - disk->queue = ns->queue;/* * Without the multipath code enabled, multiple controller per * subsystems are visible as devices and thus we cannot use the
@@ -3776,12 +3769,12 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid, ns->disk = disk;if (nvme_update_ns_info (ns, id)) - goto out_put_disk; + goto out_unlink_ns;if ((ctrl->quirks &NVME_QUIRK_LIGHTNVM ) && id->vs[0 ] ==0x1 ) {if (nvme_nvm_register (ns, disk->disk_name, node)) {dev_warn (ctrl->device,"LightNVM init failure\n" ); - goto out_put_disk; + goto out_unlink_ns; } }
@@ -3798,12 +3791,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,nvme_mpath_add_disk (ns, id);nvme_fault_inject_init (&ns->fault_inject, ns->disk->disk_name);kfree (id); -return ; - out_put_disk: -/* prevent double queue cleanup */ - ns->disk->queue =NULL ; -put_disk (ns->disk); + out_unlink_ns:mutex_lock (&ctrl->subsys->lock);list_del_rcu (&ns->siblings);
@@ -3811,8 +3800,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,list_del_init (&ns->head->entry);mutex_unlock (&ctrl->subsys->lock);nvme_put_ns_head (ns->head); - out_free_queue: -blk_cleanup_queue (ns->queue); + out_cleanup_disk: +blk_cleanup_disk (ns->disk); out_free_ns:kfree (ns); out_free_id:
Signature · 1 line
2.30.2
Christoph Hellwig
maintainerRe: [PATCH 2/2] nvme
Ignore this (second) patch, it just was in my local tree for testing.
Quoted 5 lines · Christoph Hellwig
With the legacy IDE driver gone drivers now use either REQ_OP_DRV_* or REQ_OP_SCSI_*, so unify the two concepts of passthrough requests into a single one.
Signed-off-by Christoph Hellwig <[email protected]>
Nice cleanup, we got two bits free for new req_op.
Looks good.
Christoph Hellwig
maintainerQuoted 8 lines · Chaitanya Kulkarni
Quoted 5 lines · Christoph Hellwig
With the legacy IDE driver gone drivers now use either REQ_OP_DRV_* or REQ_OP_SCSI_*, so unify the two concepts of passthrough requests into a single one.
Signed-off-by Christoph Hellwig <[email protected]>Nice cleanup, we got two bits free for new
req_op.
We could in fact easily reduce REQ_OP_BITS to 5 now with space to spare. But we haven't run out of flags bits quite yet.
Quoted 3 lines · Christoph Hellwig
With the legacy IDE driver gone drivers now use either REQ_OP_DRV_* or REQ_OP_SCSI_*, so unify the two concepts of passthrough requests into a single one.
Applied, thanks.
Signature · 1 line
Jens Axboe