rename ->make_request_fn and move it to the block_device_operations v2
Subsystems (23)
Christoph Hellwig
maintainerHi Jens,
this series moves the make_request_fn method into block_device_operations with the much more descriptive ->submit_bio name. It then also gives generic_make_request a more descriptive name, and further optimize the path to issue to blk-mq, removing the need for the direct_make_request bypass.
Changes since v1:
- fix a null pointer dereference when dispatching from bio to request based drivers
- clean up a few more comments
Diffstat:
Documentation/block/biodoc.rst | 2 Documentation/block/writeback_cache_control.rst | 2 Documentation/fault-injection/fault-injection.rst | 2 Documentation/trace/ftrace.rst | 4 arch/m68k/emu/nfblock.c | 8 arch/xtensa/platforms/iss/simdisk.c | 9 block/bio.c | 14 - block/blk-cgroup.c | 2 block/blk-core.c | 255 +++++++++------------- block/blk-crypto-fallback.c | 2 block/blk-crypto.c | 2 block/blk-merge.c | 23 - block/blk-mq.c | 12 - block/blk-throttle.c | 4 block/blk.h | 5 block/bounce.c | 2 drivers/block/brd.c | 5 drivers/block/drbd/drbd_int.h | 8 drivers/block/drbd/drbd_main.c | 12 - drivers/block/drbd/drbd_receiver.c | 2 drivers/block/drbd/drbd_req.c | 8 drivers/block/drbd/drbd_worker.c | 2 drivers/block/null_blk_main.c | 19 + drivers/block/pktcdvd.c | 15 - drivers/block/ps3vram.c | 20 - drivers/block/rsxx/dev.c | 14 - drivers/block/umem.c | 11 drivers/block/zram/zram_drv.c | 14 - drivers/lightnvm/core.c | 8 drivers/lightnvm/pblk-init.c | 16 - drivers/lightnvm/pblk-read.c | 2 drivers/md/bcache/bcache.h | 2 drivers/md/bcache/btree.c | 2 drivers/md/bcache/request.c | 11 drivers/md/bcache/request.h | 4 drivers/md/bcache/super.c | 24 +- drivers/md/dm-cache-target.c | 6 drivers/md/dm-clone-target.c | 10 drivers/md/dm-crypt.c | 6 drivers/md/dm-delay.c | 2 drivers/md/dm-era-target.c | 2 drivers/md/dm-integrity.c | 4 drivers/md/dm-mpath.c | 2 drivers/md/dm-raid1.c | 2 drivers/md/dm-snap-persistent.c | 2 drivers/md/dm-snap.c | 6 drivers/md/dm-thin.c | 4 drivers/md/dm-verity-target.c | 2 drivers/md/dm-writecache.c | 2 drivers/md/dm-zoned-target.c | 2 drivers/md/dm.c | 41 +-- drivers/md/md-faulty.c | 4 drivers/md/md-linear.c | 4 drivers/md/md-multipath.c | 4 drivers/md/md.c | 7 drivers/md/raid0.c | 8 drivers/md/raid1.c | 14 - drivers/md/raid10.c | 28 +- drivers/md/raid5.c | 10 drivers/nvdimm/blk.c | 5 drivers/nvdimm/btt.c | 5 drivers/nvdimm/pmem.c | 5 drivers/nvme/host/core.c | 1 drivers/nvme/host/multipath.c | 18 - drivers/nvme/host/nvme.h | 1 drivers/s390/block/dcssblk.c | 11 drivers/s390/block/xpram.c | 8 fs/buffer.c | 5 include/linux/blk-mq.h | 2 include/linux/blkdev.h | 12 - include/linux/lightnvm.h | 3 71 files changed, 387 insertions(+), 408 deletions(-)
Christoph Hellwig
maintainerPATCH 1/20 nfblock: stop using ->queuedata
Instead of setting up the queuedata as well just use one private data field.
--- arch/m68k/emu/nfblock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/m68k/emu/nfblock.c +1 -2
@@ -61,7 +61,7 @@ struct nfhd_device {static blk_qc_t nfhd_make_request (struct request_queue *queue,struct bio *bio) { -struct nfhd_device *dev = queue->queuedata; +struct nfhd_device *dev = bio->bi_disk->private_data;struct bio_vec bvec;struct bvec_iter iter;int dir, len, shift;
@@ -122,7 +122,6 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize)if (dev->queue ==NULL ) goto free_dev; - dev->queue->queuedata = dev;blk_queue_logical_block_size (dev->queue, bsize); dev->disk =alloc_disk (16 );
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 2/20 simdisk: stop using ->queuedata
In reply to Christoph HellwigInstead of setting up the queuedata as well just use one private data field.
--- arch/xtensa/platforms/iss/simdisk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/xtensa/platforms/iss/simdisk.c +1 -3
@@ -103,7 +103,7 @@ static void simdisk_transfer(struct simdisk *dev, unsigned long sector,static blk_qc_t simdisk_make_request (struct request_queue *q,struct bio *bio) { -struct simdisk *dev = q->queuedata; +struct simdisk *dev = bio->bi_disk->private_data;struct bio_vec bvec;struct bvec_iter iter;sector_t sector = bio->bi_iter.bi_sector;
@@ -273,8 +273,6 @@ static int __init simdisk_setup(struct simdisk *dev, int which, goto out_alloc_queue; } - dev->queue->queuedata = dev; - dev->gd =alloc_disk (SIMDISK_MINORS );if (dev->gd ==NULL ) {pr_err ("alloc_disk failed\n" );
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 3/20 drbd: stop using ->queuedata
In reply to Christoph HellwigInstead of setting up the queuedata as well just use one private data field.
--- drivers/block/drbd/drbd_main.c | 1 - drivers/block/drbd/drbd_req.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/block/drbd/drbd_main.c +0 -1
@@ -2805,7 +2805,6 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsigif (!q) goto out_no_q; device->rq_queue = q; - q->queuedata = device; disk =alloc_disk (1 );if (!disk)
drivers/block/drbd/drbd_req.c +1 -1
@@ -1595,7 +1595,7 @@ void do_submit(struct work_struct *ws)blk_qc_t drbd_make_request (struct request_queue *q,struct bio *bio) { -struct drbd_device *device = (struct drbd_device *) q->queuedata; +struct drbd_device *device = bio->bi_disk->private_data;unsigned long start_jif;blk_queue_split (q, &bio);
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 4/20 null_blk: stop using ->queuedata for bio mode
In reply to Christoph HellwigInstead of setting up the queuedata as well just use one private data field.
--- drivers/block/null_blk_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/null_blk_main.c +1 -1
@@ -1392,7 +1392,7 @@ static blk_qc_t null_queue_bio(struct request_queue *q, struct bio *bio) {sector_t sector = bio->bi_iter.bi_sector;sector_t nr_sectors =bio_sectors (bio); -struct nullb *nullb = q->queuedata; +struct nullb *nullb = bio->bi_disk->private_data;struct nullb_queue *nq =nullb_to_queue (nullb);struct nullb_cmd *cmd;
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 5/20 ps3vram: stop using ->queuedata
In reply to Christoph HellwigInstead of setting up the queuedata as well just use one private data field.
--- drivers/block/ps3vram.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/block/ps3vram.c +1 -2
@@ -587,7 +587,7 @@ static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev,static blk_qc_t ps3vram_make_request (struct request_queue *q,struct bio *bio) { -struct ps3_system_bus_device *dev = q->queuedata; +struct ps3_system_bus_device *dev = bio->bi_disk->private_data;struct ps3vram_priv *priv =ps3_system_bus_get_drvdata (dev);int busy;
@@ -745,7 +745,6 @@ static int ps3vram_probe(struct ps3_system_bus_device *dev) } priv->queue = queue; - queue->queuedata = dev;blk_queue_max_segments (queue,BLK_MAX_SEGMENTS );blk_queue_max_segment_size (queue,BLK_MAX_SEGMENT_SIZE );blk_queue_max_hw_sectors (queue,BLK_SAFE_MAX_SECTORS );
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 6/20 rsxx: stop using ->queuedata
In reply to Christoph HellwigInstead of setting up the queuedata as well just use one private data field.
--- drivers/block/rsxx/dev.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/block/rsxx/dev.c +1 -4
@@ -119,7 +119,7 @@ static void bio_dma_done_cb(struct rsxx_cardinfo *card,static blk_qc_t rsxx_make_request (struct request_queue *q,struct bio *bio) { -struct rsxx_cardinfo *card = q->queuedata; +struct rsxx_cardinfo *card = bio->bi_disk->private_data;struct rsxx_bio_meta *bio_meta;blk_status_t st =BLK_STS_IOERR ;
@@ -267,8 +267,6 @@ int rsxx_setup_dev(struct rsxx_cardinfo *card) card->queue->limits.discard_alignment =RSXX_HW_BLK_SIZE ; } - card->queue->queuedata = card; -snprintf (card->gendisk->disk_name,sizeof (card->gendisk->disk_name),"rsxx%d" , card->disk_id); card->gendisk->major = card->major;
@@ -289,7 +287,6 @@ void rsxx_destroy_dev(struct rsxx_cardinfo *card) card->gendisk =NULL ;blk_cleanup_queue (card->queue); - card->queue->queuedata =NULL ;unregister_blkdev (card->major,DRIVER_NAME ); }
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 7/20 umem: stop using ->queuedata
In reply to Christoph HellwigInstead of setting up the queuedata as well just use one private data field.
--- drivers/block/umem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/umem.c +2 -2
@@ -521,7 +521,8 @@ static int mm_check_plugged(struct cardinfo *card)static blk_qc_t mm_make_request (struct request_queue *q,struct bio *bio) { -struct cardinfo *card = q->queuedata; +struct cardinfo *card = bio->bi_disk->private_data; +pr_debug ("mm_make_request %llu %u\n" , (unsigned long long )bio->bi_iter.bi_sector, bio->bi_iter.bi_size);
@@ -888,7 +889,6 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) card->queue =blk_alloc_queue (mm_make_request,NUMA_NO_NODE );if (!card->queue) goto failed_alloc; - card->queue->queuedata = card;tasklet_init (&card->tasklet, process_page, (unsigned long )card);
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 8/20 zram: stop using ->queuedata
In reply to Christoph HellwigInstead of setting up the queuedata as well just use one private data field.
--- drivers/block/zram/zram_drv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/block/zram/zram_drv.c +1 -2
@@ -1586,7 +1586,7 @@ static void __zram_make_request(struct zram *zram, struct bio *bio)*/ static blk_qc_t zram_make_request (struct request_queue *queue,struct bio *bio) { -struct zram *zram = queue->queuedata; +struct zram *zram = bio->bi_disk->private_data;if (!valid_io_request (zram, bio->bi_iter.bi_sector, bio->bi_iter.bi_size)) {
@@ -1912,7 +1912,6 @@ static int zram_add(void) zram->disk->first_minor = device_id; zram->disk->fops = &zram_devops; zram->disk->queue = queue; - zram->disk->queue->queuedata = zram; zram->disk->private_data = zram;snprintf (zram->disk->disk_name,16 ,"zram%d" , device_id);
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 9/20 bcache: stop setting ->queuedata
In reply to Christoph HellwigNothing in bcache actually uses the ->queuedata field.
--- drivers/md/bcache/super.c | 1 - 1 file changed, 1 deletion(-)
drivers/md/bcache/super.c +0 -1
@@ -876,7 +876,6 @@ static int bcache_device_init(struct bcache_device *d, unsigned int block_size,return -ENOMEM ; d->disk->queue = q; - q->queuedata = d; q->backing_dev_info->congested_data = d; q->limits.max_hw_sectors =UINT_MAX ; q->limits.max_sectors =UINT_MAX ;
Signature · 1 line
2.26.2
Re: [PATCH 09/20] bcache: stop setting ->queuedata
Quoted 3 lines · Christoph Hellwig
Nothing in bcache actually uses the ->queuedata field.
Signed-off-by Christoph Hellwig <[email protected]>
Quoted 17 lines
--- drivers/md/bcache/super.c | 1 - 1 file changed, 1 deletion(-)drivers/md/bcache/super.c +0
-1@@ -876,7 +876,6 @@ static int bcache_device_init(struct bcache_device *d, unsigned int block_size,return -ENOMEM ; d->disk->queue = q; - q->queuedata = d; q->backing_dev_info->congested_data = d; q->limits.max_hw_sectors =UINT_MAX ; q->limits.max_sectors =UINT_MAX ;
Christoph Hellwig
maintainerPATCH 10/20 dm: stop using ->queuedata
In reply to Christoph HellwigInstead of setting up the queuedata as well just use one private data field.
--- drivers/md/dm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/md/dm.c +1 -2
@@ -1789,7 +1789,7 @@ static blk_qc_t dm_process_bio(struct mapped_device *md,static blk_qc_t dm_make_request (struct request_queue *q,struct bio *bio) { -struct mapped_device *md = q->queuedata; +struct mapped_device *md = bio->bi_disk->private_data;blk_qc_t ret =BLK_QC_T_NONE ;int srcu_idx;struct dm_table *map;
@@ -1995,7 +1995,6 @@ static struct mapped_device *alloc_dev(int minor) md->queue =blk_alloc_queue (dm_make_request, numa_node_id);if (!md->queue) goto bad; - md->queue->queuedata = md; md->disk =alloc_disk_node (1 , md->numa_node_id);if (!md->disk)
Signature · 1 line
2.26.2
Re: [PATCH 10/20] dm: stop using ->queuedata
Quoted 4 lines · Christoph Hellwig
Instead of setting up the queuedata as well just use one private data field.
Signed-off-by Christoph Hellwig <[email protected]>
Christoph Hellwig
maintainerPATCH 11/20 fs: remove a weird comment in submit_bh_wbc
In reply to Christoph HellwigAll bios can get remapped if submitted to partitions. No need to comment on that.
--- fs/buffer.c | 5 ----- 1 file changed, 5 deletions(-)
fs/buffer.c +0 -5
@@ -3040,12 +3040,7 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,if (test_set_buffer_req (bh) && (op ==REQ_OP_WRITE ))clear_buffer_write_io_error (bh); -/* -* from here on down, it's all bio -- do the initial mapping, -* submit_bio -> generic_make_request may further map this bio around -*/ bio =bio_alloc (GFP_NOIO ,1 ); - bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >>9 );bio_set_dev (bio, bh->b_bdev); bio->bi_write_hint = write_hint;
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 12/20 block: remove the request_queue argument from blk_queue_split
In reply to Christoph HellwigThe queue can be trivially derived from the bio, so pass one less argument.
--- block/blk-merge.c | 21 ++++++++++----------- block/blk-mq.c | 2 +- block/blk.h | 3 +-- drivers/block/drbd/drbd_req.c | 2 +- drivers/block/pktcdvd.c | 2 +- drivers/block/ps3vram.c | 2 +- drivers/block/rsxx/dev.c | 2 +- drivers/block/umem.c | 2 +- drivers/lightnvm/pblk-init.c | 4 ++-- drivers/md/dm.c | 2 +- drivers/md/md.c | 2 +- drivers/nvme/host/multipath.c | 9 ++++----- drivers/s390/block/dcssblk.c | 2 +- drivers/s390/block/xpram.c | 2 +- include/linux/blkdev.h | 2 +- 15 files changed, 28 insertions(+), 31 deletions(-)
block/blk-merge.c +10 -11
@@ -283,20 +283,20 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,/** * __blk_queue_split - split a bio and submit the second half -* @q: [in] request queue pointer * @bio: [in, out] bio to be split * @nr_segs: [out] number of segments in the first bio * * Split a bio into two bios, chain the two bios, submit the second half and * store a pointer to the first half in *@bio. If the second bio is still too * big it will be split by a recursive call to this function. Since this -* function may allocate a new bio from @q->bio_split, it is the responsibility -* of the caller to ensure that @q is only released after processing of the +* function may allocate a new bio from @bio->bi_disk->queue->bio_split, it is +* the responsibility of the caller to ensure that +* @bio->bi_disk->queue->bio_split is only released after processing of the * split bio has finished. */ -void __blk_queue_split (struct request_queue *q,struct bio **bio, -unsigned int *nr_segs) +void __blk_queue_split (struct bio **bio,unsigned int *nr_segs) { +struct request_queue *q = (*bio)->bi_disk->queue;struct bio *split =NULL ;switch (bio_op (*bio)) {
@@ -345,20 +345,19 @@ void __blk_queue_split(struct request_queue *q, struct bio **bio,/** * blk_queue_split - split a bio and submit the second half -* @q: [in] request queue pointer * @bio: [in, out] bio to be split * * Split a bio into two bios, chains the two bios, submit the second half and * store a pointer to the first half in *@bio. Since this function may allocate -* a new bio from @q->bio_split, it is the responsibility of the caller to -* ensure that @q is only released after processing of the split bio has -* finished. +* a new bio from @bio->bi_disk->queue->bio_split, it is the responsibility of +* the caller to ensure that @bio->bi_disk->queue->bio_split is only released +* after processing of the split bio has finished. */ -void blk_queue_split (struct request_queue *q,struct bio **bio) +void blk_queue_split (struct bio **bio) {unsigned int nr_segs; -__blk_queue_split (q, bio, &nr_segs); +__blk_queue_split (bio, &nr_segs); }EXPORT_SYMBOL (blk_queue_split);
block/blk-mq.c +1 -1
@@ -2166,7 +2166,7 @@ blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)blk_status_t ret;blk_queue_bounce (q, &bio); -__blk_queue_split (q, &bio, &nr_segs); +__blk_queue_split (&bio, &nr_segs);if (!bio_integrity_prep (bio)) goto queue_exit;
block/blk.h +1 -2
@@ -220,8 +220,7 @@ ssize_t part_timeout_show(struct device *, struct device_attribute *, char *);ssize_t part_timeout_store (struct device *,struct device_attribute *,const char *,size_t ); -void __blk_queue_split (struct request_queue *q,struct bio **bio, -unsigned int *nr_segs); +void __blk_queue_split (struct bio **bio,unsigned int *nr_segs);int ll_back_merge_fn (struct request *req,struct bio *bio,unsigned int nr_segs); int ll_front_merge_fn(struct request *req, struct bio *bio,
drivers/block/drbd/drbd_req.c +1 -1
@@ -1598,7 +1598,7 @@ blk_qc_t drbd_make_request(struct request_queue *q, struct bio *bio)struct drbd_device *device = bio->bi_disk->private_data;unsigned long start_jif; -blk_queue_split (q, &bio); +blk_queue_split (&bio); start_jif = jiffies;
drivers/block/pktcdvd.c +1 -1
@@ -2434,7 +2434,7 @@ static blk_qc_t pkt_make_request(struct request_queue *q, struct bio *bio)char b[BDEVNAME_SIZE ];struct bio *split; -blk_queue_split (q, &bio); +blk_queue_split (&bio); pd = q->queuedata;if (!pd) {
drivers/block/ps3vram.c +1 -1
@@ -593,7 +593,7 @@ static blk_qc_t ps3vram_make_request(struct request_queue *q, struct bio *bio)dev_dbg (&dev->core,"%s\n" , __func__); -blk_queue_split (q, &bio); +blk_queue_split (&bio);spin_lock_irq (&priv->lock); busy = !bio_list_empty (&priv->list);
drivers/block/rsxx/dev.c +1 -1
@@ -123,7 +123,7 @@ static blk_qc_t rsxx_make_request(struct request_queue *q, struct bio *bio)struct rsxx_bio_meta *bio_meta;blk_status_t st =BLK_STS_IOERR ; -blk_queue_split (q, &bio); +blk_queue_split (&bio);might_sleep ();
drivers/block/umem.c +1 -1
@@ -527,7 +527,7 @@ static blk_qc_t mm_make_request(struct request_queue *q, struct bio *bio) (unsigned long long )bio->bi_iter.bi_sector, bio->bi_iter.bi_size); -blk_queue_split (q, &bio); +blk_queue_split (&bio);spin_lock_irq (&card->lock); *card->biotail = bio;
drivers/lightnvm/pblk-init.c +2 -2
@@ -63,7 +63,7 @@ static blk_qc_t pblk_make_rq(struct request_queue *q, struct bio *bio)* constraint. Writes can be of arbitrary size. */ if (bio_data_dir (bio) ==READ ) { -blk_queue_split (q, &bio); +blk_queue_split (&bio);pblk_submit_read (pblk, bio); }else {/* Prevent deadlock in the case of a modest LUN configuration
@@ -71,7 +71,7 @@ static blk_qc_t pblk_make_rq(struct request_queue *q, struct bio *bio)* leaves at least 256KB available for user I/O. */ if (pblk_get_secs (bio) >pblk_rl_max_io (&pblk->rl)) -blk_queue_split (q, &bio); +blk_queue_split (&bio);pblk_write_to_cache (pblk, bio,PBLK_IOTYPE_USER ); }
drivers/md/dm.c +1 -1
@@ -1776,7 +1776,7 @@ static blk_qc_t dm_process_bio(struct mapped_device *md,*/ if (current->bio_list) {if (is_abnormal_io (bio)) -blk_queue_split (md->queue, &bio); +blk_queue_split (&bio);else dm_queue_split (md, ti, &bio); }
drivers/md/md.c +1 -1
@@ -475,7 +475,7 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio)return BLK_QC_T_NONE ; } -blk_queue_split (q, &bio); +blk_queue_split (&bio);if (mddev ==NULL || mddev->pers ==NULL ) {bio_io_error (bio);
drivers/nvme/host/multipath.c +4 -5
@@ -301,12 +301,11 @@ static blk_qc_t nvme_ns_head_make_request(struct request_queue *q,int srcu_idx;/* -* The namespace might be going away and the bio might -* be moved to a different queue via blk_steal_bios(), -* so we need to use the bio_split pool from the original -* queue to allocate the bvecs from. +* The namespace might be going away and the bio might be moved to a +* different queue via blk_steal_bios(), so we need to use the bio_split +* pool from the original queue to allocate the bvecs from. */ -blk_queue_split (q, &bio); +blk_queue_split (&bio); srcu_idx =srcu_read_lock (&head->srcu); ns =nvme_find_path (head);
drivers/s390/block/dcssblk.c +1 -1
@@ -878,7 +878,7 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)unsigned long source_addr;unsigned long bytes_done; -blk_queue_split (q, &bio); +blk_queue_split (&bio); bytes_done =0 ; dev_info = bio->bi_disk->private_data;
drivers/s390/block/xpram.c +1 -1
@@ -191,7 +191,7 @@ static blk_qc_t xpram_make_request(struct request_queue *q, struct bio *bio)unsigned long page_addr;unsigned long bytes; -blk_queue_split (q, &bio); +blk_queue_split (&bio);if ((bio->bi_iter.bi_sector &7 ) !=0 || (bio->bi_iter.bi_size &4095 ) !=0 )
include/linux/blkdev.h +1 -1
@@ -871,7 +871,7 @@ extern void blk_rq_unprep_clone(struct request *rq);extern blk_status_t blk_insert_cloned_request (struct request_queue *q,struct request *rq);extern int blk_rq_append_bio (struct request *rq,struct bio **bio); -extern void blk_queue_split (struct request_queue *,struct bio **); +extern void blk_queue_split (struct bio **);extern int scsi_verify_blk_ioctl (struct block_device *,unsigned int );extern int scsi_cmd_blk_ioctl (struct block_device *,fmode_t ,unsigned int ,void __user *);
Signature · 1 line
2.26.2
Re: [PATCH 12/20] block: remove the request_queue argument from blk_queue_split
Quoted 6 lines · Christoph Hellwig
The queue can be trivially derived from the bio, so pass one less argument.
Signed-off-by Christoph Hellwig <[email protected]>---
[...]
Quoted 1 line
drivers/md/md.c | 2 +-
For md.c:
Christoph Hellwig
maintainerPATCH 13/20 block: tidy up a warning in bio_check_ro
In reply to Christoph HellwigThe "generic_make_request: " prefix has no value, and will soon become stale.
--- block/blk-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
block/blk-core.c +1 -2
@@ -869,8 +869,7 @@ static inline bool bio_check_ro(struct bio *bio, struct hd_struct *part)return false;WARN_ONCE (1 , -"generic_make_request: Trying to write " -"to read-only block-device %s (partno %d)\n" , +"Trying to write to read-only block-device %s (partno %d)\n" ,bio_devname (bio, b), part->partno);/* Older lvm-tools actually trigger this */ return false;
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 14/20 block: remove the NULL queue check in generic_make_request_checks
In reply to Christoph HellwigAll registers disks must have a valid queue pointer, so don't bother to log a warning for that case.
--- block/blk-core.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
block/blk-core.c +1 -11
@@ -973,22 +973,12 @@ static inline blk_status_t blk_check_zone_append(struct request_queue *q, static noinline_for_stack boolgeneric_make_request_checks (struct bio *bio) { -struct request_queue *q; +struct request_queue *q = bio->bi_disk->queue;int nr_sectors =bio_sectors (bio);blk_status_t status =BLK_STS_IOERR ; -char b[BDEVNAME_SIZE ];might_sleep (); - q = bio->bi_disk->queue; -if (unlikely (!q)) { -printk (KERN_ERR -"generic_make_request: Trying to access " -"nonexistent block-device %s (%Lu)\n" , -bio_devname (bio, b), (long long )bio->bi_iter.bi_sector); - goto end_io; - } -/* * For a REQ_NOWAIT based request, return -EOPNOTSUPP * if queue is not a request based queue.
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 15/20 block: remove the nr_sectors variable in generic_make_request_checks
In reply to Christoph HellwigThe variable is only used once, so just open code the bio_sector() there.
--- block/blk-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
block/blk-core.c +1 -2
@@ -974,7 +974,6 @@ static noinline_for_stack bool generic_make_request_checks(struct bio *bio) {struct request_queue *q = bio->bi_disk->queue; -int nr_sectors =bio_sectors (bio);blk_status_t status =BLK_STS_IOERR ;might_sleep ();
@@ -1007,7 +1006,7 @@ generic_make_request_checks(struct bio *bio)if (op_is_flush (bio->bi_opf) && !test_bit (QUEUE_FLAG_WC , &q->queue_flags)) { bio->bi_opf &= ~(REQ_PREFLUSH |REQ_FUA ); -if (!nr_sectors) { +if (!bio_sectors (bio)) { status =BLK_STS_OK ; goto end_io; }
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 16/20 block: move ->make_request_fn to struct block_device_operations
In reply to Christoph HellwigThe make_request_fn is a little weird in that it sits directly in struct request_queue instead of an operation vector. Replace it with a block_device_operations method called submit_bio (which describes much better what it does). Also remove the request_queue argument to it, as the queue can be derived pretty trivially from the bio.
--- Documentation/block/biodoc.rst | 2 +- .../block/writeback_cache_control.rst | 2 +- arch/m68k/emu/nfblock.c | 5 +- arch/xtensa/platforms/iss/simdisk.c | 5 +- block/blk-cgroup.c | 2 +- block/blk-core.c | 53 +++++++------------ block/blk-mq.c | 10 ++-- block/blk.h | 2 - drivers/block/brd.c | 5 +- drivers/block/drbd/drbd_int.h | 2 +- drivers/block/drbd/drbd_main.c | 9 ++-- drivers/block/drbd/drbd_req.c | 2 +- drivers/block/null_blk_main.c | 17 ++++-- drivers/block/pktcdvd.c | 11 ++-- drivers/block/ps3vram.c | 15 +++--- drivers/block/rsxx/dev.c | 7 ++- drivers/block/umem.c | 5 +- drivers/block/zram/zram_drv.c | 11 ++-- drivers/lightnvm/core.c | 8 +-- drivers/lightnvm/pblk-init.c | 12 +++-- drivers/md/bcache/request.c | 4 +- drivers/md/bcache/request.h | 4 +- drivers/md/bcache/super.c | 23 +++++--- drivers/md/dm.c | 23 ++++---- drivers/md/md.c | 5 +- drivers/nvdimm/blk.c | 5 +- drivers/nvdimm/btt.c | 5 +- drivers/nvdimm/pmem.c | 5 +- drivers/nvme/host/core.c | 1 + drivers/nvme/host/multipath.c | 5 +- drivers/nvme/host/nvme.h | 1 + drivers/s390/block/dcssblk.c | 9 ++-- drivers/s390/block/xpram.c | 6 +-- include/linux/blk-mq.h | 2 +- include/linux/blkdev.h | 7 +-- include/linux/lightnvm.h | 3 +- 36 files changed, 153 insertions(+), 140 deletions(-)
Documentation/block/biodoc.rst +1 -1
@@ -1036,7 +1036,7 @@ Now the generic block layer performs partition-remapping early and thus provides drivers with a sector number relative to whole device, rather than having to take partition number into account in order to arrive at the true sector number. The routine blk_partition_remap() is invoked by -generic_make_request even before invoking the queue specific make_request_fn, +generic_make_request even before invoking the queue specific ->submit_bio, so the i/o scheduler also gets to operate on whole disk sector numbers. This should typically not require changes to block drivers, it just never gets to invoke its own partition sector offset calculations since all bios
Documentation/block/writeback_cache_control.rst +1 -1
@@ -47,7 +47,7 @@ the Forced Unit Access is implemented. The REQ_PREFLUSH and REQ_FUA flags may both be set on a single bio. -Implementation details for make_request_fn based block drivers +Implementation details for bio based block drivers -------------------------------------------------------------- These drivers will always see the REQ_PREFLUSH and REQ_FUA bits as they sit
arch/m68k/emu/nfblock.c +3 -2
@@ -59,7 +59,7 @@ struct nfhd_device {struct gendisk *disk; }; -static blk_qc_t nfhd_make_request (struct request_queue *queue,struct bio *bio) +static blk_qc_t nfhd_submit_bio (struct bio *bio) {struct nfhd_device *dev = bio->bi_disk->private_data;struct bio_vec bvec;
@@ -93,6 +93,7 @@ static int nfhd_getgeo(struct block_device *bdev, struct hd_geometry *geo)static const struct block_device_operations nfhd_ops = { .owner =THIS_MODULE , + .submit_bio = nfhd_submit_bio, .getgeo = nfhd_getgeo, };
@@ -118,7 +119,7 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize) dev->bsize = bsize; dev->bshift =ffs (bsize) -10 ; - dev->queue =blk_alloc_queue (nfhd_make_request,NUMA_NO_NODE ); + dev->queue =blk_alloc_queue (NUMA_NO_NODE );if (dev->queue ==NULL ) goto free_dev;
arch/xtensa/platforms/iss/simdisk.c +3 -2
@@ -101,7 +101,7 @@ static void simdisk_transfer(struct simdisk *dev, unsigned long sector,spin_unlock (&dev->lock); } -static blk_qc_t simdisk_make_request (struct request_queue *q,struct bio *bio) +static blk_qc_t simdisk_submit_bio (struct bio *bio) {struct simdisk *dev = bio->bi_disk->private_data;struct bio_vec bvec;
@@ -144,6 +144,7 @@ static void simdisk_release(struct gendisk *disk, fmode_t mode)static const struct block_device_operations simdisk_ops = { .owner =THIS_MODULE , + .submit_bio = simdisk_submit_bio, .open = simdisk_open, .release = simdisk_release, };
@@ -267,7 +268,7 @@ static int __init simdisk_setup(struct simdisk *dev, int which,spin_lock_init (&dev->lock); dev->users =0 ; - dev->queue =blk_alloc_queue (simdisk_make_request,NUMA_NO_NODE ); + dev->queue =blk_alloc_queue (NUMA_NO_NODE );if (dev->queue ==NULL ) {pr_err ("blk_alloc_queue failed\n" ); goto out_alloc_queue;
block/blk-cgroup.c +1 -1
@@ -1012,7 +1012,7 @@ static int blkcg_css_online(struct cgroup_subsys_state *css)* blkcg_init_queue - initialize blkcg part of request queue * @q: request_queue to initialize * -* Called from __blk_alloc_queue(). Responsible for initializing blkcg +* Called from blk_alloc_queue(). Responsible for initializing blkcg * part of new request_queue @q. * * RETURNS:
block/blk-core.c +19 -34
126 lines not on this page · raw message
block/blk-mq.c +5 -5
@@ -2136,8 +2136,7 @@ static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq) }/** -* blk_mq_make_request - Create and send a request to block device. -* @q: Request queue pointer. +* blk_mq_submit_bio - Create and send a request to block device. * @bio: Bio pointer. * * Builds up a request structure from @q and @bio and send to the device. The
@@ -2151,8 +2150,9 @@ static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq)* * Returns: Request queue cookie. */ -blk_qc_t blk_mq_make_request (struct request_queue *q,struct bio *bio) +blk_qc_t blk_mq_submit_bio (struct bio *bio) { +struct request_queue *q = bio->bi_disk->queue;const int is_sync =op_is_sync (bio->bi_opf);const int is_flush_fua =op_is_flush (bio->bi_opf);struct blk_mq_alloc_data data = {
@@ -2277,7 +2277,7 @@ blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)blk_queue_exit (q);return BLK_QC_T_NONE ; } -EXPORT_SYMBOL_GPL (blk_mq_make_request);/* only for request based dm */ +EXPORT_SYMBOL_GPL (blk_mq_submit_bio);/* only for request based dm */ void blk_mq_free_rqs (struct blk_mq_tag_set *set,struct blk_mq_tags *tags,unsigned int hctx_idx)
@@ -3017,7 +3017,7 @@ struct request_queue *blk_mq_init_queue_data(struct blk_mq_tag_set *set, {struct request_queue *uninit_q, *q; - uninit_q =__blk_alloc_queue (set->numa_node); + uninit_q =blk_alloc_queue (set->numa_node);if (!uninit_q)return ERR_PTR (-ENOMEM ); uninit_q->queuedata = queuedata;
block/blk.h +0 -2
@@ -419,8 +419,6 @@ static inline void part_nr_sects_write(struct hd_struct *part, sector_t size)#endif } -struct request_queue *__blk_alloc_queue (int node_id); -int bio_add_hw_page (struct request_queue *q,struct bio *bio,struct page *page,unsigned int len,unsigned int offset,unsigned int max_sectors,bool *same_page);
drivers/block/brd.c +3 -2
@@ -282,7 +282,7 @@ static int brd_do_bvec(struct brd_device *brd, struct page *page,return err; } -static blk_qc_t brd_make_request (struct request_queue *q,struct bio *bio) +static blk_qc_t brd_submit_bio (struct bio *bio) {struct brd_device *brd = bio->bi_disk->private_data;struct bio_vec bvec;
@@ -330,6 +330,7 @@ static int brd_rw_page(struct block_device *bdev, sector_t sector,static const struct block_device_operations brd_fops = { .owner =THIS_MODULE , + .submit_bio = brd_submit_bio, .rw_page = brd_rw_page, };
@@ -381,7 +382,7 @@ static struct brd_device *brd_alloc(int i)spin_lock_init (&brd->brd_lock);INIT_RADIX_TREE (&brd->brd_pages,GFP_ATOMIC ); - brd->brd_queue =blk_alloc_queue (brd_make_request,NUMA_NO_NODE ); + brd->brd_queue =blk_alloc_queue (NUMA_NO_NODE );if (!brd->brd_queue) goto out_free_dev;
drivers/block/drbd/drbd_int.h +1 -1
@@ -1451,7 +1451,7 @@ extern void conn_free_crypto(struct drbd_connection *connection);/* drbd_req */ extern void do_submit (struct work_struct *ws);extern void __drbd_make_request (struct drbd_device *,struct bio *,unsigned long ); -extern blk_qc_t drbd_make_request (struct request_queue *q,struct bio *bio); +extern blk_qc_t drbd_submit_bio (struct bio *bio);extern int drbd_read_remote (struct drbd_device *device,struct drbd_request *req);extern int is_valid_ar_handle (struct drbd_request *,sector_t );
drivers/block/drbd/drbd_main.c +5 -4
@@ -132,9 +132,10 @@ wait_queue_head_t drbd_pp_wait;DEFINE_RATELIMIT_STATE (drbd_ratelimit_state,5 *HZ ,5 );static const struct block_device_operations drbd_ops = { - .owner =THIS_MODULE , - .open = drbd_open, - .release = drbd_release, + .owner =THIS_MODULE , + .submit_bio = drbd_submit_bio, + .open = drbd_open, + .release = drbd_release, };struct bio *bio_alloc_drbd (gfp_t gfp_mask)
@@ -2801,7 +2802,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsigdrbd_init_set_defaults (device); - q =blk_alloc_queue (drbd_make_request,NUMA_NO_NODE ); + q =blk_alloc_queue (NUMA_NO_NODE );if (!q) goto out_no_q; device->rq_queue = q;
drivers/block/drbd/drbd_req.c +1 -1
@@ -1593,7 +1593,7 @@ void do_submit(struct work_struct *ws) } } -blk_qc_t drbd_make_request (struct request_queue *q,struct bio *bio) +blk_qc_t drbd_submit_bio (struct bio *bio) {struct drbd_device *device = bio->bi_disk->private_data;unsigned long start_jif;
drivers/block/null_blk_main.c +13 -4
@@ -1388,7 +1388,7 @@ static struct nullb_queue *nullb_to_queue(struct nullb *nullb)return &nullb->queues[index]; } -static blk_qc_t null_queue_bio (struct request_queue *q,struct bio *bio) +static blk_qc_t null_submit_bio (struct bio *bio) {sector_t sector = bio->bi_iter.bi_sector;sector_t nr_sectors =bio_sectors (bio);
@@ -1575,7 +1575,13 @@ static void null_config_discard(struct nullb *nullb)blk_queue_flag_set (QUEUE_FLAG_DISCARD , nullb->q); } -static const struct block_device_operations null_ops = { +static const struct block_device_operations null_bio_ops = { + .owner =THIS_MODULE , + .submit_bio = null_submit_bio, + .report_zones = null_report_zones, +}; + +static const struct block_device_operations null_rq_ops = { .owner =THIS_MODULE , .report_zones = null_report_zones, };
@@ -1647,7 +1653,10 @@ static int null_gendisk_register(struct nullb *nullb) disk->flags |=GENHD_FL_EXT_DEVT |GENHD_FL_SUPPRESS_PARTITION_INFO ; disk->major = null_major; disk->first_minor = nullb->index; - disk->fops = &null_ops; +if (queue_is_mq (nullb->q)) + disk->fops = &null_rq_ops; +else + disk->fops = &null_bio_ops; disk->private_data = nullb; disk->queue = nullb->q;strncpy (disk->disk_name, nullb->disk_name,DISK_NAME_LEN );
@@ -1792,7 +1801,7 @@ static int null_add_dev(struct nullb_device *dev) goto out_cleanup_tags; } }else if (dev->queue_mode ==NULL_Q_BIO ) { - nullb->q =blk_alloc_queue (null_queue_bio, dev->home_node); + nullb->q =blk_alloc_queue (dev->home_node);if (!nullb->q) { rv = -ENOMEM ; goto out_cleanup_queues;
drivers/block/pktcdvd.c +6 -5
@@ -36,7 +36,7 @@* block device, assembling the pieces to full packets and queuing them to the * packet I/O scheduler. * -* At the top layer there is a custom make_request_fn function that forwards +* At the top layer there is a custom ->submit_bio function that forwards * read requests directly to the iosched queue and puts write requests in the * unaligned write queue. A kernel thread performs the necessary read * gathering to convert the unaligned writes to aligned writes and then feeds
@@ -2428,7 +2428,7 @@ static void pkt_make_request_write(struct request_queue *q, struct bio *bio) } } -static blk_qc_t pkt_make_request (struct request_queue *q,struct bio *bio) +static blk_qc_t pkt_submit_bio (struct bio *bio) {struct pktcdvd_device *pd;char b[BDEVNAME_SIZE ];
@@ -2436,7 +2436,7 @@ static blk_qc_t pkt_make_request(struct request_queue *q, struct bio *bio)blk_queue_split (&bio); - pd = q->queuedata; + pd = bio->bi_disk->queue->queuedata;if (!pd) {pr_err ("%s incorrect request queue\n" ,bio_devname (bio, b)); goto end_io;
@@ -2480,7 +2480,7 @@ static blk_qc_t pkt_make_request(struct request_queue *q, struct bio *bio) split = bio; } -pkt_make_request_write (q, split); +pkt_make_request_write (bio->bi_disk->queue, split); }while (split != bio);return BLK_QC_T_NONE ;
@@ -2685,6 +2685,7 @@ static char *pkt_devnode(struct gendisk *disk, umode_t *mode)static const struct block_device_operations pktcdvd_ops = { .owner =THIS_MODULE , + .submit_bio = pkt_submit_bio, .open = pkt_open, .release = pkt_close, .ioctl = pkt_ioctl,
@@ -2749,7 +2750,7 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev) disk->flags =GENHD_FL_REMOVABLE ;strcpy (disk->disk_name, pd->name); disk->private_data = pd; - disk->queue =blk_alloc_queue (pkt_make_request,NUMA_NO_NODE ); + disk->queue =blk_alloc_queue (NUMA_NO_NODE );if (!disk->queue) goto out_mem2;
drivers/block/ps3vram.c +7 -8
@@ -90,12 +90,6 @@ struct ps3vram_priv {static int ps3vram_major; - -static const struct block_device_operations ps3vram_fops = { - .owner =THIS_MODULE , -}; - -#define DMA_NOTIFIER_HANDLE_BASE 0x66604200/* first DMA notifier handle */ #define DMA_NOTIFIER_OFFSET_BASE 0x1000/* first DMA notifier offset */ #define DMA_NOTIFIER_SIZE 0x40
@@ -585,7 +579,7 @@ static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev,return next; } -static blk_qc_t ps3vram_make_request (struct request_queue *q,struct bio *bio) +static blk_qc_t ps3vram_submit_bio (struct bio *bio) {struct ps3_system_bus_device *dev = bio->bi_disk->private_data;struct ps3vram_priv *priv =ps3_system_bus_get_drvdata (dev);
@@ -610,6 +604,11 @@ static blk_qc_t ps3vram_make_request(struct request_queue *q, struct bio *bio)return BLK_QC_T_NONE ; } +static const struct block_device_operations ps3vram_fops = { + .owner =THIS_MODULE , + .submit_bio = ps3vram_submit_bio, +}; +static int ps3vram_probe (struct ps3_system_bus_device *dev) {struct ps3vram_priv *priv;
@@ -737,7 +736,7 @@ static int ps3vram_probe(struct ps3_system_bus_device *dev)ps3vram_proc_init (dev); - queue =blk_alloc_queue (ps3vram_make_request,NUMA_NO_NODE ); + queue =blk_alloc_queue (NUMA_NO_NODE );if (!queue) {dev_err (&dev->core,"blk_alloc_queue failed\n" ); error = -ENOMEM ;
drivers/block/rsxx/dev.c +5 -2
@@ -50,6 +50,8 @@ struct rsxx_bio_meta {static struct kmem_cache *bio_meta_pool; +static blk_qc_t rsxx_submit_bio (struct bio *bio); +/*----------------- Block Device Operations -----------------*/ static int rsxx_blkdev_ioctl(struct block_device *bdev, fmode_t mode,
@@ -92,6 +94,7 @@ static int rsxx_getgeo(struct block_device *bdev, struct hd_geometry *geo)static const struct block_device_operations rsxx_fops = { .owner =THIS_MODULE , + .submit_bio = rsxx_submit_bio, .getgeo = rsxx_getgeo, .ioctl = rsxx_blkdev_ioctl, };
@@ -117,7 +120,7 @@ static void bio_dma_done_cb(struct rsxx_cardinfo *card, } } -static blk_qc_t rsxx_make_request (struct request_queue *q,struct bio *bio) +static blk_qc_t rsxx_submit_bio (struct bio *bio) {struct rsxx_cardinfo *card = bio->bi_disk->private_data;struct rsxx_bio_meta *bio_meta;
@@ -233,7 +236,7 @@ int rsxx_setup_dev(struct rsxx_cardinfo *card)return -ENOMEM ; } - card->queue =blk_alloc_queue (rsxx_make_request,NUMA_NO_NODE ); + card->queue =blk_alloc_queue (NUMA_NO_NODE );if (!card->queue) {dev_err (CARD_TO_DEV (card),"Failed queue alloc\n" );unregister_blkdev (card->major,DRIVER_NAME );
drivers/block/umem.c +3 -2
@@ -519,7 +519,7 @@ static int mm_check_plugged(struct cardinfo *card)return !!blk_check_plugged (mm_unplug, card,sizeof (struct blk_plug_cb )); } -static blk_qc_t mm_make_request (struct request_queue *q,struct bio *bio) +static blk_qc_t mm_submit_bio (struct bio *bio) {struct cardinfo *card = bio->bi_disk->private_data;
@@ -779,6 +779,7 @@ static int mm_getgeo(struct block_device *bdev, struct hd_geometry *geo)static const struct block_device_operations mm_fops = { .owner =THIS_MODULE , + .submit_bio = mm_submit_bio, .getgeo = mm_getgeo, .revalidate_disk = mm_revalidate, };
@@ -886,7 +887,7 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) card->biotail = &card->bio;spin_lock_init (&card->lock); - card->queue =blk_alloc_queue (mm_make_request,NUMA_NO_NODE ); + card->queue =blk_alloc_queue (NUMA_NO_NODE );if (!card->queue) goto failed_alloc;
drivers/block/zram/zram_drv.c +6 -5
@@ -793,9 +793,9 @@ static void zram_sync_read(struct work_struct *work) }/* -* Block layer want one ->make_request_fn to be active at a time -* so if we use chained IO with parent IO in same context, -* it's a deadlock. To avoid, it, it uses worker thread context. +* Block layer want one ->submit_bio to be active at a time, so if we use +* chained IO with parent IO in same context, it's a deadlock. To avoid that, +* use a worker thread context. */ static int read_from_bdev_sync (struct zram *zram,struct bio_vec *bvec,unsigned long entry,struct bio *bio)
@@ -1584,7 +1584,7 @@ static void __zram_make_request(struct zram *zram, struct bio *bio)/* * Handler function for all zram I/O requests. */ -static blk_qc_t zram_make_request (struct request_queue *queue,struct bio *bio) +static blk_qc_t zram_submit_bio (struct bio *bio) {struct zram *zram = bio->bi_disk->private_data;
@@ -1813,6 +1813,7 @@ static int zram_open(struct block_device *bdev, fmode_t mode)static const struct block_device_operations zram_devops = { .open = zram_open, + .submit_bio = zram_submit_bio, .swap_slot_free_notify = zram_slot_free_notify, .rw_page = zram_rw_page, .owner =THIS_MODULE
@@ -1891,7 +1892,7 @@ static int zram_add(void)#ifdef CONFIG_ZRAM_WRITEBACK spin_lock_init (&zram->wb_limit_lock);#endif - queue =blk_alloc_queue (zram_make_request,NUMA_NO_NODE ); + queue =blk_alloc_queue (NUMA_NO_NODE );if (!queue) {pr_err ("Error allocating disk queue for device %d\n" , device_id);
drivers/lightnvm/core.c +2 -6
@@ -236,10 +236,6 @@ static struct nvm_tgt_dev *nvm_create_tgt_dev(struct nvm_dev *dev,return tgt_dev; } -static const struct block_device_operations nvm_fops = { - .owner =THIS_MODULE , -}; -static struct nvm_tgt_type *__nvm_find_target_type (const char *name) {struct nvm_tgt_type *tt;
@@ -380,7 +376,7 @@ static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create) goto err_dev; } - tqueue =blk_alloc_queue (tt->make_rq, dev->q->node); + tqueue =blk_alloc_queue (dev->q->node);if (!tqueue) { ret = -ENOMEM ; goto err_disk;
@@ -390,7 +386,7 @@ static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create) tdisk->flags =GENHD_FL_EXT_DEVT ; tdisk->major =0 ; tdisk->first_minor =0 ; - tdisk->fops = &nvm_fops; + tdisk->fops = tt->bops; tdisk->queue = tqueue; targetdata = tt->init (tgt_dev, tdisk, create->flags);
drivers/lightnvm/pblk-init.c +9 -3
@@ -47,9 +47,9 @@ static struct pblk_global_caches pblk_caches = {struct bio_set pblk_bio_set; -static blk_qc_t pblk_make_rq (struct request_queue *q,struct bio *bio) +static blk_qc_t pblk_submit_bio (struct bio *bio) { -struct pblk *pblk = q->queuedata; +struct pblk *pblk = bio->bi_disk->queue->queuedata;if (bio_op (bio) ==REQ_OP_DISCARD ) {pblk_discard (pblk, bio);
@@ -79,6 +79,12 @@ static blk_qc_t pblk_make_rq(struct request_queue *q, struct bio *bio)return BLK_QC_T_NONE ; } +static const struct block_device_operations pblk_bops = { + .owner =THIS_MODULE , + .submit_bio = pblk_submit_bio, +}; + +static size_t pblk_trans_map_size (struct pblk *pblk) {int entry_size =8 ;
@@ -1280,7 +1286,7 @@ static struct nvm_tgt_type tt_pblk = { .name = "pblk", .version = {1, 0, 0}, - .make_rq = pblk_make_rq, + .bops = &pblk_bops, .capacity = pblk_capacity, .init = pblk_init,
drivers/md/bcache/request.c +2 -2
@@ -1158,7 +1158,7 @@ static void quit_max_writeback_rate(struct cache_set *c,/* Cached devices - read & write stuff */ -blk_qc_t cached_dev_make_request (struct request_queue *q,struct bio *bio) +blk_qc_t cached_dev_submit_bio (struct bio *bio) {struct search *s;struct bcache_device *d = bio->bi_disk->private_data;
@@ -1291,7 +1291,7 @@ static void flash_dev_nodata(struct closure *cl)continue_at (cl, search_free,NULL ); } -blk_qc_t flash_dev_make_request (struct request_queue *q,struct bio *bio) +blk_qc_t flash_dev_submit_bio (struct bio *bio) {struct search *s;struct closure *cl;
drivers/md/bcache/request.h +2 -2
@@ -37,10 +37,10 @@ unsigned int bch_get_congested(const struct cache_set *c);void bch_data_insert (struct closure *cl);void bch_cached_dev_request_init (struct cached_dev *dc); -blk_qc_t cached_dev_make_request (struct request_queue *q,struct bio *bio); +blk_qc_t cached_dev_submit_bio (struct bio *bio);void bch_flash_dev_request_init (struct bcache_device *d); -blk_qc_t flash_dev_make_request (struct request_queue *q,struct bio *bio); +blk_qc_t flash_dev_submit_bio (struct bio *bio);extern struct kmem_cache *bch_search_cache;
drivers/md/bcache/super.c +16 -7
@@ -680,7 +680,16 @@ static int ioctl_dev(struct block_device *b, fmode_t mode,return d->ioctl (d, mode, cmd, arg); } -static const struct block_device_operations bcache_ops = { +static const struct block_device_operations bcache_cached_ops = { + .submit_bio = cached_dev_submit_bio, + .open = open_dev, + .release = release_dev, + .ioctl = ioctl_dev, + .owner =THIS_MODULE , +}; + +static const struct block_device_operations bcache_flash_ops = { + .submit_bio = flash_dev_submit_bio, .open = open_dev, .release = release_dev, .ioctl = ioctl_dev,
@@ -820,8 +829,8 @@ static void bcache_device_free(struct bcache_device *d) }static int bcache_device_init (struct bcache_device *d,unsigned int block_size, -sector_t sectors,make_request_fn make_request_fn, -struct block_device *cached_bdev) +sector_t sectors,struct block_device *cached_bdev, +const struct block_device_operations *ops) {struct request_queue *q; const size_t max_stripes = min_t(size_t, INT_MAX,
@@ -868,10 +877,10 @@ static int bcache_device_init(struct bcache_device *d, unsigned int block_size, d->disk->major = bcache_major; d->disk->first_minor =idx_to_first_minor (idx); - d->disk->fops = &bcache_ops; + d->disk->fops = ops; d->disk->private_data = d; - q =blk_alloc_queue (make_request_fn,NUMA_NO_NODE ); + q =blk_alloc_queue (NUMA_NO_NODE );if (!q)return -ENOMEM ;
@@ -1355,7 +1364,7 @@ static int cached_dev_init(struct cached_dev *dc, unsigned int block_size) ret =bcache_device_init (&dc->disk, block_size, dc->bdev->bd_part->nr_sects - dc->sb.data_offset, - cached_dev_make_request, dc->bdev); + dc->bdev, &bcache_cached_ops);if (ret)return ret;
@@ -1468,7 +1477,7 @@ static int flash_dev_run(struct cache_set *c, struct uuid_entry *u)kobject_init (&d->kobj, &bch_flash_dev_ktype);if (bcache_device_init (d,block_bytes (c), u->sectors, - flash_dev_make_request,NULL )) +NULL , &bcache_flash_ops)) goto err;bcache_device_attach (d, c, u - c->uuids);
drivers/md/dm.c +12 -11
@@ -1770,7 +1770,7 @@ static blk_qc_t dm_process_bio(struct mapped_device *md, }/* -* If in ->make_request_fn we need to use blk_queue_split(), otherwise +* If in ->queue_bio we need to use blk_queue_split(), otherwise * queue_limits for abnormal requests (e.g. discard, writesame, etc) * won't be imposed. */
@@ -1787,7 +1787,7 @@ static blk_qc_t dm_process_bio(struct mapped_device *md,return __split_and_process_bio (md, map, bio); } -static blk_qc_t dm_make_request (struct request_queue *q,struct bio *bio) +static blk_qc_t dm_submit_bio (struct bio *bio) {struct mapped_device *md = bio->bi_disk->private_data;blk_qc_t ret =BLK_QC_T_NONE ;
@@ -1798,12 +1798,12 @@ static blk_qc_t dm_make_request(struct request_queue *q, struct bio *bio)/* * We are called with a live reference on q_usage_counter, but * that one will be released as soon as we return. Grab an -* extra one as blk_mq_make_request expects to be able to -* consume a reference (which lives until the request is freed -* in case a request is allocated). +* extra one as blk_mq_submit_bio expects to be able to consume +* a reference (which lives until the request is freed in case a +* request is allocated). */ -percpu_ref_get (&q->q_usage_counter); -return blk_mq_make_request (q, bio); +percpu_ref_get (&bio->bi_disk->queue->q_usage_counter); +return blk_mq_submit_bio (bio); } map =dm_get_live_table (md, &srcu_idx);
@@ -1988,11 +1988,11 @@ static struct mapped_device *alloc_dev(int minor)spin_lock_init (&md->uevent_lock);/* -* default to bio-based required ->make_request_fn until DM -* table is loaded and md->type established. If request-based -* table is loaded: blk-mq will override accordingly. +* default to bio-based until DM table is loaded and md->type +* established. If request-based table is loaded: blk-mq will +* override accordingly. */ - md->queue =blk_alloc_queue (dm_make_request, numa_node_id); + md->queue =blk_alloc_queue (numa_node_id);if (!md->queue) goto bad;
@@ -3232,6 +3232,7 @@ static const struct pr_ops dm_pr_ops = { };static const struct block_device_operations dm_blk_dops = { + .submit_bio = dm_submit_bio, .open = dm_blk_open, .release = dm_blk_close, .ioctl = dm_blk_ioctl,
drivers/md/md.c +3 -2
@@ -463,7 +463,7 @@ void md_handle_request(struct mddev *mddev, struct bio *bio) }EXPORT_SYMBOL (md_handle_request); -static blk_qc_t md_make_request (struct request_queue *q,struct bio *bio) +static blk_qc_t md_submit_bio (struct bio *bio) {const int rw =bio_data_dir (bio);const int sgrp =op_stat_group (bio_op (bio));
@@ -5641,7 +5641,7 @@ static int md_alloc(dev_t dev, char *name) mddev->hold_active =UNTIL_STOP ; error = -ENOMEM ; - mddev->queue =blk_alloc_queue (md_make_request,NUMA_NO_NODE ); + mddev->queue =blk_alloc_queue (NUMA_NO_NODE );if (!mddev->queue) goto abort;
@@ -7823,6 +7823,7 @@ static int md_revalidate(struct gendisk *disk)static const struct block_device_operations md_fops = { .owner =THIS_MODULE , + .submit_bio = md_submit_bio, .open = md_open, .release = md_release, .ioctl = md_ioctl,
drivers/nvdimm/blk.c +3 -2
@@ -162,7 +162,7 @@ static int nsblk_do_bvec(struct nd_namespace_blk *nsblk,return err; } -static blk_qc_t nd_blk_make_request (struct request_queue *q,struct bio *bio) +static blk_qc_t nd_blk_submit_bio (struct bio *bio) {struct bio_integrity_payload *bip;struct nd_namespace_blk *nsblk = bio->bi_disk->private_data;
@@ -225,6 +225,7 @@ static int nsblk_rw_bytes(struct nd_namespace_common *ndns,static const struct block_device_operations nd_blk_fops = { .owner =THIS_MODULE , + .submit_bio = nd_blk_submit_bio, .revalidate_disk = nvdimm_revalidate_disk, };
@@ -250,7 +251,7 @@ static int nsblk_attach_disk(struct nd_namespace_blk *nsblk) internal_nlba =div_u64 (nsblk->size,nsblk_internal_lbasize (nsblk)); available_disk_size = internal_nlba *nsblk_sector_size (nsblk); - q =blk_alloc_queue (nd_blk_make_request,NUMA_NO_NODE ); + q =blk_alloc_queue (NUMA_NO_NODE );if (!q)return -ENOMEM ;if (devm_add_action_or_reset (dev, nd_blk_release_queue, q))
drivers/nvdimm/btt.c +3 -2
@@ -1439,7 +1439,7 @@ static int btt_do_bvec(struct btt *btt, struct bio_integrity_payload *bip,return ret; } -static blk_qc_t btt_make_request (struct request_queue *q,struct bio *bio) +static blk_qc_t btt_submit_bio (struct bio *bio) {struct bio_integrity_payload *bip =bio_integrity (bio);struct btt *btt = bio->bi_disk->private_data;
@@ -1512,6 +1512,7 @@ static int btt_getgeo(struct block_device *bd, struct hd_geometry *geo)static const struct block_device_operations btt_fops = { .owner =THIS_MODULE , + .submit_bio = btt_submit_bio, .rw_page = btt_rw_page, .getgeo = btt_getgeo, .revalidate_disk = nvdimm_revalidate_disk,
@@ -1523,7 +1524,7 @@ static int btt_blk_init(struct btt *btt)struct nd_namespace_common *ndns = nd_btt->ndns;/* create a new disk and request queue for btt */ - btt->btt_queue =blk_alloc_queue (btt_make_request,NUMA_NO_NODE ); + btt->btt_queue =blk_alloc_queue (NUMA_NO_NODE );if (!btt->btt_queue)return -ENOMEM ;
drivers/nvdimm/pmem.c +3 -2
@@ -189,7 +189,7 @@ static blk_status_t pmem_do_write(struct pmem_device *pmem,return rc; } -static blk_qc_t pmem_make_request (struct request_queue *q,struct bio *bio) +static blk_qc_t pmem_submit_bio (struct bio *bio) {int ret =0 ;blk_status_t rc =0 ;
@@ -281,6 +281,7 @@ __weak long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff,static const struct block_device_operations pmem_fops = { .owner =THIS_MODULE , + .submit_bio = pmem_submit_bio, .rw_page = pmem_rw_page, .revalidate_disk = nvdimm_revalidate_disk, };
@@ -423,7 +424,7 @@ static int pmem_attach_disk(struct device *dev,return -EBUSY ; } - q =blk_alloc_queue (pmem_make_request,dev_to_node (dev)); + q =blk_alloc_queue (dev_to_node (dev));if (!q)return -ENOMEM ;
drivers/nvme/host/core.c +1 -0
@@ -2178,6 +2178,7 @@ static void nvme_ns_head_release(struct gendisk *disk, fmode_t mode)const struct block_device_operations nvme_ns_head_ops = { .owner =THIS_MODULE , + .submit_bio = nvme_ns_head_submit_bio, .open = nvme_ns_head_open, .release = nvme_ns_head_release, .ioctl = nvme_ioctl,
drivers/nvme/host/multipath.c +2 -3
@@ -291,8 +291,7 @@ static bool nvme_available_path(struct nvme_ns_head *head)return false; } -static blk_qc_t nvme_ns_head_make_request (struct request_queue *q, -struct bio *bio) +blk_qc_t nvme_ns_head_submit_bio (struct bio *bio) {struct nvme_ns_head *head = bio->bi_disk->private_data;struct device *dev =disk_to_dev (head->disk);
@@ -374,7 +373,7 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head)if (!(ctrl->subsys->cmic &NVME_CTRL_CMIC_MULTI_CTRL ) || !multipath)return 0 ; - q =blk_alloc_queue (nvme_ns_head_make_request, ctrl->numa_node); + q =blk_alloc_queue (ctrl->numa_node);if (!q) goto out;blk_queue_flag_set (QUEUE_FLAG_NONROT , q);
drivers/nvme/host/nvme.h +1 -0
@@ -586,6 +586,7 @@ void nvme_mpath_stop(struct nvme_ctrl *ctrl);bool nvme_mpath_clear_current_path (struct nvme_ns *ns);void nvme_mpath_clear_ctrl_paths (struct nvme_ctrl *ctrl);struct nvme_ns *nvme_find_path (struct nvme_ns_head *head); +blk_qc_t nvme_ns_head_submit_bio (struct bio *bio);static inline void nvme_mpath_check_last_path (struct nvme_ns *ns) {
drivers/s390/block/dcssblk.c +4 -5
@@ -31,8 +31,7 @@static int dcssblk_open (struct block_device *bdev,fmode_t mode);static void dcssblk_release (struct gendisk *disk,fmode_t mode); -static blk_qc_t dcssblk_make_request (struct request_queue *q, -struct bio *bio); +static blk_qc_t dcssblk_submit_bio (struct bio *bio);static long dcssblk_dax_direct_access (struct dax_device *dax_dev,pgoff_t pgoff,long nr_pages,void **kaddr,pfn_t *pfn);
@@ -41,6 +40,7 @@ static char dcssblk_segments[DCSSBLK_PARM_LEN] = "\0";static int dcssblk_major;static const struct block_device_operations dcssblk_devops = { .owner =THIS_MODULE , + .submit_bio = dcssblk_submit_bio, .open = dcssblk_open, .release = dcssblk_release, };
@@ -651,8 +651,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char } dev_info->gd->major = dcssblk_major; dev_info->gd->fops = &dcssblk_devops; - dev_info->dcssblk_queue = -blk_alloc_queue (dcssblk_make_request,NUMA_NO_NODE ); + dev_info->dcssblk_queue =blk_alloc_queue (NUMA_NO_NODE ); dev_info->gd->queue = dev_info->dcssblk_queue; dev_info->gd->private_data = dev_info;blk_queue_logical_block_size (dev_info->dcssblk_queue,4096 );
@@ -868,7 +867,7 @@ dcssblk_release(struct gendisk *disk, fmode_t mode) }static blk_qc_t -dcssblk_make_request (struct request_queue *q,struct bio *bio) +dcssblk_submit_bio (struct bio *bio) {struct dcssblk_dev_info *dev_info;struct bio_vec bvec;
drivers/s390/block/xpram.c +3 -3
@@ -182,7 +182,7 @@ static unsigned long xpram_highest_page_index(void)/* * Block device make request function. */ -static blk_qc_t xpram_make_request (struct request_queue *q,struct bio *bio) +static blk_qc_t xpram_submit_bio (struct bio *bio) {xpram_device_t *xdev = bio->bi_disk->private_data;struct bio_vec bvec;
@@ -250,6 +250,7 @@ static int xpram_getgeo(struct block_device *bdev, struct hd_geometry *geo)static const struct block_device_operations xpram_devops = { .owner =THIS_MODULE , + .submit_bio = xpram_submit_bio, .getgeo = xpram_getgeo, };
@@ -343,8 +344,7 @@ static int __init xpram_setup_blkdev(void) xpram_disks[i] =alloc_disk (1 );if (!xpram_disks[i]) goto out; - xpram_queues[i] =blk_alloc_queue (xpram_make_request, -NUMA_NO_NODE ); + xpram_queues[i] =blk_alloc_queue (NUMA_NO_NODE );if (!xpram_queues[i]) {put_disk (xpram_disks[i]); goto out;
include/linux/blk-mq.h +1 -1
@@ -596,6 +596,6 @@ static inline void blk_mq_cleanup_rq(struct request *rq) rq->q->mq_ops->cleanup_rq(rq); } -blk_qc_t blk_mq_make_request (struct request_queue *q,struct bio *bio); +blk_qc_t blk_mq_submit_bio (struct bio *bio);#endif
include/linux/blkdev.h +2 -5
@@ -286,8 +286,6 @@ static inline unsigned short req_get_ioprio(struct request *req)struct blk_queue_ctx ; -typedef blk_qc_t (make_request_fn ) (struct request_queue *q,struct bio *bio); -struct bio_vec ;enum blk_eh_timer_return {
@@ -398,8 +396,6 @@ struct request_queue {struct blk_queue_stats *stats;struct rq_qos *rq_qos; -make_request_fn *make_request_fn; -const struct blk_mq_ops *mq_ops;/* sw queues */
@@ -1162,7 +1158,7 @@ static inline int blk_rq_map_sg(struct request_queue *q, struct request *rq,extern void blk_dump_rq_flags (struct request *,char *);bool __must_check blk_get_queue (struct request_queue *); -struct request_queue *blk_alloc_queue (make_request_fn make_request,int node_id); +struct request_queue *blk_alloc_queue (int node_id);extern void blk_put_queue (struct request_queue *);extern void blk_set_queue_dying (struct request_queue *);
@@ -1778,6 +1774,7 @@ static inline void blk_ksm_unregister(struct request_queue *q) { }struct block_device_operations { +blk_qc_t (*submit_bio) (struct bio *bio);int (*open) (struct block_device *,fmode_t );void (*release) (struct gendisk *,fmode_t );int (*rw_page)(struct block_device *,sector_t ,struct page *,unsigned int );
include/linux/lightnvm.h +1 -2
@@ -631,7 +631,6 @@ static inline int nvm_next_ppa_in_chk(struct nvm_tgt_dev *dev,return last; } -typedef blk_qc_t (nvm_tgt_make_rq_fn )(struct request_queue *,struct bio *);typedef sector_t (nvm_tgt_capacity_fn )(void *);typedef void *(nvm_tgt_init_fn )(struct nvm_tgt_dev *,struct gendisk *,int flags);
@@ -650,7 +649,7 @@ struct nvm_tgt_type {int flags;/* target entry points */ -nvm_tgt_make_rq_fn *make_rq; +const struct block_device_operations *bops;nvm_tgt_capacity_fn *capacity;/* module-specific init/teardown */
Signature · 1 line
2.26.2
Re: [PATCH 16/20] block: move ->make_request_fn to struct block_device_operations
Quoted 9 lines · Christoph Hellwig
The
make_request_fnis a little weird in that it sits directly in structrequest_queueinstead of an operation vector. Replace it with ablock_device_operationsmethod calledsubmit_bio(which describes much better what it does). Also remove therequest_queueargument to it, as the queue can be derived pretty trivially from the bio.Signed-off-by Christoph Hellwig <[email protected]>---
[..]
Quoted 3 lines
drivers/nvdimm/blk.c | 5 +- drivers/nvdimm/btt.c | 5 +- drivers/nvdimm/pmem.c | 5 +-
For drivers/nvdimm
Re: [PATCH 16/20] block: move ->make_request_fn to struct block_device_operations
In reply to Christoph HellwigQuoted 7 lines · Christoph Hellwig
The
make_request_fnis a little weird in that it sits directly in structrequest_queueinstead of an operation vector. Replace it with ablock_device_operationsmethod calledsubmit_bio(which describes much better what it does). Also remove therequest_queueargument to it, as the queue can be derived pretty trivially from the bio.Signed-off-by Christoph Hellwig <[email protected]>
For the bcache part,
Quoted 39 lines
--- Documentation/block/biodoc.rst | 2 +- .../block/writeback_cache_control.rst | 2 +- arch/m68k/emu/nfblock.c | 5 +- arch/xtensa/platforms/iss/simdisk.c | 5 +- block/blk-cgroup.c | 2 +- block/blk-core.c | 53 +++++++------------ block/blk-mq.c | 10 ++-- block/blk.h | 2 - drivers/block/brd.c | 5 +- drivers/block/drbd/drbd_int.h | 2 +- drivers/block/drbd/drbd_main.c | 9 ++-- drivers/block/drbd/drbd_req.c | 2 +- drivers/block/null_blk_main.c | 17 ++++-- drivers/block/pktcdvd.c | 11 ++-- drivers/block/ps3vram.c | 15 +++--- drivers/block/rsxx/dev.c | 7 ++- drivers/block/umem.c | 5 +- drivers/block/zram/zram_drv.c | 11 ++-- drivers/lightnvm/core.c | 8 +-- drivers/lightnvm/pblk-init.c | 12 +++-- drivers/md/bcache/request.c | 4 +- drivers/md/bcache/request.h | 4 +- drivers/md/bcache/super.c | 23 +++++--- drivers/md/dm.c | 23 ++++---- drivers/md/md.c | 5 +- drivers/nvdimm/blk.c | 5 +- drivers/nvdimm/btt.c | 5 +- drivers/nvdimm/pmem.c | 5 +- drivers/nvme/host/core.c | 1 + drivers/nvme/host/multipath.c | 5 +- drivers/nvme/host/nvme.h | 1 + drivers/s390/block/dcssblk.c | 9 ++-- drivers/s390/block/xpram.c | 6 +-- include/linux/blk-mq.h | 2 +- include/linux/blkdev.h | 7 +-- include/linux/lightnvm.h | 3 +- 36 files changed, 153 insertions(+), 140 deletions(-)
[snipped]
Quoted 103 lines
drivers/md/bcache/request.c +2
-2@@ -1158,7 +1158,7 @@ static void quit_max_writeback_rate(struct cache_set *c,/* Cached devices - read & write stuff */ -blk_qc_t cached_dev_make_request (struct request_queue *q,struct bio *bio) +blk_qc_t cached_dev_submit_bio (struct bio *bio) {struct search *s;struct bcache_device *d = bio->bi_disk->private_data;@@ -1291,7 +1291,7 @@ static void flash_dev_nodata(struct closure *cl)continue_at (cl, search_free,NULL ); } -blk_qc_t flash_dev_make_request (struct request_queue *q,struct bio *bio) +blk_qc_t flash_dev_submit_bio (struct bio *bio) {struct search *s;struct closure *cl;drivers/md/bcache/request.h +2
-2@@ -37,10 +37,10 @@ unsigned int bch_get_congested(const struct cache_set *c);void bch_data_insert (struct closure *cl);void bch_cached_dev_request_init (struct cached_dev *dc); -blk_qc_t cached_dev_make_request (struct request_queue *q,struct bio *bio); +blk_qc_t cached_dev_submit_bio (struct bio *bio);void bch_flash_dev_request_init (struct bcache_device *d); -blk_qc_t flash_dev_make_request (struct request_queue *q,struct bio *bio); +blk_qc_t flash_dev_submit_bio (struct bio *bio);extern struct kmem_cache *bch_search_cache;drivers/md/bcache/super.c +16
-7@@ -680,7 +680,16 @@ static int ioctl_dev(struct block_device *b, fmode_t mode,return d->ioctl (d, mode, cmd, arg); } -static const struct block_device_operations bcache_ops = { +static const struct block_device_operations bcache_cached_ops = { + .submit_bio = cached_dev_submit_bio, + .open = open_dev, + .release = release_dev, + .ioctl = ioctl_dev, + .owner =THIS_MODULE , +}; + +static const struct block_device_operations bcache_flash_ops = { + .submit_bio = flash_dev_submit_bio, .open = open_dev, .release = release_dev, .ioctl = ioctl_dev,@@ -820,8 +829,8 @@ static void bcache_device_free(struct bcache_device *d) }static int bcache_device_init (struct bcache_device *d,unsigned int block_size, -sector_t sectors,make_request_fn make_request_fn, -struct block_device *cached_bdev) +sector_t sectors,struct block_device *cached_bdev, +const struct block_device_operations *ops) {struct request_queue *q; const size_t max_stripes = min_t(size_t, INT_MAX,@@ -868,10 +877,10 @@ static int bcache_device_init(struct bcache_device *d, unsigned int block_size, d->disk->major = bcache_major; d->disk->first_minor =idx_to_first_minor (idx); - d->disk->fops = &bcache_ops; + d->disk->fops = ops; d->disk->private_data = d; - q =blk_alloc_queue (make_request_fn,NUMA_NO_NODE ); + q =blk_alloc_queue (NUMA_NO_NODE );if (!q)return -ENOMEM ;@@ -1355,7 +1364,7 @@ static int cached_dev_init(struct cached_dev *dc, unsigned int block_size) ret =bcache_device_init (&dc->disk, block_size, dc->bdev->bd_part->nr_sects - dc->sb.data_offset, - cached_dev_make_request, dc->bdev); + dc->bdev, &bcache_cached_ops);if (ret)return ret;@@ -1468,7 +1477,7 @@ static int flash_dev_run(struct cache_set *c, struct uuid_entry *u)kobject_init (&d->kobj, &bch_flash_dev_ktype);if (bcache_device_init (d,block_bytes (c), u->sectors, - flash_dev_make_request,NULL )) +NULL , &bcache_flash_ops)) goto err;bcache_device_attach (d, c, u - c->uuids);
Christoph Hellwig
maintainerPATCH 17/20 block: rename generic_make_request to submit_bio_noacct
In reply to Christoph Hellwiggeneric_make_request has always been very confusingly misnamed, so rename it to submit_bio_noacct to make it clear that it is submit_bio minus accounting and a few checks.
--- Documentation/block/biodoc.rst | 2 +- .../fault-injection/fault-injection.rst | 2 +- Documentation/trace/ftrace.rst | 4 +-- block/bio.c | 14 ++++---- block/blk-core.c | 32 +++++++++---------- block/blk-crypto-fallback.c | 2 +- block/blk-crypto.c | 2 +- block/blk-merge.c | 2 +- block/blk-throttle.c | 4 +-- block/bounce.c | 2 +- drivers/block/drbd/drbd_int.h | 6 ++-- drivers/block/drbd/drbd_main.c | 2 +- drivers/block/drbd/drbd_receiver.c | 2 +- drivers/block/drbd/drbd_req.c | 2 +- drivers/block/drbd/drbd_worker.c | 2 +- drivers/block/pktcdvd.c | 2 +- drivers/lightnvm/pblk-read.c | 2 +- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/btree.c | 2 +- drivers/md/bcache/request.c | 7 ++-- drivers/md/dm-cache-target.c | 6 ++-- drivers/md/dm-clone-target.c | 10 +++--- drivers/md/dm-crypt.c | 6 ++-- drivers/md/dm-delay.c | 2 +- drivers/md/dm-era-target.c | 2 +- drivers/md/dm-integrity.c | 4 +-- drivers/md/dm-mpath.c | 2 +- drivers/md/dm-raid1.c | 2 +- drivers/md/dm-snap-persistent.c | 2 +- drivers/md/dm-snap.c | 6 ++-- drivers/md/dm-thin.c | 4 +-- drivers/md/dm-verity-target.c | 2 +- drivers/md/dm-writecache.c | 2 +- drivers/md/dm-zoned-target.c | 2 +- drivers/md/dm.c | 10 +++--- drivers/md/md-faulty.c | 4 +-- drivers/md/md-linear.c | 4 +-- drivers/md/md-multipath.c | 4 +-- drivers/md/raid0.c | 8 ++--- drivers/md/raid1.c | 14 ++++---- drivers/md/raid10.c | 28 ++++++++-------- drivers/md/raid5.c | 10 +++--- drivers/nvme/host/multipath.c | 2 +- include/linux/blkdev.h | 2 +- 44 files changed, 115 insertions(+), 118 deletions(-)
Documentation/block/biodoc.rst +1 -1
@@ -1036,7 +1036,7 @@ Now the generic block layer performs partition-remapping early and thus provides drivers with a sector number relative to whole device, rather than having to take partition number into account in order to arrive at the true sector number. The routine blk_partition_remap() is invoked by -generic_make_request even before invoking the queue specific ->submit_bio, +submit_bio_noacct even before invoking the queue specific ->submit_bio, so the i/o scheduler also gets to operate on whole disk sector numbers. This should typically not require changes to block drivers, it just never gets to invoke its own partition sector offset calculations since all bios
Documentation/fault-injection/fault-injection.rst +1 -1
@@ -24,7 +24,7 @@ Available fault injection capabilities injects disk IO errors on devices permitted by setting /sys/block/<device>/make-it-fail or - /sys/block/<device>/<partition>/make-it-fail. (generic_make_request()) + /sys/block/<device>/<partition>/make-it-fail. (submit_bio_noacct()) - fail_mmc_request
Documentation/trace/ftrace.rst +2 -2
@@ -1453,7 +1453,7 @@ function-trace, we get a much larger output:: => __blk_run_queue_uncond => __blk_run_queue => blk_queue_bio - => generic_make_request + => submit_bio_noacct => submit_bio => submit_bh => __ext3_get_inode_loc
@@ -1738,7 +1738,7 @@ tracers. => __blk_run_queue_uncond => __blk_run_queue => blk_queue_bio - => generic_make_request + => submit_bio_noacct => submit_bio => submit_bh => ext3_bread
block/bio.c +7 -7
@@ -358,7 +358,7 @@ static void bio_alloc_rescue(struct work_struct *work)if (!bio)break ; -generic_make_request (bio); +submit_bio_noacct (bio); } }
@@ -416,19 +416,19 @@ static void punt_bios_to_rescuer(struct bio_set *bs)* submit the previously allocated bio for IO before attempting to allocate * a new one. Failure to do so can cause deadlocks under memory pressure. * -* Note that when running under generic_make_request() (i.e. any block +* Note that when running under submit_bio_noacct() (i.e. any block * driver), bios are not submitted until after you return - see the code in -* generic_make_request() that converts recursion into iteration, to prevent +* submit_bio_noacct() that converts recursion into iteration, to prevent * stack overflows. * * This would normally mean allocating multiple bios under -* generic_make_request() would be susceptible to deadlocks, but we have +* submit_bio_noacct() would be susceptible to deadlocks, but we have * deadlock avoidance code that resubmits any blocked bios from a rescuer * thread. * * However, we do not guarantee forward progress for allocations from other * mempools. Doing multiple allocations from the same mempool under -* generic_make_request() should be avoided - instead, use bio_set's front_pad +* submit_bio_noacct() should be avoided - instead, use bio_set's front_pad * for per bio allocations. * * RETURNS:
@@ -457,14 +457,14 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, unsigned int nr_iovecs, nr_iovecs > 0))return NULL ;/* -* generic_make_request() converts recursion to iteration; this +* submit_bio_noacct() converts recursion to iteration; this * means if we're running beneath it, any bios we allocate and * submit will not be submitted (and thus freed) until after we * return. * * This exposes us to a potential deadlock if we allocate * multiple bios from the same bio_set() while running -* underneath generic_make_request(). If we were to allocate +* underneath submit_bio_noacct(). If we were to allocate * multiple bios (say a stacking block driver that was splitting * bios), we would deadlock if we exhausted the mempool's * reserve.
block/blk-core.c +15 -17
@@ -956,8 +956,7 @@ static inline blk_status_t blk_check_zone_append(struct request_queue *q,return BLK_STS_OK ; } -static noinline_for_stack bool -generic_make_request_checks (struct bio *bio) +static noinline_for_stack bool submit_bio_checks(struct bio *bio) {struct request_queue *q = bio->bi_disk->queue;blk_status_t status =BLK_STS_IOERR ;
@@ -985,9 +984,8 @@ generic_make_request_checks(struct bio *bio) }/* -* Filter flush bio's early so that make_request based -* drivers without flush support don't have to worry -* about them. +* Filter flush bio's early so that bio based drivers without flush +* support don't have to worry about them. */ if (op_is_flush (bio->bi_opf) && !test_bit (QUEUE_FLAG_WC , &q->queue_flags)) {
@@ -1072,7 +1070,7 @@ generic_make_request_checks(struct bio *bio)return false; } -static blk_qc_t do_make_request (struct bio *bio) +static blk_qc_t __submit_bio (struct bio *bio) {struct gendisk *disk = bio->bi_disk;blk_qc_t ret =BLK_QC_T_NONE ;
@@ -1087,7 +1085,7 @@ static blk_qc_t do_make_request(struct bio *bio) }/** -* generic_make_request - re-submit a bio to the block device layer for I/O +* submit_bio_noacct - re-submit a bio to the block device layer for I/O * @bio: The bio describing the location in memory and on the device. * * This is a version of submit_bio() that shall only be used for I/O that is
@@ -1095,7 +1093,7 @@ static blk_qc_t do_make_request(struct bio *bio)* systems and other upper level users of the block layer should use * submit_bio() instead. */ -blk_qc_t generic_make_request (struct bio *bio) +blk_qc_t submit_bio_noacct (struct bio *bio) {/* * bio_list_on_stack[0] contains bios submitted by the current
@@ -1106,7 +1104,7 @@ blk_qc_t generic_make_request(struct bio *bio)struct bio_list bio_list_on_stack[2 ];blk_qc_t ret =BLK_QC_T_NONE ; -if (!generic_make_request_checks (bio)) +if (!submit_bio_checks (bio)) goto out;/*
@@ -1114,7 +1112,7 @@ blk_qc_t generic_make_request(struct bio *bio)* stack usage with stacked devices could be a problem. So use * current->bio_list to keep a list of requests submited by a * ->submit_bio method. current->bio_list is also used as a -* flag to say if generic_make_request is currently active in this +* flag to say if submit_bio_noacct is currently active in this * task or not. If it is NULL, then no make_request is active. If * it is non-NULL, then a make_request is active, and new requests * should be added at the tail
@@ -1132,7 +1130,7 @@ blk_qc_t generic_make_request(struct bio *bio)* we assign bio_list to a pointer to the bio_list_on_stack, * thus initialising the bio_list of new bios to be * added. ->submit_bio() may indeed add some more bios -* through a recursive call to generic_make_request. If it +* through a recursive call to submit_bio_noacct. If it * did, we find a non-NULL value in bio_list and re-enter the loop * from the top. In this case we really did just take the bio * of the top of the list (no pretending) and so remove it from
@@ -1150,7 +1148,7 @@ blk_qc_t generic_make_request(struct bio *bio)/* Create a fresh bio_list for all subordinate requests */ bio_list_on_stack[1 ] = bio_list_on_stack[0 ];bio_list_init (&bio_list_on_stack[0 ]); - ret =do_make_request (bio); + ret =__submit_bio (bio);/* sort new bios into those for a lower level * and those for the same level
@@ -1174,13 +1172,13 @@ blk_qc_t generic_make_request(struct bio *bio) out:return ret; } -EXPORT_SYMBOL (generic_make_request); +EXPORT_SYMBOL (submit_bio_noacct);/** * direct_make_request - hand a buffer directly to its device driver for I/O * @bio: The bio describing the location in memory and on the device. * -* This function behaves like generic_make_request(), but does not protect +* This function behaves like submit_bio_noacct(), but does not protect * against recursion. Must only be used if the called driver is known * to be blk-mq based. */
@@ -1192,7 +1190,7 @@ blk_qc_t direct_make_request(struct bio *bio)bio_io_error (bio);return BLK_QC_T_NONE ; } -if (!generic_make_request_checks (bio)) +if (!submit_bio_checks (bio))return BLK_QC_T_NONE ;if (unlikely (bio_queue_enter (bio)))return BLK_QC_T_NONE ;
@@ -1263,13 +1261,13 @@ blk_qc_t submit_bio(struct bio *bio)blk_qc_t ret;psi_memstall_enter (&pflags); - ret =generic_make_request (bio); + ret =submit_bio_noacct (bio);psi_memstall_leave (&pflags);return ret; } -return generic_make_request (bio); +return submit_bio_noacct (bio); }EXPORT_SYMBOL (submit_bio);
block/blk-crypto-fallback.c +1 -1
@@ -228,7 +228,7 @@ static bool blk_crypto_split_bio_if_needed(struct bio **bio_ptr)return false; }bio_chain (split_bio, bio); -generic_make_request (bio); +submit_bio_noacct (bio); *bio_ptr = split_bio; }
block/blk-crypto.c +1 -1
@@ -239,7 +239,7 @@ void __blk_crypto_free_request(struct request *rq)* kernel crypto API. When the crypto API fallback is used for encryption, * blk-crypto may choose to split the bio into 2 - the first one that will * continue to be processed and the second one that will be resubmitted via -* generic_make_request. A bounce bio will be allocated to encrypt the contents +* submit_bio_noacct. A bounce bio will be allocated to encrypt the contents * of the aforementioned "first one", and *bio_ptr will be updated to this * bounce bio. *
block/blk-merge.c +1 -1
@@ -338,7 +338,7 @@ void __blk_queue_split(struct bio **bio, unsigned int *nr_segs)bio_chain (split, *bio);trace_block_split (q, split, (*bio)->bi_iter.bi_sector); -generic_make_request (*bio); +submit_bio_noacct (*bio); *bio = split; } }
block/blk-throttle.c +2 -2
@@ -1339,8 +1339,8 @@ static void blk_throtl_dispatch_work_fn(struct work_struct *work)if (!bio_list_empty (&bio_list_on_stack)) {blk_start_plug (&plug); -while ((bio =bio_list_pop (&bio_list_on_stack))) -generic_make_request (bio); +while ((bio =bio_list_pop (&bio_list_on_stack))) +submit_bio_noacct (bio);blk_finish_plug (&plug); } }
block/bounce.c +1 -1
@@ -309,7 +309,7 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig,if (!passthrough && sectors <bio_sectors (*bio_orig)) { bio =bio_split (*bio_orig, sectors,GFP_NOIO , &bounce_bio_split);bio_chain (bio, *bio_orig); -generic_make_request (*bio_orig); +submit_bio_noacct (*bio_orig); *bio_orig = bio; } bio = bounce_clone_bio(*bio_orig, GFP_NOIO, passthrough ? NULL :
drivers/block/drbd/drbd_int.h +3 -3
@@ -1576,12 +1576,12 @@ void drbd_set_my_capacity(struct drbd_device *device, sector_t size);/* * used to submit our private bio */ -static inline void drbd_generic_make_request (struct drbd_device *device, +static inline void drbd_submit_bio_noacct (struct drbd_device *device,int fault_type,struct bio *bio) {__release (local);if (!bio->bi_disk) { -drbd_err (device,"drbd_generic_make_request: bio->bi_disk == NULL\n" ); +drbd_err (device,"drbd_submit_bio_noacct: bio->bi_disk == NULL\n" ); bio->bi_status =BLK_STS_IOERR ;bio_endio (bio);return ;
@@ -1590,7 +1590,7 @@ static inline void drbd_generic_make_request(struct drbd_device *device,if (drbd_insert_fault (device, fault_type))bio_io_error (bio);else -generic_make_request (bio); +submit_bio_noacct (bio); } void drbd_bump_write_ordering(struct drbd_resource *resource, struct drbd_backing_dev *bdev,
drivers/block/drbd/drbd_main.c +1 -1
@@ -2325,7 +2325,7 @@ static void do_retry(struct work_struct *ws)* workqueues instead. */ -/* We are not just doing generic_make_request(), +/* We are not just doing submit_bio_noacct(), * as we want to keep the start_time information. */ inc_ap_bio (device);__drbd_make_request (device, bio, start_jif);
drivers/block/drbd/drbd_receiver.c +1 -1
@@ -1723,7 +1723,7 @@ int drbd_submit_peer_request(struct drbd_device *device, bios = bios->bi_next; bio->bi_next =NULL ; -drbd_generic_make_request (device, fault_type, bio); +drbd_submit_bio_noacct (device, fault_type, bio); }while (bios);return 0 ;
drivers/block/drbd/drbd_req.c +1 -1
@@ -1164,7 +1164,7 @@ drbd_submit_req_private_bio(struct drbd_request *req)else if (bio_op (bio) ==REQ_OP_DISCARD )drbd_process_discard_or_zeroes_req (req,EE_TRIM );else -generic_make_request (bio); +submit_bio_noacct (bio);put_ldev (device); }else bio_io_error (bio);
drivers/block/drbd/drbd_worker.c +1 -1
@@ -1525,7 +1525,7 @@ int w_restart_disk_io(struct drbd_work *w, int cancel)drbd_req_make_private_bio (req, req->master_bio);bio_set_dev (req->private_bio, device->ldev->backing_bdev); -generic_make_request (req->private_bio); +submit_bio_noacct (req->private_bio);return 0 ; }
drivers/block/pktcdvd.c +1 -1
@@ -913,7 +913,7 @@ static void pkt_iosched_process_queue(struct pktcdvd_device *pd) }atomic_inc (&pd->cdrw.pending_bios); -generic_make_request (bio); +submit_bio_noacct (bio); } }
drivers/lightnvm/pblk-read.c +1 -1
@@ -320,7 +320,7 @@ void pblk_submit_read(struct pblk *pblk, struct bio *bio) split_bio =bio_split (bio, nr_secs *NR_PHY_IN_LOG ,GFP_KERNEL , &pblk_bio_set);bio_chain (split_bio, bio); -generic_make_request (bio); +submit_bio_noacct (bio);/* New bio contains first N sectors of the previous one, so * we can continue to use existing rqd, but we need to shrink
drivers/md/bcache/bcache.h +1 -1
@@ -929,7 +929,7 @@ static inline void closure_bio_submit(struct cache_set *c,bio_endio (bio);return ; } -generic_make_request (bio); +submit_bio_noacct (bio); }/*
drivers/md/bcache/btree.c +1 -1
@@ -959,7 +959,7 @@ static struct btree *mca_alloc(struct cache_set *c, struct btree_op *op,* bch_btree_node_get - find a btree node in the cache and lock it, reading it * in from disk if necessary. * -* If IO is necessary and running under generic_make_request, returns -EAGAIN. +* If IO is necessary and running under submit_bio_noacct, returns -EAGAIN. * * The btree node will have either a read or a write lock held, depending on * level and op->lock.
drivers/md/bcache/request.c +3 -4
@@ -1115,7 +1115,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio) !blk_queue_discard(bdev_get_queue(dc->bdev))) bio->bi_end_io(bio); else -generic_make_request (bio ); +submit_bio_noacct (bio ); } static void quit_max_writeback_rate(struct cache_set *c,
@@ -1197,7 +1197,7 @@ blk_qc_t cached_dev_submit_bio(struct bio *bio)if (!bio->bi_iter.bi_size) {/* * can't call bch_journal_meta from under -* generic_make_request +* submit_bio_noacct */ continue_at_nobarrier(&s->cl, cached_dev_nodata,
@@ -1311,8 +1311,7 @@ blk_qc_t flash_dev_submit_bio(struct bio *bio)if (!bio->bi_iter.bi_size) {/* -* can't call bch_journal_meta from under -* generic_make_request +* can't call bch_journal_meta from under submit_bio_noacct */ continue_at_nobarrier(&s->cl, flash_dev_nodata,
drivers/md/dm-cache-target.c +3 -3
@@ -886,7 +886,7 @@ static void accounted_complete(struct cache *cache, struct bio *bio)static void accounted_request (struct cache *cache,struct bio *bio) {accounted_begin (cache, bio); -generic_make_request (bio); +submit_bio_noacct (bio); }static void issue_op (struct bio *bio,void *context)
@@ -1792,7 +1792,7 @@ static bool process_bio(struct cache *cache, struct bio *bio)bool commit_needed;if (map_bio (cache, bio,get_bio_block (cache, bio), &commit_needed) ==DM_MAPIO_REMAPPED ) -generic_make_request (bio); +submit_bio_noacct (bio);return commit_needed; }
@@ -1858,7 +1858,7 @@ static bool process_discard_bio(struct cache *cache, struct bio *bio)if (cache->features.discard_passdown) {remap_to_origin (cache, bio); -generic_make_request (bio); +submit_bio_noacct (bio); }else bio_endio (bio);
drivers/md/dm-clone-target.c +5 -5
@@ -330,7 +330,7 @@ static void submit_bios(struct bio_list *bios)blk_start_plug (&plug);while ((bio =bio_list_pop (bios))) -generic_make_request (bio); +submit_bio_noacct (bio);blk_finish_plug (&plug); }
@@ -346,7 +346,7 @@ static void submit_bios(struct bio_list *bios)static void issue_bio (struct clone *clone,struct bio *bio) {if (!bio_triggers_commit (clone, bio)) { -generic_make_request (bio); +submit_bio_noacct (bio);return ; }
@@ -473,7 +473,7 @@ static void complete_discard_bio(struct clone *clone, struct bio *bio, bool succbio_region_range (clone, bio, &rs, &nr_regions);trim_bio (bio,region_to_sector (clone, rs), nr_regions << clone->region_shift); -generic_make_request (bio); +submit_bio_noacct (bio); }else bio_endio (bio); }
@@ -865,7 +865,7 @@ static void hydration_overwrite(struct dm_clone_region_hydration *hd, struct bio bio->bi_private = hd;atomic_inc (&hd->clone->hydrations_in_flight); -generic_make_request (bio); +submit_bio_noacct (bio); }/*
@@ -1281,7 +1281,7 @@ static void process_deferred_flush_bios(struct clone *clone)*/ bio_endio (bio); }else { -generic_make_request (bio); +submit_bio_noacct (bio); } } }
drivers/md/dm-crypt.c +3 -3
@@ -1789,7 +1789,7 @@ static int kcryptd_io_read(struct dm_crypt_io *io, gfp_t gfp)return 1 ; } -generic_make_request (clone); +submit_bio_noacct (clone);return 0 ; }
@@ -1815,7 +1815,7 @@ static void kcryptd_io_write(struct dm_crypt_io *io) {struct bio *clone = io->ctx.bio_out; -generic_make_request (clone); +submit_bio_noacct (clone); }#define crypt_io_from_node (node) rb_entry((node), struct dm_crypt_io, rb_node)
@@ -1893,7 +1893,7 @@ static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io, int async) clone->bi_iter.bi_sector = cc->start + io->sector;if (likely (!async) &&test_bit (DM_CRYPT_NO_OFFLOAD , &cc->flags)) { -generic_make_request (clone); +submit_bio_noacct (clone);return ; }
drivers/md/dm-delay.c +1 -1
@@ -72,7 +72,7 @@ static void flush_bios(struct bio *bio)while (bio) { n = bio->bi_next; bio->bi_next =NULL ; -generic_make_request (bio); +submit_bio_noacct (bio); bio = n; } }
drivers/md/dm-era-target.c +1 -1
@@ -1265,7 +1265,7 @@ static void process_deferred_bios(struct era *era)bio_io_error (bio); else while ((bio = bio_list_pop(&marked_bios))) -generic_make_request (bio); +submit_bio_noacct (bio); }static void process_rpc_calls (struct era *era)
drivers/md/dm-integrity.c +2 -2
@@ -2115,12 +2115,12 @@ static void dm_integrity_map_continue(struct dm_integrity_io *dio, bool from_map dio->in_flight = (atomic_t )ATOMIC_INIT (1 ); dio->completion =NULL ; -generic_make_request (bio); +submit_bio_noacct (bio);return ; } -generic_make_request (bio); +submit_bio_noacct (bio);if (need_sync_io) {wait_for_completion_io (&read_comp);
drivers/md/dm-mpath.c +1 -1
@@ -677,7 +677,7 @@ static void process_queued_bios(struct work_struct *work)bio_endio (bio);break ;case DM_MAPIO_REMAPPED : -generic_make_request (bio); +submit_bio_noacct (bio);break ;case DM_MAPIO_SUBMITTED :break ;
drivers/md/dm-raid1.c +1 -1
@@ -779,7 +779,7 @@ static void do_writes(struct mirror_set *ms, struct bio_list *writes)wakeup_mirrord (ms); }else {map_bio (get_default_mirror (ms), bio); -generic_make_request (bio); +submit_bio_noacct (bio); } } }
drivers/md/dm-snap-persistent.c +1 -1
@@ -252,7 +252,7 @@ static int chunk_io(struct pstore *ps, void *area, chunk_t chunk, int op,/* * Issue the synchronous I/O from a different thread -* to avoid generic_make_request recursion. +* to avoid submit_bio_noacct recursion. */ INIT_WORK_ONSTACK (&req.work, do_metadata);queue_work (ps->metadata_wq, &req.work);
drivers/md/dm-snap.c +3 -3
@@ -1568,7 +1568,7 @@ static void flush_bios(struct bio *bio)while (bio) { n = bio->bi_next; bio->bi_next =NULL ; -generic_make_request (bio); +submit_bio_noacct (bio); bio = n; } }
@@ -1588,7 +1588,7 @@ static void retry_origin_bios(struct dm_snapshot *s, struct bio *bio) bio->bi_next =NULL ; r =do_origin (s->origin, bio, false);if (r ==DM_MAPIO_REMAPPED ) -generic_make_request (bio); +submit_bio_noacct (bio); bio = n; } }
@@ -1829,7 +1829,7 @@ static void start_full_bio(struct dm_snap_pending_exception *pe, bio->bi_end_io = full_bio_end_io; bio->bi_private = callback_data; -generic_make_request (bio); +submit_bio_noacct (bio); } static struct dm_snap_pending_exception *
drivers/md/dm-thin.c +2 -2
@@ -758,7 +758,7 @@ static void issue(struct thin_c *tc, struct bio *bio)struct pool *pool = tc->pool;if (!bio_triggers_commit (tc, bio)) { -generic_make_request (bio); +submit_bio_noacct (bio);return ; }
@@ -2394,7 +2394,7 @@ static void process_deferred_bios(struct pool *pool)if (bio->bi_opf &REQ_PREFLUSH )bio_endio (bio);else -generic_make_request (bio); +submit_bio_noacct (bio); } }
drivers/md/dm-verity-target.c +1 -1
@@ -681,7 +681,7 @@ static int verity_map(struct dm_target *ti, struct bio *bio)verity_submit_prefetch (v, io); -generic_make_request (bio); +submit_bio_noacct (bio);return DM_MAPIO_SUBMITTED ; }
drivers/md/dm-writecache.c +1 -1
@@ -1238,7 +1238,7 @@ static int writecache_flush_thread(void *data) bio_end_sector(bio));wc_unlock (wc);bio_set_dev (bio, wc->dev->bdev); -generic_make_request (bio); +submit_bio_noacct (bio); }else {writecache_flush (wc);wc_unlock (wc);
drivers/md/dm-zoned-target.c +1 -1
@@ -140,7 +140,7 @@ static int dmz_submit_bio(struct dmz_target *dmz, struct dm_zone *zone,bio_advance (bio, clone->bi_iter.bi_size);refcount_inc (&bioctx->ref); -generic_make_request (clone); +submit_bio_noacct (clone);if (bio_op (bio) ==REQ_OP_WRITE &&dmz_is_seq (zone)) zone->wp_block += nr_blocks;
drivers/md/dm.c +5 -5
@@ -1305,7 +1305,7 @@ static blk_qc_t __map_bio(struct dm_target_io *tio)if (md->type ==DM_TYPE_NVME_BIO_BASED ) ret =direct_make_request (clone);else - ret =generic_make_request (clone); + ret =submit_bio_noacct (clone);break ;case DM_MAPIO_KILL :free_tio (tio);
@@ -1652,7 +1652,7 @@ static blk_qc_t __split_and_process_bio(struct mapped_device *md, error =__split_and_process_non_flush (&ci);if (current->bio_list && ci.sector_count && !error) {/* -* Remainder must be passed to generic_make_request() +* Remainder must be passed to submit_bio_noacct() * so that it gets handled *after* bios already submitted * have been completely processed. * We take a clone of the original to store in
@@ -1677,7 +1677,7 @@ static blk_qc_t __split_and_process_bio(struct mapped_device *md,bio_chain (b, bio);trace_block_split (md->queue, b, bio->bi_iter.bi_sector); - ret =generic_make_request (bio); + ret =submit_bio_noacct (bio);break ; } }
@@ -1745,7 +1745,7 @@ static void dm_queue_split(struct mapped_device *md, struct dm_target *ti, strucbio_chain (split, *bio);trace_block_split (md->queue, split, (*bio)->bi_iter.bi_sector); -generic_make_request (*bio); +submit_bio_noacct (*bio); *bio = split; } }
@@ -2500,7 +2500,7 @@ static void dm_wq_work(struct work_struct *work)break ;if (dm_request_based (md)) - (void )generic_make_request (c); + (void )submit_bio_noacct (c);else (void )dm_process_bio (md, map, c); }
drivers/md/md-faulty.c +2 -2
@@ -169,7 +169,7 @@ static bool faulty_make_request(struct mddev *mddev, struct bio *bio)if (bio_data_dir (bio) ==WRITE ) {/* write request */ if (atomic_read (&conf->counters[WriteAll])) { -/* special case - don't decrement, don't generic_make_request, +/* special case - don't decrement, don't submit_bio_noacct, * just fail immediately */ bio_io_error (bio);
@@ -214,7 +214,7 @@ static bool faulty_make_request(struct mddev *mddev, struct bio *bio) }else bio_set_dev (bio, conf->rdev->bdev); -generic_make_request (bio); +submit_bio_noacct (bio);return true; }
drivers/md/md-linear.c +2 -2
@@ -267,7 +267,7 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio)struct bio *split =bio_split (bio, end_sector - bio_sector,GFP_NOIO , &mddev->bio_set);bio_chain (split, bio); -generic_make_request (bio); +submit_bio_noacct (bio); bio = split; }
@@ -286,7 +286,7 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio) bio_sector);mddev_check_writesame (mddev, bio);mddev_check_write_zeroes (mddev, bio); -generic_make_request (bio); +submit_bio_noacct (bio); }return true;
drivers/md/md-multipath.c +2 -2
@@ -131,7 +131,7 @@ static bool multipath_make_request(struct mddev *mddev, struct bio * bio) mp_bh->bio.bi_private = mp_bh;mddev_check_writesame (mddev, &mp_bh->bio);mddev_check_write_zeroes (mddev, &mp_bh->bio); -generic_make_request (&mp_bh->bio); +submit_bio_noacct (&mp_bh->bio);return true; }
@@ -348,7 +348,7 @@ static void multipathd(struct md_thread *thread) bio->bi_opf |=REQ_FAILFAST_TRANSPORT ; bio->bi_end_io = multipath_end_request; bio->bi_private = mp_bh; -generic_make_request (bio); +submit_bio_noacct (bio); } }spin_unlock_irqrestore (&conf->device_lock, flags);
drivers/md/raid0.c +4 -4
@@ -495,7 +495,7 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio) zone->zone_end - bio->bi_iter.bi_sector,GFP_NOIO , &mddev->bio_set);bio_chain (split, bio); -generic_make_request (bio); +submit_bio_noacct (bio); bio = split; end = zone->zone_end; }else
@@ -559,7 +559,7 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio)trace_block_bio_remap (bdev_get_queue (rdev->bdev), discard_bio,disk_devt (mddev->gendisk), bio->bi_iter.bi_sector); -generic_make_request (discard_bio); +submit_bio_noacct (discard_bio); }bio_endio (bio); }
@@ -600,7 +600,7 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio)struct bio *split =bio_split (bio, sectors,GFP_NOIO , &mddev->bio_set);bio_chain (split, bio); -generic_make_request (bio); +submit_bio_noacct (bio); bio = split; }
@@ -633,7 +633,7 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio) disk_devt(mddev->gendisk), bio_sector);mddev_check_writesame (mddev, bio);mddev_check_write_zeroes (mddev, bio); -generic_make_request (bio); +submit_bio_noacct (bio);return true; }
drivers/md/raid1.c +7 -7
@@ -834,7 +834,7 @@ static void flush_bio_list(struct r1conf *conf, struct bio *bio)/* Just ignore it */ bio_endio (bio); else -generic_make_request (bio ); +submit_bio_noacct (bio ); bio = next;cond_resched (); }
@@ -1312,7 +1312,7 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio,struct bio *split =bio_split (bio, max_sectors, gfp, &conf->bio_split);bio_chain (split, bio); -generic_make_request (bio); +submit_bio_noacct (bio); bio = split; r1_bio->master_bio = bio; r1_bio->sectors = max_sectors;
@@ -1338,7 +1338,7 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio,trace_block_bio_remap (read_bio->bi_disk->queue, read_bio,disk_devt (mddev->gendisk), r1_bio->sector); -generic_make_request (read_bio); +submit_bio_noacct (read_bio); } static void raid1_write_request(struct mddev *mddev, struct bio *bio,
@@ -1483,7 +1483,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,struct bio *split =bio_split (bio, max_sectors,GFP_NOIO , &conf->bio_split);bio_chain (split, bio); -generic_make_request (bio); +submit_bio_noacct (bio); bio = split; r1_bio->master_bio = bio; r1_bio->sectors = max_sectors;
@@ -2240,7 +2240,7 @@ static void sync_request_write(struct mddev *mddev, struct r1bio *r1_bio)atomic_inc (&r1_bio->remaining);md_sync_acct (conf->mirrors[i].rdev->bdev,bio_sectors (wbio)); -generic_make_request (wbio); +submit_bio_noacct (wbio); }put_sync_write_buf (r1_bio,1 );
@@ -2926,7 +2926,7 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,md_sync_acct_bio (bio, nr_sectors);if (read_targets ==1 ) bio->bi_opf &= ~MD_FAILFAST ; -generic_make_request (bio); +submit_bio_noacct (bio); } } }else {
@@ -2935,7 +2935,7 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,md_sync_acct_bio (bio, nr_sectors);if (read_targets ==1 ) bio->bi_opf &= ~MD_FAILFAST ; -generic_make_request (bio); +submit_bio_noacct (bio); }return nr_sectors; }
drivers/md/raid10.c +14 -14
@@ -917,7 +917,7 @@ static void flush_pending_writes(struct r10conf *conf)/* Just ignore it */ bio_endio (bio); else -generic_make_request (bio ); +submit_bio_noacct (bio ); bio = next; }blk_finish_plug (&plug);
@@ -1102,7 +1102,7 @@ static void raid10_unplug(struct blk_plug_cb *cb, bool from_schedule)/* Just ignore it */ bio_endio (bio); else -generic_make_request (bio ); +submit_bio_noacct (bio ); bio = next; }kfree (plug);
@@ -1194,7 +1194,7 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio, gfp, &conf->bio_split);bio_chain (split, bio);allow_barrier (conf); -generic_make_request (bio); +submit_bio_noacct (bio);wait_barrier (conf); bio = split; r10_bio->master_bio = bio;
@@ -1221,7 +1221,7 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio,trace_block_bio_remap (read_bio->bi_disk->queue, read_bio,disk_devt (mddev->gendisk), r10_bio->sector); -generic_make_request (read_bio); +submit_bio_noacct (read_bio);return ; }
@@ -1479,7 +1479,7 @@ static void raid10_write_request(struct mddev *mddev, struct bio *bio, GFP_NOIO, &conf->bio_split);bio_chain (split, bio);allow_barrier (conf); -generic_make_request (bio); +submit_bio_noacct (bio);wait_barrier (conf); bio = split; r10_bio->master_bio = bio;
@@ -2099,7 +2099,7 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio) tbio->bi_opf |=MD_FAILFAST ; tbio->bi_iter.bi_sector += conf->mirrors[d].rdev->data_offset;bio_set_dev (tbio, conf->mirrors[d].rdev->bdev); -generic_make_request (tbio); +submit_bio_noacct (tbio); }/* Now write out to any replacement devices
@@ -2118,7 +2118,7 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio)atomic_inc (&r10_bio->remaining);md_sync_acct (conf->mirrors[d].replacement->bdev,bio_sectors (tbio)); -generic_make_request (tbio); +submit_bio_noacct (tbio); } done:
@@ -2241,7 +2241,7 @@ static void recovery_request_write(struct mddev *mddev, struct r10bio *r10_bio) wbio = r10_bio->devs[1 ].bio; wbio2 = r10_bio->devs[1 ].repl_bio;/* Need to test wbio2->bi_end_io before we call -* generic_make_request as if the former is NULL, +* submit_bio_noacct as if the former is NULL, * the latter is free to free wbio2. */ if (wbio2 && !wbio2->bi_end_io)
@@ -2249,13 +2249,13 @@ static void recovery_request_write(struct mddev *mddev, struct r10bio *r10_bio)if (wbio->bi_end_io) {atomic_inc (&conf->mirrors[d].rdev->nr_pending);md_sync_acct (conf->mirrors[d].rdev->bdev,bio_sectors (wbio)); -generic_make_request (wbio); +submit_bio_noacct (wbio); }if (wbio2) {atomic_inc (&conf->mirrors[d].replacement->nr_pending);md_sync_acct (conf->mirrors[d].replacement->bdev,bio_sectors (wbio2)); -generic_make_request (wbio2); +submit_bio_noacct (wbio2); } }
@@ -2889,7 +2889,7 @@ static void raid10_set_cluster_sync_high(struct r10conf *conf)* a number of r10_bio structures, one for each out-of-sync device. * As we setup these structures, we collect all bio's together into a list * which we then process collectively to add pages, and then process again -* to pass to generic_make_request. +* to pass to submit_bio_noacct. * * The r10_bio structures are linked using a borrowed master_bio pointer. * This link is counted in ->remaining. When the r10_bio that points to NULL
@@ -3496,7 +3496,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,if (bio->bi_end_io == end_sync_read) {md_sync_acct_bio (bio, nr_sectors); bio->bi_status =0 ; -generic_make_request (bio); +submit_bio_noacct (bio); } }
@@ -4654,7 +4654,7 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr,md_sync_acct_bio (read_bio, r10_bio->sectors);atomic_inc (&r10_bio->remaining); read_bio->bi_next =NULL ; -generic_make_request (read_bio); +submit_bio_noacct (read_bio); sectors_done += nr_sectors;if (sector_nr <= last) goto read_more;
@@ -4717,7 +4717,7 @@ static void reshape_request_write(struct mddev *mddev, struct r10bio *r10_bio)md_sync_acct_bio (b, r10_bio->sectors);atomic_inc (&r10_bio->remaining); b->bi_next =NULL ; -generic_make_request (b); +submit_bio_noacct (b); }end_reshape_request (r10_bio); }
drivers/md/raid5.c +5 -5
@@ -873,7 +873,7 @@ static void dispatch_bio_list(struct bio_list *tmp)struct bio *bio;while ((bio =bio_list_pop (tmp))) -generic_make_request (bio); +submit_bio_noacct (bio); }static int cmp_stripe (void *priv,struct list_head *a,struct list_head *b)
@@ -1151,7 +1151,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)if (should_defer &&op_is_write (op))bio_list_add (&pending_bios, bi);else -generic_make_request (bi); +submit_bio_noacct (bi); }if (rrdev) { if (s->syncing || s->expanding || s->expanded
@@ -1201,7 +1201,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)if (should_defer &&op_is_write (op))bio_list_add (&pending_bios, rbi);else -generic_make_request (rbi); +submit_bio_noacct (rbi); }if (!rdev && !rrdev) {if (op_is_write (op))
@@ -5289,7 +5289,7 @@ static int raid5_read_one_chunk(struct mddev *mddev, struct bio *raid_bio)trace_block_bio_remap (align_bi->bi_disk->queue, align_bi,disk_devt (mddev->gendisk), raid_bio->bi_iter.bi_sector); -generic_make_request (align_bi); +submit_bio_noacct (align_bi);return 1 ; }else {rcu_read_unlock ();
@@ -5309,7 +5309,7 @@ static struct bio *chunk_aligned_read(struct mddev *mddev, struct bio *raid_bio)struct r5conf *conf = mddev->private; split =bio_split (raid_bio, sectors,GFP_NOIO , &conf->bio_split);bio_chain (split, raid_bio); -generic_make_request (raid_bio); +submit_bio_noacct (raid_bio); raid_bio = split; }
drivers/nvme/host/multipath.c +1 -1
@@ -351,7 +351,7 @@ static void nvme_requeue_work(struct work_struct *work)* path. */ bio->bi_disk = head->disk; -generic_make_request (bio); +submit_bio_noacct (bio); } }
include/linux/blkdev.h +1 -1
@@ -852,7 +852,7 @@ static inline void rq_flush_dcache_pages(struct request *rq)extern int blk_register_queue (struct gendisk *disk);extern void blk_unregister_queue (struct gendisk *disk); -extern blk_qc_t generic_make_request (struct bio *bio); +blk_qc_t submit_bio_noacct (struct bio *bio);extern blk_qc_t direct_make_request (struct bio *bio);extern void blk_rq_init (struct request_queue *q,struct request *rq);extern void blk_put_request (struct request *);
Signature · 1 line
2.26.2
Re: [PATCH 17/20] block: rename generic_make_request to submit_bio_noacct
Quoted 5 lines · Christoph Hellwig
generic_make_requesthas always been very confusingly misnamed, so rename it tosubmit_bio_noacctto make it clear that it issubmit_biominus accounting and a few checks.Signed-off-by Christoph Hellwig <[email protected]>
I will miss generic_make_request(). Anyway, if it is decided, for bcache part,
Quoted 47 lines
--- Documentation/block/biodoc.rst | 2 +- .../fault-injection/fault-injection.rst | 2 +- Documentation/trace/ftrace.rst | 4 +-- block/bio.c | 14 ++++---- block/blk-core.c | 32 +++++++++---------- block/blk-crypto-fallback.c | 2 +- block/blk-crypto.c | 2 +- block/blk-merge.c | 2 +- block/blk-throttle.c | 4 +-- block/bounce.c | 2 +- drivers/block/drbd/drbd_int.h | 6 ++-- drivers/block/drbd/drbd_main.c | 2 +- drivers/block/drbd/drbd_receiver.c | 2 +- drivers/block/drbd/drbd_req.c | 2 +- drivers/block/drbd/drbd_worker.c | 2 +- drivers/block/pktcdvd.c | 2 +- drivers/lightnvm/pblk-read.c | 2 +- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/btree.c | 2 +- drivers/md/bcache/request.c | 7 ++-- drivers/md/dm-cache-target.c | 6 ++-- drivers/md/dm-clone-target.c | 10 +++--- drivers/md/dm-crypt.c | 6 ++-- drivers/md/dm-delay.c | 2 +- drivers/md/dm-era-target.c | 2 +- drivers/md/dm-integrity.c | 4 +-- drivers/md/dm-mpath.c | 2 +- drivers/md/dm-raid1.c | 2 +- drivers/md/dm-snap-persistent.c | 2 +- drivers/md/dm-snap.c | 6 ++-- drivers/md/dm-thin.c | 4 +-- drivers/md/dm-verity-target.c | 2 +- drivers/md/dm-writecache.c | 2 +- drivers/md/dm-zoned-target.c | 2 +- drivers/md/dm.c | 10 +++--- drivers/md/md-faulty.c | 4 +-- drivers/md/md-linear.c | 4 +-- drivers/md/md-multipath.c | 4 +-- drivers/md/raid0.c | 8 ++--- drivers/md/raid1.c | 14 ++++---- drivers/md/raid10.c | 28 ++++++++-------- drivers/md/raid5.c | 10 +++--- drivers/nvme/host/multipath.c | 2 +- include/linux/blkdev.h | 2 +- 44 files changed, 115 insertions(+), 118 deletions(-)
[snipped]
Quoted 72 lines
drivers/lightnvm/pblk-read.c +1
-1@@ -320,7 +320,7 @@ void pblk_submit_read(struct pblk *pblk, struct bio *bio) split_bio =bio_split (bio, nr_secs *NR_PHY_IN_LOG ,GFP_KERNEL , &pblk_bio_set);bio_chain (split_bio, bio); -generic_make_request (bio); +submit_bio_noacct (bio);/* New bio contains first N sectors of the previous one, so * we can continue to use existing rqd, but we need to shrink drivers/md/bcache/bcache.h +1
-1@@ -929,7 +929,7 @@ static inline void closure_bio_submit(struct cache_set *c,bio_endio (bio);return ; } -generic_make_request (bio); +submit_bio_noacct (bio); }/* drivers/md/bcache/btree.c +1
-1@@ -959,7 +959,7 @@ static struct btree *mca_alloc(struct cache_set *c, struct btree_op *op,* bch_btree_node_get - find a btree node in the cache and lock it, reading it * in from disk if necessary. * -* If IO is necessary and running under generic_make_request, returns -EAGAIN. +* If IO is necessary and running under submit_bio_noacct, returns -EAGAIN. * * The btree node will have either a read or a write lock held, depending on * level and op->lock. drivers/md/bcache/request.c +3
-4@@ -1115,7 +1115,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio) !blk_queue_discard(bdev_get_queue(dc->bdev))) bio->bi_end_io(bio); else -generic_make_request (bio ); +submit_bio_noacct (bio ); } static void quit_max_writeback_rate(struct cache_set *c,@@ -1197,7 +1197,7 @@ blk_qc_t cached_dev_submit_bio(struct bio *bio)if (!bio->bi_iter.bi_size) {/* * can't call bch_journal_meta from under -* generic_make_request +* submit_bio_noacct */ continue_at_nobarrier(&s->cl, cached_dev_nodata,@@ -1311,8 +1311,7 @@ blk_qc_t flash_dev_submit_bio(struct bio *bio)if (!bio->bi_iter.bi_size) {/* -* can't call bch_journal_meta from under -* generic_make_request +* can't call bch_journal_meta from under submit_bio_noacct */ continue_at_nobarrier(&s->cl, flash_dev_nodata,
Re: [PATCH 17/20] block: rename generic_make_request to submit_bio_noacct
In reply to Christoph HellwigQuoted 7 lines · Christoph Hellwig
generic_make_requesthas always been very confusingly misnamed, so rename it tosubmit_bio_noacctto make it clear that it issubmit_biominus accounting and a few checks.Signed-off-by Christoph Hellwig <[email protected]>---
[...]
Quoted 7 lines
drivers/md/md-faulty.c | 4 +-- drivers/md/md-linear.c | 4 +-- drivers/md/md-multipath.c | 4 +-- drivers/md/raid0.c | 8 ++--- drivers/md/raid1.c | 14 ++++---- drivers/md/raid10.c | 28 ++++++++-------- drivers/md/raid5.c | 10 +++---
For md part:
Christoph Hellwig
maintainerPATCH 18/20 block: refator submit_bio_noacct
In reply to Christoph HellwigSplit out a __submit_bio_noacct helper for the actual de-recursion algorithm, and simplify the loop by using a continue when we can't enter the queue for a bio.
--- block/blk-core.c | 143 +++++++++++++++++++++++++---------------------- 1 file changed, 75 insertions(+), 68 deletions(-)
block/blk-core.c +75 -68
@@ -1084,6 +1084,74 @@ static blk_qc_t __submit_bio(struct bio *bio)return ret; } +/* +* The loop in this function may be a bit non-obvious, and so deserves some +* explanation: +* +* - Before entering the loop, bio->bi_next is NULL (as all callers ensure +* that), so we have a list with a single bio. +* - We pretend that we have just taken it off a longer list, so we assign +* bio_list to a pointer to the bio_list_on_stack, thus initialising the +* bio_list of new bios to be added. ->submit_bio() may indeed add some more +* bios through a recursive call to submit_bio_noacct. If it did, we find a +* non-NULL value in bio_list and re-enter the loop from the top. +* - In this case we really did just take the bio of the top of the list (no +* pretending) and so remove it from bio_list, and call into ->submit_bio() +* again. +* +* bio_list_on_stack[0] contains bios submitted by the current ->submit_bio. +* bio_list_on_stack[1] contains bios that were submitted before the current +* ->submit_bio_bio, but that haven't been processed yet. +*/ +static blk_qc_t __submit_bio_noacct (struct bio *bio) +{ +struct bio_list bio_list_on_stack[2 ]; +blk_qc_t ret =BLK_QC_T_NONE ; + +BUG_ON (bio->bi_next); + +bio_list_init (&bio_list_on_stack[0 ]); + current->bio_list = bio_list_on_stack; + +do { +struct request_queue *q = bio->bi_disk->queue; +struct bio_list lower, same; + +if (unlikely (bio_queue_enter (bio) !=0 )) +continue ; + +/* +* Create a fresh bio_list for all subordinate requests. +*/ + bio_list_on_stack[1 ] = bio_list_on_stack[0 ]; +bio_list_init (&bio_list_on_stack[0 ]); + + ret =__submit_bio (bio); + +/* +* Sort new bios into those for a lower level and those for the +* same level. +*/ +bio_list_init (&lower); +bio_list_init (&same); +while ((bio =bio_list_pop (&bio_list_on_stack[0 ])) !=NULL ) +if (q == bio->bi_disk->queue) +bio_list_add (&same, bio); +else +bio_list_add (&lower, bio); + +/* +* Now assemble so we handle the lowest level first. +*/ +bio_list_merge (&bio_list_on_stack[0 ], &lower); +bio_list_merge (&bio_list_on_stack[0 ], &same); +bio_list_merge (&bio_list_on_stack[0 ], &bio_list_on_stack[1 ]); + }while ((bio =bio_list_pop (&bio_list_on_stack[0 ]))); + + current->bio_list =NULL ; +return ret; +} +/** * submit_bio_noacct - re-submit a bio to the block device layer for I/O * @bio: The bio describing the location in memory and on the device.
@@ -1095,82 +1163,21 @@ static blk_qc_t __submit_bio(struct bio *bio)*/ blk_qc_t submit_bio_noacct (struct bio *bio) { -/* -* bio_list_on_stack[0] contains bios submitted by the current -* ->submit_bio. -* bio_list_on_stack[1] contains bios that were submitted before the -* current ->submit_bio_bio, but that haven't been processed yet. -*/ -struct bio_list bio_list_on_stack[2 ]; -blk_qc_t ret =BLK_QC_T_NONE ; -if (!submit_bio_checks (bio)) - goto out; +return BLK_QC_T_NONE ;/* -* We only want one ->submit_bio to be active at a time, else -* stack usage with stacked devices could be a problem. So use -* current->bio_list to keep a list of requests submited by a -* ->submit_bio method. current->bio_list is also used as a -* flag to say if submit_bio_noacct is currently active in this -* task or not. If it is NULL, then no make_request is active. If -* it is non-NULL, then a make_request is active, and new requests -* should be added at the tail +* We only want one ->submit_bio to be active at a time, else stack +* usage with stacked devices could be a problem. Use current->bio_list +* to collect a list of requests submited by a ->submit_bio method while +* it is active, and then process them after it returned. */ if (current->bio_list) {bio_list_add (¤t->bio_list[0 ], bio); - goto out; +return BLK_QC_T_NONE ; } -/* following loop may be a bit non-obvious, and so deserves some -* explanation. -* Before entering the loop, bio->bi_next is NULL (as all callers -* ensure that) so we have a list with a single bio. -* We pretend that we have just taken it off a longer list, so -* we assign bio_list to a pointer to the bio_list_on_stack, -* thus initialising the bio_list of new bios to be -* added. ->submit_bio() may indeed add some more bios -* through a recursive call to submit_bio_noacct. If it -* did, we find a non-NULL value in bio_list and re-enter the loop -* from the top. In this case we really did just take the bio -* of the top of the list (no pretending) and so remove it from -* bio_list, and call into ->submit_bio() again. -*/ -BUG_ON (bio->bi_next); -bio_list_init (&bio_list_on_stack[0 ]); - current->bio_list = bio_list_on_stack; -do { -struct request_queue *q = bio->bi_disk->queue; - -if (likely (bio_queue_enter (bio) ==0 )) { -struct bio_list lower, same; - -/* Create a fresh bio_list for all subordinate requests */ - bio_list_on_stack[1 ] = bio_list_on_stack[0 ]; -bio_list_init (&bio_list_on_stack[0 ]); - ret =__submit_bio (bio); - -/* sort new bios into those for a lower level -* and those for the same level -*/ -bio_list_init (&lower); -bio_list_init (&same); -while ((bio =bio_list_pop (&bio_list_on_stack[0 ])) !=NULL ) -if (q == bio->bi_disk->queue) -bio_list_add (&same, bio); -else -bio_list_add (&lower, bio); -/* now assemble so we handle the lowest level first */ -bio_list_merge (&bio_list_on_stack[0 ], &lower); -bio_list_merge (&bio_list_on_stack[0 ], &same); -bio_list_merge (&bio_list_on_stack[0 ], &bio_list_on_stack[1 ]); - } - bio =bio_list_pop (&bio_list_on_stack[0 ]); - }while (bio); - current->bio_list =NULL ;/* deactivate */ - -out: -return ret; +return __submit_bio_noacct (bio); }EXPORT_SYMBOL (submit_bio_noacct);
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 19/20 block: shortcut __submit_bio_noacct for blk-mq drivers
In reply to Christoph HellwigFor blk-mq drivers bios can only be inserted for the same queue. So bypass the complicated sorting logic in __submit_bio_noacct with a blk-mq simpler submission helper.
--- block/blk-core.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
block/blk-core.c +30 -0
@@ -1152,6 +1152,34 @@ static blk_qc_t __submit_bio_noacct(struct bio *bio)return ret; } +static blk_qc_t __submit_bio_noacct_mq (struct bio *bio) +{ +struct gendisk *disk = bio->bi_disk; +struct bio_list bio_list; +blk_qc_t ret =BLK_QC_T_NONE ; + +bio_list_init (&bio_list); + current->bio_list = &bio_list; + +do { +WARN_ON_ONCE (bio->bi_disk != disk); + +if (unlikely (bio_queue_enter (bio) !=0 )) +continue ; + +if (!blk_crypto_bio_prep (&bio)) { +blk_queue_exit (disk->queue); + ret =BLK_QC_T_NONE ; +continue ; + } + + ret =blk_mq_submit_bio (bio); + }while ((bio =bio_list_pop (&bio_list))); + + current->bio_list =NULL ; +return ret; +} +/** * submit_bio_noacct - re-submit a bio to the block device layer for I/O * @bio: The bio describing the location in memory and on the device.
@@ -1177,6 +1205,8 @@ blk_qc_t submit_bio_noacct(struct bio *bio)return BLK_QC_T_NONE ; } +if (!bio->bi_disk->fops->submit_bio) +return __submit_bio_noacct_mq (bio);return __submit_bio_noacct (bio); }EXPORT_SYMBOL (submit_bio_noacct);
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 20/20 block: remove direct_make_request
In reply to Christoph HellwigNow that submit_bio_noacct has a decent blk-mq fast path there is no more need for this bypass.
--- block/blk-core.c | 28 ---------------------------- drivers/md/dm.c | 5 +---- drivers/nvme/host/multipath.c | 2 +- include/linux/blkdev.h | 1 - 4 files changed, 2 insertions(+), 34 deletions(-)
block/blk-core.c +0 -28
@@ -1211,34 +1211,6 @@ blk_qc_t submit_bio_noacct(struct bio *bio) }EXPORT_SYMBOL (submit_bio_noacct); -/** -* direct_make_request - hand a buffer directly to its device driver for I/O -* @bio: The bio describing the location in memory and on the device. -* -* This function behaves like submit_bio_noacct(), but does not protect -* against recursion. Must only be used if the called driver is known -* to be blk-mq based. -*/ -blk_qc_t direct_make_request (struct bio *bio) -{ -struct gendisk *disk = bio->bi_disk; - -if (WARN_ON_ONCE (!disk->queue->mq_ops)) { -bio_io_error (bio); -return BLK_QC_T_NONE ; - } -if (!submit_bio_checks (bio)) -return BLK_QC_T_NONE ; -if (unlikely (bio_queue_enter (bio))) -return BLK_QC_T_NONE ; -if (!blk_crypto_bio_prep (&bio)) { -blk_queue_exit (disk->queue); -return BLK_QC_T_NONE ; - } -return blk_mq_submit_bio (bio); -} -EXPORT_SYMBOL_GPL (direct_make_request); -/** * submit_bio - submit a bio to the block device layer for I/O * @bio: The &struct bio which describes the I/O
drivers/md/dm.c +1 -4
@@ -1302,10 +1302,7 @@ static blk_qc_t __map_bio(struct dm_target_io *tio)/* the bio has been remapped so dispatch it */ trace_block_bio_remap (clone->bi_disk->queue, clone,bio_dev (io->orig_bio), sector); -if (md->type ==DM_TYPE_NVME_BIO_BASED ) - ret =direct_make_request (clone); -else - ret =submit_bio_noacct (clone); + ret =submit_bio_noacct (clone);break ;case DM_MAPIO_KILL :free_tio (tio);
drivers/nvme/host/multipath.c +1 -1
@@ -314,7 +314,7 @@ blk_qc_t nvme_ns_head_submit_bio(struct bio *bio)trace_block_bio_remap (bio->bi_disk->queue, bio,disk_devt (ns->head->disk), bio->bi_iter.bi_sector); - ret =direct_make_request (bio); + ret =submit_bio_noacct (bio); }else if (nvme_available_path (head)) {dev_warn_ratelimited (dev,"no usable path - requeuing I/O\n" );
include/linux/blkdev.h +0 -1
@@ -853,7 +853,6 @@ static inline void rq_flush_dcache_pages(struct request *rq)extern int blk_register_queue (struct gendisk *disk);extern void blk_unregister_queue (struct gendisk *disk);blk_qc_t submit_bio_noacct (struct bio *bio); -extern blk_qc_t direct_make_request (struct bio *bio);extern void blk_rq_init (struct request_queue *q,struct request *rq);extern void blk_put_request (struct request *); extern struct request *blk_get_request(struct request_queue *, unsigned int op,
Signature · 1 line
2.26.2
Jens Axboe
maintainerQuoted 7 lines · Christoph Hellwig
Hi Jens,
this series moves the
make_request_fnmethod intoblock_device_operationswith the much more descriptive ->submit_bio name. It then also givesgeneric_make_requesta more descriptive name, and further optimize the path to issue to blk-mq, removing the need for thedirect_make_requestbypass.
Thanks, I'll try this again.
Signature · 1 line
Jens Axboe