Immutable biovecs
Subsystems (44)
Jens - here's immutable biovecs, rebased and ready for 3.14. Changes since the last version of the series:
* bio_clone_bioset() retains the old behaviour, as previously discussed - bio_clone_fast() is being used by bcache, dm and the new bio_split().
There aren't that many users of the old bio_clone() and we should eventually convert all the users that don't actually need it (for a couple of reasons), but that can be left to future cleanups.
* refactoring patches to use submit_bio_wait() and bio_for_each_segment()
Regarding the bio chaining stuff, I'm not terribly happy with all the bio_endio_nodec() calls but I want to keep that stuff simple for now - Mike Snitzer had a good suggestion for that though. But I am seeing more and more ways we can use that functionality to clean other stuff up - also, we should be able to drop bi_cnt eventually, bi_remaining seems like it can be used to replace the various bio_get() uses.
The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:
Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)
are available in the git repository at:
git://evilpiepirate.org/~kent/linux-bcache.git for-jens
for you to fetch changes up to 4b1faf931650d4a35b2a570318862821d6a962e3:
block: Kill bio_pair_split() (2013-11-23 22:33:57 -0800)
----------------------------------------------------------------
Kent Overstreet (25):
block: submit_bio_wait() conversions
block: Convert various code to bio_for_each_segment()
bcache: Kill unaligned bvec hack
block: Abstract out bvec iterator
dm: Use bvec_iter for dm_bio_record()
block: Convert bio_iovec() to bvec_iter
block: Convert bio_for_each_segment() to bvec_iter
block: Immutable bio vecs
block: Convert bio_copy_data() to bvec_iter
bio-integrity: Convert to bvec_iter
block: Kill bio_segments()/bi_vcnt usage
block: Convert drivers to immutable biovecs
aoe: Convert to immutable biovecs
ceph: Convert to immutable biovecs
block: Kill bio_iovec_idx(), __bio_iovec()
block: Refactor bio_clone_bioset() for immutable biovecs
block: Add bio_clone_fast()
rbd: Refactor bio cloning
dm: Refactor for new bio cloning/splitting
block: Don't save/copy bvec array anymore
block: Remove bi_idx hacks
block: Generic bio chaining
block: Rename bio_split() -> bio_pair_split()
block: Introduce new bio_split()
block: Kill bio_pair_split()
Documentation/block/biodoc.txt | 7 +- Documentation/block/biovecs.txt | 111 ++++++ arch/m68k/emu/nfblock.c | 13 +- arch/powerpc/sysdev/axonram.c | 21 +- block/blk-core.c | 40 +-- block/blk-flush.c | 21 +- block/blk-integrity.c | 40 ++- block/blk-lib.c | 12 +- block/blk-map.c | 6 +- block/blk-merge.c | 66 ++-- block/blk-mq.c | 2 +- block/blk-throttle.c | 14 +- block/elevator.c | 2 +- drivers/block/aoe/aoe.h | 10 +- drivers/block/aoe/aoecmd.c | 153 ++++----- drivers/block/brd.c | 16 +- drivers/block/drbd/drbd_actlog.c | 2 +- drivers/block/drbd/drbd_bitmap.c | 2 +- drivers/block/drbd/drbd_main.c | 27 +- drivers/block/drbd/drbd_receiver.c | 19 +- drivers/block/drbd/drbd_req.c | 6 +- drivers/block/drbd/drbd_req.h | 2 +- drivers/block/drbd/drbd_worker.c | 8 +- drivers/block/floppy.c | 16 +- drivers/block/loop.c | 27 +- drivers/block/mtip32xx/mtip32xx.c | 20 +- drivers/block/nbd.c | 14 +- drivers/block/nvme-core.c | 142 ++------ drivers/block/pktcdvd.c | 182 +++++----- drivers/block/ps3disk.c | 17 +- drivers/block/ps3vram.c | 12 +- drivers/block/rbd.c | 91 +---- drivers/block/rsxx/dev.c | 6 +- drivers/block/rsxx/dma.c | 15 +- drivers/block/umem.c | 53 ++- drivers/block/xen-blkback/blkback.c | 2 +- drivers/block/xen-blkfront.c | 2 +- drivers/md/bcache/bcache.h | 2 - drivers/md/bcache/btree.c | 8 +- drivers/md/bcache/debug.c | 21 +- drivers/md/bcache/io.c | 196 ++--------- drivers/md/bcache/journal.c | 12 +- drivers/md/bcache/movinggc.c | 4 +- drivers/md/bcache/request.c | 131 +++----- drivers/md/bcache/super.c | 20 +- drivers/md/bcache/util.c | 4 +- drivers/md/bcache/writeback.c | 6 +- drivers/md/bcache/writeback.h | 2 +- drivers/md/dm-bio-record.h | 37 +- drivers/md/dm-bufio.c | 2 +- drivers/md/dm-cache-policy-mq.c | 4 +- drivers/md/dm-cache-target.c | 28 +- drivers/md/dm-crypt.c | 64 ++-- drivers/md/dm-delay.c | 7 +- drivers/md/dm-flakey.c | 7 +- drivers/md/dm-io.c | 37 +- drivers/md/dm-linear.c | 3 +- drivers/md/dm-raid1.c | 20 +- drivers/md/dm-region-hash.c | 3 +- drivers/md/dm-snap.c | 19 +- drivers/md/dm-stripe.c | 13 +- drivers/md/dm-switch.c | 4 +- drivers/md/dm-thin.c | 30 +- drivers/md/dm-verity.c | 62 ++-- drivers/md/dm.c | 189 ++--------- drivers/md/faulty.c | 19 +- drivers/md/linear.c | 96 +++--- drivers/md/md.c | 24 +- drivers/md/multipath.c | 13 +- drivers/md/raid0.c | 79 ++--- drivers/md/raid1.c | 75 +++-- drivers/md/raid10.c | 194 +++++------ drivers/md/raid5.c | 84 ++--- drivers/message/fusion/mptsas.c | 8 +- drivers/s390/block/dasd_diag.c | 10 +- drivers/s390/block/dasd_eckd.c | 48 +-- drivers/s390/block/dasd_fba.c | 26 +- drivers/s390/block/dcssblk.c | 21 +- drivers/s390/block/scm_blk.c | 8 +- drivers/s390/block/scm_blk_cluster.c | 4 +- drivers/s390/block/xpram.c | 19 +- drivers/scsi/libsas/sas_expander.c | 8 +- drivers/scsi/mpt2sas/mpt2sas_transport.c | 41 +-- drivers/scsi/mpt3sas/mpt3sas_transport.c | 39 +-- drivers/scsi/osd/osd_initiator.c | 2 +- drivers/scsi/sd.c | 2 +- drivers/scsi/sd_dif.c | 30 +- drivers/staging/lustre/lustre/llite/lloop.c | 26 +- drivers/staging/zram/zram_drv.c | 33 +- drivers/target/target_core_iblock.c | 2 +- fs/bio-integrity.c | 179 +++------- fs/bio.c | 502 +++++++++++++--------------- fs/btrfs/check-integrity.c | 40 +-- fs/btrfs/check-integrity.h | 2 + fs/btrfs/compression.c | 27 +- fs/btrfs/disk-io.c | 11 +- fs/btrfs/extent_io.c | 61 ++-- fs/btrfs/file-item.c | 19 +- fs/btrfs/inode.c | 37 +- fs/btrfs/raid56.c | 22 +- fs/btrfs/scrub.c | 45 +-- fs/btrfs/volumes.c | 12 +- fs/buffer.c | 12 +- fs/direct-io.c | 4 +- fs/ext4/page-io.c | 8 +- fs/f2fs/data.c | 15 +- fs/f2fs/segment.c | 14 +- fs/gfs2/lops.c | 2 +- fs/gfs2/ops_fstype.c | 2 +- fs/hfsplus/wrapper.c | 19 +- fs/jfs/jfs_logmgr.c | 12 +- fs/jfs/jfs_metapage.c | 9 +- fs/logfs/dev_bdev.c | 53 ++- fs/mpage.c | 19 +- fs/nfs/blocklayout/blocklayout.c | 43 +-- fs/nilfs2/segbuf.c | 3 +- fs/ocfs2/cluster/heartbeat.c | 2 +- fs/xfs/xfs_aops.c | 2 +- fs/xfs/xfs_buf.c | 4 +- include/linux/bio.h | 283 ++++++++++------ include/linux/blk_types.h | 24 +- include/linux/blkdev.h | 9 +- include/linux/ceph/messenger.h | 4 +- include/linux/dm-io.h | 4 +- include/trace/events/bcache.h | 26 +- include/trace/events/block.h | 26 +- include/trace/events/f2fs.h | 4 +- kernel/power/block_io.c | 2 +- kernel/trace/blktrace.c | 15 +- mm/bounce.c | 44 ++- mm/page_io.c | 10 +- net/ceph/messenger.c | 43 +-- 132 files changed, 2063 insertions(+), 2656 deletions(-) create mode 100644 Documentation/block/biovecs.txt
Quoted 2 lines · Kent Overstreet
Jens - here's immutable biovecs, rebased and ready for 3.14. Changes since the last version of the series:
Can you do a resend of the patch series to all involved lists first so we can have a detailed look at the current version?
Quoted 3 lines
*
bio_clone_bioset()retains the old behaviour, as previously discussed -bio_clone_fast()is being used by bcache, dm and the newbio_split().
Any chance to have a more descriptive name than bio_clone_fast? Also without having the actual patches in front of me, did you make sure to document the different in semantics in detail?
Quoted 1 line
* refactoring patches to use
submit_bio_wait()andbio_for_each_segment()
Jens already applied the submit_bio_wait patch.
Quoted 6 lines · Christoph Hellwig
Quoted 2 lines · Kent Overstreet
Jens - here's immutable biovecs, rebased and ready for 3.14. Changes since the last version of the series:
Can you do a resend of the patch series to all involved lists first so we can have a detailed look at the current version?
Sure thing.
Quoted 6 lines
Quoted 2 lines
*
bio_clone_bioset()retains the old behaviour, as previously discussed -bio_clone_fast()is being used by bcache, dm and the newbio_split().Any chance to have a more descriptive name than
bio_clone_fast? Also without having the actual patches in front of me, did you make sure to document the different in semantics in detail?
I haven't been able to think of anything I don't hate, I'm open to suggestions.
PATCH 1/25 block: submit_bio_wait() conversions
It was being open coded in a few places.
--- block/blk-flush.c | 19 +------------------ drivers/md/md.c | 14 +------------- fs/btrfs/check-integrity.c | 32 +++++++++++++------------------- fs/btrfs/check-integrity.h | 2 ++ fs/btrfs/extent_io.c | 12 +----------- fs/btrfs/scrub.c | 33 ++++----------------------------- fs/hfsplus/wrapper.c | 17 +---------------- fs/logfs/dev_bdev.c | 13 +------------ 8 files changed, 24 insertions(+), 118 deletions(-)
block/blk-flush.c +1 -18
@@ -502,15 +502,6 @@ void blk_abort_flushes(struct request_queue *q) } } -static void bio_end_flush (struct bio *bio,int err) -{ -if (err) -clear_bit (BIO_UPTODATE , &bio->bi_flags); -if (bio->bi_private) -complete (bio->bi_private); -bio_put (bio); -} -/** * blkdev_issue_flush - queue a flush * @bdev: blockdev to issue flush for
@@ -526,7 +517,6 @@ static void bio_end_flush(struct bio *bio, int err)int blkdev_issue_flush (struct block_device *bdev,gfp_t gfp_mask,sector_t *error_sector) { -DECLARE_COMPLETION_ONSTACK (wait);struct request_queue *q;struct bio *bio;int ret =0 ;
@@ -548,13 +538,9 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask,return -ENXIO ; bio =bio_alloc (gfp_mask,0 ); - bio->bi_end_io = bio_end_flush; bio->bi_bdev = bdev; - bio->bi_private = &wait; -bio_get (bio); -submit_bio (WRITE_FLUSH , bio); -wait_for_completion_io (&wait); + ret =submit_bio_wait (WRITE_FLUSH , bio);/* * The driver must store the error location in ->bi_sector, if
@@ -564,9 +550,6 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask,if (error_sector) *error_sector = bio->bi_sector; -if (!bio_flagged (bio,BIO_UPTODATE )) - ret = -EIO ; -bio_put (bio);return ret; }
drivers/md/md.c +1 -13
@@ -776,20 +776,12 @@ void md_super_wait(struct mddev *mddev)finish_wait (&mddev->sb_wait, &wq); } -static void bi_complete (struct bio *bio,int error) -{ -complete ((struct completion *)bio->bi_private); -} -int sync_page_io (struct md_rdev *rdev,sector_t sector,int size,struct page *page,int rw,bool metadata_op) {struct bio *bio =bio_alloc_mddev (GFP_NOIO ,1 , rdev->mddev); -struct completion event;int ret; - rw |=REQ_SYNC ; - bio->bi_bdev = (metadata_op && rdev->meta_bdev) ? rdev->meta_bdev : rdev->bdev;if (metadata_op)
@@ -801,11 +793,7 @@ int sync_page_io(struct md_rdev *rdev, sector_t sector, int size,else bio->bi_sector = sector + rdev->data_offset;bio_add_page (bio, page, size,0 ); -init_completion (&event); - bio->bi_private = &event; - bio->bi_end_io = bi_complete; -submit_bio (rw, bio); -wait_for_completion (&event); +submit_bio_wait (rw, bio); ret =test_bit (BIO_UPTODATE , &bio->bi_flags);bio_put (bio);
fs/btrfs/check-integrity.c +13 -19
@@ -333,7 +333,6 @@ static void btrfsic_release_block_ctx(struct btrfsic_block_data_ctx *block_ctx);static int btrfsic_read_block (struct btrfsic_state *state,struct btrfsic_block_data_ctx *block_ctx);static void btrfsic_dump_database (struct btrfsic_state *state); -static void btrfsic_complete_bio_end_io (struct bio *bio,int err);static int btrfsic_test_for_metadata (struct btrfsic_state *state,char **datav,unsigned int num_pages); static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state,
@@ -1687,7 +1686,6 @@ static int btrfsic_read_block(struct btrfsic_state *state,for (i =0 ; i < num_pages;) {struct bio *bio;unsigned int j; -DECLARE_COMPLETION_ONSTACK (complete); bio =btrfs_io_bio_alloc (GFP_NOFS , num_pages - i);if (!bio) {
@@ -1698,8 +1696,6 @@ static int btrfsic_read_block(struct btrfsic_state *state, } bio->bi_bdev = block_ctx->dev->bdev; bio->bi_sector = dev_bytenr >>9 ; - bio->bi_end_io = btrfsic_complete_bio_end_io; - bio->bi_private = &complete;for (j = i; j < num_pages; j++) { ret = bio_add_page(bio, block_ctx->pagev[j],
@@ -1712,12 +1708,7 @@ static int btrfsic_read_block(struct btrfsic_state *state, "btrfsic: error, failed to add a single page!\n");return -1 ; } -submit_bio (READ , bio); - -/* this will also unplug the queue */ -wait_for_completion (&complete); - -if (!test_bit (BIO_UPTODATE , &bio->bi_flags)) { +if (submit_bio_wait (READ , bio)) {printk (KERN_INFO "btrfsic: read error at logical %llu dev %s!\n" , block_ctx->start, block_ctx->dev->name);
@@ -1740,11 +1731,6 @@ static int btrfsic_read_block(struct btrfsic_state *state,return block_ctx->len; } -static void btrfsic_complete_bio_end_io (struct bio *bio,int err) -{ -complete ((struct completion *)bio->bi_private); -} -static void btrfsic_dump_database (struct btrfsic_state *state) {struct list_head *elem_all;
@@ -3008,14 +2994,12 @@ int btrfsic_submit_bh(int rw, struct buffer_head *bh)return submit_bh (rw, bh); } -void btrfsic_submit_bio (int rw,struct bio *bio) +static void __btrfsic_submit_bio (int rw,struct bio *bio) {struct btrfsic_dev_state *dev_state; -if (!btrfsic_is_initialized) { -submit_bio (rw, bio); +if (!btrfsic_is_initialized)return ; - }mutex_lock (&btrfsic_mutex);/* since btrfsic_submit_bio() is also called before
@@ -3106,10 +3090,20 @@ void btrfsic_submit_bio(int rw, struct bio *bio) } leave:mutex_unlock (&btrfsic_mutex); +} +void btrfsic_submit_bio (int rw,struct bio *bio) +{ +__btrfsic_submit_bio (rw, bio);submit_bio (rw, bio); } +int btrfsic_submit_bio_wait (int rw,struct bio *bio) +{ +__btrfsic_submit_bio (rw, bio); +return submit_bio_wait (rw, bio); +} +int btrfsic_mount (struct btrfs_root *root,struct btrfs_fs_devices *fs_devices,int including_extent_data,u32 print_mask)
fs/btrfs/check-integrity.h +2 -0
@@ -22,9 +22,11 @@#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY int btrfsic_submit_bh (int rw,struct buffer_head *bh);void btrfsic_submit_bio (int rw,struct bio *bio); +int btrfsic_submit_bio_wait (int rw,struct bio *bio);#else #define btrfsic_submit_bh submit_bh#define btrfsic_submit_bio submit_bio +#define btrfsic_submit_bio_wait submit_bio_wait#endif int btrfsic_mount(struct btrfs_root *root,
fs/btrfs/extent_io.c +1 -11
@@ -1952,11 +1952,6 @@ static int free_io_failure(struct inode *inode, struct io_failure_record *rec,return err; } -static void repair_io_failure_callback (struct bio *bio,int err) -{ -complete (bio->bi_private); -} -/* * this bypasses the standard btrfs submit functions deliberately, as * the standard behavior is to write all copies in a raid setup. here we only
@@ -1973,7 +1968,6 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 start, {struct bio *bio;struct btrfs_device *dev; -DECLARE_COMPLETION_ONSTACK (compl);u64 map_length =0 ;u64 sector;struct btrfs_bio *bbio =NULL ;
@@ -1990,8 +1984,6 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 start, bio =btrfs_io_bio_alloc (GFP_NOFS ,1 );if (!bio)return -EIO ; - bio->bi_private = &compl; - bio->bi_end_io = repair_io_failure_callback; bio->bi_size =0 ; map_length = length;
@@ -2012,10 +2004,8 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 start, } bio->bi_bdev = dev->bdev;bio_add_page (bio, page, length, start -page_offset (page)); -btrfsic_submit_bio (WRITE_SYNC , bio); -wait_for_completion (&compl); -if (!test_bit (BIO_UPTODATE , &bio->bi_flags)) { +if (btrfsic_submit_bio_wait (WRITE_SYNC , bio)) {/* try to remap that extent elsewhere? */ bio_put (bio);btrfs_dev_stat_inc_and_print (dev,BTRFS_DEV_STAT_WRITE_ERRS );
fs/btrfs/scrub.c +4 -29
@@ -208,7 +208,6 @@ static void scrub_recheck_block_checksum(struct btrfs_fs_info *fs_info, int is_metadata, int have_csum, const u8 *csum, u64 generation, u16 csum_size); -static void scrub_complete_bio_end_io (struct bio *bio,int err);static int scrub_repair_block_from_good_copy (struct scrub_block *sblock_bad,struct scrub_block *sblock_good,int force_write);
@@ -1294,7 +1293,6 @@ static void scrub_recheck_block(struct btrfs_fs_info *fs_info,for (page_num =0 ; page_num < sblock->page_count; page_num++) {struct bio *bio;struct scrub_page *page = sblock->pagev[page_num]; -DECLARE_COMPLETION_ONSTACK (complete);if (page->dev->bdev ==NULL ) { page->io_error =1 ;
@@ -1311,18 +1309,11 @@ static void scrub_recheck_block(struct btrfs_fs_info *fs_info, } bio->bi_bdev = page->dev->bdev; bio->bi_sector = page->physical >>9 ; - bio->bi_end_io = scrub_complete_bio_end_io; - bio->bi_private = &complete;bio_add_page (bio, page->page,PAGE_SIZE ,0 ); -btrfsic_submit_bio (READ , bio); - -/* this will also unplug the queue */ -wait_for_completion (&complete); - - page->io_error = !test_bit (BIO_UPTODATE , &bio->bi_flags); -if (!test_bit (BIO_UPTODATE , &bio->bi_flags)) +if (btrfsic_submit_bio_wait (READ , bio)) sblock->no_io_error_seen =0 ; +bio_put (bio); }
@@ -1391,11 +1382,6 @@ static void scrub_recheck_block_checksum(struct btrfs_fs_info *fs_info, sblock->checksum_error =1 ; } -static void scrub_complete_bio_end_io (struct bio *bio,int err) -{ -complete ((struct completion *)bio->bi_private); -} -static int scrub_repair_block_from_good_copy (struct scrub_block *sblock_bad,struct scrub_block *sblock_good,int force_write)
@@ -1430,7 +1416,6 @@ static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad, sblock_bad->checksum_error || page_bad->io_error) {struct bio *bio;int ret; -DECLARE_COMPLETION_ONSTACK (complete);if (!page_bad->dev->bdev) { printk_ratelimited(KERN_WARNING
@@ -1443,19 +1428,14 @@ static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad,return -EIO ; bio->bi_bdev = page_bad->dev->bdev; bio->bi_sector = page_bad->physical >>9 ; - bio->bi_end_io = scrub_complete_bio_end_io; - bio->bi_private = &complete; ret =bio_add_page (bio, page_good->page,PAGE_SIZE ,0 );if (PAGE_SIZE != ret) {bio_put (bio);return -EIO ; } -btrfsic_submit_bio (WRITE , bio); -/* this will also unplug the queue */ -wait_for_completion (&complete); -if (!bio_flagged (bio,BIO_UPTODATE )) { +if (btrfsic_submit_bio_wait (WRITE , bio)) {btrfs_dev_stat_inc_and_print (page_bad->dev,BTRFS_DEV_STAT_WRITE_ERRS ); btrfs_dev_replace_stats_inc(
@@ -3375,7 +3355,6 @@ static int write_page_nocow(struct scrub_ctx *sctx,struct bio *bio;struct btrfs_device *dev;int ret; -DECLARE_COMPLETION_ONSTACK (compl); dev = sctx->wr_ctx.tgtdev;if (!dev)
@@ -3392,8 +3371,6 @@ static int write_page_nocow(struct scrub_ctx *sctx,spin_unlock (&sctx->stat_lock);return -ENOMEM ; } - bio->bi_private = &compl; - bio->bi_end_io = scrub_complete_bio_end_io; bio->bi_size =0 ; bio->bi_sector = physical_for_dev_replace >>9 ; bio->bi_bdev = dev->bdev;
@@ -3404,10 +3381,8 @@ leave_with_eio:btrfs_dev_stat_inc_and_print (dev,BTRFS_DEV_STAT_WRITE_ERRS );return -EIO ; } -btrfsic_submit_bio (WRITE_SYNC , bio); -wait_for_completion (&compl); -if (!test_bit (BIO_UPTODATE , &bio->bi_flags)) +if (btrfsic_submit_bio_wait (WRITE_SYNC , bio)) goto leave_with_eio;bio_put (bio);
fs/hfsplus/wrapper.c +1 -16
@@ -24,13 +24,6 @@ struct hfsplus_wd {u16 embed_count; }; -static void hfsplus_end_io_sync (struct bio *bio,int err) -{ -if (err) -clear_bit (BIO_UPTODATE , &bio->bi_flags); -complete (bio->bi_private); -} -/* * hfsplus_submit_bio - Perfrom block I/O * @sb: super block of volume for I/O
@@ -53,7 +46,6 @@ static void hfsplus_end_io_sync(struct bio *bio, int err)int hfsplus_submit_bio (struct super_block *sb,sector_t sector,void *buf,void **data,int rw) { -DECLARE_COMPLETION_ONSTACK (wait);struct bio *bio;int ret =0 ;u64 io_size;
@@ -73,8 +65,6 @@ int hfsplus_submit_bio(struct super_block *sb, sector_t sector, bio =bio_alloc (GFP_NOIO ,1 ); bio->bi_sector = sector; bio->bi_bdev = sb->s_bdev; - bio->bi_end_io = hfsplus_end_io_sync; - bio->bi_private = &wait;if (!(rw &WRITE ) && data) *data = (u8 *)buf + offset;
@@ -93,12 +83,7 @@ int hfsplus_submit_bio(struct super_block *sb, sector_t sector, buf = (u8 *)buf + len; } -submit_bio (rw, bio); -wait_for_completion (&wait); - -if (!bio_flagged (bio,BIO_UPTODATE )) - ret = -EIO ; - + ret =submit_bio_wait (rw, bio); out:bio_put (bio);return ret <0 ? ret :0 ;
fs/logfs/dev_bdev.c +1 -12
@@ -14,16 +14,10 @@#define PAGE_OFS (ofs) ((ofs) & (PAGE_SIZE-1)) -static void request_complete (struct bio *bio,int err) -{ -complete ((struct completion *)bio->bi_private); -} -static int sync_request (struct page *page,struct block_device *bdev,int rw) {struct bio bio;struct bio_vec bio_vec; -struct completion complete;bio_init (&bio); bio.bi_max_vecs =1 ;
@@ -35,13 +29,8 @@ static int sync_request(struct page *page, struct block_device *bdev, int rw) bio.bi_size =PAGE_SIZE ; bio.bi_bdev = bdev; bio.bi_sector = page->index * (PAGE_SIZE >>9 ); -init_completion (&complete); - bio.bi_private = &complete; - bio.bi_end_io = request_complete; -submit_bio (rw, &bio); -wait_for_completion (&complete); -return test_bit (BIO_UPTODATE , &bio.bi_flags) ?0 : -EIO ; +return submit_bio_wait (rw, &bio); }static int bdev_readpage (void *_sb,struct page *page)
Signature · 1 line
1.8.4.4
PATCH 2/25 block: Convert various code to bio_for_each_segment()
With immutable biovecs we don't want code accessing bi_io_vec directly - the uses this patch changes weren't incorrect since they all own the bio, but it makes the code harder to audit for no good reason - also, this will help with multipage bvecs later.
--- fs/btrfs/compression.c | 10 ++++------ fs/btrfs/disk-io.c | 11 ++++------- fs/btrfs/extent_io.c | 35 +++++++++++++---------------------- fs/btrfs/inode.c | 15 ++++++--------- fs/ext4/page-io.c | 4 ++-- fs/f2fs/data.c | 13 +++++-------- fs/f2fs/segment.c | 12 +++++------- fs/logfs/dev_bdev.c | 18 +++++++----------- fs/mpage.c | 17 ++++++++--------- fs/nfs/blocklayout/blocklayout.c | 34 +++++++++++++--------------------- 10 files changed, 67 insertions(+), 102 deletions(-)
fs/btrfs/compression.c +4 -6
@@ -201,18 +201,16 @@ csum_failed:if (cb->errors) {bio_io_error (cb->orig_bio); }else { -int bio_index =0 ; -struct bio_vec *bvec = cb->orig_bio->bi_io_vec; +int i; +struct bio_vec *bvec;/* * we have verified the checksum already, set page * checked so the end_io handlers know about it */ -while (bio_index < cb->orig_bio->bi_vcnt) { +bio_for_each_segment_all (bvec, cb->orig_bio, i)SetPageChecked (bvec->bv_page); - bvec++; - bio_index++; - } +bio_endio (cb->orig_bio,0 ); }
fs/btrfs/disk-io.c +4 -7
@@ -842,20 +842,17 @@ int btrfs_wq_submit_bio(struct btrfs_fs_info *fs_info, struct inode *inode,static int btree_csum_one_bio (struct bio *bio) { -struct bio_vec *bvec = bio->bi_io_vec; -int bio_index =0 ; +struct bio_vec *bvec;struct btrfs_root *root; -int ret =0 ; +int i, ret =0 ; -WARN_ON (bio->bi_vcnt <=0 ); -while (bio_index < bio->bi_vcnt) { +bio_for_each_segment_all (bvec, bio, i) { root =BTRFS_I (bvec->bv_page->mapping->host)->root; ret =csum_dirty_buffer (root, bvec->bv_page);if (ret)break ; - bio_index++; - bvec++; } +return ret; }
fs/btrfs/extent_io.c +13 -22
@@ -2332,12 +2332,13 @@ int end_extent_writepage(struct page *page, int err, u64 start, u64 end)*/ static void end_bio_extent_writepage (struct bio *bio,int err) { -struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt -1 ; +struct bio_vec *bvec;struct extent_io_tree *tree;u64 start;u64 end; +int i; - do { +bio_for_each_segment_all (bvec, bio, i) {struct page *page = bvec->bv_page; tree = &BTRFS_I (page->mapping->host)->io_tree;
@@ -2355,14 +2356,11 @@ static void end_bio_extent_writepage(struct bio *bio, int err) start =page_offset (page); end = start + bvec->bv_offset + bvec->bv_len -1 ; -if (--bvec >= bio->bi_io_vec) -prefetchw (&bvec->bv_page->flags); -if (end_extent_writepage (page, err, start, end))continue ;end_page_writeback (page); - }while (bvec >= bio->bi_io_vec); + }bio_put (bio); }
@@ -2392,9 +2390,8 @@ endio_readpage_release_extent(struct extent_io_tree *tree, u64 start, u64 len,*/ static void end_bio_extent_readpage (struct bio *bio,int err) { +struct bio_vec *bvec;int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags); -struct bio_vec *bvec_end = bio->bi_io_vec + bio->bi_vcnt -1 ; -struct bio_vec *bvec = bio->bi_io_vec;struct btrfs_io_bio *io_bio =btrfs_io_bio (bio);struct extent_io_tree *tree;u64 offset =0 ;
@@ -2405,11 +2402,12 @@ static void end_bio_extent_readpage(struct bio *bio, int err)u64 extent_len =0 ;int mirror;int ret; +int i;if (err) uptodate =0 ; - do { +bio_for_each_segment_all (bvec, bio, i) {struct page *page = bvec->bv_page;struct inode *inode = page->mapping->host;
@@ -2433,9 +2431,6 @@ static void end_bio_extent_readpage(struct bio *bio, int err) end = start + bvec->bv_offset + bvec->bv_len -1 ; len = bvec->bv_len; -if (++bvec <= bvec_end) -prefetchw (&bvec->bv_page->flags); - mirror = io_bio->mirror_num;if (likely (uptodate && tree->ops && tree->ops->readpage_end_io_hook)) {
@@ -2516,7 +2511,7 @@ readpage_ok: extent_start = start; extent_len = end +1 - start; } - }while (bvec <= bvec_end); + }if (extent_len) endio_readpage_release_extent(tree, extent_start, extent_len,
@@ -2547,7 +2542,6 @@ btrfs_bio_alloc(struct block_device *bdev, u64 first_sector, int nr_vecs, }if (bio) { - bio->bi_size =0 ; bio->bi_bdev = bdev; bio->bi_sector = first_sector; btrfs_bio =btrfs_io_bio (bio);
@@ -3410,20 +3404,18 @@ static void end_extent_buffer_writeback(struct extent_buffer *eb)static void end_bio_extent_buffer_writepage (struct bio *bio,int err) { -int uptodate = err ==0 ; -struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt -1 ; +struct bio_vec *bvec;struct extent_buffer *eb; -int done; +int i, done; - do { +bio_for_each_segment_all (bvec, bio, i) {struct page *page = bvec->bv_page; - bvec--; eb = (struct extent_buffer *)page->private;BUG_ON (!eb); done =atomic_dec_and_test (&eb->io_pages); - if (!uptodate || test_bit(EXTENT_BUFFER_IOERR, &eb->bflags)) { +if (err ||test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) {set_bit (EXTENT_BUFFER_IOERR , &eb->bflags);ClearPageUptodate (page);SetPageError (page);
@@ -3435,10 +3427,9 @@ static void end_bio_extent_buffer_writepage(struct bio *bio, int err)continue ;end_extent_buffer_writeback (eb); - }while (bvec >= bio->bi_io_vec); + }bio_put (bio); - } static int write_one_eb(struct extent_buffer *eb,
fs/btrfs/inode.c +6 -9
@@ -6779,17 +6779,16 @@ unlock_err:static void btrfs_endio_direct_read (struct bio *bio,int err) {struct btrfs_dio_private *dip = bio->bi_private; -struct bio_vec *bvec_end = bio->bi_io_vec + bio->bi_vcnt -1 ; -struct bio_vec *bvec = bio->bi_io_vec; +struct bio_vec *bvec;struct inode *inode = dip->inode;struct btrfs_root *root =BTRFS_I (inode)->root;struct bio *dio_bio;u32 *csums = (u32 *)dip->csum; -int index =0 ;u64 start; +int i; start = dip->logical_offset; - do { +bio_for_each_segment_all (bvec, bio, i) {if (!(BTRFS_I (inode)->flags &BTRFS_INODE_NODATASUM )) {struct page *page = bvec->bv_page;char *kaddr;
@@ -6805,18 +6804,16 @@ static void btrfs_endio_direct_read(struct bio *bio, int err)local_irq_restore (flags);flush_dcache_page (bvec->bv_page); -if (csum != csums[index]) { +if (csum != csums[i]) {btrfs_err (root->fs_info,"csum failed ino %llu off %llu csum %u expected csum %u" ,btrfs_ino (inode), start, csum, - csums[index]); + csums[i]); err = -EIO ; } } start += bvec->bv_len; - bvec++; - index++; - }while (bvec <= bvec_end); + }unlock_extent (&BTRFS_I (inode)->io_tree, dip->logical_offset, dip->logical_offset + dip->bytes -1 );
fs/ext4/page-io.c +2 -2
@@ -65,9 +65,9 @@ static void ext4_finish_bio(struct bio *bio) {int i;int error = !test_bit (BIO_UPTODATE , &bio->bi_flags); +struct bio_vec *bvec; -for (i =0 ; i < bio->bi_vcnt; i++) { -struct bio_vec *bvec = &bio->bi_io_vec[i]; +bio_for_each_segment_all (bvec, bio, i) {struct page *page = bvec->bv_page;struct buffer_head *bh, *head;unsigned bio_start = bvec->bv_offset;
fs/f2fs/data.c +5 -8
@@ -351,23 +351,20 @@ repeat:static void read_end_io (struct bio *bio,int err) { -const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags); -struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt -1 ; +struct bio_vec *bvec; +int i; -do { +bio_for_each_segment_all (bvec, bio, i) {struct page *page = bvec->bv_page; -if (--bvec >= bio->bi_io_vec) -prefetchw (&bvec->bv_page->flags); - -if (uptodate) { +if (!err) {SetPageUptodate (page); }else {ClearPageUptodate (page);SetPageError (page); }unlock_page (page); - }while (bvec >= bio->bi_io_vec); + }bio_put (bio); }
fs/f2fs/segment.c +5 -7
@@ -575,16 +575,14 @@ static const struct segment_allocation default_salloc_ops = {static void f2fs_end_io_write (struct bio *bio,int err) { -const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags); -struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt -1 ;struct bio_private *p = bio->bi_private; +struct bio_vec *bvec; +int i; - do { +bio_for_each_segment_all (bvec, bio, i) {struct page *page = bvec->bv_page; - if (--bvec >= bio->bi_io_vec) - prefetchw(&bvec->bv_page->flags); - if (!uptodate) { +if (err) {SetPageError (page);if (page->mapping)set_bit (AS_EIO , &page->mapping->flags);
@@ -593,7 +591,7 @@ static void f2fs_end_io_write(struct bio *bio, int err) }end_page_writeback (page);dec_page_count (p->sbi,F2FS_WRITEBACK ); - }while (bvec >= bio->bi_io_vec); + }if (p->is_sync)complete (p->wait);
fs/logfs/dev_bdev.c +7 -11
@@ -56,22 +56,18 @@ static DECLARE_WAIT_QUEUE_HEAD(wq);static void writeseg_end_io (struct bio *bio,int err) {const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags); -struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt -1 ; +struct bio_vec *bvec; +int i;struct super_block *sb = bio->bi_private;struct logfs_super *super =logfs_super (sb); -struct page *page;BUG_ON (!uptodate);/* FIXME: Retry io or write elsewhere */ BUG_ON (err); -BUG_ON (bio->bi_vcnt ==0 ); -do { - page = bvec->bv_page; -if (--bvec >= bio->bi_io_vec) -prefetchw (&bvec->bv_page->flags); - -end_page_writeback (page); -page_cache_release (page); - }while (bvec >= bio->bi_io_vec); + +bio_for_each_segment_all (bvec, bio, i) { +end_page_writeback (bvec->bv_page); +page_cache_release (bvec->bv_page); + }bio_put (bio);if (atomic_dec_and_test (&super->s_pending_writes))wake_up (&wq);
fs/mpage.c +8 -9
@@ -43,16 +43,14 @@*/ static void mpage_end_io (struct bio *bio,int err) { -const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags); -struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt -1 ; +struct bio_vec *bv; +int i; - do { - struct page *page = bvec->bv_page; +bio_for_each_segment_all (bv, bio, i) { +struct page *page = bv->bv_page; - if (--bvec >= bio->bi_io_vec) - prefetchw(&bvec->bv_page->flags);if (bio_data_dir (bio) ==READ ) { - if (uptodate) { +if (!err) {SetPageUptodate (page); }else {ClearPageUptodate (page);
@@ -60,14 +58,15 @@ static void mpage_end_io(struct bio *bio, int err) }unlock_page (page); }else {/* bio_data_dir(bio) == WRITE */ -if (!uptodate) { +if (err) {SetPageError (page);if (page->mapping)set_bit (AS_EIO , &page->mapping->flags); }end_page_writeback (page); } - }while (bvec >= bio->bi_io_vec); + } +bio_put (bio); }
fs/nfs/blocklayout/blocklayout.c +13 -21
@@ -201,18 +201,14 @@ static struct bio *bl_add_page_to_bio(struct bio *bio, int npg, int rw,static void bl_end_io_read (struct bio *bio,int err) {struct parallel_io *par = bio->bi_private; -const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags); -struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt -1 ; +struct bio_vec *bvec; +int i; -do { -struct page *page = bvec->bv_page; +if (!err) +bio_for_each_segment_all (bvec, bio, i) +SetPageUptodate (bvec->bv_page); -if (--bvec >= bio->bi_io_vec) -prefetchw (&bvec->bv_page->flags); -if (uptodate) -SetPageUptodate (page); - }while (bvec >= bio->bi_io_vec); -if (!uptodate) { +if (err) {struct nfs_read_data *rdata = par->data;struct nfs_pgio_header *header = rdata->header;
@@ -383,20 +379,16 @@ static void mark_extents_written(struct pnfs_block_layout *bl,static void bl_end_io_write_zero (struct bio *bio,int err) {struct parallel_io *par = bio->bi_private; -const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags); -struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt -1 ; - -do { -struct page *page = bvec->bv_page; +struct bio_vec *bvec; +int i; -if (--bvec >= bio->bi_io_vec) -prefetchw (&bvec->bv_page->flags); +bio_for_each_segment_all (bvec, bio, i) {/* This is the zeroing page we added */ -end_page_writeback (page); -page_cache_release (page); - }while (bvec >= bio->bi_io_vec); +end_page_writeback (bvec->bv_page); +page_cache_release (bvec->bv_page); + } -if (unlikely (!uptodate)) { +if (unlikely (err)) {struct nfs_write_data *data = par->data;struct nfs_pgio_header *header = data->header;
Signature · 1 line
1.8.4.4
PATCH 3/25 bcache: Kill unaligned bvec hack
In reply to Kent OverstreetBcache has a hack to avoid cloning the biovec if it's all full pages - but with immutable biovecs coming this won't be necessary anymore.
For now, we remove the special case and always clone the bvec array so that the immutable biovec patches are simpler.
--- drivers/md/bcache/bcache.h | 1 - drivers/md/bcache/request.c | 37 +++++++------------------------------ drivers/md/bcache/super.c | 4 ---- 3 files changed, 7 insertions(+), 35 deletions(-)
drivers/md/bcache/bcache.h +0 -1
@@ -279,7 +279,6 @@ struct bcache_device {unsigned long sectors_dirty_last;long sectors_dirty_derivative; -mempool_t *unaligned_bvec;struct bio_set *bio_split; unsigned data_csum:1;
drivers/md/bcache/request.c +7 -30
@@ -606,7 +606,6 @@ struct search {unsigned insert_bio_sectors; unsigned recoverable:1; - unsigned unaligned_bvec:1; unsigned write:1; unsigned read_dirty_data:1;
@@ -614,6 +613,7 @@ struct search {struct btree_op op;struct data_insert_op iop; +struct bio_vec bv[BIO_MAX_PAGES ]; };static void bch_cache_read_endio (struct bio *bio,int error)
@@ -759,10 +759,14 @@ static void bio_complete(struct search *s)static void do_bio_hook (struct search *s) {struct bio *bio = &s->bio.bio; -memcpy (bio, s->orig_bio,sizeof (struct bio )); +bio_init (bio); + bio->bi_io_vec = s->bv; + bio->bi_max_vecs =BIO_MAX_PAGES ; +__bio_clone (bio, s->orig_bio); bio->bi_end_io = request_endio; bio->bi_private = &s->cl; +atomic_set (&bio->bi_cnt,3 ); }
@@ -774,9 +778,6 @@ static void search_free(struct closure *cl)if (s->iop.bio)bio_put (s->iop.bio); -if (s->unaligned_bvec) -mempool_free (s->bio.bio.bi_io_vec, s->d->unaligned_bvec); -closure_debug_destroy (cl);mempool_free (s, s->d->c->search); }
@@ -784,7 +785,6 @@ static void search_free(struct closure *cl)static struct search *search_alloc (struct bio *bio,struct bcache_device *d) {struct search *s; -struct bio_vec *bv; s =mempool_alloc (d->c->search,GFP_NOIO ); memset(s, 0, offsetof(struct search, iop.insert_keys));
@@ -803,15 +803,6 @@ static struct search *search_alloc(struct bio *bio, struct bcache_device *d) s->start_time = jiffies;do_bio_hook (s); -if (bio->bi_size !=bio_segments (bio) *PAGE_SIZE ) { - bv =mempool_alloc (d->unaligned_bvec,GFP_NOIO ); -memcpy (bv,bio_iovec (bio), -sizeof (struct bio_vec ) *bio_segments (bio)); - - s->bio.bio.bi_io_vec = bv; - s->unaligned_bvec =1 ; - } -return s; }
@@ -850,26 +841,13 @@ static void cached_dev_read_error(struct closure *cl) { struct search *s = container_of(cl, struct search, cl);struct bio *bio = &s->bio.bio; -struct bio_vec *bv; -int i;if (s->recoverable) {/* Retry from the backing device: */ trace_bcache_read_retry (s->orig_bio); s->iop.error =0 ; - bv = s->bio.bio.bi_io_vec;do_bio_hook (s); - s->bio.bio.bi_io_vec = bv; - -if (!s->unaligned_bvec) -bio_for_each_segment (bv, s->orig_bio, i) - bv->bv_offset =0 , bv->bv_len =PAGE_SIZE ; -else -memcpy (s->bio.bio.bi_io_vec, -bio_iovec (s->orig_bio), -sizeof (struct bio_vec ) * -bio_segments (s->orig_bio));/* XXX: invalidate cache */
@@ -905,8 +883,7 @@ static void cached_dev_read_done(struct closure *cl) s->cache_miss =NULL ; } -if (verify (dc, &s->bio.bio) && s->recoverable && - !s->unaligned_bvec && !s->read_dirty_data) +if (verify (dc, &s->bio.bio) && s->recoverable && !s->read_dirty_data)bch_data_verify (dc, s->orig_bio);bio_complete (s);
drivers/md/bcache/super.c +0 -4
@@ -739,8 +739,6 @@ static void bcache_device_free(struct bcache_device *d) }bio_split_pool_free (&d->bio_split_hook); -if (d->unaligned_bvec) -mempool_destroy (d->unaligned_bvec);if (d->bio_split)bioset_free (d->bio_split);if (is_vmalloc_addr (d->full_dirty_stripes))
@@ -793,8 +791,6 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size,return minor;if (!(d->bio_split =bioset_create (4 , offsetof(struct bbio , bio))) || - !(d->unaligned_bvec =mempool_create_kmalloc_pool (1 , -sizeof (struct bio_vec ) *BIO_MAX_PAGES )) ||bio_split_pool_init (&d->bio_split_hook) || !(d->disk =alloc_disk (1 ))) {ida_simple_remove (&bcache_minor, minor);
Signature · 1 line
1.8.4.4
PATCH 4/25 block: Abstract out bvec iterator
In reply to a message not in the archiveImmutable biovecs are going to require an explicit iterator. To implement immutable bvecs, a later patch is going to add a bi_bvec_done member to this struct; for now, this patch effectively just renames things.
--- Documentation/block/biodoc.txt | 7 +-- arch/m68k/emu/nfblock.c | 2 +- arch/powerpc/sysdev/axonram.c | 3 +- block/blk-core.c | 36 ++++++------ block/blk-flush.c | 2 +- block/blk-lib.c | 12 ++-- block/blk-map.c | 6 +- block/blk-merge.c | 4 +- block/blk-mq.c | 2 +- block/blk-throttle.c | 14 ++--- block/elevator.c | 2 +- drivers/block/aoe/aoecmd.c | 6 +- drivers/block/brd.c | 4 +- drivers/block/drbd/drbd_actlog.c | 2 +- drivers/block/drbd/drbd_bitmap.c | 2 +- drivers/block/drbd/drbd_receiver.c | 6 +- drivers/block/drbd/drbd_req.c | 6 +- drivers/block/drbd/drbd_req.h | 2 +- drivers/block/floppy.c | 4 +- drivers/block/loop.c | 4 +- drivers/block/mtip32xx/mtip32xx.c | 7 ++- drivers/block/nvme-core.c | 25 ++++---- drivers/block/pktcdvd.c | 54 +++++++++-------- drivers/block/ps3disk.c | 2 +- drivers/block/ps3vram.c | 2 +- drivers/block/rbd.c | 21 +++---- drivers/block/rsxx/dev.c | 6 +- drivers/block/rsxx/dma.c | 4 +- drivers/block/umem.c | 9 +-- drivers/block/xen-blkback/blkback.c | 2 +- drivers/block/xen-blkfront.c | 2 +- drivers/md/bcache/btree.c | 4 +- drivers/md/bcache/debug.c | 2 +- drivers/md/bcache/io.c | 26 ++++----- drivers/md/bcache/journal.c | 12 ++-- drivers/md/bcache/movinggc.c | 4 +- drivers/md/bcache/request.c | 58 +++++++++--------- drivers/md/bcache/super.c | 16 ++--- drivers/md/bcache/util.c | 4 +- drivers/md/bcache/writeback.c | 6 +- drivers/md/bcache/writeback.h | 2 +- drivers/md/dm-bio-record.h | 12 ++-- drivers/md/dm-bufio.c | 2 +- drivers/md/dm-cache-policy-mq.c | 4 +- drivers/md/dm-cache-target.c | 22 +++---- drivers/md/dm-crypt.c | 19 +++--- drivers/md/dm-delay.c | 7 ++- drivers/md/dm-flakey.c | 7 ++- drivers/md/dm-io.c | 6 +- drivers/md/dm-linear.c | 3 +- drivers/md/dm-raid1.c | 16 ++--- drivers/md/dm-region-hash.c | 3 +- drivers/md/dm-snap.c | 18 +++--- drivers/md/dm-stripe.c | 13 +++-- drivers/md/dm-switch.c | 4 +- drivers/md/dm-thin.c | 22 +++---- drivers/md/dm-verity.c | 8 +-- drivers/md/dm.c | 25 ++++---- drivers/md/faulty.c | 19 +++--- drivers/md/linear.c | 12 ++-- drivers/md/md.c | 10 ++-- drivers/md/multipath.c | 13 +++-- drivers/md/raid0.c | 16 ++--- drivers/md/raid1.c | 75 ++++++++++++------------ drivers/md/raid10.c | 91 ++++++++++++++++------------- drivers/md/raid5.c | 72 ++++++++++++----------- drivers/s390/block/dcssblk.c | 5 +- drivers/s390/block/xpram.c | 9 +-- drivers/scsi/osd/osd_initiator.c | 2 +- drivers/staging/lustre/lustre/llite/lloop.c | 12 ++-- drivers/staging/zram/zram_drv.c | 14 +++-- drivers/target/target_core_iblock.c | 2 +- fs/bio-integrity.c | 8 +-- fs/bio.c | 56 +++++++++--------- fs/btrfs/check-integrity.c | 8 +-- fs/btrfs/compression.c | 17 +++--- fs/btrfs/extent_io.c | 14 ++--- fs/btrfs/file-item.c | 19 +++--- fs/btrfs/inode.c | 22 +++---- fs/btrfs/raid56.c | 22 +++---- fs/btrfs/scrub.c | 12 ++-- fs/btrfs/volumes.c | 12 ++-- fs/buffer.c | 12 ++-- fs/direct-io.c | 4 +- fs/ext4/page-io.c | 4 +- fs/f2fs/data.c | 2 +- fs/f2fs/segment.c | 2 +- fs/gfs2/lops.c | 2 +- fs/gfs2/ops_fstype.c | 2 +- fs/hfsplus/wrapper.c | 2 +- fs/jfs/jfs_logmgr.c | 12 ++-- fs/jfs/jfs_metapage.c | 9 +-- fs/logfs/dev_bdev.c | 20 +++---- fs/mpage.c | 2 +- fs/nfs/blocklayout/blocklayout.c | 9 +-- fs/nilfs2/segbuf.c | 3 +- fs/ocfs2/cluster/heartbeat.c | 2 +- fs/xfs/xfs_aops.c | 2 +- fs/xfs/xfs_buf.c | 4 +- include/linux/bio.h | 16 ++--- include/linux/blk_types.h | 19 +++--- include/trace/events/bcache.h | 26 ++++----- include/trace/events/block.h | 26 ++++----- include/trace/events/f2fs.h | 4 +- kernel/power/block_io.c | 2 +- kernel/trace/blktrace.c | 15 ++--- mm/page_io.c | 10 ++-- 107 files changed, 700 insertions(+), 638 deletions(-)
Documentation/block/biodoc.txt +3 -4
@@ -447,14 +447,13 @@ struct bio_vec { * main unit of I/O for the block layer and lower layers (ie drivers) */ struct bio { - sector_t bi_sector; struct bio *bi_next; /* request queue link */ struct block_device *bi_bdev; /* target device */ unsigned long bi_flags; /* status, command, etc */ unsigned long bi_rw; /* low bits: r/w, high: priority */ unsigned int bi_vcnt; /* how may bio_vec's */ - unsigned int bi_idx; /* current index into bio_vec array */ + struct bvec_iter bi_iter; /* current index into bio_vec array */ unsigned int bi_size; /* total size in bytes */ unsigned short bi_phys_segments; /* segments after physaddr coalesce*/
@@ -480,7 +479,7 @@ With this multipage bio design: - Code that traverses the req list can find all the segments of a bio by using rq_for_each_segment. This handles the fact that a request has multiple bios, each of which can have multiple segments. -- Drivers which can't process a large bio in one shot can use the bi_idx +- Drivers which can't process a large bio in one shot can use the bi_iter field to keep track of the next bio_vec entry to process. (e.g a 1MB bio_vec needs to be handled in max 128kB chunks for IDE) [TBD: Should preferably also have a bi_voffset and bi_vlen to avoid modifying
@@ -589,7 +588,7 @@ driver should not modify these values. The block layer sets up the nr_sectors and current_nr_sectors fields (based on the corresponding hard_xxx values and the number of bytes transferred) and updates it on every transfer that invokes end_that_request_first. It does the same for the -buffer, bio, bio->bi_idx fields too. +buffer, bio, bio->bi_iter fields too. The buffer field is just a virtual address mapping of the current segment of the i/o buffer in cases where the buffer resides in low-memory. For high
arch/m68k/emu/nfblock.c +1 -1
@@ -64,7 +64,7 @@ static void nfhd_make_request(struct request_queue *queue, struct bio *bio)struct nfhd_device *dev = queue->queuedata;struct bio_vec *bvec;int i, dir, len, shift; -sector_t sec = bio->bi_sector; +sector_t sec = bio->bi_iter.bi_sector; dir =bio_data_dir (bio); shift = dev->bshift;
arch/powerpc/sysdev/axonram.c +2 -1
@@ -113,7 +113,8 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio)unsigned int transfered;unsigned short idx; - phys_mem = bank->io_addr + (bio->bi_sector <<AXON_RAM_SECTOR_SHIFT ); + phys_mem = bank->io_addr + (bio->bi_iter.bi_sector << +AXON_RAM_SECTOR_SHIFT ); phys_end = bank->io_addr + bank->size; transfered =0 ;bio_for_each_segment (vec, bio, idx) {
block/blk-core.c +18 -18
@@ -130,7 +130,7 @@ static void req_bio_endio(struct request *rq, struct bio *bio,bio_advance (bio, nbytes);/* don't actually finish bio if it's part of flush sequence */ -if (bio->bi_size ==0 && !(rq->cmd_flags &REQ_FLUSH_SEQ )) +if (bio->bi_iter.bi_size ==0 && !(rq->cmd_flags &REQ_FLUSH_SEQ ))bio_endio (bio, error); }
@@ -1326,7 +1326,7 @@ void blk_add_request_payload(struct request *rq, struct page *page, bio->bi_io_vec->bv_offset =0 ; bio->bi_io_vec->bv_len = len; - bio->bi_size = len; + bio->bi_iter.bi_size = len; bio->bi_vcnt =1 ; bio->bi_phys_segments =1 ;
@@ -1351,7 +1351,7 @@ bool bio_attempt_back_merge(struct request_queue *q, struct request *req, req->biotail->bi_next = bio; req->biotail = bio; - req->__data_len += bio->bi_size; + req->__data_len += bio->bi_iter.bi_size; req->ioprio =ioprio_best (req->ioprio,bio_prio (bio));blk_account_io_start (req, false);
@@ -1380,8 +1380,8 @@ bool bio_attempt_front_merge(struct request_queue *q, struct request *req,* not touch req->buffer either... */ req->buffer =bio_data (bio); - req->__sector = bio->bi_sector; - req->__data_len += bio->bi_size; + req->__sector = bio->bi_iter.bi_sector; + req->__data_len += bio->bi_iter.bi_size; req->ioprio =ioprio_best (req->ioprio,bio_prio (bio));blk_account_io_start (req, false);
@@ -1459,7 +1459,7 @@ void init_request_from_bio(struct request *req, struct bio *bio) req->cmd_flags |=REQ_FAILFAST_MASK ; req->errors =0 ; - req->__sector = bio->bi_sector; + req->__sector = bio->bi_iter.bi_sector; req->ioprio =bio_prio (bio);blk_rq_bio_prep (req->q, req, bio); }
@@ -1583,12 +1583,12 @@ static inline void blk_partition_remap(struct bio *bio)if (bio_sectors (bio) && bdev != bdev->bd_contains) {struct hd_struct *p = bdev->bd_part; - bio->bi_sector += p->start_sect; + bio->bi_iter.bi_sector += p->start_sect; bio->bi_bdev = bdev->bd_contains;trace_block_bio_remap (bdev_get_queue (bio->bi_bdev), bio, bdev->bd_dev, - bio->bi_sector - p->start_sect); + bio->bi_iter.bi_sector - p->start_sect); } }
@@ -1654,7 +1654,7 @@ static inline int bio_check_eod(struct bio *bio, unsigned int nr_sectors)/* Test device or partition size, when known. */ maxsector =i_size_read (bio->bi_bdev->bd_inode) >>9 ;if (maxsector) { -sector_t sector = bio->bi_sector; +sector_t sector = bio->bi_iter.bi_sector;if (maxsector < nr_sectors || maxsector - nr_sectors < sector) {/*
@@ -1690,7 +1690,7 @@ generic_make_request_checks(struct bio *bio)"generic_make_request: Trying to access " "nonexistent block-device %s (%Lu)\n" ,bdevname (bio->bi_bdev, b), - (long long) bio->bi_sector); + (long long) bio->bi_iter.bi_sector); goto end_io; }
@@ -1704,9 +1704,9 @@ generic_make_request_checks(struct bio *bio) } part = bio->bi_bdev->bd_part; -if (should_fail_request (part, bio->bi_size) || +if (should_fail_request (part, bio->bi_iter.bi_size) ||should_fail_request (&part_to_disk (part)->part0, - bio->bi_size)) + bio->bi_iter.bi_size)) goto end_io;/*
@@ -1865,7 +1865,7 @@ void submit_bio(int rw, struct bio *bio)if (rw &WRITE ) {count_vm_events (PGPGOUT , count); }else { -task_io_account_read (bio->bi_size); +task_io_account_read (bio->bi_iter.bi_size);count_vm_events (PGPGIN , count); }
@@ -1874,7 +1874,7 @@ void submit_bio(int rw, struct bio *bio)printk (KERN_DEBUG "%s(%d): %s block %Lu on %s (%u sectors)\n" , current->comm,task_pid_nr (current), (rw &WRITE ) ?"WRITE" :"READ" , - (unsigned long long )bio->bi_sector, + (unsigned long long )bio->bi_iter.bi_sector,bdevname (bio->bi_bdev, b), count); }
@@ -2007,7 +2007,7 @@ unsigned int blk_rq_err_bytes(const struct request *rq)for (bio = rq->bio; bio; bio = bio->bi_next) {if ((bio->bi_rw & ff) != ff)break ; - bytes += bio->bi_size; + bytes += bio->bi_iter.bi_size; }/* this could lead to infinite loop */
@@ -2378,9 +2378,9 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) total_bytes =0 ;while (req->bio) {struct bio *bio = req->bio; -unsigned bio_bytes =min (bio->bi_size, nr_bytes); +unsigned bio_bytes =min (bio->bi_iter.bi_size, nr_bytes); -if (bio_bytes == bio->bi_size) +if (bio_bytes == bio->bi_iter.bi_size) req->bio = bio->bi_next;req_bio_endio (req, bio, bio_bytes, error);
@@ -2728,7 +2728,7 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq, rq->nr_phys_segments =bio_phys_segments (q, bio); rq->buffer =bio_data (bio); } - rq->__data_len = bio->bi_size; + rq->__data_len = bio->bi_iter.bi_size; rq->bio = rq->biotail = bio;if (bio->bi_bdev)
block/blk-flush.c +1 -1
@@ -548,7 +548,7 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask,* copied from blk_rq_pos(rq). */ if (error_sector) - *error_sector = bio->bi_sector; + *error_sector = bio->bi_iter.bi_sector;bio_put (bio);return ret;
block/blk-lib.c +6 -6
@@ -108,12 +108,12 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector, req_sects = end_sect - sector; } - bio->bi_sector = sector; + bio->bi_iter.bi_sector = sector; bio->bi_end_io = bio_batch_end_io; bio->bi_bdev = bdev; bio->bi_private = &bb; - bio->bi_size = req_sects <<9 ; + bio->bi_iter.bi_size = req_sects <<9 ; nr_sects -= req_sects; sector = end_sect;
@@ -174,7 +174,7 @@ int blkdev_issue_write_same(struct block_device *bdev, sector_t sector,break ; } - bio->bi_sector = sector; + bio->bi_iter.bi_sector = sector; bio->bi_end_io = bio_batch_end_io; bio->bi_bdev = bdev; bio->bi_private = &bb;
@@ -184,11 +184,11 @@ int blkdev_issue_write_same(struct block_device *bdev, sector_t sector, bio->bi_io_vec->bv_len =bdev_logical_block_size (bdev);if (nr_sects > max_write_same_sectors) { - bio->bi_size = max_write_same_sectors <<9 ; + bio->bi_iter.bi_size = max_write_same_sectors <<9 ; nr_sects -= max_write_same_sectors; sector += max_write_same_sectors; }else { - bio->bi_size = nr_sects <<9 ; + bio->bi_iter.bi_size = nr_sects <<9 ; nr_sects =0 ; }
@@ -240,7 +240,7 @@ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,break ; } - bio->bi_sector = sector; + bio->bi_iter.bi_sector = sector; bio->bi_bdev = bdev; bio->bi_end_io = bio_batch_end_io; bio->bi_private = &bb;
block/blk-map.c +3 -3
@@ -20,7 +20,7 @@ int blk_rq_append_bio(struct request_queue *q, struct request *rq, rq->biotail->bi_next = bio; rq->biotail = bio; - rq->__data_len += bio->bi_size; + rq->__data_len += bio->bi_iter.bi_size; }return 0 ; }
@@ -76,7 +76,7 @@ static int __blk_rq_map_user(struct request_queue *q, struct request *rq, ret =blk_rq_append_bio (q, rq, bio);if (!ret) -return bio->bi_size; +return bio->bi_iter.bi_size;/* if it was boucned we must call the end io function */ bio_endio (bio,0 );
@@ -220,7 +220,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,if (IS_ERR (bio))return PTR_ERR (bio); -if (bio->bi_size != len) { +if (bio->bi_iter.bi_size != len) {/* * Grab an extra reference to this bio, as bio_unmap_user() * expects to be able to drop it twice as it happens on the
block/blk-merge.c +2 -2
@@ -543,9 +543,9 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)int blk_try_merge (struct request *rq,struct bio *bio) { -if (blk_rq_pos (rq) +blk_rq_sectors (rq) == bio->bi_sector) +if (blk_rq_pos (rq) +blk_rq_sectors (rq) == bio->bi_iter.bi_sector)return ELEVATOR_BACK_MERGE ; -else if (blk_rq_pos (rq) -bio_sectors (bio) == bio->bi_sector) +else if (blk_rq_pos (rq) -bio_sectors (bio) == bio->bi_iter.bi_sector)return ELEVATOR_FRONT_MERGE ;return ELEVATOR_NO_MERGE ; }
block/blk-mq.c +1 -1
@@ -301,7 +301,7 @@ void blk_mq_complete_request(struct request *rq, int error)struct bio *next = bio->bi_next; bio->bi_next =NULL ; - bytes += bio->bi_size; + bytes += bio->bi_iter.bi_size;blk_mq_bio_endio (rq, bio, error); bio = next; }
block/blk-throttle.c +7 -7
@@ -877,14 +877,14 @@ static bool tg_with_in_bps_limit(struct throtl_grp *tg, struct bio *bio,do_div (tmp,HZ ); bytes_allowed = tmp; -if (tg->bytes_disp[rw] + bio->bi_size <= bytes_allowed) { +if (tg->bytes_disp[rw] + bio->bi_iter.bi_size <= bytes_allowed) {if (wait) *wait =0 ;return 1 ; }/* Calc approx time to dispatch */ - extra_bytes = tg->bytes_disp[rw] + bio->bi_size - bytes_allowed; + extra_bytes = tg->bytes_disp[rw] + bio->bi_iter.bi_size - bytes_allowed; jiffy_wait =div64_u64 (extra_bytes *HZ , tg->bps[rw]);if (!jiffy_wait)
@@ -987,7 +987,7 @@ static void throtl_charge_bio(struct throtl_grp *tg, struct bio *bio)bool rw =bio_data_dir (bio);/* Charge the bio to the group */ - tg->bytes_disp[rw] += bio->bi_size; + tg->bytes_disp[rw] += bio->bi_iter.bi_size; tg->io_disp[rw]++;/*
@@ -1003,8 +1003,8 @@ static void throtl_charge_bio(struct throtl_grp *tg, struct bio *bio)*/ if (!(bio->bi_rw &REQ_THROTTLED )) { bio->bi_rw |=REQ_THROTTLED ; -throtl_update_dispatch_stats (tg_to_blkg (tg), bio->bi_size, - bio->bi_rw); +throtl_update_dispatch_stats (tg_to_blkg (tg), + bio->bi_iter.bi_size, bio->bi_rw); } }
@@ -1508,7 +1508,7 @@ bool blk_throtl_bio(struct request_queue *q, struct bio *bio)if (tg) {if (!tg->has_rules[rw]) {throtl_update_dispatch_stats (tg_to_blkg (tg), - bio->bi_size, bio->bi_rw); + bio->bi_iter.bi_size, bio->bi_rw); goto out_unlock_rcu; } }
@@ -1564,7 +1564,7 @@ bool blk_throtl_bio(struct request_queue *q, struct bio *bio)/* out-of-limit, queue to @tg */ throtl_log (sq,"[%c] bio. bdisp=%llu sz=%u bps=%llu iodisp=%u iops=%u queued=%d/%d" , rw ==READ ?'R' :'W' , - tg->bytes_disp[rw], bio->bi_size, tg->bps[rw], + tg->bytes_disp[rw], bio->bi_iter.bi_size, tg->bps[rw], tg->io_disp[rw], tg->iops[rw], sq->nr_queued[READ ], sq->nr_queued[WRITE ]);
block/elevator.c +1 -1
@@ -440,7 +440,7 @@ int elv_merge(struct request_queue *q, struct request **req, struct bio *bio)/* * See if our hash lookup can find a potential backmerge. */ - __rq =elv_rqhash_find (q, bio->bi_sector); + __rq =elv_rqhash_find (q, bio->bi_iter.bi_sector);if (__rq &&elv_rq_merge_ok (__rq, bio)) { *req = __rq;return ELEVATOR_BACK_MERGE ;
drivers/block/aoe/aoecmd.c +3 -3
@@ -929,8 +929,8 @@ bufinit(struct buf *buf, struct request *rq, struct bio *bio)memset (buf,0 ,sizeof (*buf)); buf->rq = rq; buf->bio = bio; - buf->resid = bio->bi_size; - buf->sector = bio->bi_sector; + buf->resid = bio->bi_iter.bi_size; + buf->sector = bio->bi_iter.bi_sector;bio_pageinc (bio); buf->bv =bio_iovec (bio); buf->bv_resid = buf->bv->bv_len;
@@ -1152,7 +1152,7 @@ aoe_end_request(struct aoedev *d, struct request *rq, int fastfail)do { bio = rq->bio; bok = !fastfail &&test_bit (BIO_UPTODATE , &bio->bi_flags); - }while (__blk_end_request (rq, bok ?0 : -EIO , bio->bi_size)); + }while (__blk_end_request (rq, bok ?0 : -EIO , bio->bi_iter.bi_size));/* cf. http://lkml.org/lkml/2006/10/31/28 */ if (!fastfail)
drivers/block/brd.c +2 -2
@@ -333,13 +333,13 @@ static void brd_make_request(struct request_queue *q, struct bio *bio)int i;int err = -EIO ; - sector = bio->bi_sector; + sector = bio->bi_iter.bi_sector;if (bio_end_sector (bio) >get_capacity (bdev->bd_disk)) goto out;if (unlikely (bio->bi_rw &REQ_DISCARD )) { err =0 ; -discard_from_brd (brd, sector, bio->bi_size); +discard_from_brd (brd, sector, bio->bi_iter.bi_size); goto out; }
drivers/block/drbd/drbd_actlog.c +1 -1
@@ -159,7 +159,7 @@ static int _drbd_md_sync_page_io(struct drbd_conf *mdev, bio =bio_alloc_drbd (GFP_NOIO ); bio->bi_bdev = bdev->md_bdev; - bio->bi_sector = sector; + bio->bi_iter.bi_sector = sector; err = -EIO ;if (bio_add_page (bio, page, size,0 ) != size) goto out;
drivers/block/drbd/drbd_bitmap.c +1 -1
@@ -1028,7 +1028,7 @@ static void bm_page_io_async(struct bm_aio_ctx *ctx, int page_nr, int rw) __must }else page = b->bm_pages[page_nr]; bio->bi_bdev = mdev->ldev->md_bdev; - bio->bi_sector = on_disk_sector; + bio->bi_iter.bi_sector = on_disk_sector;/* bio_add_page of a single page to an empty bio will always succeed, * according to api. Do we want to assert that? */ bio_add_page (bio, page, len,0 );
drivers/block/drbd/drbd_receiver.c +3 -3
@@ -1333,7 +1333,7 @@ next_bio: goto fail; }/* > peer_req->i.sector, unless this is the first bio */ - bio->bi_sector = sector; + bio->bi_iter.bi_sector = sector; bio->bi_bdev = mdev->ldev->backing_bdev; bio->bi_rw = rw; bio->bi_private = peer_req;
@@ -1353,7 +1353,7 @@ next_bio:dev_err (DEV ,"bio_add_page failed for len=%u, " "bi_vcnt=0 (bi_sector=%llu)\n" , - len, (unsigned long long )bio->bi_sector); + len, (uint64_t )bio->bi_iter.bi_sector); err = -ENOSPC ; goto fail; }
@@ -1615,7 +1615,7 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req, mdev->recv_cnt += data_size>>9 ; bio = req->master_bio; -D_ASSERT (sector == bio->bi_sector); +D_ASSERT (sector == bio->bi_iter.bi_sector);bio_for_each_segment (bvec, bio, i) {void *mapped =kmap (bvec->bv_page) + bvec->bv_offset;
drivers/block/drbd/drbd_req.c +3 -3
@@ -77,8 +77,8 @@ static struct drbd_request *drbd_req_new(struct drbd_conf *mdev, req->epoch =0 ;drbd_clear_interval (&req->i); - req->i.sector = bio_src->bi_sector; - req->i.size = bio_src->bi_size; + req->i.sector = bio_src->bi_iter.bi_sector; + req->i.size = bio_src->bi_iter.bi_size; req->i.local = true; req->i.waiting = false;
@@ -1280,7 +1280,7 @@ void drbd_make_request(struct request_queue *q, struct bio *bio)/* * what we "blindly" assume: */ -D_ASSERT (IS_ALIGNED (bio->bi_size,512 )); +D_ASSERT (IS_ALIGNED (bio->bi_iter.bi_size,512 ));inc_ap_bio (mdev);__drbd_make_request (mdev, bio, start_time);
drivers/block/drbd/drbd_req.h +1 -1
@@ -269,7 +269,7 @@ static inline void drbd_req_make_private_bio(struct drbd_request *req, struct bi/* Short lived temporary struct on the stack. * We could squirrel the error to be returned into -* bio->bi_size, or similar. But that would be too ugly. */ +* bio->bi_iter.bi_size, or similar. But that would be too ugly. */ struct bio_and_error {struct bio *bio;int error;
drivers/block/floppy.c +2 -2
@@ -3775,9 +3775,9 @@ static int __floppy_read_block_0(struct block_device *bdev) bio_vec.bv_len = size; bio_vec.bv_offset =0 ; bio.bi_vcnt =1 ; - bio.bi_size = size; + bio.bi_iter.bi_size = size; bio.bi_bdev = bdev; - bio.bi_sector =0 ; + bio.bi_iter.bi_sector =0 ; bio.bi_flags = (1 <<BIO_QUIET );init_completion (&complete); bio.bi_private = &complete;
drivers/block/loop.c +2 -2
@@ -415,7 +415,7 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio)loff_t pos;int ret; - pos = ((loff_t ) bio->bi_sector <<9 ) + lo->lo_offset; + pos = ((loff_t ) bio->bi_iter.bi_sector <<9 ) + lo->lo_offset;if (bio_rw (bio) ==WRITE ) {struct file *file = lo->lo_backing_file;
@@ -444,7 +444,7 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio) goto out; } ret = file->f_op->fallocate (file, mode, pos, - bio->bi_size); + bio->bi_iter.bi_size);if (unlikely (ret && ret != -EINVAL && ret != -EOPNOTSUPP )) ret = -EIO ;
drivers/block/mtip32xx/mtip32xx.c +4 -3
@@ -3993,7 +3993,7 @@ static void mtip_make_request(struct request_queue *queue, struct bio *bio) }if (unlikely (bio->bi_rw &REQ_DISCARD )) { -bio_endio (bio,mtip_send_trim (dd, bio->bi_sector, +bio_endio (bio,mtip_send_trim (dd, bio->bi_iter.bi_sector,bio_sectors (bio)));return ; }
@@ -4006,7 +4006,8 @@ static void mtip_make_request(struct request_queue *queue, struct bio *bio)if (bio_data_dir (bio) ==WRITE &&bio_sectors (bio) <=64 && dd->unal_qdepth) { -if (bio->bi_sector %8 !=0 )/* Unaligned on 4k boundaries */ +if (bio->bi_iter.bi_sector %8 !=0 ) +/* Unaligned on 4k boundaries */ unaligned =1 ;else if (bio_sectors (bio) %8 !=0 )/* Aligned but not 4k/8k */ unaligned =1 ;
@@ -4035,7 +4036,7 @@ static void mtip_make_request(struct request_queue *queue, struct bio *bio)/* Issue the read/write. */ mtip_hw_submit_io(dd, - bio->bi_sector, + bio->bi_iter.bi_sector, bio_sectors(bio), nents, tag,
drivers/block/nvme-core.c +13 -12
@@ -468,7 +468,7 @@ static struct nvme_bio_pair *nvme_bio_split(struct bio *bio, int idx, {struct nvme_bio_pair *bp; -BUG_ON (len > bio->bi_size); +BUG_ON (len > bio->bi_iter.bi_size);BUG_ON (idx > bio->bi_vcnt); bp =kmalloc (sizeof (*bp),GFP_ATOMIC );
@@ -479,11 +479,11 @@ static struct nvme_bio_pair *nvme_bio_split(struct bio *bio, int idx, bp->b1 = *bio; bp->b2 = *bio; - bp->b1.bi_size = len; - bp->b2.bi_size -= len; + bp->b1.bi_iter.bi_size = len; + bp->b2.bi_iter.bi_size -= len; bp->b1.bi_vcnt = idx; - bp->b2.bi_idx = idx; - bp->b2.bi_sector += len >>9 ; + bp->b2.bi_iter.bi_idx = idx; + bp->b2.bi_iter.bi_sector += len >>9 ;if (offset) { bp->bv1 = kmalloc(bio->bi_max_vecs * sizeof(struct bio_vec),
@@ -552,11 +552,12 @@ static int nvme_map_bio(struct nvme_queue *nvmeq, struct nvme_iod *iod, {struct bio_vec *bvec, *bvprv =NULL ;struct scatterlist *sg =NULL ; -int i, length =0 , nsegs =0 , split_len = bio->bi_size; +int i, length =0 , nsegs =0 , split_len = bio->bi_iter.bi_size;if (nvmeq->dev->stripe_size) split_len = nvmeq->dev->stripe_size - - ((bio->bi_sector <<9 ) & (nvmeq->dev->stripe_size -1 )); + ((bio->bi_iter.bi_sector <<9 ) & + (nvmeq->dev->stripe_size -1 ));sg_init_table (iod->sg, psegs);bio_for_each_segment (bvec, bio, i) {
@@ -584,7 +585,7 @@ static int nvme_map_bio(struct nvme_queue *nvmeq, struct nvme_iod *iod,if (dma_map_sg (nvmeq->q_dmadev, iod->sg, iod->nents, dma_dir) ==0 )return -ENOMEM ; -BUG_ON (length != bio->bi_size); +BUG_ON (length != bio->bi_iter.bi_size);return length; }
@@ -608,8 +609,8 @@ static int nvme_submit_discard(struct nvme_queue *nvmeq, struct nvme_ns *ns, iod->npages =0 ; range->cattr =cpu_to_le32 (0 ); - range->nlb =cpu_to_le32 (bio->bi_size >> ns->lba_shift); - range->slba =cpu_to_le64 (nvme_block_nr (ns, bio->bi_sector)); + range->nlb =cpu_to_le32 (bio->bi_iter.bi_size >> ns->lba_shift); + range->slba =cpu_to_le64 (nvme_block_nr (ns, bio->bi_iter.bi_sector));memset (cmnd,0 ,sizeof (*cmnd)); cmnd->dsm.opcode = nvme_cmd_dsm;
@@ -674,7 +675,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns, } result = -ENOMEM ; - iod =nvme_alloc_iod (psegs, bio->bi_size,GFP_ATOMIC ); + iod =nvme_alloc_iod (psegs, bio->bi_iter.bi_size,GFP_ATOMIC );if (!iod) goto nomem; iod->private = bio;
@@ -723,7 +724,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns, cmnd->rw.nsid =cpu_to_le32 (ns->ns_id); length =nvme_setup_prps (nvmeq->dev, &cmnd->common, iod, length,GFP_ATOMIC ); - cmnd->rw.slba =cpu_to_le64 (nvme_block_nr (ns, bio->bi_sector)); + cmnd->rw.slba =cpu_to_le64 (nvme_block_nr (ns, bio->bi_iter.bi_sector)); cmnd->rw.length =cpu_to_le16 ((length >> ns->lba_shift) -1 ); cmnd->rw.control =cpu_to_le16 (control); cmnd->rw.dsmgmt =cpu_to_le32 (dsmgmt);
drivers/block/pktcdvd.c +29 -25
167 lines not on this page · raw message
drivers/block/ps3disk.c +1 -1
@@ -104,7 +104,7 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev,dev_dbg (&dev->sbd.core,"%s:%u: bio %u: %u segs %u sectors from %lu\n" , __func__, __LINE__, i,bio_segments (iter.bio), -bio_sectors (iter.bio), iter.bio->bi_sector); +bio_sectors (iter.bio), iter.bio->bi_iter.bi_sector); size = bvec->bv_len; buf =bvec_kmap_irq (bvec, &flags);
drivers/block/ps3vram.c +1 -1
@@ -553,7 +553,7 @@ static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev,struct ps3vram_priv *priv =ps3_system_bus_get_drvdata (dev);int write =bio_data_dir (bio) ==WRITE ;const char *op = write ?"write" :"read" ; -loff_t offset = bio->bi_sector <<9 ; +loff_t offset = bio->bi_iter.bi_sector <<9 ;int error =0 ;struct bio_vec *bvec;unsigned int i;
drivers/block/rbd.c +11 -10
@@ -1183,14 +1183,14 @@ static struct bio *bio_clone_range(struct bio *bio_src,/* Handle the easy case for the caller */ -if (!offset && len == bio_src->bi_size) +if (!offset && len == bio_src->bi_iter.bi_size)return bio_clone (bio_src, gfpmask);if (WARN_ON_ONCE (!len))return NULL ; -if (WARN_ON_ONCE (len > bio_src->bi_size)) +if (WARN_ON_ONCE (len > bio_src->bi_iter.bi_size))return NULL ; -if (WARN_ON_ONCE (offset > bio_src->bi_size - len)) +if (WARN_ON_ONCE (offset > bio_src->bi_iter.bi_size - len))return NULL ;/* Find first affected segment... */
@@ -1220,7 +1220,8 @@ static struct bio *bio_clone_range(struct bio *bio_src,return NULL ;/* ENOMEM */ bio->bi_bdev = bio_src->bi_bdev; - bio->bi_sector = bio_src->bi_sector + (offset >>SECTOR_SHIFT ); + bio->bi_iter.bi_sector = bio_src->bi_iter.bi_sector + + (offset >>SECTOR_SHIFT ); bio->bi_rw = bio_src->bi_rw; bio->bi_flags |=1 <<BIO_CLONED ;
@@ -1239,8 +1240,7 @@ static struct bio *bio_clone_range(struct bio *bio_src, } bio->bi_vcnt = vcnt; - bio->bi_size = len; - bio->bi_idx =0 ; + bio->bi_iter.bi_size = len;return bio; }
@@ -1271,7 +1271,7 @@ static struct bio *bio_chain_clone_range(struct bio **bio_src,/* Build up a chain of clone bios up to the limit */ -if (!bi || off >= bi->bi_size || !len) +if (!bi || off >= bi->bi_iter.bi_size || !len)return NULL ;/* Nothing to clone */ end = &chain;
@@ -1283,7 +1283,7 @@ static struct bio *bio_chain_clone_range(struct bio **bio_src,rbd_warn (NULL ,"bio_chain exhausted with %u left" , len); goto out_err;/* EINVAL; ran out of bio's */ } - bi_size = min_t(unsigned int, bi->bi_size - off, len); + bi_size = min_t(unsigned int, bi->bi_iter.bi_size - off, len); bio =bio_clone_range (bi, off, bi_size, gfpmask);if (!bio) goto out_err;/* ENOMEM */
@@ -1292,7 +1292,7 @@ static struct bio *bio_chain_clone_range(struct bio **bio_src, end = &bio->bi_next; off += bi_size; -if (off == bi->bi_size) { +if (off == bi->bi_iter.bi_size) { bi = bi->bi_next; off =0 ; }
@@ -2186,7 +2186,8 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request,if (type ==OBJ_REQUEST_BIO ) { bio_list = data_desc; -rbd_assert (img_offset == bio_list->bi_sector <<SECTOR_SHIFT ); +rbd_assert (img_offset == + bio_list->bi_iter.bi_sector <<SECTOR_SHIFT ); }else {rbd_assert (type ==OBJ_REQUEST_PAGES ); pages = data_desc;
drivers/block/rsxx/dev.c +3 -3
@@ -174,7 +174,7 @@ static void rsxx_make_request(struct request_queue *q, struct bio *bio)if (!card) goto req_err; -if (bio->bi_sector + (bio->bi_size >>9 ) >get_capacity (card->gendisk)) +if (bio_end_sector (bio) >get_capacity (card->gendisk)) goto req_err;if (unlikely (card->halt)) {
@@ -187,7 +187,7 @@ static void rsxx_make_request(struct request_queue *q, struct bio *bio) goto req_err; } -if (bio->bi_size ==0 ) { +if (bio->bi_iter.bi_size ==0 ) {dev_err (CARD_TO_DEV (card),"size zero BIO!\n" ); goto req_err; }
@@ -208,7 +208,7 @@ static void rsxx_make_request(struct request_queue *q, struct bio *bio)dev_dbg (CARD_TO_DEV (card),"BIO[%c]: meta: %p addr8: x%llx size: %d\n" ,bio_data_dir (bio) ?'W' :'R' , bio_meta, - (u64 )bio->bi_sector <<9 , bio->bi_size); + (u64 )bio->bi_iter.bi_sector <<9 , bio->bi_iter.bi_size); st =rsxx_dma_queue_bio (card, bio, &bio_meta->pending_dmas, bio_dma_done_cb, bio_meta);
drivers/block/rsxx/dma.c +2 -2
@@ -696,7 +696,7 @@ int rsxx_dma_queue_bio(struct rsxx_cardinfo *card,int st;int i; - addr8 = bio->bi_sector <<9 ;/* sectors are 512 bytes */ + addr8 = bio->bi_iter.bi_sector <<9 ;/* sectors are 512 bytes */ atomic_set (n_dmas,0 );for (i =0 ; i < card->n_targets; i++) {
@@ -705,7 +705,7 @@ int rsxx_dma_queue_bio(struct rsxx_cardinfo *card, }if (bio->bi_rw &REQ_DISCARD ) { - bv_len = bio->bi_size; + bv_len = bio->bi_iter.bi_size;while (bv_len >0 ) { tgt =rsxx_get_dma_tgt (card, addr8);
drivers/block/umem.c +5 -4
@@ -352,8 +352,8 @@ static int add_bio(struct cardinfo *card) bio = card->currentbio;if (!bio && card->bio) { card->currentbio = card->bio; - card->current_idx = card->bio->bi_idx; - card->current_sector = card->bio->bi_sector; + card->current_idx = card->bio->bi_iter.bi_idx; + card->current_sector = card->bio->bi_iter.bi_sector; card->bio = card->bio->bi_next;if (card->bio ==NULL ) card->biotail = &card->bio;
@@ -451,7 +451,7 @@ static void process_page(unsigned long data)if (page->idx >= bio->bi_vcnt) { page->bio = bio->bi_next;if (page->bio) - page->idx = page->bio->bi_idx; + page->idx = page->bio->bi_iter.bi_idx; } pci_unmap_page(card->dev, desc->data_dma_handle,
@@ -532,7 +532,8 @@ static void mm_make_request(struct request_queue *q, struct bio *bio) {struct cardinfo *card = q->queuedata;pr_debug ("mm_make_request %llu %u\n" , - (unsigned long long )bio->bi_sector, bio->bi_size); + (unsigned long long )bio->bi_iter.bi_sector, + bio->bi_iter.bi_size);spin_lock_irq (&card->lock); *card->biotail = bio;
drivers/block/xen-blkback/blkback.c +1 -1
@@ -1257,7 +1257,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif, bio->bi_bdev = preq.bdev; bio->bi_private = pending_req; bio->bi_end_io = end_block_io_op; - bio->bi_sector = preq.sector_number; + bio->bi_iter.bi_sector = preq.sector_number; } preq.sector_number += seg[i].nsec;
drivers/block/xen-blkfront.c +1 -1
@@ -1547,7 +1547,7 @@ static int blkif_recover(struct blkfront_info *info)for (i =0 ; i < pending; i++) { offset = (i * segs *PAGE_SIZE ) >>9 ; size =min ((unsigned int )(segs *PAGE_SIZE ) >>9 , - (unsigned int )(bio->bi_size >>9 ) - offset); + (unsigned int )bio_sectors (bio) - offset); cloned_bio =bio_clone (bio,GFP_NOIO );BUG_ON (cloned_bio ==NULL );bio_trim (cloned_bio, offset, size);
drivers/md/bcache/btree.c +2 -2
@@ -299,7 +299,7 @@ void bch_btree_node_read(struct btree *b) bio =bch_bbio_alloc (b->c); bio->bi_rw =REQ_META |READ_SYNC ; - bio->bi_size =KEY_SIZE (&b->key) <<9 ; + bio->bi_iter.bi_size =KEY_SIZE (&b->key) <<9 ; bio->bi_end_io = btree_node_read_endio; bio->bi_private = &cl;
@@ -395,7 +395,7 @@ static void do_btree_node_write(struct btree *b) b->bio->bi_end_io = btree_node_write_endio; b->bio->bi_private = cl; b->bio->bi_rw =REQ_META |WRITE_SYNC |REQ_FUA ; - b->bio->bi_size =set_blocks (i, b->c) *block_bytes (b->c); + b->bio->bi_iter.bi_size =set_blocks (i, b->c) *block_bytes (b->c);bch_bio_map (b->bio, i);/*
drivers/md/bcache/debug.c +1 -1
@@ -195,7 +195,7 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio) dc->disk.c,"verify failed at dev %s sector %llu" ,bdevname (dc->bdev, name), - (uint64_t) bio->bi_sector); + (uint64_t) bio->bi_iter.bi_sector);kunmap_atomic (p1); }
drivers/md/bcache/io.c +13 -13
@@ -21,18 +21,18 @@ static void bch_bi_idx_hack_endio(struct bio *bio, int error)static void bch_generic_make_request_hack (struct bio *bio) { -if (bio->bi_idx) { +if (bio->bi_iter.bi_idx) {struct bio *clone =bio_alloc (GFP_NOIO ,bio_segments (bio));memcpy (clone->bi_io_vec,bio_iovec (bio),bio_segments (bio) *sizeof (struct bio_vec )); - clone->bi_sector = bio->bi_sector; + clone->bi_iter.bi_sector = bio->bi_iter.bi_sector; clone->bi_bdev = bio->bi_bdev; clone->bi_rw = bio->bi_rw; clone->bi_vcnt =bio_segments (bio); - clone->bi_size = bio->bi_size; + clone->bi_iter.bi_size = bio->bi_iter.bi_size; clone->bi_private = bio; clone->bi_end_io = bch_bi_idx_hack_endio;
@@ -72,7 +72,7 @@ static void bch_generic_make_request_hack(struct bio *bio)struct bio *bch_bio_split (struct bio *bio,int sectors,gfp_t gfp,struct bio_set *bs) { -unsigned idx = bio->bi_idx, vcnt =0 , nbytes = sectors <<9 ; +unsigned idx = bio->bi_iter.bi_idx, vcnt =0 , nbytes = sectors <<9 ;struct bio_vec *bv;struct bio *ret =NULL ;
@@ -90,7 +90,7 @@ struct bio *bch_bio_split(struct bio *bio, int sectors, }bio_for_each_segment (bv, bio, idx) { - vcnt = idx - bio->bi_idx; + vcnt = idx - bio->bi_iter.bi_idx;if (!nbytes) { ret =bio_alloc_bioset (gfp, vcnt, bs);
@@ -119,15 +119,15 @@ struct bio *bch_bio_split(struct bio *bio, int sectors, } out: ret->bi_bdev = bio->bi_bdev; - ret->bi_sector = bio->bi_sector; - ret->bi_size = sectors <<9 ; + ret->bi_iter.bi_sector = bio->bi_iter.bi_sector; + ret->bi_iter.bi_size = sectors <<9 ; ret->bi_rw = bio->bi_rw; ret->bi_vcnt = vcnt; ret->bi_max_vecs = vcnt; - bio->bi_sector += sectors; - bio->bi_size -= sectors <<9 ; - bio->bi_idx = idx; + bio->bi_iter.bi_sector += sectors; + bio->bi_iter.bi_size -= sectors <<9 ; + bio->bi_iter.bi_idx = idx;if (bio_integrity (bio)) {if (bio_integrity_clone (ret, bio, gfp)) {
@@ -162,7 +162,7 @@ static unsigned bch_bio_max_sectors(struct bio *bio)bio_for_each_segment (bv, bio, i) {struct bvec_merge_data bvm = { .bi_bdev = bio->bi_bdev, - .bi_sector = bio->bi_sector, + .bi_sector = bio->bi_iter.bi_sector, .bi_size = ret <<9 , .bi_rw = bio->bi_rw, };
@@ -272,8 +272,8 @@ void __bch_submit_bbio(struct bio *bio, struct cache_set *c) { struct bbio *b = container_of(bio, struct bbio, bio); - bio->bi_sector =PTR_OFFSET (&b->key,0 ); - bio->bi_bdev =PTR_CACHE (c, &b->key,0 )->bdev; + bio->bi_iter.bi_sector =PTR_OFFSET (&b->key,0 ); + bio->bi_bdev =PTR_CACHE (c, &b->key,0 )->bdev; b->submit_time_us =local_clock_us ();closure_bio_submit (bio, bio->bi_private,PTR_CACHE (c, &b->key,0 ));
drivers/md/bcache/journal.c +6 -6
@@ -51,10 +51,10 @@ reread: left = ca->sb.bucket_size - offset; len =min_t (unsigned, left,PAGE_SECTORS *8 );bio_reset (bio); - bio->bi_sector = bucket + offset; + bio->bi_iter.bi_sector = bucket + offset; bio->bi_bdev = ca->bdev; bio->bi_rw =READ ; - bio->bi_size = len <<9 ; + bio->bi_iter.bi_size = len <<9 ; bio->bi_end_io = journal_read_endio; bio->bi_private = &cl;
@@ -437,13 +437,13 @@ static void do_journal_discard(struct cache *ca)atomic_set (&ja->discard_in_flight,DISCARD_IN_FLIGHT );bio_init (bio); - bio->bi_sector =bucket_to_sector (ca->set, + bio->bi_iter.bi_sector =bucket_to_sector (ca->set, ca->sb.d[ja->discard_idx]); bio->bi_bdev = ca->bdev; bio->bi_rw =REQ_WRITE |REQ_DISCARD ; bio->bi_max_vecs =1 ; bio->bi_io_vec = bio->bi_inline_vecs; - bio->bi_size =bucket_bytes (ca); + bio->bi_iter.bi_size =bucket_bytes (ca); bio->bi_end_io = journal_discard_endio;closure_get (&ca->set->cl);
@@ -608,10 +608,10 @@ static void journal_write_unlocked(struct closure *cl)atomic_long_add (sectors, &ca->meta_sectors_written);bio_reset (bio); - bio->bi_sector =PTR_OFFSET (k, i); + bio->bi_iter.bi_sector =PTR_OFFSET (k, i); bio->bi_bdev = ca->bdev; bio->bi_rw =REQ_WRITE |REQ_SYNC |REQ_META |REQ_FLUSH |REQ_FUA ; - bio->bi_size = sectors <<9 ; + bio->bi_iter.bi_size = sectors <<9 ; bio->bi_end_io = journal_write_endio; bio->bi_private = w;
drivers/md/bcache/movinggc.c +2 -2
@@ -82,7 +82,7 @@ static void moving_init(struct moving_io *io)bio_get (bio);bio_set_prio (bio,IOPRIO_PRIO_VALUE (IOPRIO_CLASS_IDLE ,0 )); - bio->bi_size =KEY_SIZE (&io->w->key) <<9 ; + bio->bi_iter.bi_size =KEY_SIZE (&io->w->key) <<9 ; bio->bi_max_vecs =DIV_ROUND_UP (KEY_SIZE (&io->w->key),PAGE_SECTORS ); bio->bi_private = &io->cl;
@@ -98,7 +98,7 @@ static void write_moving(struct closure *cl)if (!op->error) {moving_init (io); - io->bio.bio.bi_sector =KEY_START (&io->w->key); + io->bio.bio.bi_iter.bi_sector =KEY_START (&io->w->key); op->write_prio =1 ; op->bio = &io->bio.bio;
drivers/md/bcache/request.c +29 -29
180 lines not on this page · raw message
drivers/md/bcache/super.c +8 -8
@@ -233,9 +233,9 @@ static void __write_super(struct cache_sb *sb, struct bio *bio)struct cache_sb *out =page_address (bio->bi_io_vec[0 ].bv_page);unsigned i; - bio->bi_sector =SB_SECTOR ; - bio->bi_rw =REQ_SYNC |REQ_META ; - bio->bi_size =SB_SIZE ; + bio->bi_iter.bi_sector =SB_SECTOR ; + bio->bi_rw =REQ_SYNC |REQ_META ; + bio->bi_iter.bi_size =SB_SIZE ;bch_bio_map (bio,NULL ); out->offset =cpu_to_le64 (sb->offset);
@@ -347,7 +347,7 @@ static void uuid_io(struct cache_set *c, unsigned long rw,struct bio *bio =bch_bbio_alloc (c); bio->bi_rw =REQ_SYNC |REQ_META |rw; - bio->bi_size =KEY_SIZE (k) <<9 ; + bio->bi_iter.bi_size =KEY_SIZE (k) <<9 ; bio->bi_end_io = uuid_endio; bio->bi_private = cl;
@@ -503,10 +503,10 @@ static void prio_io(struct cache *ca, uint64_t bucket, unsigned long rw)closure_init_stack (cl); - bio->bi_sector = bucket * ca->sb.bucket_size; - bio->bi_bdev = ca->bdev; - bio->bi_rw =REQ_SYNC |REQ_META |rw; - bio->bi_size =bucket_bytes (ca); + bio->bi_iter.bi_sector = bucket * ca->sb.bucket_size; + bio->bi_bdev = ca->bdev; + bio->bi_rw =REQ_SYNC |REQ_META |rw; + bio->bi_iter.bi_size =bucket_bytes (ca); bio->bi_end_io = prio_endio; bio->bi_private = ca;
drivers/md/bcache/util.c +2 -2
@@ -218,10 +218,10 @@ uint64_t bch_next_delay(struct bch_ratelimit *d, uint64_t done)void bch_bio_map (struct bio *bio,void *base) { -size_t size = bio->bi_size; +size_t size = bio->bi_iter.bi_size;struct bio_vec *bv = bio->bi_io_vec; -BUG_ON (!bio->bi_size); +BUG_ON (!bio->bi_iter.bi_size);BUG_ON (bio->bi_vcnt); bv->bv_offset = base ? ((unsigned long ) base) %PAGE_SIZE :0 ;
drivers/md/bcache/writeback.c +3 -3
@@ -113,7 +113,7 @@ static void dirty_init(struct keybuf_key *w)if (!io->dc->writeback_percent)bio_set_prio (bio,IOPRIO_PRIO_VALUE (IOPRIO_CLASS_IDLE ,0 )); - bio->bi_size =KEY_SIZE (&w->key) <<9 ; + bio->bi_iter.bi_size =KEY_SIZE (&w->key) <<9 ; bio->bi_max_vecs =DIV_ROUND_UP (KEY_SIZE (&w->key),PAGE_SECTORS ); bio->bi_private = w; bio->bi_io_vec = bio->bi_inline_vecs;
@@ -186,7 +186,7 @@ static void write_dirty(struct closure *cl)dirty_init (w); io->bio.bi_rw =WRITE ; - io->bio.bi_sector =KEY_START (&w->key); + io->bio.bi_iter.bi_sector =KEY_START (&w->key); io->bio.bi_bdev = io->dc->bdev; io->bio.bi_end_io = dirty_endio;
@@ -255,7 +255,7 @@ static void read_dirty(struct cached_dev *dc) io->dc = dc;dirty_init (w); - io->bio.bi_sector =PTR_OFFSET (&w->key,0 ); + io->bio.bi_iter.bi_sector =PTR_OFFSET (&w->key,0 ); io->bio.bi_bdev =PTR_CACHE (dc->disk.c, &w->key,0 )->bdev; io->bio.bi_rw =READ ;
drivers/md/bcache/writeback.h +1 -1
@@ -50,7 +50,7 @@ static inline bool should_writeback(struct cached_dev *dc, struct bio *bio,return false;if (dc->partial_stripes_expensive && -bcache_dev_stripe_dirty (dc, bio->bi_sector, +bcache_dev_stripe_dirty (dc, bio->bi_iter.bi_sector,bio_sectors (bio)))return true;
drivers/md/dm-bio-record.h +6 -6
@@ -40,10 +40,10 @@ static inline void dm_bio_record(struct dm_bio_details *bd, struct bio *bio) {unsigned i; - bd->bi_sector = bio->bi_sector; + bd->bi_sector = bio->bi_iter.bi_sector; bd->bi_bdev = bio->bi_bdev; - bd->bi_size = bio->bi_size; - bd->bi_idx = bio->bi_idx; + bd->bi_size = bio->bi_iter.bi_size; + bd->bi_idx = bio->bi_iter.bi_idx; bd->bi_flags = bio->bi_flags;for (i =0 ; i < bio->bi_vcnt; i++) {
@@ -56,10 +56,10 @@ static inline void dm_bio_restore(struct dm_bio_details *bd, struct bio *bio) {unsigned i; - bio->bi_sector = bd->bi_sector; + bio->bi_iter.bi_sector = bd->bi_sector; bio->bi_bdev = bd->bi_bdev; - bio->bi_size = bd->bi_size; - bio->bi_idx = bd->bi_idx; + bio->bi_iter.bi_size = bd->bi_size; + bio->bi_iter.bi_idx = bd->bi_idx; bio->bi_flags = bd->bi_flags;for (i =0 ; i < bio->bi_vcnt; i++) {
drivers/md/dm-bufio.c +1 -1
@@ -538,7 +538,7 @@ static void use_inline_bio(struct dm_buffer *b, int rw, sector_t block,bio_init (&b->bio); b->bio.bi_io_vec = b->bio_vec; b->bio.bi_max_vecs =DM_BUFIO_INLINE_VECS ; - b->bio.bi_sector = block << b->c->sectors_per_block_bits; + b->bio.bi_iter.bi_sector = block << b->c->sectors_per_block_bits; b->bio.bi_bdev = b->c->bdev; b->bio.bi_end_io = end_io;
drivers/md/dm-cache-policy-mq.c +2 -2
@@ -72,7 +72,7 @@ static enum io_pattern iot_pattern(struct io_tracker *t)static void iot_update_stats (struct io_tracker *t,struct bio *bio) { -if (bio->bi_sector ==from_oblock (t->last_end_oblock) +1 ) +if (bio->bi_iter.bi_sector ==from_oblock (t->last_end_oblock) +1 ) t->nr_seq_samples++;else {/*
@@ -87,7 +87,7 @@ static void iot_update_stats(struct io_tracker *t, struct bio *bio) t->nr_rand_samples++; } - t->last_end_oblock =to_oblock (bio->bi_sector +bio_sectors (bio) -1 ); + t->last_end_oblock =to_oblock (bio_end_sector (bio) -1 ); }static void iot_check_for_pattern_switch (struct io_tracker *t)
drivers/md/dm-cache-target.c +12 -10
@@ -664,15 +664,17 @@ static void remap_to_origin(struct cache *cache, struct bio *bio)static void remap_to_cache (struct cache *cache,struct bio *bio,dm_cblock_t cblock) { -sector_t bi_sector = bio->bi_sector; +sector_t bi_sector = bio->bi_iter.bi_sector; bio->bi_bdev = cache->cache_dev->bdev;if (!block_size_is_power_of_two (cache)) - bio->bi_sector = (from_cblock (cblock) * cache->sectors_per_block) + -sector_div (bi_sector, cache->sectors_per_block); + bio->bi_iter.bi_sector = + (from_cblock (cblock) * cache->sectors_per_block) + +sector_div (bi_sector, cache->sectors_per_block);else - bio->bi_sector = (from_cblock (cblock) << cache->sectors_per_block_shift) | - (bi_sector & (cache->sectors_per_block -1 )); + bio->bi_iter.bi_sector = + (from_cblock (cblock) << cache->sectors_per_block_shift) | + (bi_sector & (cache->sectors_per_block -1 )); }static void check_if_tick_bio_needed (struct cache *cache,struct bio *bio)
@@ -712,7 +714,7 @@ static void remap_to_cache_dirty(struct cache *cache, struct bio *bio,static dm_oblock_t get_bio_block (struct cache *cache,struct bio *bio) { -sector_t block_nr = bio->bi_sector; +sector_t block_nr = bio->bi_iter.bi_sector;if (!block_size_is_power_of_two (cache)) (void )sector_div (block_nr, cache->sectors_per_block);
@@ -1027,7 +1029,7 @@ static void issue_overwrite(struct dm_cache_migration *mg, struct bio *bio)static bool bio_writes_complete_block (struct cache *cache,struct bio *bio) {return (bio_data_dir (bio) ==WRITE ) && - (bio->bi_size == (cache->sectors_per_block <<SECTOR_SHIFT )); + (bio->bi_iter.bi_size == (cache->sectors_per_block <<SECTOR_SHIFT )); }static void avoid_copy (struct dm_cache_migration *mg)
@@ -1252,7 +1254,7 @@ static void process_flush_bio(struct cache *cache, struct bio *bio)size_t pb_data_size =get_per_bio_data_size (cache);struct per_bio_data *pb =get_per_bio_data (bio, pb_data_size); -BUG_ON (bio->bi_size); +BUG_ON (bio->bi_iter.bi_size);if (!pb->req_nr)remap_to_origin (cache, bio);else
@@ -1275,9 +1277,9 @@ static void process_flush_bio(struct cache *cache, struct bio *bio)*/ static void process_discard_bio (struct cache *cache,struct bio *bio) { -dm_block_t start_block =dm_sector_div_up (bio->bi_sector, +dm_block_t start_block =dm_sector_div_up (bio->bi_iter.bi_sector, cache->discard_block_size); -dm_block_t end_block = bio->bi_sector +bio_sectors (bio); +dm_block_t end_block =bio_end_sector (bio);dm_block_t b; end_block =block_div (end_block, cache->discard_block_size);
drivers/md/dm-crypt.c +10 -9
@@ -828,8 +828,8 @@ static void crypt_convert_init(struct crypt_config *cc, ctx->bio_out = bio_out; ctx->offset_in =0 ; ctx->offset_out =0 ; - ctx->idx_in = bio_in ? bio_in->bi_idx :0 ; - ctx->idx_out = bio_out ? bio_out->bi_idx :0 ; + ctx->idx_in = bio_in ? bio_in->bi_iter.bi_idx :0 ; + ctx->idx_out = bio_out ? bio_out->bi_iter.bi_idx :0 ; ctx->cc_sector = sector + cc->iv_offset;init_completion (&ctx->restart); }
@@ -1021,7 +1021,7 @@ static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned size, size -= len; } -if (!clone->bi_size) { +if (!clone->bi_iter.bi_size) {bio_put (clone);return NULL ; }
@@ -1161,7 +1161,7 @@ static int kcryptd_io_read(struct dm_crypt_io *io, gfp_t gfp)crypt_inc_pending (io);clone_init (io, clone); - clone->bi_sector = cc->start + io->sector; + clone->bi_iter.bi_sector = cc->start + io->sector;generic_make_request (clone);return 0 ;
@@ -1209,7 +1209,7 @@ static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io, int async)/* crypt_convert should have filled the clone bio */ BUG_ON (io->ctx.idx_out < clone->bi_vcnt); - clone->bi_sector = cc->start + io->sector; + clone->bi_iter.bi_sector = cc->start + io->sector;if (async)kcryptd_queue_io (io);
@@ -1224,7 +1224,7 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)struct dm_crypt_io *new_io;int crypt_finished;unsigned out_of_pages =0 ; -unsigned remaining = io->base_bio->bi_size; +unsigned remaining = io->base_bio->bi_iter.bi_size;sector_t sector = io->sector;int r;
@@ -1248,7 +1248,7 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) io->ctx.bio_out = clone; io->ctx.idx_out =0 ; - remaining -= clone->bi_size; + remaining -= clone->bi_iter.bi_size; sector +=bio_sectors (clone);crypt_inc_pending (io);
@@ -1869,11 +1869,12 @@ static int crypt_map(struct dm_target *ti, struct bio *bio)if (unlikely (bio->bi_rw & (REQ_FLUSH |REQ_DISCARD ))) { bio->bi_bdev = cc->dev->bdev;if (bio_sectors (bio)) - bio->bi_sector = cc->start +dm_target_offset (ti, bio->bi_sector); + bio->bi_iter.bi_sector = cc->start + +dm_target_offset (ti, bio->bi_iter.bi_sector);return DM_MAPIO_REMAPPED ; } - io =crypt_io_alloc (cc, bio,dm_target_offset (ti, bio->bi_sector)); + io =crypt_io_alloc (cc, bio,dm_target_offset (ti, bio->bi_iter.bi_sector));if (bio_data_dir (io->base_bio) ==READ ) {if (kcryptd_io_read (io,GFP_NOWAIT ))
drivers/md/dm-delay.c +4 -3
@@ -281,14 +281,15 @@ static int delay_map(struct dm_target *ti, struct bio *bio)if ((bio_data_dir (bio) ==WRITE ) && (dc->dev_write)) { bio->bi_bdev = dc->dev_write->bdev;if (bio_sectors (bio)) - bio->bi_sector = dc->start_write + -dm_target_offset (ti, bio->bi_sector); + bio->bi_iter.bi_sector = dc->start_write + +dm_target_offset (ti, bio->bi_iter.bi_sector);return delay_bio (dc, dc->write_delay, bio); } bio->bi_bdev = dc->dev_read->bdev; - bio->bi_sector = dc->start_read +dm_target_offset (ti, bio->bi_sector); + bio->bi_iter.bi_sector = dc->start_read + +dm_target_offset (ti, bio->bi_iter.bi_sector);return delay_bio (dc, dc->read_delay, bio); }
drivers/md/dm-flakey.c +4 -3
@@ -248,7 +248,8 @@ static void flakey_map_bio(struct dm_target *ti, struct bio *bio) bio->bi_bdev = fc->dev->bdev;if (bio_sectors (bio)) - bio->bi_sector =flakey_map_sector (ti, bio->bi_sector); + bio->bi_iter.bi_sector = +flakey_map_sector (ti, bio->bi_iter.bi_sector); }static void corrupt_bio_data (struct bio *bio,struct flakey_c *fc)
@@ -265,8 +266,8 @@ static void corrupt_bio_data(struct bio *bio, struct flakey_c *fc)DMDEBUG ("Corrupting data bio=%p by writing %u to byte %u " "(rw=%c bi_rw=%lu bi_sector=%llu cur_bytes=%u)\n" , bio, fc->corrupt_bio_value, fc->corrupt_bio_byte, - (bio_data_dir (bio) ==WRITE ) ?'w' :'r' , - bio->bi_rw, (unsigned long long )bio->bi_sector, bio_bytes); + (bio_data_dir (bio) ==WRITE ) ?'w' :'r' , bio->bi_rw, + (unsigned long long )bio->bi_iter.bi_sector, bio_bytes); } }
drivers/md/dm-io.c +3 -3
@@ -304,14 +304,14 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where, dm_sector_div_up(remaining, (PAGE_SIZE >> SECTOR_SHIFT))); bio =bio_alloc_bioset (GFP_NOIO , num_bvecs, io->client->bios); - bio->bi_sector = where->sector + (where->count - remaining); + bio->bi_iter.bi_sector = where->sector + (where->count - remaining); bio->bi_bdev = where->bdev; bio->bi_end_io = endio;store_io_and_region_in_bio (bio, io, region);if (rw &REQ_DISCARD ) { num_sectors =min_t (sector_t, q->limits.max_discard_sectors, remaining); - bio->bi_size = num_sectors <<SECTOR_SHIFT ; + bio->bi_iter.bi_size = num_sectors <<SECTOR_SHIFT ; remaining -= num_sectors; }else if (rw &REQ_WRITE_SAME ) {/*
@@ -320,7 +320,7 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where, dp->get_page (dp, &page, &len, &offset);bio_add_page (bio, page, logical_block_size, offset); num_sectors =min_t (sector_t, q->limits.max_write_same_sectors, remaining); - bio->bi_size = num_sectors <<SECTOR_SHIFT ; + bio->bi_iter.bi_size = num_sectors <<SECTOR_SHIFT ; offset =0 ; remaining -= num_sectors;
drivers/md/dm-linear.c +2 -1
@@ -85,7 +85,8 @@ static void linear_map_bio(struct dm_target *ti, struct bio *bio) bio->bi_bdev = lc->dev->bdev;if (bio_sectors (bio)) - bio->bi_sector =linear_map_sector (ti, bio->bi_sector); + bio->bi_iter.bi_sector = +linear_map_sector (ti, bio->bi_iter.bi_sector); }static int linear_map (struct dm_target *ti,struct bio *bio)
drivers/md/dm-raid1.c +8 -8
@@ -432,7 +432,7 @@ static int mirror_available(struct mirror_set *ms, struct bio *bio)region_t region =dm_rh_bio_to_region (ms->rh, bio);if (log->type->in_sync (log, region,0 )) -return choose_mirror (ms, bio->bi_sector) ?1 :0 ; +return choose_mirror (ms, bio->bi_iter.bi_sector) ?1 :0 ;return 0 ; }
@@ -442,15 +442,15 @@ static int mirror_available(struct mirror_set *ms, struct bio *bio)*/ static sector_t map_sector (struct mirror *m,struct bio *bio) { -if (unlikely (!bio->bi_size)) +if (unlikely (!bio->bi_iter.bi_size))return 0 ; -return m->offset +dm_target_offset (m->ms->ti, bio->bi_sector); +return m->offset +dm_target_offset (m->ms->ti, bio->bi_iter.bi_sector); }static void map_bio (struct mirror *m,struct bio *bio) { bio->bi_bdev = m->dev->bdev; - bio->bi_sector =map_sector (m, bio); + bio->bi_iter.bi_sector =map_sector (m, bio); } static void map_region(struct dm_io_region *io, struct mirror *m,
@@ -527,7 +527,7 @@ static void read_async_bio(struct mirror *m, struct bio *bio)struct dm_io_request io_req = { .bi_rw =READ , .mem.type =DM_IO_BVEC , - .mem.ptr.bvec = bio->bi_io_vec + bio->bi_idx, + .mem.ptr.bvec = bio->bi_io_vec + bio->bi_iter.bi_idx, .notify.fn = read_callback, .notify.context = bio, .client = m->ms->io_client,
@@ -559,7 +559,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)* We can only read balance if the region is in sync. */ if (likely (region_in_sync (ms, region,1 ))) - m =choose_mirror (ms, bio->bi_sector); + m =choose_mirror (ms, bio->bi_iter.bi_sector);else if (m &&atomic_read (&m->error_count)) m =NULL ;
@@ -630,7 +630,7 @@ static void do_write(struct mirror_set *ms, struct bio *bio)struct dm_io_request io_req = { .bi_rw =WRITE | (bio->bi_rw &WRITE_FLUSH_FUA ), .mem.type =DM_IO_BVEC , - .mem.ptr.bvec = bio->bi_io_vec + bio->bi_idx, + .mem.ptr.bvec = bio->bi_io_vec + bio->bi_iter.bi_idx, .notify.fn = write_callback, .notify.context = bio, .client = ms->io_client,
@@ -1181,7 +1181,7 @@ static int mirror_map(struct dm_target *ti, struct bio *bio)* The region is in-sync and we can perform reads directly. * Store enough information so we can retry if it fails. */ - m =choose_mirror (ms, bio->bi_sector); + m =choose_mirror (ms, bio->bi_iter.bi_sector);if (unlikely (!m))return -EIO ;
drivers/md/dm-region-hash.c +2 -1
@@ -126,7 +126,8 @@ EXPORT_SYMBOL_GPL(dm_rh_region_to_sector);region_t dm_rh_bio_to_region (struct dm_region_hash *rh,struct bio *bio) { -return dm_rh_sector_to_region (rh, bio->bi_sector - rh->target_begin); +return dm_rh_sector_to_region (rh, bio->bi_iter.bi_sector - + rh->target_begin); }EXPORT_SYMBOL_GPL (dm_rh_bio_to_region);
drivers/md/dm-snap.c +9 -9
@@ -1562,11 +1562,10 @@ static void remap_exception(struct dm_snapshot *s, struct dm_exception *e, struct bio *bio, chunk_t chunk) { bio->bi_bdev = s->cow->bdev; - bio->bi_sector =chunk_to_sector (s->store, -dm_chunk_number (e->new_chunk) + - (chunk - e->old_chunk)) + - (bio->bi_sector & - s->store->chunk_mask); + bio->bi_iter.bi_sector = +chunk_to_sector (s->store,dm_chunk_number (e->new_chunk) + + (chunk - e->old_chunk)) + + (bio->bi_iter.bi_sector & s->store->chunk_mask); }static int snapshot_map (struct dm_target *ti,struct bio *bio)
@@ -1584,7 +1583,7 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio)return DM_MAPIO_REMAPPED ; } - chunk =sector_to_chunk (s->store, bio->bi_sector); + chunk =sector_to_chunk (s->store, bio->bi_iter.bi_sector);/* Full snapshots are not usable */ /* To get here the table must be live so s->active is always set. */
@@ -1645,7 +1644,8 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio) r =DM_MAPIO_SUBMITTED ;if (!pe->started && - bio->bi_size == (s->store->chunk_size <<SECTOR_SHIFT )) { + bio->bi_iter.bi_size == + (s->store->chunk_size <<SECTOR_SHIFT )) { pe->started =1 ;up_write (&s->lock);start_full_bio (pe, bio);
@@ -1701,7 +1701,7 @@ static int snapshot_merge_map(struct dm_target *ti, struct bio *bio)return DM_MAPIO_REMAPPED ; } - chunk =sector_to_chunk (s->store, bio->bi_sector); + chunk =sector_to_chunk (s->store, bio->bi_iter.bi_sector);down_write (&s->lock);
@@ -2038,7 +2038,7 @@ static int do_origin(struct dm_dev *origin, struct bio *bio)down_read (&_origins_lock); o =__lookup_origin (origin->bdev);if (o) - r =__origin_write (&o->snapshots, bio->bi_sector, bio); + r =__origin_write (&o->snapshots, bio->bi_iter.bi_sector, bio);up_read (&_origins_lock);return r;
drivers/md/dm-stripe.c +8 -5
@@ -259,13 +259,15 @@ static int stripe_map_range(struct stripe_c *sc, struct bio *bio, {sector_t begin, end; -stripe_map_range_sector (sc, bio->bi_sector, target_stripe, &begin); +stripe_map_range_sector (sc, bio->bi_iter.bi_sector, + target_stripe, &begin);stripe_map_range_sector (sc,bio_end_sector (bio), target_stripe, &end);if (begin < end) { bio->bi_bdev = sc->stripe[target_stripe].dev->bdev; - bio->bi_sector = begin + sc->stripe[target_stripe].physical_start; - bio->bi_size =to_bytes (end - begin); + bio->bi_iter.bi_sector = begin + + sc->stripe[target_stripe].physical_start; + bio->bi_iter.bi_size =to_bytes (end - begin);return DM_MAPIO_REMAPPED ; }else {/* The range doesn't map to the target stripe */
@@ -293,9 +295,10 @@ static int stripe_map(struct dm_target *ti, struct bio *bio)return stripe_map_range (sc, bio, target_bio_nr); } -stripe_map_sector (sc, bio->bi_sector, &stripe, &bio->bi_sector); +stripe_map_sector (sc, bio->bi_iter.bi_sector, + &stripe, &bio->bi_iter.bi_sector); - bio->bi_sector += sc->stripe[stripe].physical_start; + bio->bi_iter.bi_sector += sc->stripe[stripe].physical_start; bio->bi_bdev = sc->stripe[stripe].dev->bdev;return DM_MAPIO_REMAPPED ;
drivers/md/dm-switch.c +2 -2
@@ -311,11 +311,11 @@ error:static int switch_map (struct dm_target *ti,struct bio *bio) {struct switch_ctx *sctx = ti->private; -sector_t offset =dm_target_offset (ti, bio->bi_sector); +sector_t offset =dm_target_offset (ti, bio->bi_iter.bi_sector);unsigned path_nr =switch_get_path_nr (sctx, offset); bio->bi_bdev = sctx->path_list[path_nr].dmdev->bdev; - bio->bi_sector = sctx->path_list[path_nr].start + offset; + bio->bi_iter.bi_sector = sctx->path_list[path_nr].start + offset;return DM_MAPIO_REMAPPED ; }
drivers/md/dm-thin.c +12 -10
@@ -413,7 +413,7 @@ static bool block_size_is_power_of_two(struct pool *pool)static dm_block_t get_bio_block (struct thin_c *tc,struct bio *bio) {struct pool *pool = tc->pool; -sector_t block_nr = bio->bi_sector; +sector_t block_nr = bio->bi_iter.bi_sector;if (block_size_is_power_of_two (pool)) block_nr >>= pool->sectors_per_block_shift;
@@ -426,14 +426,15 @@ static dm_block_t get_bio_block(struct thin_c *tc, struct bio *bio)static void remap (struct thin_c *tc,struct bio *bio,dm_block_t block) {struct pool *pool = tc->pool; -sector_t bi_sector = bio->bi_sector; +sector_t bi_sector = bio->bi_iter.bi_sector; bio->bi_bdev = tc->pool_dev->bdev;if (block_size_is_power_of_two (pool)) - bio->bi_sector = (block << pool->sectors_per_block_shift) | - (bi_sector & (pool->sectors_per_block -1 )); + bio->bi_iter.bi_sector = + (block << pool->sectors_per_block_shift) | + (bi_sector & (pool->sectors_per_block -1 ));else - bio->bi_sector = (block * pool->sectors_per_block) + + bio->bi_iter.bi_sector = (block * pool->sectors_per_block) +sector_div (bi_sector, pool->sectors_per_block); }
@@ -721,7 +722,8 @@ static void process_prepared(struct pool *pool, struct list_head *head,*/ static int io_overlaps_block (struct pool *pool,struct bio *bio) { -return bio->bi_size == (pool->sectors_per_block <<SECTOR_SHIFT ); +return bio->bi_iter.bi_size == + (pool->sectors_per_block <<SECTOR_SHIFT ); }static int io_overwrites_block (struct pool *pool,struct bio *bio)
@@ -1130,7 +1132,7 @@ static void process_shared_bio(struct thin_c *tc, struct bio *bio,if (bio_detain (pool, &key, bio, &cell))return ; -if (bio_data_dir (bio) ==WRITE && bio->bi_size) +if (bio_data_dir (bio) ==WRITE && bio->bi_iter.bi_size)break_sharing (tc, bio, block, &key, lookup_result, cell);else {struct dm_thin_endio_hook *h =dm_per_bio_data (bio,sizeof (struct dm_thin_endio_hook ));
@@ -1153,7 +1155,7 @@ static void provision_block(struct thin_c *tc, struct bio *bio, dm_block_t block/* * Remap empty bios (flushes) immediately, without provisioning. */ -if (!bio->bi_size) { +if (!bio->bi_iter.bi_size) {inc_all_io_entry (pool, bio);cell_defer_no_holder (tc, cell);
@@ -1253,7 +1255,7 @@ static void process_bio_read_only(struct thin_c *tc, struct bio *bio) r =dm_thin_find_block (tc->td, block,1 , &lookup_result);switch (r) {case 0 : -if (lookup_result.shared && (rw ==WRITE ) && bio->bi_size) +if (lookup_result.shared && (rw ==WRITE ) && bio->bi_iter.bi_size)bio_io_error (bio);else {inc_all_io_entry (tc->pool, bio);
@@ -2867,7 +2869,7 @@ out_unlock:static int thin_map (struct dm_target *ti,struct bio *bio) { - bio->bi_sector =dm_target_offset (ti, bio->bi_sector); + bio->bi_iter.bi_sector =dm_target_offset (ti, bio->bi_iter.bi_sector);return thin_bio_map (ti, bio); }
drivers/md/dm-verity.c +4 -4
@@ -493,9 +493,9 @@ static int verity_map(struct dm_target *ti, struct bio *bio)struct dm_verity_io *io; bio->bi_bdev = v->data_dev->bdev; - bio->bi_sector =verity_map_sector (v, bio->bi_sector); + bio->bi_iter.bi_sector =verity_map_sector (v, bio->bi_iter.bi_sector); -if (((unsigned )bio->bi_sector |bio_sectors (bio)) & +if (((unsigned )bio->bi_iter.bi_sector |bio_sectors (bio)) & ((1 << (v->data_dev_block_bits -SECTOR_SHIFT )) -1 )) {DMERR_LIMIT ("unaligned io" );return -EIO ;
@@ -514,8 +514,8 @@ static int verity_map(struct dm_target *ti, struct bio *bio) io->v = v; io->orig_bi_end_io = bio->bi_end_io; io->orig_bi_private = bio->bi_private; - io->block = bio->bi_sector >> (v->data_dev_block_bits -SECTOR_SHIFT ); - io->n_blocks = bio->bi_size >> v->data_dev_block_bits; + io->block = bio->bi_iter.bi_sector >> (v->data_dev_block_bits -SECTOR_SHIFT ); + io->n_blocks = bio->bi_iter.bi_size >> v->data_dev_block_bits; bio->bi_end_io = verity_end_io; bio->bi_private = io;
drivers/md/dm.c +13 -12
@@ -575,7 +575,7 @@ static void start_io_acct(struct dm_io *io) atomic_inc_return(&md->pending[rw]));if (unlikely (dm_stats_used (&md->stats))) -dm_stats_account_io (&md->stats, bio->bi_rw, bio->bi_sector, +dm_stats_account_io (&md->stats, bio->bi_rw, bio->bi_iter.bi_sector,bio_sectors (bio), false,0 , &io->stats_aux); }
@@ -593,7 +593,7 @@ static void end_io_acct(struct dm_io *io)part_stat_unlock ();if (unlikely (dm_stats_used (&md->stats))) -dm_stats_account_io (&md->stats, bio->bi_rw, bio->bi_sector, +dm_stats_account_io (&md->stats, bio->bi_rw, bio->bi_iter.bi_sector,bio_sectors (bio), true, duration, &io->stats_aux);/*
@@ -742,7 +742,7 @@ static void dec_pending(struct dm_io *io, int error)if (io_error ==DM_ENDIO_REQUEUE )return ; -if ((bio->bi_rw &REQ_FLUSH ) && bio->bi_size) { +if ((bio->bi_rw &REQ_FLUSH ) && bio->bi_iter.bi_size) {/* * Preflush done for flush with data, reissue * without REQ_FLUSH.
@@ -797,7 +797,7 @@ static void end_clone_bio(struct bio *clone, int error)struct dm_rq_clone_bio_info *info = clone->bi_private;struct dm_rq_target_io *tio = info->tio;struct bio *bio = info->orig; -unsigned int nr_bytes = info->orig->bi_size; +unsigned int nr_bytes = info->orig->bi_iter.bi_size;bio_put (clone);
@@ -1128,7 +1128,7 @@ static void __map_bio(struct dm_target_io *tio)* this io. */ atomic_inc (&tio->io->io_count); - sector = clone->bi_sector; + sector = clone->bi_iter.bi_sector; r = ti->type->map (ti, clone);if (r ==DM_MAPIO_REMAPPED ) {/* the bio has been remapped so dispatch it */
@@ -1160,13 +1160,13 @@ struct clone_info {static void bio_setup_sector (struct bio *bio,sector_t sector,sector_t len) { - bio->bi_sector = sector; - bio->bi_size =to_bytes (len); + bio->bi_iter.bi_sector = sector; + bio->bi_iter.bi_size =to_bytes (len); }static void bio_setup_bv (struct bio *bio,unsigned short idx,unsigned short bv_count) { - bio->bi_idx = idx; + bio->bi_iter.bi_idx = idx; bio->bi_vcnt = idx + bv_count; bio->bi_flags &= ~(1 <<BIO_SEG_VALID ); }
@@ -1202,7 +1202,7 @@ static void clone_split_bio(struct dm_target_io *tio, struct bio *bio, clone->bi_rw = bio->bi_rw; clone->bi_vcnt =1 ; clone->bi_io_vec->bv_offset = offset; - clone->bi_io_vec->bv_len = clone->bi_size; + clone->bi_io_vec->bv_len = clone->bi_iter.bi_size; clone->bi_flags |=1 <<BIO_CLONED ;clone_bio_integrity (bio, clone, idx, len, offset,1 );
@@ -1222,7 +1222,8 @@ static void clone_bio(struct dm_target_io *tio, struct bio *bio,bio_setup_sector (clone, sector, len);bio_setup_bv (clone, idx, bv_count); -if (idx != bio->bi_idx || clone->bi_size < bio->bi_size) +if (idx != bio->bi_iter.bi_idx || + clone->bi_iter.bi_size < bio->bi_iter.bi_size) trim =1 ;clone_bio_integrity (bio, clone, idx, len,0 , trim); }
@@ -1510,8 +1511,8 @@ static void __split_and_process_bio(struct mapped_device *md, ci.io->bio = bio; ci.io->md = md;spin_lock_init (&ci.io->endio_lock); - ci.sector = bio->bi_sector; - ci.idx = bio->bi_idx; + ci.sector = bio->bi_iter.bi_sector; + ci.idx = bio->bi_iter.bi_idx;start_io_acct (ci.io);
drivers/md/faulty.c +12 -7
@@ -74,8 +74,8 @@ static void faulty_fail(struct bio *bio, int error) {struct bio *b = bio->bi_private; - b->bi_size = bio->bi_size; - b->bi_sector = bio->bi_sector; + b->bi_iter.bi_size = bio->bi_iter.bi_size; + b->bi_iter.bi_sector = bio->bi_iter.bi_sector;bio_put (bio);
@@ -185,26 +185,31 @@ static void make_request(struct mddev *mddev, struct bio *bio)return ; } -if (check_sector (conf, bio->bi_sector,bio_end_sector (bio),WRITE )) +if (check_sector (conf, bio->bi_iter.bi_sector, +bio_end_sector (bio),WRITE )) failit =1 ;if (check_mode (conf, WritePersistent)) { -add_sector (conf, bio->bi_sector, WritePersistent); +add_sector (conf, bio->bi_iter.bi_sector, + WritePersistent); failit =1 ; }if (check_mode (conf, WriteTransient)) failit =1 ; }else {/* read request */ -if (check_sector (conf, bio->bi_sector,bio_end_sector (bio),READ )) +if (check_sector (conf, bio->bi_iter.bi_sector, +bio_end_sector (bio),READ )) failit =1 ;if (check_mode (conf, ReadTransient)) failit =1 ;if (check_mode (conf, ReadPersistent)) { -add_sector (conf, bio->bi_sector, ReadPersistent); +add_sector (conf, bio->bi_iter.bi_sector, + ReadPersistent); failit =1 ; }if (check_mode (conf, ReadFixable)) { -add_sector (conf, bio->bi_sector, ReadFixable); +add_sector (conf, bio->bi_iter.bi_sector, + ReadFixable); failit =1 ; } }
drivers/md/linear.c +6 -6
@@ -297,19 +297,19 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio) }rcu_read_lock (); - tmp_dev =which_dev (mddev, bio->bi_sector); + tmp_dev =which_dev (mddev, bio->bi_iter.bi_sector); start_sector = tmp_dev->end_sector - tmp_dev->rdev->sectors; -if (unlikely (bio->bi_sector >= (tmp_dev->end_sector) - || (bio->bi_sector < start_sector))) { +if (unlikely (bio->bi_iter.bi_sector >= (tmp_dev->end_sector) + || (bio->bi_iter.bi_sector < start_sector))) {char b[BDEVNAME_SIZE ];printk (KERN_ERR "md/linear:%s: make_request: Sector %llu out of bounds on " "dev %s: %llu sectors, offset %llu\n" ,mdname (mddev), - (unsigned long long )bio->bi_sector, + (unsigned long long )bio->bi_iter.bi_sector,bdevname (tmp_dev->rdev->bdev, b), (unsigned long long )tmp_dev->rdev->sectors, (unsigned long long )start_sector);
@@ -326,7 +326,7 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio)rcu_read_unlock (); - bp =bio_split (bio, end_sector - bio->bi_sector); + bp =bio_split (bio, end_sector - bio->bi_iter.bi_sector);linear_make_request (mddev, &bp->bio1);linear_make_request (mddev, &bp->bio2);
@@ -335,7 +335,7 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio) } bio->bi_bdev = tmp_dev->rdev->bdev; - bio->bi_sector = bio->bi_sector - start_sector + bio->bi_iter.bi_sector = bio->bi_iter.bi_sector - start_sector + tmp_dev->rdev->data_offset;rcu_read_unlock ();
drivers/md/md.c +5 -5
@@ -393,7 +393,7 @@ static void md_submit_flush_data(struct work_struct *ws) struct mddev *mddev = container_of(ws, struct mddev, flush_work);struct bio *bio = mddev->flush_bio; -if (bio->bi_size ==0 ) +if (bio->bi_iter.bi_size ==0 )/* an empty barrier - all done */ bio_endio (bio,0 );else {
@@ -754,7 +754,7 @@ void md_super_write(struct mddev *mddev, struct md_rdev *rdev,struct bio *bio =bio_alloc_mddev (GFP_NOIO ,1 , mddev); bio->bi_bdev = rdev->meta_bdev ? rdev->meta_bdev : rdev->bdev; - bio->bi_sector = sector; + bio->bi_iter.bi_sector = sector;bio_add_page (bio, page, size,0 ); bio->bi_private = rdev; bio->bi_end_io = super_written;
@@ -785,13 +785,13 @@ int sync_page_io(struct md_rdev *rdev, sector_t sector, int size, bio->bi_bdev = (metadata_op && rdev->meta_bdev) ? rdev->meta_bdev : rdev->bdev;if (metadata_op) - bio->bi_sector = sector + rdev->sb_start; + bio->bi_iter.bi_sector = sector + rdev->sb_start;else if (rdev->mddev->reshape_position != MaxSector && (rdev->mddev->reshape_backwards == (sector >= rdev->mddev->reshape_position))) - bio->bi_sector = sector + rdev->new_data_offset; + bio->bi_iter.bi_sector = sector + rdev->new_data_offset;else - bio->bi_sector = sector + rdev->data_offset; + bio->bi_iter.bi_sector = sector + rdev->data_offset;bio_add_page (bio, page, size,0 );submit_bio_wait (rw, bio);
drivers/md/multipath.c +7 -6
@@ -100,7 +100,7 @@ static void multipath_end_request(struct bio *bio, int error)md_error (mp_bh->mddev, rdev);printk (KERN_ERR "multipath: %s: rescheduling sector %llu\n" ,bdevname (rdev->bdev,b), - (unsigned long long )bio->bi_sector); + (unsigned long long )bio->bi_iter.bi_sector);multipath_reschedule_retry (mp_bh); }else multipath_end_bh_io (mp_bh, error);
@@ -132,7 +132,7 @@ static void multipath_make_request(struct mddev *mddev, struct bio * bio) multipath = conf->multipaths + mp_bh->path; mp_bh->bio = *bio; - mp_bh->bio.bi_sector += multipath->rdev->data_offset; + mp_bh->bio.bi_iter.bi_sector += multipath->rdev->data_offset; mp_bh->bio.bi_bdev = multipath->rdev->bdev; mp_bh->bio.bi_rw |=REQ_FAILFAST_TRANSPORT ; mp_bh->bio.bi_end_io = multipath_end_request;
@@ -355,21 +355,22 @@ static void multipathd(struct md_thread *thread)spin_unlock_irqrestore (&conf->device_lock, flags); bio = &mp_bh->bio; - bio->bi_sector = mp_bh->master_bio->bi_sector; + bio->bi_iter.bi_sector = mp_bh->master_bio->bi_iter.bi_sector;if ((mp_bh->path =multipath_map (conf))<0 ) {printk (KERN_ALERT "multipath: %s: unrecoverable IO read" " error for block %llu\n" ,bdevname (bio->bi_bdev,b), - (unsigned long long )bio->bi_sector); + (unsigned long long )bio->bi_iter.bi_sector);multipath_end_bh_io (mp_bh, -EIO ); }else {printk (KERN_ERR "multipath: %s: redirecting sector %llu" " to another IO path\n" ,bdevname (bio->bi_bdev,b), - (unsigned long long )bio->bi_sector); + (unsigned long long )bio->bi_iter.bi_sector); *bio = *(mp_bh->master_bio); - bio->bi_sector += conf->multipaths[mp_bh->path].rdev->data_offset; + bio->bi_iter.bi_sector += + conf->multipaths[mp_bh->path].rdev->data_offset; bio->bi_bdev = conf->multipaths[mp_bh->path].rdev->bdev; bio->bi_rw |=REQ_FAILFAST_TRANSPORT ; bio->bi_end_io = multipath_end_request;
drivers/md/raid0.c +9 -7
@@ -501,10 +501,11 @@ static inline int is_io_in_chunk_boundary(struct mddev *mddev, unsigned int chunk_sects, struct bio *bio) { if (likely(is_power_of_2(chunk_sects))) { - return chunk_sects >= ((bio->bi_sector & (chunk_sects-1)) + return chunk_sects >= + ((bio->bi_iter.bi_sector & (chunk_sects-1)) + bio_sectors(bio)); } else{ - sector_t sector = bio->bi_sector; + sector_t sector = bio->bi_iter.bi_sector;return chunk_sects >= (sector_div (sector, chunk_sects) +bio_sectors (bio)); }
@@ -524,7 +525,7 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio) chunk_sects = mddev->chunk_sectors;if (unlikely (!is_io_in_chunk_boundary (mddev, chunk_sects, bio))) { -sector_t sector = bio->bi_sector; +sector_t sector = bio->bi_iter.bi_sector;struct bio_pair *bp;/* Sanity check -- queue functions should prevent this happening */ if (bio_segments (bio) >1 )
@@ -544,12 +545,12 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)return ; } - sector_offset = bio->bi_sector; + sector_offset = bio->bi_iter.bi_sector; zone =find_zone (mddev->private, §or_offset); - tmp_dev =map_sector (mddev, zone, bio->bi_sector, + tmp_dev =map_sector (mddev, zone, bio->bi_iter.bi_sector, §or_offset); bio->bi_bdev = tmp_dev->bdev; - bio->bi_sector = sector_offset + zone->dev_start + + bio->bi_iter.bi_sector = sector_offset + zone->dev_start + tmp_dev->data_offset; if (unlikely((bio->bi_rw & REQ_DISCARD) &&
@@ -566,7 +567,8 @@ bad_map:printk ("md/raid0:%s: make_request bug: can't convert block across chunks" " or bigger than %dk %llu %d\n" ,mdname (mddev), chunk_sects /2 , - (unsigned long long )bio->bi_sector,bio_sectors (bio) /2 ); + (unsigned long long )bio->bi_iter.bi_sector, +bio_sectors (bio) /2 );bio_io_error (bio);return ;
drivers/md/raid1.c +39 -36
246 lines not on this page · raw message
drivers/md/raid10.c +49 -42
284 lines not on this page · raw message
drivers/md/raid5.c +37 -35
234 lines not on this page · raw message
drivers/s390/block/dcssblk.c +3 -2
@@ -819,7 +819,8 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio) dev_info = bio->bi_bdev->bd_disk->private_data;if (dev_info ==NULL ) goto fail; -if ((bio->bi_sector &7 ) !=0 || (bio->bi_size &4095 ) !=0 ) +if ((bio->bi_iter.bi_sector &7 ) !=0 || + (bio->bi_iter.bi_size &4095 ) !=0 )/* Request is not page-aligned. */ goto fail;if (bio_end_sector (bio) >get_capacity (bio->bi_bdev->bd_disk)) {
@@ -842,7 +843,7 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio) } } - index = (bio->bi_sector >>3 ); + index = (bio->bi_iter.bi_sector >>3 );bio_for_each_segment (bvec, bio, i) { page_addr = (unsigned long )page_address (bvec->bv_page) + bvec->bv_offset;
drivers/s390/block/xpram.c +5 -4
@@ -190,15 +190,16 @@ static void xpram_make_request(struct request_queue *q, struct bio *bio)unsigned long bytes;int i; -if ((bio->bi_sector &7 ) !=0 || (bio->bi_size &4095 ) !=0 ) +if ((bio->bi_iter.bi_sector &7 ) !=0 || + (bio->bi_iter.bi_size &4095 ) !=0 )/* Request is not page-aligned. */ goto fail; -if ((bio->bi_size >>12 ) > xdev->size) +if ((bio->bi_iter.bi_size >>12 ) > xdev->size)/* Request size is no page-aligned. */ goto fail; -if ((bio->bi_sector >>3 ) >0xffffffffU - xdev->offset) +if ((bio->bi_iter.bi_sector >>3 ) >0xffffffffU - xdev->offset) goto fail; - index = (bio->bi_sector >>3 ) + xdev->offset; + index = (bio->bi_iter.bi_sector >>3 ) + xdev->offset;bio_for_each_segment (bvec, bio, i) { page_addr = (unsigned long )kmap (bvec->bv_page) + bvec->bv_offset;
drivers/scsi/osd/osd_initiator.c +1 -1
@@ -731,7 +731,7 @@ static int _osd_req_list_objects(struct osd_request *or, bio->bi_rw &= ~REQ_WRITE ; or->in.bio = bio; - or->in.total_bytes = bio->bi_size; + or->in.total_bytes = bio->bi_iter.bi_size;return 0 ; }
drivers/staging/lustre/lustre/llite/lloop.c +7 -5
@@ -220,7 +220,7 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)for (bio = head; bio !=NULL ; bio = bio->bi_next) {LASSERT (rw == bio->bi_rw); - offset = (pgoff_t)(bio->bi_sector <<9 ) + lo->lo_offset; + offset = (pgoff_t)(bio->bi_iter.bi_sector <<9 ) + lo->lo_offset;bio_for_each_segment (bvec, bio, i) {BUG_ON (bvec->bv_offset !=0 );BUG_ON (bvec->bv_len !=PAGE_CACHE_SIZE );
@@ -313,7 +313,8 @@ static unsigned int loop_get_bio(struct lloop_device *lo, struct bio **req) bio = &lo->lo_bio;while (*bio && (*bio)->bi_rw == rw) {CDEBUG (D_INFO ,"bio sector %llu size %u count %u vcnt%u \n" , - (unsigned long long )(*bio)->bi_sector, (*bio)->bi_size, + (unsigned long long )(*bio)->bi_iter.bi_sector, + (*bio)->bi_iter.bi_size, page_count, (*bio)->bi_vcnt);if (page_count + (*bio)->bi_vcnt >LLOOP_MAX_SEGMENTS )break ;
@@ -347,7 +348,8 @@ static void loop_make_request(struct request_queue *q, struct bio *old_bio) goto err;CDEBUG (D_INFO ,"submit bio sector %llu size %u\n" , - (unsigned long long )old_bio->bi_sector, old_bio->bi_size); + (unsigned long long )old_bio->bi_iter.bi_sector, + old_bio->bi_iter.bi_size);spin_lock_irq (&lo->lo_lock); inactive = (lo->lo_state !=LLOOP_BOUND );
@@ -367,7 +369,7 @@ static void loop_make_request(struct request_queue *q, struct bio *old_bio)loop_add_bio (lo, old_bio);return ; err: -cfs_bio_io_error (old_bio, old_bio->bi_size); +cfs_bio_io_error (old_bio, old_bio->bi_iter.bi_size); }
@@ -378,7 +380,7 @@ static inline void loop_handle_bio(struct lloop_device *lo, struct bio *bio)while (bio) {struct bio *tmp = bio->bi_next; bio->bi_next =NULL ; -cfs_bio_endio (bio, bio->bi_size, ret); +cfs_bio_endio (bio, bio->bi_iter.bi_size, ret); bio = tmp; } }
drivers/staging/zram/zram_drv.c +8 -6
@@ -171,13 +171,14 @@ static inline int valid_io_request(struct zram *zram, struct bio *bio)u64 start, end, bound;/* unaligned request */ -if (unlikely (bio->bi_sector & (ZRAM_SECTOR_PER_LOGICAL_BLOCK -1 ))) +if (unlikely (bio->bi_iter.bi_sector & + (ZRAM_SECTOR_PER_LOGICAL_BLOCK -1 )))return 0 ; -if (unlikely (bio->bi_size & (ZRAM_LOGICAL_BLOCK_SIZE -1 ))) +if (unlikely (bio->bi_iter.bi_size & (ZRAM_LOGICAL_BLOCK_SIZE -1 )))return 0 ; - start = bio->bi_sector; - end = start + (bio->bi_size >>SECTOR_SHIFT ); + start = bio->bi_iter.bi_sector; + end = start + (bio->bi_iter.bi_size >>SECTOR_SHIFT ); bound = zram->disksize >>SECTOR_SHIFT ;/* out of range range */ if (unlikely (start >= bound || end > bound || start > end))
@@ -684,8 +685,9 @@ static void __zram_make_request(struct zram *zram, struct bio *bio, int rw)break ; } - index = bio->bi_sector >>SECTORS_PER_PAGE_SHIFT ; - offset = (bio->bi_sector & (SECTORS_PER_PAGE -1 )) <<SECTOR_SHIFT ; + index = bio->bi_iter.bi_sector >>SECTORS_PER_PAGE_SHIFT ; + offset = (bio->bi_iter.bi_sector & + (SECTORS_PER_PAGE -1 )) <<SECTOR_SHIFT ;bio_for_each_segment (bvec, bio, i) {int max_transfer_size =PAGE_SIZE - offset;
drivers/target/target_core_iblock.c +1 -1
@@ -319,7 +319,7 @@ iblock_get_bio(struct se_cmd *cmd, sector_t lba, u32 sg_num) bio->bi_bdev = ib_dev->ibd_bd; bio->bi_private = cmd; bio->bi_end_io = &iblock_bio_done; - bio->bi_sector = lba; + bio->bi_iter.bi_sector = lba;return bio; }
fs/bio-integrity.c +4 -4
@@ -215,9 +215,9 @@ unsigned int bio_integrity_tag_size(struct bio *bio) {struct blk_integrity *bi =bdev_get_integrity (bio->bi_bdev); -BUG_ON (bio->bi_size ==0 ); +BUG_ON (bio->bi_iter.bi_size ==0 ); -return bi->tag_size * (bio->bi_size / bi->sector_size); +return bi->tag_size * (bio->bi_iter.bi_size / bi->sector_size); }EXPORT_SYMBOL (bio_integrity_tag_size);
@@ -300,7 +300,7 @@ static void bio_integrity_generate(struct bio *bio)struct blk_integrity *bi =bdev_get_integrity (bio->bi_bdev);struct blk_integrity_exchg bix;struct bio_vec *bv; -sector_t sector = bio->bi_sector; +sector_t sector = bio->bi_iter.bi_sector;unsigned int i, sectors, total;void *prot_buf = bio->bi_integrity->bip_buf;
@@ -387,7 +387,7 @@ int bio_integrity_prep(struct bio *bio) bip->bip_owns_buf =1 ; bip->bip_buf = buf; bip->bip_size = len; - bip->bip_sector = bio->bi_sector; + bip->bip_sector = bio->bi_iter.bi_sector;/* Map it */ offset =offset_in_page (buf);
fs/bio.c +29 -27
16 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
1.8.4.4 _______________________________________________ drbd-dev mailing list [email protected] http://lists.linbit.com/mailman/listinfo/drbd-dev
Part of the diff is not shown here. View the raw message.
PATCH 5/25 dm: Use bvec_iter for dm_bio_record()
In reply to Kent OverstreetThis patch doesn't itself have any functional changes, but immutable biovecs are going to add a bi_bvec_done member to bi_iter, which will need to be saved too here.
--- drivers/md/dm-bio-record.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/md/dm-bio-record.h +3 -9
@@ -28,11 +28,9 @@ struct dm_bio_vec_details { };struct dm_bio_details { -sector_t bi_sector;struct block_device *bi_bdev; -unsigned int bi_size; -unsigned short bi_idx;unsigned long bi_flags; +struct bvec_iter bi_iter;struct dm_bio_vec_details bi_io_vec[BIO_MAX_PAGES ]; };
@@ -40,11 +38,9 @@ static inline void dm_bio_record(struct dm_bio_details *bd, struct bio *bio) {unsigned i; - bd->bi_sector = bio->bi_iter.bi_sector; bd->bi_bdev = bio->bi_bdev; - bd->bi_size = bio->bi_iter.bi_size; - bd->bi_idx = bio->bi_iter.bi_idx; bd->bi_flags = bio->bi_flags; + bd->bi_iter = bio->bi_iter;for (i =0 ; i < bio->bi_vcnt; i++) { bd->bi_io_vec[i].bv_len = bio->bi_io_vec[i].bv_len;
@@ -56,11 +52,9 @@ static inline void dm_bio_restore(struct dm_bio_details *bd, struct bio *bio) {unsigned i; - bio->bi_iter.bi_sector = bd->bi_sector; bio->bi_bdev = bd->bi_bdev; - bio->bi_iter.bi_size = bd->bi_size; - bio->bi_iter.bi_idx = bd->bi_idx; bio->bi_flags = bd->bi_flags; + bio->bi_iter = bd->bi_iter;for (i =0 ; i < bio->bi_vcnt; i++) { bio->bi_io_vec[i].bv_len = bd->bi_io_vec[i].bv_len;
Signature · 1 line
1.8.4.4
PATCH 6/25 block: Convert bio_iovec() to bvec_iter
In reply to Kent OverstreetFor immutable biovecs, we'll be introducing a new bio_iovec() that uses our new bvec iterator to construct a biovec, taking into account bvec_iter->bi_bvec_done - this patch updates existing users for the new usage.
Some of the existing users really do need a pointer into the bvec array
- those uses are all going to be removed, but we'll need the functionality from immutable to remove them - so for now rename the existing bio_iovec() -> __bio_iovec(), and it'll be removed in a couple patches.
--- drivers/block/aoe/aoecmd.c | 2 +- drivers/md/bcache/io.c | 13 +++++++------ drivers/md/dm-verity.c | 2 +- drivers/scsi/sd.c | 2 +- fs/bio.c | 20 ++++++++++---------- include/linux/bio.h | 10 ++++++---- 6 files changed, 26 insertions(+), 23 deletions(-)
drivers/block/aoe/aoecmd.c +1 -1
@@ -932,7 +932,7 @@ bufinit(struct buf *buf, struct request *rq, struct bio *bio) buf->resid = bio->bi_iter.bi_size; buf->sector = bio->bi_iter.bi_sector;bio_pageinc (bio); - buf->bv =bio_iovec (bio); + buf->bv =__bio_iovec (bio); buf->bv_resid = buf->bv->bv_len;WARN_ON (buf->bv_resid ==0 ); }
drivers/md/bcache/io.c +7 -6
@@ -22,11 +22,12 @@ static void bch_bi_idx_hack_endio(struct bio *bio, int error)static void bch_generic_make_request_hack (struct bio *bio) {if (bio->bi_iter.bi_idx) { +int i; +struct bio_vec *bv;struct bio *clone =bio_alloc (GFP_NOIO ,bio_segments (bio)); -memcpy (clone->bi_io_vec, -bio_iovec (bio), -bio_segments (bio) *sizeof (struct bio_vec )); +bio_for_each_segment (bv, bio, i) + clone->bi_io_vec[clone->bi_vcnt++] = *bv; clone->bi_iter.bi_sector = bio->bi_iter.bi_sector; clone->bi_bdev = bio->bi_bdev;
@@ -97,7 +98,7 @@ struct bio *bch_bio_split(struct bio *bio, int sectors,if (!ret)return NULL ; -memcpy (ret->bi_io_vec,bio_iovec (bio), +memcpy (ret->bi_io_vec,__bio_iovec (bio),sizeof (struct bio_vec ) * vcnt);break ;
@@ -106,7 +107,7 @@ struct bio *bch_bio_split(struct bio *bio, int sectors,if (!ret)return NULL ; -memcpy (ret->bi_io_vec,bio_iovec (bio), +memcpy (ret->bi_io_vec,__bio_iovec (bio),sizeof (struct bio_vec ) * vcnt); ret->bi_io_vec[vcnt -1 ].bv_len = nbytes;
@@ -182,7 +183,7 @@ static unsigned bch_bio_max_sectors(struct bio *bio) ret =min (ret,queue_max_sectors (q));WARN_ON (!ret); - ret =max_t (int, ret,bio_iovec (bio)->bv_len >>9 ); + ret =max_t (int, ret,bio_iovec (bio).bv_len >>9 );return ret; }
drivers/md/dm-verity.c +1 -1
@@ -524,7 +524,7 @@ static int verity_map(struct dm_target *ti, struct bio *bio) io->io_vec = io->io_vec_inline; else io->io_vec = mempool_alloc(v->vec_mempool, GFP_NOIO); -memcpy (io->io_vec,bio_iovec (bio), +memcpy (io->io_vec,__bio_iovec (bio), io->io_vec_size *sizeof (struct bio_vec ));verity_submit_prefetch (v, io);
drivers/scsi/sd.c +1 -1
@@ -801,7 +801,7 @@ static int sd_setup_write_same_cmnd(struct scsi_device *sdp, struct request *rq)if (sdkp->device->no_write_same)return BLKPREP_KILL ; -BUG_ON (bio_offset (bio) ||bio_iovec (bio)->bv_len != sdp->sector_size); +BUG_ON (bio_offset (bio) ||bio_iovec (bio).bv_len != sdp->sector_size); sector >>=ilog2 (sdp->sector_size) -9 ; nr_sectors >>=ilog2 (sdp->sector_size) -9 ;
fs/bio.c +10 -10
@@ -821,12 +821,12 @@ void bio_advance(struct bio *bio, unsigned bytes)break ; } -if (bytes >=bio_iovec (bio)->bv_len) { - bytes -=bio_iovec (bio)->bv_len; +if (bytes >=bio_iovec (bio).bv_len) { + bytes -=bio_iovec (bio).bv_len; bio->bi_iter.bi_idx++; }else { -bio_iovec (bio)->bv_len -= bytes; -bio_iovec (bio)->bv_offset += bytes; +bio_iovec (bio).bv_len -= bytes; +bio_iovec (bio).bv_offset += bytes; bytes =0 ; } }
@@ -879,8 +879,8 @@ void bio_copy_data(struct bio *dst, struct bio *src)unsigned src_offset, dst_offset, bytes;void *src_p, *dst_p; - src_bv =bio_iovec (src); - dst_bv =bio_iovec (dst); + src_bv =__bio_iovec (src); + dst_bv =__bio_iovec (dst); src_offset = src_bv->bv_offset; dst_offset = dst_bv->bv_offset;
@@ -893,7 +893,7 @@ void bio_copy_data(struct bio *dst, struct bio *src)if (!src)break ; - src_bv =bio_iovec (src); + src_bv =__bio_iovec (src); } src_offset = src_bv->bv_offset;
@@ -906,7 +906,7 @@ void bio_copy_data(struct bio *dst, struct bio *src)if (!dst)break ; - dst_bv =bio_iovec (dst); + dst_bv =__bio_iovec (dst); } dst_offset = dst_bv->bv_offset;
@@ -1776,8 +1776,8 @@ struct bio_pair *bio_split(struct bio *bi, int first_sectors) bp->bio1.bi_iter.bi_size = first_sectors <<9 ;if (bi->bi_vcnt !=0 ) { - bp->bv1 = *bio_iovec (bi); - bp->bv2 = *bio_iovec (bi); + bp->bv1 =bio_iovec (bi); + bp->bv2 =bio_iovec (bi);if (bio_is_rw (bi)) { bp->bv2.bv_offset += first_sectors <<9 ;
include/linux/bio.h +6 -4
@@ -62,9 +62,11 @@* on highmem page vectors */ #define bio_iovec_idx (bio, idx) (&((bio)->bi_io_vec[(idx)])) -#define bio_iovec (bio) bio_iovec_idx((bio), (bio)->bi_iter.bi_idx) -#define bio_page (bio) bio_iovec((bio))->bv_page -#define bio_offset (bio) bio_iovec((bio))->bv_offset +#define __bio_iovec (bio) bio_iovec_idx((bio), (bio)->bi_iter.bi_idx) +#define bio_iovec (bio) (*__bio_iovec(bio)) + +#define bio_page (bio) (bio_iovec((bio)).bv_page) +#define bio_offset (bio) (bio_iovec((bio)).bv_offset)#define bio_segments (bio) ((bio)->bi_vcnt - (bio)->bi_iter.bi_idx)#define bio_sectors (bio) ((bio)->bi_iter.bi_size >> 9)#define bio_end_sector (bio) ((bio)->bi_iter.bi_sector + bio_sectors((bio)))
@@ -72,7 +74,7 @@static inline unsigned int bio_cur_bytes (struct bio *bio) {if (bio->bi_vcnt) -return bio_iovec (bio)->bv_len; +return bio_iovec (bio).bv_len;else /* dataless requests such as discard */ return bio->bi_iter.bi_size; }
Signature · 1 line
1.8.4.4
PATCH 7/25 block: Convert bio_for_each_segment() to bvec_iter
In reply to Kent OverstreetMore prep work for immutable biovecs - with immutable bvecs drivers won't be able to use the biovec directly, they'll need to use helpers that take into account bio->bi_iter.bi_bvec_done.
This updates callers for the new usage without changing the implementation yet.
--- arch/m68k/emu/nfblock.c | 11 ++--- arch/powerpc/sysdev/axonram.c | 18 ++++---- block/blk-core.c | 4 +- block/blk-merge.c | 49 ++++++++++---------- drivers/block/aoe/aoecmd.c | 16 +++---- drivers/block/brd.c | 12 ++--- drivers/block/drbd/drbd_main.c | 27 ++++++----- drivers/block/drbd/drbd_receiver.c | 13 +++--- drivers/block/drbd/drbd_worker.c | 8 ++-- drivers/block/floppy.c | 12 ++--- drivers/block/loop.c | 23 +++++----- drivers/block/mtip32xx/mtip32xx.c | 13 +++--- drivers/block/nbd.c | 12 ++--- drivers/block/nvme-core.c | 33 ++++++++------ drivers/block/ps3disk.c | 10 ++--- drivers/block/ps3vram.c | 10 ++--- drivers/block/rbd.c | 38 ++++++++-------- drivers/block/rsxx/dma.c | 11 ++--- drivers/md/bcache/btree.c | 4 +- drivers/md/bcache/debug.c | 19 ++++---- drivers/md/bcache/io.c | 69 ++++++++++++----------------- drivers/md/bcache/request.c | 26 +++++------ drivers/md/raid5.c | 12 ++--- drivers/s390/block/dasd_diag.c | 10 ++--- drivers/s390/block/dasd_eckd.c | 48 ++++++++++---------- drivers/s390/block/dasd_fba.c | 26 +++++------ drivers/s390/block/dcssblk.c | 16 +++---- drivers/s390/block/scm_blk.c | 8 ++-- drivers/s390/block/scm_blk_cluster.c | 4 +- drivers/s390/block/xpram.c | 10 ++--- drivers/scsi/mpt2sas/mpt2sas_transport.c | 31 ++++++------- drivers/scsi/mpt3sas/mpt3sas_transport.c | 31 ++++++------- drivers/staging/lustre/lustre/llite/lloop.c | 14 +++--- drivers/staging/zram/zram_drv.c | 19 ++++---- fs/bio-integrity.c | 30 +++++++------ fs/bio.c | 22 ++++----- include/linux/bio.h | 28 ++++++------ include/linux/blkdev.h | 7 +-- mm/bounce.c | 44 +++++++++--------- 39 files changed, 401 insertions(+), 397 deletions(-)
arch/m68k/emu/nfblock.c +6 -5
@@ -62,17 +62,18 @@ struct nfhd_device {static void nfhd_make_request (struct request_queue *queue,struct bio *bio) {struct nfhd_device *dev = queue->queuedata; -struct bio_vec *bvec; -int i, dir, len, shift; +struct bio_vec bvec; +struct bvec_iter iter; +int dir, len, shift;sector_t sec = bio->bi_iter.bi_sector; dir =bio_data_dir (bio); shift = dev->bshift; -bio_for_each_segment (bvec, bio, i) { - len = bvec->bv_len; +bio_for_each_segment (bvec, bio, iter) { + len = bvec.bv_len; len >>=9 ;nfhd_read_write (dev->id,0 , dir, sec >> shift, len >> shift, -bvec_to_phys (bvec)); +bvec_to_phys (&bvec)); sec += len; }bio_endio (bio,0 );
arch/powerpc/sysdev/axonram.c +9 -9
@@ -109,28 +109,28 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio)struct axon_ram_bank *bank = bio->bi_bdev->bd_disk->private_data;unsigned long phys_mem, phys_end;void *user_mem; -struct bio_vec *vec; +struct bio_vec vec;unsigned int transfered; -unsigned short idx; +struct bvec_iter iter; phys_mem = bank->io_addr + (bio->bi_iter.bi_sector <<AXON_RAM_SECTOR_SHIFT ); phys_end = bank->io_addr + bank->size; transfered =0 ; -bio_for_each_segment (vec, bio, idx) { -if (unlikely (phys_mem + vec->bv_len > phys_end)) { +bio_for_each_segment (vec, bio, iter) { +if (unlikely (phys_mem + vec.bv_len > phys_end)) {bio_io_error (bio);return ; } - user_mem =page_address (vec->bv_page) + vec->bv_offset; + user_mem =page_address (vec.bv_page) + vec.bv_offset;if (bio_data_dir (bio) ==READ ) -memcpy (user_mem, (void *) phys_mem, vec->bv_len); +memcpy (user_mem, (void *) phys_mem, vec.bv_len);else -memcpy ((void *) phys_mem, user_mem, vec->bv_len); +memcpy ((void *) phys_mem, user_mem, vec.bv_len); - phys_mem += vec->bv_len; - transfered += vec->bv_len; + phys_mem += vec.bv_len; + transfered += vec.bv_len; }bio_endio (bio,0 ); }
block/blk-core.c +2 -2
@@ -2746,10 +2746,10 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq,void rq_flush_dcache_pages (struct request *rq) {struct req_iterator iter; -struct bio_vec *bvec; +struct bio_vec bvec;rq_for_each_segment (bvec, rq, iter) -flush_dcache_page (bvec->bv_page); +flush_dcache_page (bvec.bv_page); }EXPORT_SYMBOL_GPL (rq_flush_dcache_pages);#endif
block/blk-merge.c +23 -26
128 lines not on this page · raw message
drivers/block/aoe/aoecmd.c +8 -8
@@ -897,15 +897,15 @@ rqbiocnt(struct request *r)static void bio_pageinc (struct bio *bio) { -struct bio_vec *bv; +struct bio_vec bv;struct page *page; -int i; +struct bvec_iter iter; -bio_for_each_segment (bv, bio, i) { +bio_for_each_segment (bv, bio, iter) {/* Non-zero page count for non-head members of * compound pages is no longer allowed by the kernel. */ - page =compound_trans_head (bv->bv_page); + page =compound_trans_head (bv.bv_page);atomic_inc (&page->_count); } }
@@ -913,12 +913,12 @@ bio_pageinc(struct bio *bio)static void bio_pagedec (struct bio *bio) { -struct bio_vec *bv;struct page *page; -int i; +struct bio_vec bv; +struct bvec_iter iter; -bio_for_each_segment (bv, bio, i) { - page =compound_trans_head (bv->bv_page); +bio_for_each_segment (bv, bio, iter) { + page =compound_trans_head (bv.bv_page);atomic_dec (&page->_count); } }
drivers/block/brd.c +6 -6
@@ -328,9 +328,9 @@ static void brd_make_request(struct request_queue *q, struct bio *bio)struct block_device *bdev = bio->bi_bdev;struct brd_device *brd = bdev->bd_disk->private_data;int rw; -struct bio_vec *bvec; +struct bio_vec bvec;sector_t sector; -int i; +struct bvec_iter iter;int err = -EIO ; sector = bio->bi_iter.bi_sector;
@@ -347,10 +347,10 @@ static void brd_make_request(struct request_queue *q, struct bio *bio)if (rw ==READA ) rw =READ ; -bio_for_each_segment (bvec, bio, i) { -unsigned int len = bvec->bv_len; - err =brd_do_bvec (brd, bvec->bv_page, len, - bvec->bv_offset, rw, sector); +bio_for_each_segment (bvec, bio, iter) { +unsigned int len = bvec.bv_len; + err =brd_do_bvec (brd, bvec.bv_page, len, + bvec.bv_offset, rw, sector);if (err)break ; sector += len >>SECTOR_SHIFT ;
drivers/block/drbd/drbd_main.c +15 -12
@@ -1537,15 +1537,17 @@ static int _drbd_send_page(struct drbd_conf *mdev, struct page *page,static int _drbd_send_bio (struct drbd_conf *mdev,struct bio *bio) { -struct bio_vec *bvec; -int i; +struct bio_vec bvec; +struct bvec_iter iter; +/* hint all but last page with MSG_MORE */ -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) {int err; - err =_drbd_no_send_page (mdev, bvec->bv_page, - bvec->bv_offset, bvec->bv_len, - i == bio->bi_vcnt -1 ?0 :MSG_MORE ); + err =_drbd_no_send_page (mdev, bvec.bv_page, + bvec.bv_offset, bvec.bv_len, +bio_iter_last (bio, iter) + ?0 :MSG_MORE );if (err)return err; }
@@ -1554,15 +1556,16 @@ static int _drbd_send_bio(struct drbd_conf *mdev, struct bio *bio)static int _drbd_send_zc_bio (struct drbd_conf *mdev,struct bio *bio) { -struct bio_vec *bvec; -int i; +struct bio_vec bvec; +struct bvec_iter iter; +/* hint all but last page with MSG_MORE */ -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) {int err; - err =_drbd_send_page (mdev, bvec->bv_page, - bvec->bv_offset, bvec->bv_len, - i == bio->bi_vcnt -1 ?0 :MSG_MORE ); + err =_drbd_send_page (mdev, bvec.bv_page, + bvec.bv_offset, bvec.bv_len, +bio_iter_last (bio, iter) ?0 :MSG_MORE );if (err)return err; }
drivers/block/drbd/drbd_receiver.c +7 -6
@@ -1595,9 +1595,10 @@ static int drbd_drain_block(struct drbd_conf *mdev, int data_size)static int recv_dless_read (struct drbd_conf *mdev,struct drbd_request *req,sector_t sector,int data_size) { -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;struct bio *bio; -int dgs, err, i, expect; +int dgs, err, expect;void *dig_in = mdev->tconn->int_dig_in;void *dig_vv = mdev->tconn->int_dig_vv;
@@ -1617,11 +1618,11 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req, bio = req->master_bio;D_ASSERT (sector == bio->bi_iter.bi_sector); -bio_for_each_segment (bvec, bio, i) { -void *mapped =kmap (bvec->bv_page) + bvec->bv_offset; - expect =min_t (int, data_size, bvec->bv_len); +bio_for_each_segment (bvec, bio, iter) { +void *mapped =kmap (bvec.bv_page) + bvec.bv_offset; + expect =min_t (int, data_size, bvec.bv_len); err =drbd_recv_all_warn (mdev->tconn, mapped, expect); -kunmap (bvec->bv_page); +kunmap (bvec.bv_page);if (err)return err; data_size -= expect;
drivers/block/drbd/drbd_worker.c +4 -4
@@ -313,8 +313,8 @@ void drbd_csum_bio(struct drbd_conf *mdev, struct crypto_hash *tfm, struct bio * {struct hash_desc desc;struct scatterlist sg; -struct bio_vec *bvec; -int i; +struct bio_vec bvec; +struct bvec_iter iter; desc.tfm = tfm; desc.flags =0 ;
@@ -322,8 +322,8 @@ void drbd_csum_bio(struct drbd_conf *mdev, struct crypto_hash *tfm, struct bio *sg_init_table (&sg,1 );crypto_hash_init (&desc); -bio_for_each_segment (bvec, bio, i) { -sg_set_page (&sg, bvec->bv_page, bvec->bv_len, bvec->bv_offset); +bio_for_each_segment (bvec, bio, iter) { +sg_set_page (&sg, bvec.bv_page, bvec.bv_len, bvec.bv_offset);crypto_hash_update (&desc, &sg, sg.length); }crypto_hash_final (&desc, digest);
drivers/block/floppy.c +6 -6
@@ -2351,7 +2351,7 @@ static void rw_interrupt(void)/* Compute maximal contiguous buffer size. */ static int buffer_chain_size (void ) { -struct bio_vec *bv; +struct bio_vec bv;int size;struct req_iterator iter;char *base;
@@ -2360,10 +2360,10 @@ static int buffer_chain_size(void) size =0 ;rq_for_each_segment (bv, current_req, iter) { -if (page_address (bv->bv_page) + bv->bv_offset != base + size) +if (page_address (bv.bv_page) + bv.bv_offset != base + size)break ; - size += bv->bv_len; + size += bv.bv_len; }return size >>9 ;
@@ -2389,7 +2389,7 @@ static int transfer_size(int ssize, int max_sector, int max_size)static void copy_buffer (int ssize,int max_sector,int max_sector_2) {int remaining;/* number of transferred 512-byte sectors */ -struct bio_vec *bv; +struct bio_vec bv;char *buffer;char *dma_buffer;int size;
@@ -2427,10 +2427,10 @@ static void copy_buffer(int ssize, int max_sector, int max_sector_2)if (!remaining)break ; - size = bv->bv_len; + size = bv.bv_len;SUPBOUND (size, remaining); - buffer =page_address (bv->bv_page) + bv->bv_offset; + buffer =page_address (bv.bv_page) + bv.bv_offset;if (dma_buffer + size > floppy_track_buffer + (max_buffer_sectors <<10 ) || dma_buffer < floppy_track_buffer) {
drivers/block/loop.c +12 -11
@@ -288,9 +288,10 @@ static int lo_send(struct loop_device *lo, struct bio *bio, loff_t pos) {int (*do_lo_send)(struct loop_device *,struct bio_vec *,loff_t ,struct page *page); -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;struct page *page =NULL ; -int i, ret =0 ; +int ret =0 ;if (lo->transfer != transfer_none) { page =alloc_page (GFP_NOIO | __GFP_HIGHMEM);
@@ -302,11 +303,11 @@ static int lo_send(struct loop_device *lo, struct bio *bio, loff_t pos) do_lo_send = do_lo_send_direct_write; } -bio_for_each_segment (bvec, bio, i) { - ret =do_lo_send (lo, bvec, pos, page); +bio_for_each_segment (bvec, bio, iter) { + ret =do_lo_send (lo, &bvec, pos, page);if (ret <0 )break ; - pos += bvec->bv_len; + pos += bvec.bv_len; }if (page) {kunmap (page);
@@ -392,20 +393,20 @@ do_lo_receive(struct loop_device *lo,static int lo_receive (struct loop_device *lo,struct bio *bio,int bsize,loff_t pos) { -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;ssize_t s; -int i; -bio_for_each_segment (bvec, bio, i) { - s =do_lo_receive (lo, bvec, bsize, pos); +bio_for_each_segment (bvec, bio, iter) { + s =do_lo_receive (lo, &bvec, bsize, pos);if (s <0 )return s; -if (s != bvec->bv_len) { +if (s != bvec.bv_len) {zero_fill_bio (bio);break ; } - pos += bvec->bv_len; + pos += bvec.bv_len; }return 0 ; }
drivers/block/mtip32xx/mtip32xx.c +7 -6
@@ -3962,8 +3962,9 @@ static void mtip_make_request(struct request_queue *queue, struct bio *bio) {struct driver_data *dd = queue->queuedata;struct scatterlist *sg; -struct bio_vec *bvec; -int i, nents =0 ; +struct bio_vec bvec; +struct bvec_iter iter; +int nents =0 ;int tag =0 , unaligned =0 ;if (unlikely (dd->dd_flag &MTIP_DDF_STOP_IO )) {
@@ -4026,11 +4027,11 @@ static void mtip_make_request(struct request_queue *queue, struct bio *bio) }/* Create the scatter list for this bio. */ -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) {sg_set_page (&sg[nents], - bvec->bv_page, - bvec->bv_len, - bvec->bv_offset); + bvec.bv_page, + bvec.bv_len, + bvec.bv_offset); nents++; }
drivers/block/nbd.c +6 -6
@@ -271,7 +271,7 @@ static int nbd_send_req(struct nbd_device *nbd, struct request *req)if (nbd_cmd (req) ==NBD_CMD_WRITE ) {struct req_iterator iter; -struct bio_vec *bvec; +struct bio_vec bvec;/* * we are really probing at internals to determine * whether to set MSG_MORE or not...
@@ -281,8 +281,8 @@ static int nbd_send_req(struct nbd_device *nbd, struct request *req)if (!rq_iter_last (req, iter)) flags =MSG_MORE ;dprintk (DBG_TX ,"%s: request %p: sending %d bytes data\n" , - nbd->disk->disk_name, req, bvec->bv_len); - result =sock_send_bvec (nbd, bvec, flags); + nbd->disk->disk_name, req, bvec.bv_len); + result =sock_send_bvec (nbd, &bvec, flags);if (result <=0 ) { dev_err(disk_to_dev(nbd->disk), "Send data failed (result %d)\n",
@@ -378,10 +378,10 @@ static struct request *nbd_read_stat(struct nbd_device *nbd) nbd->disk->disk_name, req);if (nbd_cmd (req) ==NBD_CMD_READ ) {struct req_iterator iter; -struct bio_vec *bvec; +struct bio_vec bvec;rq_for_each_segment (bvec, req, iter) { - result =sock_recv_bvec (nbd, bvec); + result =sock_recv_bvec (nbd, &bvec);if (result <=0 ) {dev_err (disk_to_dev (nbd->disk),"Receive data failed (result %d)\n" , result);
@@ -389,7 +389,7 @@ static struct request *nbd_read_stat(struct nbd_device *nbd)return req; }dprintk (DBG_RX ,"%s: request %p: got %d bytes data\n" , - nbd->disk->disk_name, req, bvec->bv_len); + nbd->disk->disk_name, req, bvec.bv_len); } }return req;
drivers/block/nvme-core.c +19 -14
@@ -550,9 +550,11 @@ static int nvme_split_and_submit(struct bio *bio, struct nvme_queue *nvmeq,static int nvme_map_bio (struct nvme_queue *nvmeq,struct nvme_iod *iod,struct bio *bio,enum dma_data_direction dma_dir,int psegs) { -struct bio_vec *bvec, *bvprv =NULL ; +struct bio_vec bvec, bvprv; +struct bvec_iter iter;struct scatterlist *sg =NULL ; -int i, length =0 , nsegs =0 , split_len = bio->bi_iter.bi_size; +int length =0 , nsegs =0 , split_len = bio->bi_iter.bi_size; +int first =1 ;if (nvmeq->dev->stripe_size) split_len = nvmeq->dev->stripe_size -
@@ -560,25 +562,28 @@ static int nvme_map_bio(struct nvme_queue *nvmeq, struct nvme_iod *iod, (nvmeq->dev->stripe_size - 1));sg_init_table (iod->sg, psegs); -bio_for_each_segment (bvec, bio, i) { -if (bvprv &&BIOVEC_PHYS_MERGEABLE (bvprv, bvec)) { - sg->length += bvec->bv_len; +bio_for_each_segment (bvec, bio, iter) { +if (!first &&BIOVEC_PHYS_MERGEABLE (&bvprv, &bvec)) { + sg->length += bvec.bv_len; }else { -if (bvprv &&BIOVEC_NOT_VIRT_MERGEABLE (bvprv, bvec)) -return nvme_split_and_submit (bio, nvmeq, i, - length,0 ); +if (!first &&BIOVEC_NOT_VIRT_MERGEABLE (&bvprv, &bvec)) +return nvme_split_and_submit (bio, nvmeq, + iter.bi_idx, + length,0 ); sg = sg ? sg +1 : iod->sg; -sg_set_page (sg, bvec->bv_page, bvec->bv_len, - bvec->bv_offset); +sg_set_page (sg, bvec.bv_page, + bvec.bv_len, bvec.bv_offset); nsegs++; } -if (split_len - length < bvec->bv_len) -return nvme_split_and_submit (bio, nvmeq, i, split_len, - split_len - length); - length += bvec->bv_len; +if (split_len - length < bvec.bv_len) +return nvme_split_and_submit (bio, nvmeq, iter.bi_idx, + split_len, + split_len - length); + length += bvec.bv_len; bvprv = bvec; + first =0 ; } iod->nents = nsegs;sg_mark_end (sg);
drivers/block/ps3disk.c +5 -5
@@ -94,7 +94,7 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev, {unsigned int offset =0 ;struct req_iterator iter; -struct bio_vec *bvec; +struct bio_vec bvec;unsigned int i =0 ;size_t size;void *buf;
@@ -106,14 +106,14 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev, __func__, __LINE__, i,bio_segments (iter.bio), bio_sectors(iter.bio), iter.bio->bi_iter.bi_sector); - size = bvec->bv_len; - buf =bvec_kmap_irq (bvec, &flags); + size = bvec.bv_len; + buf =bvec_kmap_irq (&bvec, &flags);if (gather)memcpy (dev->bounce_buf+offset, buf, size);else memcpy (buf, dev->bounce_buf+offset, size); offset += size; -flush_kernel_dcache_page (bvec->bv_page); +flush_kernel_dcache_page (bvec.bv_page);bvec_kunmap_irq (buf, &flags); i++; }
@@ -130,7 +130,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,#ifdef DEBUG unsigned int n =0 ; -struct bio_vec *bv; +struct bio_vec bv;struct req_iterator iter;rq_for_each_segment (bv, req, iter)
drivers/block/ps3vram.c +5 -5
@@ -555,14 +555,14 @@ static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev,const char *op = write ?"write" :"read" ;loff_t offset = bio->bi_iter.bi_sector <<9 ;int error =0 ; -struct bio_vec *bvec; -unsigned int i; +struct bio_vec bvec; +struct bvec_iter iter;struct bio *next; -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) {/* PS3 is ppc64, so we don't handle highmem */ -char *ptr =page_address (bvec->bv_page) + bvec->bv_offset; -size_t len = bvec->bv_len, retlen; +char *ptr =page_address (bvec.bv_page) + bvec.bv_offset; +size_t len = bvec.bv_len, retlen;dev_dbg (&dev->core," %s %zu bytes at offset %llu\n" , op, len, offset);
drivers/block/rbd.c +19 -19
@@ -1109,23 +1109,23 @@ static void bio_chain_put(struct bio *chain)*/ static void zero_bio_chain (struct bio *chain,int start_ofs) { -struct bio_vec *bv; +struct bio_vec bv; +struct bvec_iter iter;unsigned long flags;void *buf; -int i;int pos =0 ;while (chain) { -bio_for_each_segment (bv, chain, i) { -if (pos + bv->bv_len > start_ofs) { +bio_for_each_segment (bv, chain, iter) { +if (pos + bv.bv_len > start_ofs) {int remainder =max (start_ofs - pos,0 ); - buf =bvec_kmap_irq (bv, &flags); + buf =bvec_kmap_irq (&bv, &flags);memset (buf + remainder,0 , - bv->bv_len - remainder); -flush_dcache_page (bv->bv_page); + bv.bv_len - remainder); +flush_dcache_page (bv.bv_page);bvec_kunmap_irq (buf, &flags); } - pos += bv->bv_len; + pos += bv.bv_len; } chain = chain->bi_next;
@@ -1173,11 +1173,11 @@ static struct bio *bio_clone_range(struct bio *bio_src, unsigned int len, gfp_t gfpmask) { -struct bio_vec *bv; +struct bio_vec bv; +struct bvec_iter iter; +struct bvec_iter end_iter;unsigned int resid; -unsigned short idx;unsigned int voff; -unsigned short end_idx;unsigned short vcnt;struct bio *bio;
@@ -1196,22 +1196,22 @@ static struct bio *bio_clone_range(struct bio *bio_src,/* Find first affected segment... */ resid = offset; -bio_for_each_segment (bv, bio_src, idx) { -if (resid < bv->bv_len) +bio_for_each_segment (bv, bio_src, iter) { +if (resid < bv.bv_len)break ; - resid -= bv->bv_len; + resid -= bv.bv_len; } voff = resid;/* ...and the last affected segment */ resid += len; -__bio_for_each_segment (bv, bio_src, end_idx, idx) { -if (resid <= bv->bv_len) +__bio_for_each_segment (bv, bio_src, end_iter, iter) { +if (resid <= bv.bv_len)break ; - resid -= bv->bv_len; + resid -= bv.bv_len; } - vcnt = end_idx - idx +1 ; + vcnt = end_iter.bi_idx = iter.bi_idx +1 ;/* Build the clone */
@@ -1229,7 +1229,7 @@ static struct bio *bio_clone_range(struct bio *bio_src,* Copy over our part of the bio_vec, then update the first * and last (or only) entries. */ -memcpy (&bio->bi_io_vec[0 ], &bio_src->bi_io_vec[idx], +memcpy (&bio->bi_io_vec[0 ], &bio_src->bi_io_vec[iter.bi_idx], vcnt *sizeof (struct bio_vec )); bio->bi_io_vec[0 ].bv_offset += voff;if (vcnt >1 ) {
drivers/block/rsxx/dma.c +6 -5
@@ -684,7 +684,8 @@ int rsxx_dma_queue_bio(struct rsxx_cardinfo *card, void *cb_data) {struct list_head dma_list[RSXX_MAX_TARGETS ]; -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;unsigned long long addr8;unsigned int laddr;unsigned int bv_len;
@@ -722,9 +723,9 @@ int rsxx_dma_queue_bio(struct rsxx_cardinfo *card, bv_len -=RSXX_HW_BLK_SIZE ; } }else { -bio_for_each_segment (bvec, bio, i) { - bv_len = bvec->bv_len; - bv_off = bvec->bv_offset; +bio_for_each_segment (bvec, bio, iter) { + bv_len = bvec.bv_len; + bv_off = bvec.bv_offset;while (bv_len >0 ) { tgt =rsxx_get_dma_tgt (card, addr8);
@@ -736,7 +737,7 @@ int rsxx_dma_queue_bio(struct rsxx_cardinfo *card, st =rsxx_queue_dma (card, &dma_list[tgt],bio_data_dir (bio), dma_off, dma_len, - laddr, bvec->bv_page, + laddr, bvec.bv_page, bv_off, cb, cb_data);if (st) goto bvec_err;
drivers/md/bcache/btree.c +2 -2
@@ -362,7 +362,7 @@ static void btree_node_write_done(struct closure *cl)struct bio_vec *bv;int n; -__bio_for_each_segment (bv, b->bio, n,0 ) +bio_for_each_segment_all (bv, b->bio, n)__free_page (bv->bv_page);__btree_node_write_done (cl);
@@ -421,7 +421,7 @@ static void do_btree_node_write(struct btree *b)struct bio_vec *bv;void *base = (void *) ((unsigned long ) i & ~(PAGE_SIZE -1 )); -bio_for_each_segment (bv, b->bio, j) +bio_for_each_segment_all (bv, b->bio, j)memcpy (page_address (bv->bv_page), base + j *PAGE_SIZE ,PAGE_SIZE );
drivers/md/bcache/debug.c +10 -9
@@ -173,7 +173,8 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio) {char name[BDEVNAME_SIZE ];struct bio *check; -struct bio_vec *bv; +struct bio_vec bv, *bv2; +struct bvec_iter iter;int i; check =bio_clone (bio,GFP_NOIO );
@@ -185,13 +186,13 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)submit_bio_wait (READ_SYNC , check); -bio_for_each_segment (bv, bio, i) { -void *p1 =kmap_atomic (bv->bv_page); -void *p2 =page_address (check->bi_io_vec[i].bv_page); +bio_for_each_segment (bv, bio, iter) { +void *p1 =kmap_atomic (bv.bv_page); +void *p2 =page_address (check->bi_io_vec[iter.bi_idx].bv_page); - cache_set_err_on(memcmp(p1 + bv->bv_offset, - p2 + bv->bv_offset, - bv->bv_len), + cache_set_err_on(memcmp(p1 + bv.bv_offset, + p2 + bv.bv_offset, + bv.bv_len), dc->disk.c, "verify failed at dev %s sector %llu", bdevname(dc->bdev, name),
@@ -200,8 +201,8 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)kunmap_atomic (p1); } -bio_for_each_segment_all (bv, check, i) -__free_page (bv->bv_page); +bio_for_each_segment_all (bv2, check, i) +__free_page (bv2->bv_page); out_put:bio_put (check); }
drivers/md/bcache/io.c +29 -40
130 lines not on this page · raw message
drivers/md/bcache/request.c +13 -13
@@ -198,14 +198,14 @@ static bool verify(struct cached_dev *dc, struct bio *bio)static void bio_csum (struct bio *bio,struct bkey *k) { -struct bio_vec *bv; +struct bio_vec bv; +struct bvec_iter iter;uint64_t csum =0 ; -int i; -bio_for_each_segment (bv, bio, i) { -void *d =kmap (bv->bv_page) + bv->bv_offset; - csum =bch_crc64_update (csum, d, bv->bv_len); -kunmap (bv->bv_page); +bio_for_each_segment (bv, bio, iter) { +void *d =kmap (bv.bv_page) + bv.bv_offset; + csum =bch_crc64_update (csum, d, bv.bv_len); +kunmap (bv.bv_page); } k->ptr[KEY_PTRS (k)] = csum & (~0ULL >>1 );
@@ -1182,17 +1182,17 @@ void bch_cached_dev_request_init(struct cached_dev *dc)static int flash_dev_cache_miss (struct btree *b,struct search *s,struct bio *bio,unsigned sectors) { -struct bio_vec *bv; -int i; +struct bio_vec bv; +struct bvec_iter iter;/* Zero fill bio */ -bio_for_each_segment (bv, bio, i) { -unsigned j =min (bv->bv_len >>9 , sectors); +bio_for_each_segment (bv, bio, iter) { +unsigned j =min (bv.bv_len >>9 , sectors); -void *p =kmap (bv->bv_page); -memset (p + bv->bv_offset,0 , j <<9 ); -kunmap (bv->bv_page); +void *p =kmap (bv.bv_page); +memset (p + bv.bv_offset,0 , j <<9 ); +kunmap (bv.bv_page); sectors -= j; }
drivers/md/raid5.c +6 -6
@@ -937,9 +937,9 @@ static struct dma_async_tx_descriptor * async_copy_data(int frombio, struct bio *bio, struct page *page, sector_t sector, struct dma_async_tx_descriptor *tx) { - struct bio_vec *bvl; + struct bio_vec bvl; +struct bvec_iter iter;struct page *bio_page; -int i;int page_offset;struct async_submit_ctl submit;enum async_tx_flags flags =0 ;
@@ -953,8 +953,8 @@ async_copy_data(int frombio, struct bio *bio, struct page *page, flags |=ASYNC_TX_FENCE ;init_async_submit (&submit, flags, tx,NULL ,NULL ,NULL ); -bio_for_each_segment (bvl, bio, i) { -int len = bvl->bv_len; +bio_for_each_segment (bvl, bio, iter) { +int len = bvl.bv_len;int clen;int b_offset =0 ;
@@ -970,8 +970,8 @@ async_copy_data(int frombio, struct bio *bio, struct page *page, clen = len;if (clen >0 ) { - b_offset += bvl->bv_offset; - bio_page = bvl->bv_page; + b_offset += bvl.bv_offset; + bio_page = bvl.bv_page;if (frombio) tx =async_memcpy (page, bio_page, page_offset, b_offset, clen, &submit);
drivers/s390/block/dasd_diag.c +5 -5
@@ -504,7 +504,7 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,struct dasd_diag_req *dreq;struct dasd_diag_bio *dbio;struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv;char *dst;unsigned int count, datasize;sector_t recid, first_rec, last_rec;
@@ -525,10 +525,10 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,/* Check struct bio and count the number of blocks for the request. */ count =0 ;rq_for_each_segment (bv, req, iter) { -if (bv->bv_len & (blksize -1 )) +if (bv.bv_len & (blksize -1 ))/* Fba can only do full blocks. */ return ERR_PTR (-EINVAL ); - count += bv->bv_len >> (block->s2b_shift +9 ); + count += bv.bv_len >> (block->s2b_shift +9 ); }/* Paranoia. */ if (count != last_rec - first_rec +1 )
@@ -545,8 +545,8 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev, dbio = dreq->bio; recid = first_rec;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv->bv_page) + bv->bv_offset; -for (off =0 ; off < bv->bv_len; off += blksize) { + dst =page_address (bv.bv_page) + bv.bv_offset; +for (off =0 ; off < bv.bv_len; off += blksize) {memset (dbio,0 ,sizeof (struct dasd_diag_bio )); dbio->type = rw_cmd; dbio->block_number = recid +1 ;
drivers/s390/block/dasd_eckd.c +24 -24
136 lines not on this page · raw message
drivers/s390/block/dasd_fba.c +13 -13
@@ -260,7 +260,7 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev,struct dasd_ccw_req *cqr;struct ccw1 *ccw;struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv;char *dst;int count, cidaw, cplength, datasize;sector_t recid, first_rec, last_rec;
@@ -283,13 +283,13 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev, count =0 ; cidaw =0 ;rq_for_each_segment (bv, req, iter) { -if (bv->bv_len & (blksize -1 )) +if (bv.bv_len & (blksize -1 ))/* Fba can only do full blocks. */ return ERR_PTR (-EINVAL ); - count += bv->bv_len >> (block->s2b_shift +9 ); + count += bv.bv_len >> (block->s2b_shift +9 );#if defined(CONFIG_64BIT ) -if (idal_is_needed (page_address (bv->bv_page), bv->bv_len)) - cidaw += bv->bv_len / blksize; +if (idal_is_needed (page_address (bv.bv_page), bv.bv_len)) + cidaw += bv.bv_len / blksize;#endif }/* Paranoia. */
@@ -326,16 +326,16 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev, } recid = first_rec;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv->bv_page) + bv->bv_offset; + dst =page_address (bv.bv_page) + bv.bv_offset;if (dasd_page_cache) {char *copy =kmem_cache_alloc (dasd_page_cache,GFP_DMA | __GFP_NOWARN);if (copy &&rq_data_dir (req) ==WRITE ) -memcpy (copy + bv->bv_offset, dst, bv->bv_len); +memcpy (copy + bv.bv_offset, dst, bv.bv_len);if (copy) - dst = copy + bv->bv_offset; + dst = copy + bv.bv_offset; } -for (off =0 ; off < bv->bv_len; off += blksize) { +for (off =0 ; off < bv.bv_len; off += blksize) {/* Locate record for stupid devices. */ if (private->rdc_data.mode.bits.data_chain ==0 ) { ccw[-1 ].flags |=CCW_FLAG_CC ;
@@ -384,7 +384,7 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req)struct dasd_fba_private *private;struct ccw1 *ccw;struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv;char *dst, *cda;unsigned int blksize, off;int status;
@@ -399,8 +399,8 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req)if (private->rdc_data.mode.bits.data_chain !=0 ) ccw++;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv->bv_page) + bv->bv_offset; -for (off =0 ; off < bv->bv_len; off += blksize) { + dst =page_address (bv.bv_page) + bv.bv_offset; +for (off =0 ; off < bv.bv_len; off += blksize) {/* Skip locate record. */ if (private->rdc_data.mode.bits.data_chain ==0 ) ccw++;
@@ -411,7 +411,7 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req) cda = (char *)((addr_t ) ccw->cda);if (dst != cda) {if (rq_data_dir (req) ==READ ) -memcpy (dst, cda, bv->bv_len); +memcpy (dst, cda, bv.bv_len);kmem_cache_free (dasd_page_cache, (void *)((addr_t )cda &PAGE_MASK )); }
drivers/s390/block/dcssblk.c +8 -8
@@ -808,12 +808,12 @@ static void dcssblk_make_request(struct request_queue *q, struct bio *bio) { struct dcssblk_dev_info *dev_info; -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;unsigned long index;unsigned long page_addr;unsigned long source_addr;unsigned long bytes_done; -int i; bytes_done =0 ; dev_info = bio->bi_bdev->bd_disk->private_data;
@@ -844,21 +844,21 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio) } index = (bio->bi_iter.bi_sector >>3 ); -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) { page_addr = (unsigned long ) -page_address (bvec->bv_page) + bvec->bv_offset; +page_address (bvec.bv_page) + bvec.bv_offset; source_addr = dev_info->start + (index<<12 ) + bytes_done; -if (unlikely ((page_addr &4095 ) !=0 ) || (bvec->bv_len &4095 ) !=0 ) +if (unlikely ((page_addr &4095 ) !=0 ) || (bvec.bv_len &4095 ) !=0 )// More paranoia. goto fail;if (bio_data_dir (bio) ==READ ) {memcpy ((void *)page_addr, (void *)source_addr, - bvec->bv_len); + bvec.bv_len); }else {memcpy ((void *)source_addr, (void *)page_addr, - bvec->bv_len); + bvec.bv_len); } - bytes_done += bvec->bv_len; + bytes_done += bvec.bv_len; }bio_endio (bio,0 );return ;
drivers/s390/block/scm_blk.c +4 -4
@@ -130,7 +130,7 @@ static void scm_request_prepare(struct scm_request *scmrq)struct aidaw *aidaw = scmrq->aidaw;struct msb *msb = &scmrq->aob->msb[0 ];struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv; msb->bs =MSB_BS_4K ; scmrq->aob->request.msb_count =1 ;
@@ -142,9 +142,9 @@ static void scm_request_prepare(struct scm_request *scmrq) msb->data_addr = (u64 ) aidaw;rq_for_each_segment (bv, scmrq->request, iter) { -WARN_ON (bv->bv_offset); - msb->blk_count += bv->bv_len >>12 ; - aidaw->data_addr = (u64 )page_address (bv->bv_page); +WARN_ON (bv.bv_offset); + msb->blk_count += bv.bv_len >>12 ; + aidaw->data_addr = (u64 )page_address (bv.bv_page); aidaw++; } }
drivers/s390/block/scm_blk_cluster.c +2 -2
@@ -122,7 +122,7 @@ static void scm_prepare_cluster_request(struct scm_request *scmrq)struct aidaw *aidaw = scmrq->aidaw;struct msb *msb = &scmrq->aob->msb[0 ];struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv;int i =0 ;u64 addr;
@@ -163,7 +163,7 @@ static void scm_prepare_cluster_request(struct scm_request *scmrq) i++; }rq_for_each_segment (bv, req, iter) { - aidaw->data_addr = (u64 )page_address (bv->bv_page); + aidaw->data_addr = (u64 )page_address (bv.bv_page); aidaw++; i++; }
drivers/s390/block/xpram.c +5 -5
@@ -184,11 +184,11 @@ static unsigned long xpram_highest_page_index(void)static void xpram_make_request (struct request_queue *q,struct bio *bio) {xpram_device_t *xdev = bio->bi_bdev->bd_disk->private_data; -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;unsigned int index;unsigned long page_addr;unsigned long bytes; -int i;if ((bio->bi_iter.bi_sector &7 ) !=0 || (bio->bi_iter.bi_size &4095 ) !=0 )
@@ -200,10 +200,10 @@ static void xpram_make_request(struct request_queue *q, struct bio *bio)if ((bio->bi_iter.bi_sector >>3 ) >0xffffffffU - xdev->offset) goto fail; index = (bio->bi_iter.bi_sector >>3 ) + xdev->offset; -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) { page_addr = (unsigned long ) -kmap (bvec->bv_page) + bvec->bv_offset; - bytes = bvec->bv_len; +kmap (bvec.bv_page) + bvec.bv_offset; + bytes = bvec.bv_len;if ((page_addr &4095 ) !=0 || (bytes &4095 ) !=0 )/* More paranoia. */ goto fail;
drivers/scsi/mpt2sas/mpt2sas_transport.c +16 -15
@@ -1901,7 +1901,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,struct MPT2SAS_ADAPTER *ioc =shost_priv (shost);Mpi2SmpPassthroughRequest_t *mpi_request;Mpi2SmpPassthroughReply_t *mpi_reply; -int rc, i; +int rc;u16 smid;u32 ioc_state;unsigned long timeleft;
@@ -1916,7 +1916,8 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,void *pci_addr_out =NULL ;u16 wait_state_count;struct request *rsp = req->next_rq; -struct bio_vec *bvec =NULL ; +struct bio_vec bvec; +struct bvec_iter iter;if (!rsp) { printk(MPT2SAS_ERR_FMT "%s: the smp response space is "
@@ -1955,11 +1956,11 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, goto out; } -bio_for_each_segment (bvec, req->bio, i) { +bio_for_each_segment (bvec, req->bio, iter) {memcpy (pci_addr_out + offset, -page_address (bvec->bv_page) + bvec->bv_offset, - bvec->bv_len); - offset += bvec->bv_len; +page_address (bvec.bv_page) + bvec.bv_offset, + bvec.bv_len); + offset += bvec.bv_len; } }else { dma_addr_out = pci_map_single(ioc->pdev, bio_data(req->bio),
@@ -2106,19 +2107,19 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,u32 offset =0 ;u32 bytes_to_copy =le16_to_cpu (mpi_reply->ResponseDataLength); -bio_for_each_segment (bvec, rsp->bio, i) { -if (bytes_to_copy <= bvec->bv_len) { -memcpy (page_address (bvec->bv_page) + - bvec->bv_offset, pci_addr_in + +bio_for_each_segment (bvec, rsp->bio, iter) { +if (bytes_to_copy <= bvec.bv_len) { +memcpy (page_address (bvec.bv_page) + + bvec.bv_offset, pci_addr_in + offset, bytes_to_copy);break ; }else { -memcpy (page_address (bvec->bv_page) + - bvec->bv_offset, pci_addr_in + - offset, bvec->bv_len); - bytes_to_copy -= bvec->bv_len; +memcpy (page_address (bvec.bv_page) + + bvec.bv_offset, pci_addr_in + + offset, bvec.bv_len); + bytes_to_copy -= bvec.bv_len; } - offset += bvec->bv_len; + offset += bvec.bv_len; } } }else {
drivers/scsi/mpt3sas/mpt3sas_transport.c +16 -15
@@ -1884,7 +1884,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,struct MPT3SAS_ADAPTER *ioc =shost_priv (shost);Mpi2SmpPassthroughRequest_t *mpi_request;Mpi2SmpPassthroughReply_t *mpi_reply; -int rc, i; +int rc;u16 smid;u32 ioc_state;unsigned long timeleft;
@@ -1898,7 +1898,8 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,void *pci_addr_out =NULL ;u16 wait_state_count;struct request *rsp = req->next_rq; -struct bio_vec *bvec =NULL ; +struct bio_vec bvec; +struct bvec_iter iter;if (!rsp) { pr_err(MPT3SAS_FMT "%s: the smp response space is missing\n",
@@ -1938,11 +1939,11 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, goto out; } -bio_for_each_segment (bvec, req->bio, i) { +bio_for_each_segment (bvec, req->bio, iter) {memcpy (pci_addr_out + offset, -page_address (bvec->bv_page) + bvec->bv_offset, - bvec->bv_len); - offset += bvec->bv_len; +page_address (bvec.bv_page) + bvec.bv_offset, + bvec.bv_len); + offset += bvec.bv_len; } }else { dma_addr_out = pci_map_single(ioc->pdev, bio_data(req->bio),
@@ -2067,19 +2068,19 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,u32 offset =0 ;u32 bytes_to_copy =le16_to_cpu (mpi_reply->ResponseDataLength); -bio_for_each_segment (bvec, rsp->bio, i) { -if (bytes_to_copy <= bvec->bv_len) { -memcpy (page_address (bvec->bv_page) + - bvec->bv_offset, pci_addr_in + +bio_for_each_segment (bvec, rsp->bio, iter) { +if (bytes_to_copy <= bvec.bv_len) { +memcpy (page_address (bvec.bv_page) + + bvec.bv_offset, pci_addr_in + offset, bytes_to_copy);break ; }else { -memcpy (page_address (bvec->bv_page) + - bvec->bv_offset, pci_addr_in + - offset, bvec->bv_len); - bytes_to_copy -= bvec->bv_len; +memcpy (page_address (bvec.bv_page) + + bvec.bv_offset, pci_addr_in + + offset, bvec.bv_len); + bytes_to_copy -= bvec.bv_len; } - offset += bvec->bv_len; + offset += bvec.bv_len; } } }else {
drivers/staging/lustre/lustre/llite/lloop.c +7 -7
@@ -194,10 +194,10 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)struct cl_object *obj =ll_i2info (inode)->lli_clob;pgoff_t offset;int ret; -int i;int rw;obd_count page_count =0 ; -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;struct bio *bio;ssize_t bytes;
@@ -221,14 +221,14 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)LASSERT (rw == bio->bi_rw); offset = (pgoff_t)(bio->bi_iter.bi_sector <<9 ) + lo->lo_offset; -bio_for_each_segment (bvec, bio, i) { -BUG_ON (bvec->bv_offset !=0 ); -BUG_ON (bvec->bv_len !=PAGE_CACHE_SIZE ); +bio_for_each_segment (bvec, bio, iter) { +BUG_ON (bvec.bv_offset !=0 ); +BUG_ON (bvec.bv_len !=PAGE_CACHE_SIZE ); - pages[page_count] = bvec->bv_page; + pages[page_count] = bvec.bv_page; offsets[page_count] = offset; page_count++; - offset += bvec->bv_len; + offset += bvec.bv_len; }LASSERT (page_count <=LLOOP_MAX_SEGMENTS ); }
drivers/staging/zram/zram_drv.c +10 -9
@@ -672,9 +672,10 @@ static ssize_t reset_store(struct device *dev,static void __zram_make_request (struct zram *zram,struct bio *bio,int rw) { -int i, offset; +int offset;u32 index; -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;switch (rw) {case READ :
@@ -689,33 +690,33 @@ static void __zram_make_request(struct zram *zram, struct bio *bio, int rw) offset = (bio->bi_iter.bi_sector & (SECTORS_PER_PAGE -1 )) <<SECTOR_SHIFT ; -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) {int max_transfer_size =PAGE_SIZE - offset; -if (bvec->bv_len > max_transfer_size) { +if (bvec.bv_len > max_transfer_size) {/* * zram_bvec_rw() can only make operation on a single * zram page. Split the bio vector. */ struct bio_vec bv; - bv.bv_page = bvec->bv_page; + bv.bv_page = bvec.bv_page; bv.bv_len = max_transfer_size; - bv.bv_offset = bvec->bv_offset; + bv.bv_offset = bvec.bv_offset;if (zram_bvec_rw (zram, &bv, index, offset, bio, rw) <0 ) goto out; - bv.bv_len = bvec->bv_len - max_transfer_size; + bv.bv_len = bvec.bv_len - max_transfer_size; bv.bv_offset += max_transfer_size;if (zram_bvec_rw (zram, &bv, index+1 ,0 , bio, rw) <0 ) goto out; }else -if (zram_bvec_rw (zram, bvec, index, offset, bio, rw) +if (zram_bvec_rw (zram, &bvec, index, offset, bio, rw) <0 ) goto out; -update_position (&index, &offset, bvec); +update_position (&index, &offset, &bvec); }set_bit (BIO_UPTODATE , &bio->bi_flags);
fs/bio-integrity.c +16 -14
@@ -299,25 +299,26 @@ static void bio_integrity_generate(struct bio *bio) {struct blk_integrity *bi =bdev_get_integrity (bio->bi_bdev);struct blk_integrity_exchg bix; -struct bio_vec *bv; +struct bio_vec bv; +struct bvec_iter iter;sector_t sector = bio->bi_iter.bi_sector; -unsigned int i, sectors, total; +unsigned int sectors, total;void *prot_buf = bio->bi_integrity->bip_buf; total =0 ; bix.disk_name = bio->bi_bdev->bd_disk->disk_name; bix.sector_size = bi->sector_size; -bio_for_each_segment (bv, bio, i) { -void *kaddr =kmap_atomic (bv->bv_page); - bix.data_buf = kaddr + bv->bv_offset; - bix.data_size = bv->bv_len; +bio_for_each_segment (bv, bio, iter) { +void *kaddr =kmap_atomic (bv.bv_page); + bix.data_buf = kaddr + bv.bv_offset; + bix.data_size = bv.bv_len; bix.prot_buf = prot_buf; bix.sector = sector; bi->generate_fn (&bix); - sectors = bv->bv_len / bi->sector_size; + sectors = bv.bv_len / bi->sector_size; sector += sectors; prot_buf += sectors * bi->tuple_size; total += sectors * bi->tuple_size;
@@ -441,19 +442,20 @@ static int bio_integrity_verify(struct bio *bio) {struct blk_integrity *bi =bdev_get_integrity (bio->bi_bdev);struct blk_integrity_exchg bix; -struct bio_vec *bv; +struct bio_vec bv; +struct bvec_iter iter;sector_t sector = bio->bi_integrity->bip_sector; -unsigned int i, sectors, total, ret; +unsigned int sectors, total, ret;void *prot_buf = bio->bi_integrity->bip_buf; ret = total =0 ; bix.disk_name = bio->bi_bdev->bd_disk->disk_name; bix.sector_size = bi->sector_size; -bio_for_each_segment (bv, bio, i) { -void *kaddr =kmap_atomic (bv->bv_page); - bix.data_buf = kaddr + bv->bv_offset; - bix.data_size = bv->bv_len; +bio_for_each_segment (bv, bio, iter) { +void *kaddr =kmap_atomic (bv.bv_page); + bix.data_buf = kaddr + bv.bv_offset; + bix.data_size = bv.bv_len; bix.prot_buf = prot_buf; bix.sector = sector;
@@ -464,7 +466,7 @@ static int bio_integrity_verify(struct bio *bio)return ret; } - sectors = bv->bv_len / bi->sector_size; + sectors = bv.bv_len / bi->sector_size; sector += sectors; prot_buf += sectors * bi->tuple_size; total += sectors * bi->tuple_size;
fs/bio.c +11 -11
@@ -473,13 +473,13 @@ EXPORT_SYMBOL(bio_alloc_bioset);void zero_fill_bio (struct bio *bio) {unsigned long flags; -struct bio_vec *bv; -int i; +struct bio_vec bv; +struct bvec_iter iter; -bio_for_each_segment (bv, bio, i) { -char *data =bvec_kmap_irq (bv, &flags); -memset (data,0 , bv->bv_len); -flush_dcache_page (bv->bv_page); +bio_for_each_segment (bv, bio, iter) { +char *data =bvec_kmap_irq (&bv, &flags); +memset (data,0 , bv.bv_len); +flush_dcache_page (bv.bv_page);bvec_kunmap_irq (data, &flags); } }
@@ -1687,11 +1687,11 @@ void bio_check_pages_dirty(struct bio *bio)#if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE void bio_flush_dcache_pages (struct bio *bi) { -int i; -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter; -bio_for_each_segment (bvec, bi, i) -flush_dcache_page (bvec->bv_page); +bio_for_each_segment (bvec, bi, iter) +flush_dcache_page (bvec.bv_page); }EXPORT_SYMBOL (bio_flush_dcache_pages);#endif
@@ -1840,7 +1840,7 @@ void bio_trim(struct bio *bio, int offset, int size) bio->bi_iter.bi_idx =0 ; }/* Make sure vcnt and last bv are not too big */ -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment_all (bvec, bio, i) {if (sofar + bvec->bv_len > size) bvec->bv_len = size - sofar;if (bvec->bv_len ==0 ) {
include/linux/bio.h +14 -14
@@ -63,10 +63,13 @@*/ #define bio_iovec_idx (bio, idx) (&((bio)->bi_io_vec[(idx)]))#define __bio_iovec (bio) bio_iovec_idx((bio), (bio)->bi_iter.bi_idx) -#define bio_iovec (bio) (*__bio_iovec(bio)) + +#define bio_iter_iovec (bio, iter) ((bio)->bi_io_vec[(iter).bi_idx])#define bio_page (bio) (bio_iovec((bio)).bv_page)#define bio_offset (bio) (bio_iovec((bio)).bv_offset) +#define bio_iovec (bio) (*__bio_iovec(bio)) +#define bio_segments (bio) ((bio)->bi_vcnt - (bio)->bi_iter.bi_idx)#define bio_sectors (bio) ((bio)->bi_iter.bi_size >> 9)#define bio_end_sector (bio) ((bio)->bi_iter.bi_sector + bio_sectors((bio)))
@@ -134,15 +137,6 @@ static inline void *bio_data(struct bio *bio)#define bio_io_error (bio) bio_endio((bio), -EIO)/* -* drivers should not use the __ version unless they _really_ know what -* they're doing -*/ -#define __bio_for_each_segment (bvl, bio, i, start_idx) \ - for (bvl = bio_iovec_idx((bio), (start_idx)), i = (start_idx); \ - i < (bio)->bi_vcnt; \ - bvl++, i++) - -/* * drivers should _never_ use the all version - the bio may have been split * before it got to the driver and the driver won't own all of it */
@@ -151,10 +145,16 @@ static inline void *bio_data(struct bio *bio) bvl =bio_iovec_idx ((bio), (i)), i < (bio)->bi_vcnt; \ i++) -#define bio_for_each_segment (bvl, bio, i) \ - for (i = (bio)->bi_iter.bi_idx; \ - bvl = bio_iovec_idx((bio), (i)), i < (bio)->bi_vcnt; \ - i++) +#define __bio_for_each_segment (bvl, bio, iter, start) \ + for (iter = (start); \ + bvl = bio_iter_iovec((bio), (iter)), \ + (iter).bi_idx < (bio)->bi_vcnt; \ + (iter).bi_idx++) + +#define bio_for_each_segment (bvl, bio, iter) \ + __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter) + +#define bio_iter_last (bio, iter) ((iter).bi_idx == (bio)->bi_vcnt - 1)/* * get a reference to a bio, so it won't disappear. the intended use is
include/linux/blkdev.h +4 -3
@@ -735,7 +735,7 @@ struct rq_map_data { };struct req_iterator { -int i; +struct bvec_iter iter;struct bio *bio; };
@@ -748,10 +748,11 @@ struct req_iterator {#define rq_for_each_segment (bvl, _rq, _iter) \ __rq_for_each_bio(_iter.bio, _rq) \ - bio_for_each_segment(bvl, _iter.bio, _iter.i) + bio_for_each_segment(bvl, _iter.bio, _iter.iter)#define rq_iter_last (rq, _iter) \ - (_iter.bio->bi_next == NULL && _iter.i == _iter.bio->bi_vcnt-1) + (_iter.bio->bi_next == NULL && \ + bio_iter_last(_iter.bio, _iter.iter))#ifndef ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE # error "You should define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE for your platform"
mm/bounce.c +21 -23
61 lines not on this page · raw message
Signature · 7 lines
1.8.4.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 7/25 block: Convert bio_for_each_segment() to bvec_iter
In reply to Kent OverstreetMore prep work for immutable biovecs - with immutable bvecs drivers won't be able to use the biovec directly, they'll need to use helpers that take into account bio->bi_iter.bi_bvec_done.
This updates callers for the new usage without changing the implementation yet.
--- arch/m68k/emu/nfblock.c | 11 ++--- arch/powerpc/sysdev/axonram.c | 18 ++++---- block/blk-core.c | 4 +- block/blk-merge.c | 49 ++++++++++---------- drivers/block/aoe/aoecmd.c | 16 +++---- drivers/block/brd.c | 12 ++--- drivers/block/drbd/drbd_main.c | 27 ++++++----- drivers/block/drbd/drbd_receiver.c | 13 +++--- drivers/block/drbd/drbd_worker.c | 8 ++-- drivers/block/floppy.c | 12 ++--- drivers/block/loop.c | 23 +++++----- drivers/block/mtip32xx/mtip32xx.c | 13 +++--- drivers/block/nbd.c | 12 ++--- drivers/block/nvme-core.c | 33 ++++++++------ drivers/block/ps3disk.c | 10 ++--- drivers/block/ps3vram.c | 10 ++--- drivers/block/rbd.c | 38 ++++++++-------- drivers/block/rsxx/dma.c | 11 ++--- drivers/md/bcache/btree.c | 4 +- drivers/md/bcache/debug.c | 19 ++++---- drivers/md/bcache/io.c | 69 ++++++++++++----------------- drivers/md/bcache/request.c | 26 +++++------ drivers/md/raid5.c | 12 ++--- drivers/s390/block/dasd_diag.c | 10 ++--- drivers/s390/block/dasd_eckd.c | 48 ++++++++++---------- drivers/s390/block/dasd_fba.c | 26 +++++------ drivers/s390/block/dcssblk.c | 16 +++---- drivers/s390/block/scm_blk.c | 8 ++-- drivers/s390/block/scm_blk_cluster.c | 4 +- drivers/s390/block/xpram.c | 10 ++--- drivers/scsi/mpt2sas/mpt2sas_transport.c | 31 ++++++------- drivers/scsi/mpt3sas/mpt3sas_transport.c | 31 ++++++------- drivers/staging/lustre/lustre/llite/lloop.c | 14 +++--- drivers/staging/zram/zram_drv.c | 19 ++++---- fs/bio-integrity.c | 30 +++++++------ fs/bio.c | 22 ++++----- include/linux/bio.h | 28 ++++++------ include/linux/blkdev.h | 7 +-- mm/bounce.c | 44 +++++++++--------- 39 files changed, 401 insertions(+), 397 deletions(-)
arch/m68k/emu/nfblock.c +6 -5
@@ -62,17 +62,18 @@ struct nfhd_device {static void nfhd_make_request (struct request_queue *queue,struct bio *bio) {struct nfhd_device *dev = queue->queuedata; -struct bio_vec *bvec; -int i, dir, len, shift; +struct bio_vec bvec; +struct bvec_iter iter; +int dir, len, shift;sector_t sec = bio->bi_iter.bi_sector; dir =bio_data_dir (bio); shift = dev->bshift; -bio_for_each_segment (bvec, bio, i) { - len = bvec->bv_len; +bio_for_each_segment (bvec, bio, iter) { + len = bvec.bv_len; len >>=9 ;nfhd_read_write (dev->id,0 , dir, sec >> shift, len >> shift, -bvec_to_phys (bvec)); +bvec_to_phys (&bvec)); sec += len; }bio_endio (bio,0 );
arch/powerpc/sysdev/axonram.c +9 -9
@@ -109,28 +109,28 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio)struct axon_ram_bank *bank = bio->bi_bdev->bd_disk->private_data;unsigned long phys_mem, phys_end;void *user_mem; -struct bio_vec *vec; +struct bio_vec vec;unsigned int transfered; -unsigned short idx; +struct bvec_iter iter; phys_mem = bank->io_addr + (bio->bi_iter.bi_sector <<AXON_RAM_SECTOR_SHIFT ); phys_end = bank->io_addr + bank->size; transfered =0 ; -bio_for_each_segment (vec, bio, idx) { -if (unlikely (phys_mem + vec->bv_len > phys_end)) { +bio_for_each_segment (vec, bio, iter) { +if (unlikely (phys_mem + vec.bv_len > phys_end)) {bio_io_error (bio);return ; } - user_mem =page_address (vec->bv_page) + vec->bv_offset; + user_mem =page_address (vec.bv_page) + vec.bv_offset;if (bio_data_dir (bio) ==READ ) -memcpy (user_mem, (void *) phys_mem, vec->bv_len); +memcpy (user_mem, (void *) phys_mem, vec.bv_len);else -memcpy ((void *) phys_mem, user_mem, vec->bv_len); +memcpy ((void *) phys_mem, user_mem, vec.bv_len); - phys_mem += vec->bv_len; - transfered += vec->bv_len; + phys_mem += vec.bv_len; + transfered += vec.bv_len; }bio_endio (bio,0 ); }
block/blk-core.c +2 -2
@@ -2746,10 +2746,10 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq,void rq_flush_dcache_pages (struct request *rq) {struct req_iterator iter; -struct bio_vec *bvec; +struct bio_vec bvec;rq_for_each_segment (bvec, rq, iter) -flush_dcache_page (bvec->bv_page); +flush_dcache_page (bvec.bv_page); }EXPORT_SYMBOL_GPL (rq_flush_dcache_pages);#endif
block/blk-merge.c +23 -26
128 lines not on this page · raw message
drivers/block/aoe/aoecmd.c +8 -8
@@ -897,15 +897,15 @@ rqbiocnt(struct request *r)static void bio_pageinc (struct bio *bio) { -struct bio_vec *bv; +struct bio_vec bv;struct page *page; -int i; +struct bvec_iter iter; -bio_for_each_segment (bv, bio, i) { +bio_for_each_segment (bv, bio, iter) {/* Non-zero page count for non-head members of * compound pages is no longer allowed by the kernel. */ - page =compound_trans_head (bv->bv_page); + page =compound_trans_head (bv.bv_page);atomic_inc (&page->_count); } }
@@ -913,12 +913,12 @@ bio_pageinc(struct bio *bio)static void bio_pagedec (struct bio *bio) { -struct bio_vec *bv;struct page *page; -int i; +struct bio_vec bv; +struct bvec_iter iter; -bio_for_each_segment (bv, bio, i) { - page =compound_trans_head (bv->bv_page); +bio_for_each_segment (bv, bio, iter) { + page =compound_trans_head (bv.bv_page);atomic_dec (&page->_count); } }
drivers/block/brd.c +6 -6
@@ -328,9 +328,9 @@ static void brd_make_request(struct request_queue *q, struct bio *bio)struct block_device *bdev = bio->bi_bdev;struct brd_device *brd = bdev->bd_disk->private_data;int rw; -struct bio_vec *bvec; +struct bio_vec bvec;sector_t sector; -int i; +struct bvec_iter iter;int err = -EIO ; sector = bio->bi_iter.bi_sector;
@@ -347,10 +347,10 @@ static void brd_make_request(struct request_queue *q, struct bio *bio)if (rw ==READA ) rw =READ ; -bio_for_each_segment (bvec, bio, i) { -unsigned int len = bvec->bv_len; - err =brd_do_bvec (brd, bvec->bv_page, len, - bvec->bv_offset, rw, sector); +bio_for_each_segment (bvec, bio, iter) { +unsigned int len = bvec.bv_len; + err =brd_do_bvec (brd, bvec.bv_page, len, + bvec.bv_offset, rw, sector);if (err)break ; sector += len >>SECTOR_SHIFT ;
drivers/block/drbd/drbd_main.c +15 -12
@@ -1537,15 +1537,17 @@ static int _drbd_send_page(struct drbd_conf *mdev, struct page *page,static int _drbd_send_bio (struct drbd_conf *mdev,struct bio *bio) { -struct bio_vec *bvec; -int i; +struct bio_vec bvec; +struct bvec_iter iter; +/* hint all but last page with MSG_MORE */ -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) {int err; - err =_drbd_no_send_page (mdev, bvec->bv_page, - bvec->bv_offset, bvec->bv_len, - i == bio->bi_vcnt -1 ?0 :MSG_MORE ); + err =_drbd_no_send_page (mdev, bvec.bv_page, + bvec.bv_offset, bvec.bv_len, +bio_iter_last (bio, iter) + ?0 :MSG_MORE );if (err)return err; }
@@ -1554,15 +1556,16 @@ static int _drbd_send_bio(struct drbd_conf *mdev, struct bio *bio)static int _drbd_send_zc_bio (struct drbd_conf *mdev,struct bio *bio) { -struct bio_vec *bvec; -int i; +struct bio_vec bvec; +struct bvec_iter iter; +/* hint all but last page with MSG_MORE */ -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) {int err; - err =_drbd_send_page (mdev, bvec->bv_page, - bvec->bv_offset, bvec->bv_len, - i == bio->bi_vcnt -1 ?0 :MSG_MORE ); + err =_drbd_send_page (mdev, bvec.bv_page, + bvec.bv_offset, bvec.bv_len, +bio_iter_last (bio, iter) ?0 :MSG_MORE );if (err)return err; }
drivers/block/drbd/drbd_receiver.c +7 -6
@@ -1595,9 +1595,10 @@ static int drbd_drain_block(struct drbd_conf *mdev, int data_size)static int recv_dless_read (struct drbd_conf *mdev,struct drbd_request *req,sector_t sector,int data_size) { -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;struct bio *bio; -int dgs, err, i, expect; +int dgs, err, expect;void *dig_in = mdev->tconn->int_dig_in;void *dig_vv = mdev->tconn->int_dig_vv;
@@ -1617,11 +1618,11 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req, bio = req->master_bio;D_ASSERT (sector == bio->bi_iter.bi_sector); -bio_for_each_segment (bvec, bio, i) { -void *mapped =kmap (bvec->bv_page) + bvec->bv_offset; - expect =min_t (int, data_size, bvec->bv_len); +bio_for_each_segment (bvec, bio, iter) { +void *mapped =kmap (bvec.bv_page) + bvec.bv_offset; + expect =min_t (int, data_size, bvec.bv_len); err =drbd_recv_all_warn (mdev->tconn, mapped, expect); -kunmap (bvec->bv_page); +kunmap (bvec.bv_page);if (err)return err; data_size -= expect;
drivers/block/drbd/drbd_worker.c +4 -4
@@ -313,8 +313,8 @@ void drbd_csum_bio(struct drbd_conf *mdev, struct crypto_hash *tfm, struct bio * {struct hash_desc desc;struct scatterlist sg; -struct bio_vec *bvec; -int i; +struct bio_vec bvec; +struct bvec_iter iter; desc.tfm = tfm; desc.flags =0 ;
@@ -322,8 +322,8 @@ void drbd_csum_bio(struct drbd_conf *mdev, struct crypto_hash *tfm, struct bio *sg_init_table (&sg,1 );crypto_hash_init (&desc); -bio_for_each_segment (bvec, bio, i) { -sg_set_page (&sg, bvec->bv_page, bvec->bv_len, bvec->bv_offset); +bio_for_each_segment (bvec, bio, iter) { +sg_set_page (&sg, bvec.bv_page, bvec.bv_len, bvec.bv_offset);crypto_hash_update (&desc, &sg, sg.length); }crypto_hash_final (&desc, digest);
drivers/block/floppy.c +6 -6
@@ -2351,7 +2351,7 @@ static void rw_interrupt(void)/* Compute maximal contiguous buffer size. */ static int buffer_chain_size (void ) { -struct bio_vec *bv; +struct bio_vec bv;int size;struct req_iterator iter;char *base;
@@ -2360,10 +2360,10 @@ static int buffer_chain_size(void) size =0 ;rq_for_each_segment (bv, current_req, iter) { -if (page_address (bv->bv_page) + bv->bv_offset != base + size) +if (page_address (bv.bv_page) + bv.bv_offset != base + size)break ; - size += bv->bv_len; + size += bv.bv_len; }return size >>9 ;
@@ -2389,7 +2389,7 @@ static int transfer_size(int ssize, int max_sector, int max_size)static void copy_buffer (int ssize,int max_sector,int max_sector_2) {int remaining;/* number of transferred 512-byte sectors */ -struct bio_vec *bv; +struct bio_vec bv;char *buffer;char *dma_buffer;int size;
@@ -2427,10 +2427,10 @@ static void copy_buffer(int ssize, int max_sector, int max_sector_2)if (!remaining)break ; - size = bv->bv_len; + size = bv.bv_len;SUPBOUND (size, remaining); - buffer =page_address (bv->bv_page) + bv->bv_offset; + buffer =page_address (bv.bv_page) + bv.bv_offset;if (dma_buffer + size > floppy_track_buffer + (max_buffer_sectors <<10 ) || dma_buffer < floppy_track_buffer) {
drivers/block/loop.c +12 -11
@@ -288,9 +288,10 @@ static int lo_send(struct loop_device *lo, struct bio *bio, loff_t pos) {int (*do_lo_send)(struct loop_device *,struct bio_vec *,loff_t ,struct page *page); -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;struct page *page =NULL ; -int i, ret =0 ; +int ret =0 ;if (lo->transfer != transfer_none) { page =alloc_page (GFP_NOIO | __GFP_HIGHMEM);
@@ -302,11 +303,11 @@ static int lo_send(struct loop_device *lo, struct bio *bio, loff_t pos) do_lo_send = do_lo_send_direct_write; } -bio_for_each_segment (bvec, bio, i) { - ret =do_lo_send (lo, bvec, pos, page); +bio_for_each_segment (bvec, bio, iter) { + ret =do_lo_send (lo, &bvec, pos, page);if (ret <0 )break ; - pos += bvec->bv_len; + pos += bvec.bv_len; }if (page) {kunmap (page);
@@ -392,20 +393,20 @@ do_lo_receive(struct loop_device *lo,static int lo_receive (struct loop_device *lo,struct bio *bio,int bsize,loff_t pos) { -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;ssize_t s; -int i; -bio_for_each_segment (bvec, bio, i) { - s =do_lo_receive (lo, bvec, bsize, pos); +bio_for_each_segment (bvec, bio, iter) { + s =do_lo_receive (lo, &bvec, bsize, pos);if (s <0 )return s; -if (s != bvec->bv_len) { +if (s != bvec.bv_len) {zero_fill_bio (bio);break ; } - pos += bvec->bv_len; + pos += bvec.bv_len; }return 0 ; }
drivers/block/mtip32xx/mtip32xx.c +7 -6
@@ -3962,8 +3962,9 @@ static void mtip_make_request(struct request_queue *queue, struct bio *bio) {struct driver_data *dd = queue->queuedata;struct scatterlist *sg; -struct bio_vec *bvec; -int i, nents =0 ; +struct bio_vec bvec; +struct bvec_iter iter; +int nents =0 ;int tag =0 , unaligned =0 ;if (unlikely (dd->dd_flag &MTIP_DDF_STOP_IO )) {
@@ -4026,11 +4027,11 @@ static void mtip_make_request(struct request_queue *queue, struct bio *bio) }/* Create the scatter list for this bio. */ -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) {sg_set_page (&sg[nents], - bvec->bv_page, - bvec->bv_len, - bvec->bv_offset); + bvec.bv_page, + bvec.bv_len, + bvec.bv_offset); nents++; }
drivers/block/nbd.c +6 -6
@@ -271,7 +271,7 @@ static int nbd_send_req(struct nbd_device *nbd, struct request *req)if (nbd_cmd (req) ==NBD_CMD_WRITE ) {struct req_iterator iter; -struct bio_vec *bvec; +struct bio_vec bvec;/* * we are really probing at internals to determine * whether to set MSG_MORE or not...
@@ -281,8 +281,8 @@ static int nbd_send_req(struct nbd_device *nbd, struct request *req)if (!rq_iter_last (req, iter)) flags =MSG_MORE ;dprintk (DBG_TX ,"%s: request %p: sending %d bytes data\n" , - nbd->disk->disk_name, req, bvec->bv_len); - result =sock_send_bvec (nbd, bvec, flags); + nbd->disk->disk_name, req, bvec.bv_len); + result =sock_send_bvec (nbd, &bvec, flags);if (result <=0 ) { dev_err(disk_to_dev(nbd->disk), "Send data failed (result %d)\n",
@@ -378,10 +378,10 @@ static struct request *nbd_read_stat(struct nbd_device *nbd) nbd->disk->disk_name, req);if (nbd_cmd (req) ==NBD_CMD_READ ) {struct req_iterator iter; -struct bio_vec *bvec; +struct bio_vec bvec;rq_for_each_segment (bvec, req, iter) { - result =sock_recv_bvec (nbd, bvec); + result =sock_recv_bvec (nbd, &bvec);if (result <=0 ) {dev_err (disk_to_dev (nbd->disk),"Receive data failed (result %d)\n" , result);
@@ -389,7 +389,7 @@ static struct request *nbd_read_stat(struct nbd_device *nbd)return req; }dprintk (DBG_RX ,"%s: request %p: got %d bytes data\n" , - nbd->disk->disk_name, req, bvec->bv_len); + nbd->disk->disk_name, req, bvec.bv_len); } }return req;
drivers/block/nvme-core.c +19 -14
@@ -550,9 +550,11 @@ static int nvme_split_and_submit(struct bio *bio, struct nvme_queue *nvmeq,static int nvme_map_bio (struct nvme_queue *nvmeq,struct nvme_iod *iod,struct bio *bio,enum dma_data_direction dma_dir,int psegs) { -struct bio_vec *bvec, *bvprv =NULL ; +struct bio_vec bvec, bvprv; +struct bvec_iter iter;struct scatterlist *sg =NULL ; -int i, length =0 , nsegs =0 , split_len = bio->bi_iter.bi_size; +int length =0 , nsegs =0 , split_len = bio->bi_iter.bi_size; +int first =1 ;if (nvmeq->dev->stripe_size) split_len = nvmeq->dev->stripe_size -
@@ -560,25 +562,28 @@ static int nvme_map_bio(struct nvme_queue *nvmeq, struct nvme_iod *iod, (nvmeq->dev->stripe_size - 1));sg_init_table (iod->sg, psegs); -bio_for_each_segment (bvec, bio, i) { -if (bvprv &&BIOVEC_PHYS_MERGEABLE (bvprv, bvec)) { - sg->length += bvec->bv_len; +bio_for_each_segment (bvec, bio, iter) { +if (!first &&BIOVEC_PHYS_MERGEABLE (&bvprv, &bvec)) { + sg->length += bvec.bv_len; }else { -if (bvprv &&BIOVEC_NOT_VIRT_MERGEABLE (bvprv, bvec)) -return nvme_split_and_submit (bio, nvmeq, i, - length,0 ); +if (!first &&BIOVEC_NOT_VIRT_MERGEABLE (&bvprv, &bvec)) +return nvme_split_and_submit (bio, nvmeq, + iter.bi_idx, + length,0 ); sg = sg ? sg +1 : iod->sg; -sg_set_page (sg, bvec->bv_page, bvec->bv_len, - bvec->bv_offset); +sg_set_page (sg, bvec.bv_page, + bvec.bv_len, bvec.bv_offset); nsegs++; } -if (split_len - length < bvec->bv_len) -return nvme_split_and_submit (bio, nvmeq, i, split_len, - split_len - length); - length += bvec->bv_len; +if (split_len - length < bvec.bv_len) +return nvme_split_and_submit (bio, nvmeq, iter.bi_idx, + split_len, + split_len - length); + length += bvec.bv_len; bvprv = bvec; + first =0 ; } iod->nents = nsegs;sg_mark_end (sg);
drivers/block/ps3disk.c +5 -5
@@ -94,7 +94,7 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev, {unsigned int offset =0 ;struct req_iterator iter; -struct bio_vec *bvec; +struct bio_vec bvec;unsigned int i =0 ;size_t size;void *buf;
@@ -106,14 +106,14 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev, __func__, __LINE__, i,bio_segments (iter.bio), bio_sectors(iter.bio), iter.bio->bi_iter.bi_sector); - size = bvec->bv_len; - buf =bvec_kmap_irq (bvec, &flags); + size = bvec.bv_len; + buf =bvec_kmap_irq (&bvec, &flags);if (gather)memcpy (dev->bounce_buf+offset, buf, size);else memcpy (buf, dev->bounce_buf+offset, size); offset += size; -flush_kernel_dcache_page (bvec->bv_page); +flush_kernel_dcache_page (bvec.bv_page);bvec_kunmap_irq (buf, &flags); i++; }
@@ -130,7 +130,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,#ifdef DEBUG unsigned int n =0 ; -struct bio_vec *bv; +struct bio_vec bv;struct req_iterator iter;rq_for_each_segment (bv, req, iter)
drivers/block/ps3vram.c +5 -5
@@ -555,14 +555,14 @@ static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev,const char *op = write ?"write" :"read" ;loff_t offset = bio->bi_iter.bi_sector <<9 ;int error =0 ; -struct bio_vec *bvec; -unsigned int i; +struct bio_vec bvec; +struct bvec_iter iter;struct bio *next; -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) {/* PS3 is ppc64, so we don't handle highmem */ -char *ptr =page_address (bvec->bv_page) + bvec->bv_offset; -size_t len = bvec->bv_len, retlen; +char *ptr =page_address (bvec.bv_page) + bvec.bv_offset; +size_t len = bvec.bv_len, retlen;dev_dbg (&dev->core," %s %zu bytes at offset %llu\n" , op, len, offset);
drivers/block/rbd.c +19 -19
@@ -1109,23 +1109,23 @@ static void bio_chain_put(struct bio *chain)*/ static void zero_bio_chain (struct bio *chain,int start_ofs) { -struct bio_vec *bv; +struct bio_vec bv; +struct bvec_iter iter;unsigned long flags;void *buf; -int i;int pos =0 ;while (chain) { -bio_for_each_segment (bv, chain, i) { -if (pos + bv->bv_len > start_ofs) { +bio_for_each_segment (bv, chain, iter) { +if (pos + bv.bv_len > start_ofs) {int remainder =max (start_ofs - pos,0 ); - buf =bvec_kmap_irq (bv, &flags); + buf =bvec_kmap_irq (&bv, &flags);memset (buf + remainder,0 , - bv->bv_len - remainder); -flush_dcache_page (bv->bv_page); + bv.bv_len - remainder); +flush_dcache_page (bv.bv_page);bvec_kunmap_irq (buf, &flags); } - pos += bv->bv_len; + pos += bv.bv_len; } chain = chain->bi_next;
@@ -1173,11 +1173,11 @@ static struct bio *bio_clone_range(struct bio *bio_src, unsigned int len, gfp_t gfpmask) { -struct bio_vec *bv; +struct bio_vec bv; +struct bvec_iter iter; +struct bvec_iter end_iter;unsigned int resid; -unsigned short idx;unsigned int voff; -unsigned short end_idx;unsigned short vcnt;struct bio *bio;
@@ -1196,22 +1196,22 @@ static struct bio *bio_clone_range(struct bio *bio_src,/* Find first affected segment... */ resid = offset; -bio_for_each_segment (bv, bio_src, idx) { -if (resid < bv->bv_len) +bio_for_each_segment (bv, bio_src, iter) { +if (resid < bv.bv_len)break ; - resid -= bv->bv_len; + resid -= bv.bv_len; } voff = resid;/* ...and the last affected segment */ resid += len; -__bio_for_each_segment (bv, bio_src, end_idx, idx) { -if (resid <= bv->bv_len) +__bio_for_each_segment (bv, bio_src, end_iter, iter) { +if (resid <= bv.bv_len)break ; - resid -= bv->bv_len; + resid -= bv.bv_len; } - vcnt = end_idx - idx +1 ; + vcnt = end_iter.bi_idx = iter.bi_idx +1 ;/* Build the clone */
@@ -1229,7 +1229,7 @@ static struct bio *bio_clone_range(struct bio *bio_src,* Copy over our part of the bio_vec, then update the first * and last (or only) entries. */ -memcpy (&bio->bi_io_vec[0 ], &bio_src->bi_io_vec[idx], +memcpy (&bio->bi_io_vec[0 ], &bio_src->bi_io_vec[iter.bi_idx], vcnt *sizeof (struct bio_vec )); bio->bi_io_vec[0 ].bv_offset += voff;if (vcnt >1 ) {
drivers/block/rsxx/dma.c +6 -5
@@ -684,7 +684,8 @@ int rsxx_dma_queue_bio(struct rsxx_cardinfo *card, void *cb_data) {struct list_head dma_list[RSXX_MAX_TARGETS ]; -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;unsigned long long addr8;unsigned int laddr;unsigned int bv_len;
@@ -722,9 +723,9 @@ int rsxx_dma_queue_bio(struct rsxx_cardinfo *card, bv_len -=RSXX_HW_BLK_SIZE ; } }else { -bio_for_each_segment (bvec, bio, i) { - bv_len = bvec->bv_len; - bv_off = bvec->bv_offset; +bio_for_each_segment (bvec, bio, iter) { + bv_len = bvec.bv_len; + bv_off = bvec.bv_offset;while (bv_len >0 ) { tgt =rsxx_get_dma_tgt (card, addr8);
@@ -736,7 +737,7 @@ int rsxx_dma_queue_bio(struct rsxx_cardinfo *card, st =rsxx_queue_dma (card, &dma_list[tgt],bio_data_dir (bio), dma_off, dma_len, - laddr, bvec->bv_page, + laddr, bvec.bv_page, bv_off, cb, cb_data);if (st) goto bvec_err;
drivers/md/bcache/btree.c +2 -2
@@ -362,7 +362,7 @@ static void btree_node_write_done(struct closure *cl)struct bio_vec *bv;int n; -__bio_for_each_segment (bv, b->bio, n,0 ) +bio_for_each_segment_all (bv, b->bio, n)__free_page (bv->bv_page);__btree_node_write_done (cl);
@@ -421,7 +421,7 @@ static void do_btree_node_write(struct btree *b)struct bio_vec *bv;void *base = (void *) ((unsigned long ) i & ~(PAGE_SIZE -1 )); -bio_for_each_segment (bv, b->bio, j) +bio_for_each_segment_all (bv, b->bio, j)memcpy (page_address (bv->bv_page), base + j *PAGE_SIZE ,PAGE_SIZE );
drivers/md/bcache/debug.c +10 -9
@@ -173,7 +173,8 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio) {char name[BDEVNAME_SIZE ];struct bio *check; -struct bio_vec *bv; +struct bio_vec bv, *bv2; +struct bvec_iter iter;int i; check =bio_clone (bio,GFP_NOIO );
@@ -185,13 +186,13 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)submit_bio_wait (READ_SYNC , check); -bio_for_each_segment (bv, bio, i) { -void *p1 =kmap_atomic (bv->bv_page); -void *p2 =page_address (check->bi_io_vec[i].bv_page); +bio_for_each_segment (bv, bio, iter) { +void *p1 =kmap_atomic (bv.bv_page); +void *p2 =page_address (check->bi_io_vec[iter.bi_idx].bv_page); - cache_set_err_on(memcmp(p1 + bv->bv_offset, - p2 + bv->bv_offset, - bv->bv_len), + cache_set_err_on(memcmp(p1 + bv.bv_offset, + p2 + bv.bv_offset, + bv.bv_len), dc->disk.c, "verify failed at dev %s sector %llu", bdevname(dc->bdev, name),
@@ -200,8 +201,8 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)kunmap_atomic (p1); } -bio_for_each_segment_all (bv, check, i) -__free_page (bv->bv_page); +bio_for_each_segment_all (bv2, check, i) +__free_page (bv2->bv_page); out_put:bio_put (check); }
drivers/md/bcache/io.c +29 -40
130 lines not on this page · raw message
drivers/md/bcache/request.c +13 -13
@@ -198,14 +198,14 @@ static bool verify(struct cached_dev *dc, struct bio *bio)static void bio_csum (struct bio *bio,struct bkey *k) { -struct bio_vec *bv; +struct bio_vec bv; +struct bvec_iter iter;uint64_t csum =0 ; -int i; -bio_for_each_segment (bv, bio, i) { -void *d =kmap (bv->bv_page) + bv->bv_offset; - csum =bch_crc64_update (csum, d, bv->bv_len); -kunmap (bv->bv_page); +bio_for_each_segment (bv, bio, iter) { +void *d =kmap (bv.bv_page) + bv.bv_offset; + csum =bch_crc64_update (csum, d, bv.bv_len); +kunmap (bv.bv_page); } k->ptr[KEY_PTRS (k)] = csum & (~0ULL >>1 );
@@ -1182,17 +1182,17 @@ void bch_cached_dev_request_init(struct cached_dev *dc)static int flash_dev_cache_miss (struct btree *b,struct search *s,struct bio *bio,unsigned sectors) { -struct bio_vec *bv; -int i; +struct bio_vec bv; +struct bvec_iter iter;/* Zero fill bio */ -bio_for_each_segment (bv, bio, i) { -unsigned j =min (bv->bv_len >>9 , sectors); +bio_for_each_segment (bv, bio, iter) { +unsigned j =min (bv.bv_len >>9 , sectors); -void *p =kmap (bv->bv_page); -memset (p + bv->bv_offset,0 , j <<9 ); -kunmap (bv->bv_page); +void *p =kmap (bv.bv_page); +memset (p + bv.bv_offset,0 , j <<9 ); +kunmap (bv.bv_page); sectors -= j; }
drivers/md/raid5.c +6 -6
@@ -937,9 +937,9 @@ static struct dma_async_tx_descriptor * async_copy_data(int frombio, struct bio *bio, struct page *page, sector_t sector, struct dma_async_tx_descriptor *tx) { - struct bio_vec *bvl; + struct bio_vec bvl; +struct bvec_iter iter;struct page *bio_page; -int i;int page_offset;struct async_submit_ctl submit;enum async_tx_flags flags =0 ;
@@ -953,8 +953,8 @@ async_copy_data(int frombio, struct bio *bio, struct page *page, flags |=ASYNC_TX_FENCE ;init_async_submit (&submit, flags, tx,NULL ,NULL ,NULL ); -bio_for_each_segment (bvl, bio, i) { -int len = bvl->bv_len; +bio_for_each_segment (bvl, bio, iter) { +int len = bvl.bv_len;int clen;int b_offset =0 ;
@@ -970,8 +970,8 @@ async_copy_data(int frombio, struct bio *bio, struct page *page, clen = len;if (clen >0 ) { - b_offset += bvl->bv_offset; - bio_page = bvl->bv_page; + b_offset += bvl.bv_offset; + bio_page = bvl.bv_page;if (frombio) tx =async_memcpy (page, bio_page, page_offset, b_offset, clen, &submit);
drivers/s390/block/dasd_diag.c +5 -5
@@ -504,7 +504,7 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,struct dasd_diag_req *dreq;struct dasd_diag_bio *dbio;struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv;char *dst;unsigned int count, datasize;sector_t recid, first_rec, last_rec;
@@ -525,10 +525,10 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,/* Check struct bio and count the number of blocks for the request. */ count =0 ;rq_for_each_segment (bv, req, iter) { -if (bv->bv_len & (blksize -1 )) +if (bv.bv_len & (blksize -1 ))/* Fba can only do full blocks. */ return ERR_PTR (-EINVAL ); - count += bv->bv_len >> (block->s2b_shift +9 ); + count += bv.bv_len >> (block->s2b_shift +9 ); }/* Paranoia. */ if (count != last_rec - first_rec +1 )
@@ -545,8 +545,8 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev, dbio = dreq->bio; recid = first_rec;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv->bv_page) + bv->bv_offset; -for (off =0 ; off < bv->bv_len; off += blksize) { + dst =page_address (bv.bv_page) + bv.bv_offset; +for (off =0 ; off < bv.bv_len; off += blksize) {memset (dbio,0 ,sizeof (struct dasd_diag_bio )); dbio->type = rw_cmd; dbio->block_number = recid +1 ;
drivers/s390/block/dasd_eckd.c +24 -24
136 lines not on this page · raw message
drivers/s390/block/dasd_fba.c +13 -13
@@ -260,7 +260,7 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev,struct dasd_ccw_req *cqr;struct ccw1 *ccw;struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv;char *dst;int count, cidaw, cplength, datasize;sector_t recid, first_rec, last_rec;
@@ -283,13 +283,13 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev, count =0 ; cidaw =0 ;rq_for_each_segment (bv, req, iter) { -if (bv->bv_len & (blksize -1 )) +if (bv.bv_len & (blksize -1 ))/* Fba can only do full blocks. */ return ERR_PTR (-EINVAL ); - count += bv->bv_len >> (block->s2b_shift +9 ); + count += bv.bv_len >> (block->s2b_shift +9 );#if defined(CONFIG_64BIT ) -if (idal_is_needed (page_address (bv->bv_page), bv->bv_len)) - cidaw += bv->bv_len / blksize; +if (idal_is_needed (page_address (bv.bv_page), bv.bv_len)) + cidaw += bv.bv_len / blksize;#endif }/* Paranoia. */
@@ -326,16 +326,16 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev, } recid = first_rec;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv->bv_page) + bv->bv_offset; + dst =page_address (bv.bv_page) + bv.bv_offset;if (dasd_page_cache) {char *copy =kmem_cache_alloc (dasd_page_cache,GFP_DMA | __GFP_NOWARN);if (copy &&rq_data_dir (req) ==WRITE ) -memcpy (copy + bv->bv_offset, dst, bv->bv_len); +memcpy (copy + bv.bv_offset, dst, bv.bv_len);if (copy) - dst = copy + bv->bv_offset; + dst = copy + bv.bv_offset; } -for (off =0 ; off < bv->bv_len; off += blksize) { +for (off =0 ; off < bv.bv_len; off += blksize) {/* Locate record for stupid devices. */ if (private->rdc_data.mode.bits.data_chain ==0 ) { ccw[-1 ].flags |=CCW_FLAG_CC ;
@@ -384,7 +384,7 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req)struct dasd_fba_private *private;struct ccw1 *ccw;struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv;char *dst, *cda;unsigned int blksize, off;int status;
@@ -399,8 +399,8 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req)if (private->rdc_data.mode.bits.data_chain !=0 ) ccw++;rq_for_each_segment (bv, req, iter) { - dst =page_address (bv->bv_page) + bv->bv_offset; -for (off =0 ; off < bv->bv_len; off += blksize) { + dst =page_address (bv.bv_page) + bv.bv_offset; +for (off =0 ; off < bv.bv_len; off += blksize) {/* Skip locate record. */ if (private->rdc_data.mode.bits.data_chain ==0 ) ccw++;
@@ -411,7 +411,7 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req) cda = (char *)((addr_t ) ccw->cda);if (dst != cda) {if (rq_data_dir (req) ==READ ) -memcpy (dst, cda, bv->bv_len); +memcpy (dst, cda, bv.bv_len);kmem_cache_free (dasd_page_cache, (void *)((addr_t )cda &PAGE_MASK )); }
drivers/s390/block/dcssblk.c +8 -8
@@ -808,12 +808,12 @@ static void dcssblk_make_request(struct request_queue *q, struct bio *bio) { struct dcssblk_dev_info *dev_info; -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;unsigned long index;unsigned long page_addr;unsigned long source_addr;unsigned long bytes_done; -int i; bytes_done =0 ; dev_info = bio->bi_bdev->bd_disk->private_data;
@@ -844,21 +844,21 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio) } index = (bio->bi_iter.bi_sector >>3 ); -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) { page_addr = (unsigned long ) -page_address (bvec->bv_page) + bvec->bv_offset; +page_address (bvec.bv_page) + bvec.bv_offset; source_addr = dev_info->start + (index<<12 ) + bytes_done; -if (unlikely ((page_addr &4095 ) !=0 ) || (bvec->bv_len &4095 ) !=0 ) +if (unlikely ((page_addr &4095 ) !=0 ) || (bvec.bv_len &4095 ) !=0 )// More paranoia. goto fail;if (bio_data_dir (bio) ==READ ) {memcpy ((void *)page_addr, (void *)source_addr, - bvec->bv_len); + bvec.bv_len); }else {memcpy ((void *)source_addr, (void *)page_addr, - bvec->bv_len); + bvec.bv_len); } - bytes_done += bvec->bv_len; + bytes_done += bvec.bv_len; }bio_endio (bio,0 );return ;
drivers/s390/block/scm_blk.c +4 -4
@@ -130,7 +130,7 @@ static void scm_request_prepare(struct scm_request *scmrq)struct aidaw *aidaw = scmrq->aidaw;struct msb *msb = &scmrq->aob->msb[0 ];struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv; msb->bs =MSB_BS_4K ; scmrq->aob->request.msb_count =1 ;
@@ -142,9 +142,9 @@ static void scm_request_prepare(struct scm_request *scmrq) msb->data_addr = (u64 ) aidaw;rq_for_each_segment (bv, scmrq->request, iter) { -WARN_ON (bv->bv_offset); - msb->blk_count += bv->bv_len >>12 ; - aidaw->data_addr = (u64 )page_address (bv->bv_page); +WARN_ON (bv.bv_offset); + msb->blk_count += bv.bv_len >>12 ; + aidaw->data_addr = (u64 )page_address (bv.bv_page); aidaw++; } }
drivers/s390/block/scm_blk_cluster.c +2 -2
@@ -122,7 +122,7 @@ static void scm_prepare_cluster_request(struct scm_request *scmrq)struct aidaw *aidaw = scmrq->aidaw;struct msb *msb = &scmrq->aob->msb[0 ];struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv;int i =0 ;u64 addr;
@@ -163,7 +163,7 @@ static void scm_prepare_cluster_request(struct scm_request *scmrq) i++; }rq_for_each_segment (bv, req, iter) { - aidaw->data_addr = (u64 )page_address (bv->bv_page); + aidaw->data_addr = (u64 )page_address (bv.bv_page); aidaw++; i++; }
drivers/s390/block/xpram.c +5 -5
@@ -184,11 +184,11 @@ static unsigned long xpram_highest_page_index(void)static void xpram_make_request (struct request_queue *q,struct bio *bio) {xpram_device_t *xdev = bio->bi_bdev->bd_disk->private_data; -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;unsigned int index;unsigned long page_addr;unsigned long bytes; -int i;if ((bio->bi_iter.bi_sector &7 ) !=0 || (bio->bi_iter.bi_size &4095 ) !=0 )
@@ -200,10 +200,10 @@ static void xpram_make_request(struct request_queue *q, struct bio *bio)if ((bio->bi_iter.bi_sector >>3 ) >0xffffffffU - xdev->offset) goto fail; index = (bio->bi_iter.bi_sector >>3 ) + xdev->offset; -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) { page_addr = (unsigned long ) -kmap (bvec->bv_page) + bvec->bv_offset; - bytes = bvec->bv_len; +kmap (bvec.bv_page) + bvec.bv_offset; + bytes = bvec.bv_len;if ((page_addr &4095 ) !=0 || (bytes &4095 ) !=0 )/* More paranoia. */ goto fail;
drivers/scsi/mpt2sas/mpt2sas_transport.c +16 -15
@@ -1901,7 +1901,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,struct MPT2SAS_ADAPTER *ioc =shost_priv (shost);Mpi2SmpPassthroughRequest_t *mpi_request;Mpi2SmpPassthroughReply_t *mpi_reply; -int rc, i; +int rc;u16 smid;u32 ioc_state;unsigned long timeleft;
@@ -1916,7 +1916,8 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,void *pci_addr_out =NULL ;u16 wait_state_count;struct request *rsp = req->next_rq; -struct bio_vec *bvec =NULL ; +struct bio_vec bvec; +struct bvec_iter iter;if (!rsp) { printk(MPT2SAS_ERR_FMT "%s: the smp response space is "
@@ -1955,11 +1956,11 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, goto out; } -bio_for_each_segment (bvec, req->bio, i) { +bio_for_each_segment (bvec, req->bio, iter) {memcpy (pci_addr_out + offset, -page_address (bvec->bv_page) + bvec->bv_offset, - bvec->bv_len); - offset += bvec->bv_len; +page_address (bvec.bv_page) + bvec.bv_offset, + bvec.bv_len); + offset += bvec.bv_len; } }else { dma_addr_out = pci_map_single(ioc->pdev, bio_data(req->bio),
@@ -2106,19 +2107,19 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,u32 offset =0 ;u32 bytes_to_copy =le16_to_cpu (mpi_reply->ResponseDataLength); -bio_for_each_segment (bvec, rsp->bio, i) { -if (bytes_to_copy <= bvec->bv_len) { -memcpy (page_address (bvec->bv_page) + - bvec->bv_offset, pci_addr_in + +bio_for_each_segment (bvec, rsp->bio, iter) { +if (bytes_to_copy <= bvec.bv_len) { +memcpy (page_address (bvec.bv_page) + + bvec.bv_offset, pci_addr_in + offset, bytes_to_copy);break ; }else { -memcpy (page_address (bvec->bv_page) + - bvec->bv_offset, pci_addr_in + - offset, bvec->bv_len); - bytes_to_copy -= bvec->bv_len; +memcpy (page_address (bvec.bv_page) + + bvec.bv_offset, pci_addr_in + + offset, bvec.bv_len); + bytes_to_copy -= bvec.bv_len; } - offset += bvec->bv_len; + offset += bvec.bv_len; } } }else {
drivers/scsi/mpt3sas/mpt3sas_transport.c +16 -15
@@ -1884,7 +1884,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,struct MPT3SAS_ADAPTER *ioc =shost_priv (shost);Mpi2SmpPassthroughRequest_t *mpi_request;Mpi2SmpPassthroughReply_t *mpi_reply; -int rc, i; +int rc;u16 smid;u32 ioc_state;unsigned long timeleft;
@@ -1898,7 +1898,8 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,void *pci_addr_out =NULL ;u16 wait_state_count;struct request *rsp = req->next_rq; -struct bio_vec *bvec =NULL ; +struct bio_vec bvec; +struct bvec_iter iter;if (!rsp) { pr_err(MPT3SAS_FMT "%s: the smp response space is missing\n",
@@ -1938,11 +1939,11 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, goto out; } -bio_for_each_segment (bvec, req->bio, i) { +bio_for_each_segment (bvec, req->bio, iter) {memcpy (pci_addr_out + offset, -page_address (bvec->bv_page) + bvec->bv_offset, - bvec->bv_len); - offset += bvec->bv_len; +page_address (bvec.bv_page) + bvec.bv_offset, + bvec.bv_len); + offset += bvec.bv_len; } }else { dma_addr_out = pci_map_single(ioc->pdev, bio_data(req->bio),
@@ -2067,19 +2068,19 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,u32 offset =0 ;u32 bytes_to_copy =le16_to_cpu (mpi_reply->ResponseDataLength); -bio_for_each_segment (bvec, rsp->bio, i) { -if (bytes_to_copy <= bvec->bv_len) { -memcpy (page_address (bvec->bv_page) + - bvec->bv_offset, pci_addr_in + +bio_for_each_segment (bvec, rsp->bio, iter) { +if (bytes_to_copy <= bvec.bv_len) { +memcpy (page_address (bvec.bv_page) + + bvec.bv_offset, pci_addr_in + offset, bytes_to_copy);break ; }else { -memcpy (page_address (bvec->bv_page) + - bvec->bv_offset, pci_addr_in + - offset, bvec->bv_len); - bytes_to_copy -= bvec->bv_len; +memcpy (page_address (bvec.bv_page) + + bvec.bv_offset, pci_addr_in + + offset, bvec.bv_len); + bytes_to_copy -= bvec.bv_len; } - offset += bvec->bv_len; + offset += bvec.bv_len; } } }else {
drivers/staging/lustre/lustre/llite/lloop.c +7 -7
@@ -194,10 +194,10 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)struct cl_object *obj =ll_i2info (inode)->lli_clob;pgoff_t offset;int ret; -int i;int rw;obd_count page_count =0 ; -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;struct bio *bio;ssize_t bytes;
@@ -221,14 +221,14 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)LASSERT (rw == bio->bi_rw); offset = (pgoff_t)(bio->bi_iter.bi_sector <<9 ) + lo->lo_offset; -bio_for_each_segment (bvec, bio, i) { -BUG_ON (bvec->bv_offset !=0 ); -BUG_ON (bvec->bv_len !=PAGE_CACHE_SIZE ); +bio_for_each_segment (bvec, bio, iter) { +BUG_ON (bvec.bv_offset !=0 ); +BUG_ON (bvec.bv_len !=PAGE_CACHE_SIZE ); - pages[page_count] = bvec->bv_page; + pages[page_count] = bvec.bv_page; offsets[page_count] = offset; page_count++; - offset += bvec->bv_len; + offset += bvec.bv_len; }LASSERT (page_count <=LLOOP_MAX_SEGMENTS ); }
drivers/staging/zram/zram_drv.c +10 -9
@@ -672,9 +672,10 @@ static ssize_t reset_store(struct device *dev,static void __zram_make_request (struct zram *zram,struct bio *bio,int rw) { -int i, offset; +int offset;u32 index; -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter;switch (rw) {case READ :
@@ -689,33 +690,33 @@ static void __zram_make_request(struct zram *zram, struct bio *bio, int rw) offset = (bio->bi_iter.bi_sector & (SECTORS_PER_PAGE -1 )) <<SECTOR_SHIFT ; -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment (bvec, bio, iter) {int max_transfer_size =PAGE_SIZE - offset; -if (bvec->bv_len > max_transfer_size) { +if (bvec.bv_len > max_transfer_size) {/* * zram_bvec_rw() can only make operation on a single * zram page. Split the bio vector. */ struct bio_vec bv; - bv.bv_page = bvec->bv_page; + bv.bv_page = bvec.bv_page; bv.bv_len = max_transfer_size; - bv.bv_offset = bvec->bv_offset; + bv.bv_offset = bvec.bv_offset;if (zram_bvec_rw (zram, &bv, index, offset, bio, rw) <0 ) goto out; - bv.bv_len = bvec->bv_len - max_transfer_size; + bv.bv_len = bvec.bv_len - max_transfer_size; bv.bv_offset += max_transfer_size;if (zram_bvec_rw (zram, &bv, index+1 ,0 , bio, rw) <0 ) goto out; }else -if (zram_bvec_rw (zram, bvec, index, offset, bio, rw) +if (zram_bvec_rw (zram, &bvec, index, offset, bio, rw) <0 ) goto out; -update_position (&index, &offset, bvec); +update_position (&index, &offset, &bvec); }set_bit (BIO_UPTODATE , &bio->bi_flags);
fs/bio-integrity.c +16 -14
@@ -299,25 +299,26 @@ static void bio_integrity_generate(struct bio *bio) {struct blk_integrity *bi =bdev_get_integrity (bio->bi_bdev);struct blk_integrity_exchg bix; -struct bio_vec *bv; +struct bio_vec bv; +struct bvec_iter iter;sector_t sector = bio->bi_iter.bi_sector; -unsigned int i, sectors, total; +unsigned int sectors, total;void *prot_buf = bio->bi_integrity->bip_buf; total =0 ; bix.disk_name = bio->bi_bdev->bd_disk->disk_name; bix.sector_size = bi->sector_size; -bio_for_each_segment (bv, bio, i) { -void *kaddr =kmap_atomic (bv->bv_page); - bix.data_buf = kaddr + bv->bv_offset; - bix.data_size = bv->bv_len; +bio_for_each_segment (bv, bio, iter) { +void *kaddr =kmap_atomic (bv.bv_page); + bix.data_buf = kaddr + bv.bv_offset; + bix.data_size = bv.bv_len; bix.prot_buf = prot_buf; bix.sector = sector; bi->generate_fn (&bix); - sectors = bv->bv_len / bi->sector_size; + sectors = bv.bv_len / bi->sector_size; sector += sectors; prot_buf += sectors * bi->tuple_size; total += sectors * bi->tuple_size;
@@ -441,19 +442,20 @@ static int bio_integrity_verify(struct bio *bio) {struct blk_integrity *bi =bdev_get_integrity (bio->bi_bdev);struct blk_integrity_exchg bix; -struct bio_vec *bv; +struct bio_vec bv; +struct bvec_iter iter;sector_t sector = bio->bi_integrity->bip_sector; -unsigned int i, sectors, total, ret; +unsigned int sectors, total, ret;void *prot_buf = bio->bi_integrity->bip_buf; ret = total =0 ; bix.disk_name = bio->bi_bdev->bd_disk->disk_name; bix.sector_size = bi->sector_size; -bio_for_each_segment (bv, bio, i) { -void *kaddr =kmap_atomic (bv->bv_page); - bix.data_buf = kaddr + bv->bv_offset; - bix.data_size = bv->bv_len; +bio_for_each_segment (bv, bio, iter) { +void *kaddr =kmap_atomic (bv.bv_page); + bix.data_buf = kaddr + bv.bv_offset; + bix.data_size = bv.bv_len; bix.prot_buf = prot_buf; bix.sector = sector;
@@ -464,7 +466,7 @@ static int bio_integrity_verify(struct bio *bio)return ret; } - sectors = bv->bv_len / bi->sector_size; + sectors = bv.bv_len / bi->sector_size; sector += sectors; prot_buf += sectors * bi->tuple_size; total += sectors * bi->tuple_size;
fs/bio.c +11 -11
@@ -473,13 +473,13 @@ EXPORT_SYMBOL(bio_alloc_bioset);void zero_fill_bio (struct bio *bio) {unsigned long flags; -struct bio_vec *bv; -int i; +struct bio_vec bv; +struct bvec_iter iter; -bio_for_each_segment (bv, bio, i) { -char *data =bvec_kmap_irq (bv, &flags); -memset (data,0 , bv->bv_len); -flush_dcache_page (bv->bv_page); +bio_for_each_segment (bv, bio, iter) { +char *data =bvec_kmap_irq (&bv, &flags); +memset (data,0 , bv.bv_len); +flush_dcache_page (bv.bv_page);bvec_kunmap_irq (data, &flags); } }
@@ -1687,11 +1687,11 @@ void bio_check_pages_dirty(struct bio *bio)#if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE void bio_flush_dcache_pages (struct bio *bi) { -int i; -struct bio_vec *bvec; +struct bio_vec bvec; +struct bvec_iter iter; -bio_for_each_segment (bvec, bi, i) -flush_dcache_page (bvec->bv_page); +bio_for_each_segment (bvec, bi, iter) +flush_dcache_page (bvec.bv_page); }EXPORT_SYMBOL (bio_flush_dcache_pages);#endif
@@ -1840,7 +1840,7 @@ void bio_trim(struct bio *bio, int offset, int size) bio->bi_iter.bi_idx =0 ; }/* Make sure vcnt and last bv are not too big */ -bio_for_each_segment (bvec, bio, i) { +bio_for_each_segment_all (bvec, bio, i) {if (sofar + bvec->bv_len > size) bvec->bv_len = size - sofar;if (bvec->bv_len ==0 ) {
include/linux/bio.h +14 -14
@@ -63,10 +63,13 @@*/ #define bio_iovec_idx (bio, idx) (&((bio)->bi_io_vec[(idx)]))#define __bio_iovec (bio) bio_iovec_idx((bio), (bio)->bi_iter.bi_idx) -#define bio_iovec (bio) (*__bio_iovec(bio)) + +#define bio_iter_iovec (bio, iter) ((bio)->bi_io_vec[(iter).bi_idx])#define bio_page (bio) (bio_iovec((bio)).bv_page)#define bio_offset (bio) (bio_iovec((bio)).bv_offset) +#define bio_iovec (bio) (*__bio_iovec(bio)) +#define bio_segments (bio) ((bio)->bi_vcnt - (bio)->bi_iter.bi_idx)#define bio_sectors (bio) ((bio)->bi_iter.bi_size >> 9)#define bio_end_sector (bio) ((bio)->bi_iter.bi_sector + bio_sectors((bio)))
@@ -134,15 +137,6 @@ static inline void *bio_data(struct bio *bio)#define bio_io_error (bio) bio_endio((bio), -EIO)/* -* drivers should not use the __ version unless they _really_ know what -* they're doing -*/ -#define __bio_for_each_segment (bvl, bio, i, start_idx) \ - for (bvl = bio_iovec_idx((bio), (start_idx)), i = (start_idx); \ - i < (bio)->bi_vcnt; \ - bvl++, i++) - -/* * drivers should _never_ use the all version - the bio may have been split * before it got to the driver and the driver won't own all of it */
@@ -151,10 +145,16 @@ static inline void *bio_data(struct bio *bio) bvl =bio_iovec_idx ((bio), (i)), i < (bio)->bi_vcnt; \ i++) -#define bio_for_each_segment (bvl, bio, i) \ - for (i = (bio)->bi_iter.bi_idx; \ - bvl = bio_iovec_idx((bio), (i)), i < (bio)->bi_vcnt; \ - i++) +#define __bio_for_each_segment (bvl, bio, iter, start) \ + for (iter = (start); \ + bvl = bio_iter_iovec((bio), (iter)), \ + (iter).bi_idx < (bio)->bi_vcnt; \ + (iter).bi_idx++) + +#define bio_for_each_segment (bvl, bio, iter) \ + __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter) + +#define bio_iter_last (bio, iter) ((iter).bi_idx == (bio)->bi_vcnt - 1)/* * get a reference to a bio, so it won't disappear. the intended use is
include/linux/blkdev.h +4 -3
@@ -735,7 +735,7 @@ struct rq_map_data { };struct req_iterator { -int i; +struct bvec_iter iter;struct bio *bio; };
@@ -748,10 +748,11 @@ struct req_iterator {#define rq_for_each_segment (bvl, _rq, _iter) \ __rq_for_each_bio(_iter.bio, _rq) \ - bio_for_each_segment(bvl, _iter.bio, _iter.i) + bio_for_each_segment(bvl, _iter.bio, _iter.iter)#define rq_iter_last (rq, _iter) \ - (_iter.bio->bi_next == NULL && _iter.i == _iter.bio->bi_vcnt-1) + (_iter.bio->bi_next == NULL && \ + bio_iter_last(_iter.bio, _iter.iter))#ifndef ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE # error "You should define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE for your platform"
mm/bounce.c +21 -23
61 lines not on this page · raw message
Signature · 1 line
1.8.4.4
PATCH 8/25 block: Immutable bio vecs
In reply to Kent OverstreetThis adds a mechanism by which we can advance a bio by an arbitrary number of bytes without modifying the biovec: bio->bi_iter.bi_bvec_done indicates the number of bytes completed in the current bvec.
Various driver code still needs to be updated to not refer to the bvec directly before we can use this for interesting things, like efficient bio splitting.
--- Documentation/block/biovecs.txt | 111 ++++++++++++++++++++++++++++++++++++++++ drivers/block/drbd/drbd_main.c | 4 +- drivers/block/nbd.c | 2 +- fs/bio.c | 27 +--------- include/linux/bio.h | 81 ++++++++++++++++++++++++++--- include/linux/blk_types.h | 3 ++ include/linux/blkdev.h | 4 +- 7 files changed, 194 insertions(+), 38 deletions(-) create mode 100644 Documentation/block/biovecs.txt
Documentation/block/biovecs.txt new file +111 -0
@@ -0,0 +1,111 @@ + +Immutable biovecs and biovec iterators: +======================================= + +Kent Overstreet <kmo-PEzghdH756F8UrSeD/[email protected]> + +As of 3.13, biovecs should never be modified after a bio has been submitted. +Instead, we have a new struct bvec_iter which represents a range of a biovec - +the iterator will be modified as the bio is completed, not the biovec. + +More specifically, old code that needed to partially complete a bio would +update bi_sector and bi_size, and advance bi_idx to the next biovec. If it +ended up partway through a biovec, it would increment bv_offset and decrement +bv_len by the number of bytes completed in that biovec. + +In the new scheme of things, everything that must be mutated in order to +partially complete a bio is segregated into struct bvec_iter: bi_sector, +bi_size and bi_idx have been moved there; and instead of modifying bv_offset +and bv_len, struct bvec_iter has bi_bvec_done, which represents the number of +bytes completed in the current bvec. + +There are a bunch of new helper macros for hiding the gory details - in +particular, presenting the illusion of partially completed biovecs so that +normal code doesn't have to deal with bi_bvec_done. + + * Driver code should no longer refer to biovecs directly; we now have + bio_iovec() and bio_iovec_iter() macros that return literal struct biovecs, + constructed from the raw biovecs but taking into account bi_bvec_done and + bi_size. + + bio_for_each_segment() has been updated to take a bvec_iter argument + instead of an integer (that corresponded to bi_idx); for a lot of code the + conversion just required changing the types of the arguments to + bio_for_each_segment(). + + * Advancing a bvec_iter is done with bio_advance_iter(); bio_advance() is a + wrapper around bio_advance_iter() that operates on bio->bi_iter, and also + advances the bio integrity's iter if present. + + There is a lower level advance function - bvec_iter_advance() - which takes + a pointer to a biovec, not a bio; this is used by the bio integrity code. + +What's all this get us? +======================= + +Having a real iterator, and making biovecs immutable, has a number of +advantages: + + * Before, iterating over bios was very awkward when you weren't processing + exactly one bvec at a time - for example, bio_copy_data() in fs/bio.c, + which copies the contents of one bio into another. Because the biovecs + wouldn't necessarily be the same size, the old code was tricky convoluted - + it had to walk two different bios at the same time, keeping both bi_idx and + and offset into the current biovec for each. + + The new code is much more straightforward - have a look. This sort of + pattern comes up in a lot of places; a lot of drivers were essentially open + coding bvec iterators before, and having common implementation considerably + simplifies a lot of code. + + * Before, any code that might need to use the biovec after the bio had been + completed (perhaps to copy the data somewhere else, or perhaps to resubmit + it somewhere else if there was an error) had to save the entire bvec array + - again, this was being done in a fair number of places. + + * Biovecs can be shared between multiple bios - a bvec iter can represent an + arbitrary range of an existing biovec, both starting and ending midway + through biovecs. This is what enables efficient splitting of arbitrary + bios. Note that this means we _only_ use bi_size to determine when we've + reached the end of a bio, not bi_vcnt - and the bio_iovec() macro takes + bi_size into account when constructing biovecs. + + * Splitting bios is now much simpler. The old bio_split() didn't even work on + bios with more than a single bvec! Now, we can efficiently split arbitrary + size bios - because the new bio can share the old bio's biovec. + + Care must be taken to ensure the biovec isn't freed while the split bio is + still using it, in case the original bio completes first, though. Using + bio_chain() when splitting bios helps with this. + + * Submitting partially completed bios is now perfectly fine - this comes up + occasionally in stacking block drivers and various code (e.g. md and + bcache) had some ugly workarounds for this. + + It used to be the case that submitting a partially completed bio would work + fine to _most_ devices, but since accessing the raw bvec array was the + norm, not all drivers would respect bi_idx and those would break. Now, + since all drivers _must_ go through the bvec iterator - and have been + audited to make sure they are - submitting partially completed bios is + perfectly fine. + +Other implications: +=================== + + * Almost all usage of bi_idx is now incorrect and has been removed; instead, + where previously you would have used bi_idx you'd now use a bvec_iter, + probably passing it to one of the helper macros. + + I.e. instead of using bio_iovec_idx() (or bio->bi_iovec[bio->bi_idx]), you + now use bio_iter_iovec(), which takes a bvec_iter and returns a + literal struct bio_vec - constructed on the fly from the raw biovec but + taking into account bi_bvec_done (and bi_size). + + * bi_vcnt can't be trusted or relied upon by driver code - i.e. anything that + doesn't actually own the bio. The reason is twofold: firstly, it's not + actually needed for iterating over the bio anymore - we only use bi_size. + Secondly, when cloning a bio and reusing (a portion of) the original bio's + biovec, in order to calculate bi_vcnt for the new bio we'd have to iterate + over all the biovecs in the new bio - which is silly as it's not needed. + + So, don't use bi_vcnt anymore.
drivers/block/drbd/drbd_main.c +2 -2
@@ -1546,7 +1546,7 @@ static int _drbd_send_bio(struct drbd_conf *mdev, struct bio *bio) err =_drbd_no_send_page (mdev, bvec.bv_page, bvec.bv_offset, bvec.bv_len, -bio_iter_last (bio, iter) +bio_iter_last (bvec, iter) ?0 :MSG_MORE );if (err)return err;
@@ -1565,7 +1565,7 @@ static int _drbd_send_zc_bio(struct drbd_conf *mdev, struct bio *bio) err =_drbd_send_page (mdev, bvec.bv_page, bvec.bv_offset, bvec.bv_len, -bio_iter_last (bio, iter) ?0 :MSG_MORE ); +bio_iter_last (bvec, iter) ?0 :MSG_MORE );if (err)return err; }
drivers/block/nbd.c +1 -1
@@ -278,7 +278,7 @@ static int nbd_send_req(struct nbd_device *nbd, struct request *req)*/ rq_for_each_segment (bvec, req, iter) { flags =0 ; -if (!rq_iter_last (req, iter)) +if (!rq_iter_last (bvec, iter)) flags =MSG_MORE ;dprintk (DBG_TX ,"%s: request %p: sending %d bytes data\n" , nbd->disk->disk_name, req, bvec.bv_len);
fs/bio.c +2 -25
@@ -532,13 +532,11 @@ void __bio_clone(struct bio *bio, struct bio *bio_src)* most users will be overriding ->bi_bdev with a new target, * so we don't set nor calculate new physical/hw segment counts here */ - bio->bi_iter.bi_sector = bio_src->bi_iter.bi_sector; bio->bi_bdev = bio_src->bi_bdev; bio->bi_flags |=1 <<BIO_CLONED ; bio->bi_rw = bio_src->bi_rw; bio->bi_vcnt = bio_src->bi_vcnt; - bio->bi_iter.bi_size = bio_src->bi_iter.bi_size; - bio->bi_iter.bi_idx = bio_src->bi_iter.bi_idx; + bio->bi_iter = bio_src->bi_iter; }EXPORT_SYMBOL (__bio_clone);
@@ -808,28 +806,7 @@ void bio_advance(struct bio *bio, unsigned bytes)if (bio_integrity (bio))bio_integrity_advance (bio, bytes); - bio->bi_iter.bi_sector += bytes >>9 ; - bio->bi_iter.bi_size -= bytes; - -if (bio->bi_rw &BIO_NO_ADVANCE_ITER_MASK ) -return ; - -while (bytes) { -if (unlikely (bio->bi_iter.bi_idx >= bio->bi_vcnt)) { -WARN_ONCE (1 ,"bio idx %d >= vcnt %d\n" , - bio->bi_iter.bi_idx, bio->bi_vcnt); -break ; - } - -if (bytes >=bio_iovec (bio).bv_len) { - bytes -=bio_iovec (bio).bv_len; - bio->bi_iter.bi_idx++; - }else { -bio_iovec (bio).bv_len -= bytes; -bio_iovec (bio).bv_offset += bytes; - bytes =0 ; - } - } +bio_advance_iter (bio, &bio->bi_iter, bytes); }EXPORT_SYMBOL (bio_advance);
include/linux/bio.h +73 -8
100 lines not on this page · raw message
include/linux/blk_types.h +3 -0
@@ -34,6 +34,9 @@ struct bvec_iter {unsigned int bi_size;/* residual I/O count */ unsigned int bi_idx;/* current index into bvl_vec */ + +unsigned int bi_bvec_done;/* number of bytes completed in +current bvec */ };/*
include/linux/blkdev.h +2 -2
@@ -750,9 +750,9 @@ struct req_iterator { __rq_for_each_bio(_iter.bio, _rq) \ bio_for_each_segment(bvl, _iter.bio, _iter.iter) -#define rq_iter_last (rq, _iter) \ +#define rq_iter_last (bvec, _iter) \ (_iter.bio->bi_next == NULL && \ - bio_iter_last(_iter.bio, _iter.iter)) + bio_iter_last(bvec, _iter.iter))#ifndef ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE # error "You should define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE for your platform"
Signature · 1 line
1.8.4.4
PATCH 9/25 block: Convert bio_copy_data() to bvec_iter
In reply to Kent OverstreetOur fancy new bvec iterator makes code like this much easier to write.
--- fs/bio.c | 60 +++++++++++++++++++++++++----------------------------------- 1 file changed, 25 insertions(+), 35 deletions(-)
fs/bio.c +25 -35
@@ -852,58 +852,48 @@ EXPORT_SYMBOL(bio_alloc_pages);*/ void bio_copy_data (struct bio *dst,struct bio *src) { -struct bio_vec *src_bv, *dst_bv; -unsigned src_offset, dst_offset, bytes; +struct bvec_iter src_iter, dst_iter; +struct bio_vec src_bv, dst_bv;void *src_p, *dst_p; +unsigned bytes; - src_bv =__bio_iovec (src); - dst_bv =__bio_iovec (dst); - - src_offset = src_bv->bv_offset; - dst_offset = dst_bv->bv_offset; + src_iter = src->bi_iter; + dst_iter = dst->bi_iter;while (1 ) { -if (src_offset == src_bv->bv_offset + src_bv->bv_len) { - src_bv++; -if (src_bv ==bio_iovec_idx (src, src->bi_vcnt)) { - src = src->bi_next; -if (!src) -break ; - - src_bv =__bio_iovec (src); - } +if (!src_iter.bi_size) { + src = src->bi_next; +if (!src) +break ; - src_offset = src_bv->bv_offset; + src_iter = src->bi_iter; } -if (dst_offset == dst_bv->bv_offset + dst_bv->bv_len) { - dst_bv++; -if (dst_bv ==bio_iovec_idx (dst, dst->bi_vcnt)) { - dst = dst->bi_next; -if (!dst) -break ; - - dst_bv =__bio_iovec (dst); - } +if (!dst_iter.bi_size) { + dst = dst->bi_next; +if (!dst) +break ; - dst_offset = dst_bv->bv_offset; + dst_iter = dst->bi_iter; } - bytes =min (dst_bv->bv_offset + dst_bv->bv_len - dst_offset, - src_bv->bv_offset + src_bv->bv_len - src_offset); + src_bv =bio_iter_iovec (src, src_iter); + dst_bv =bio_iter_iovec (dst, dst_iter); + + bytes =min (src_bv.bv_len, dst_bv.bv_len); - src_p =kmap_atomic (src_bv->bv_page); - dst_p =kmap_atomic (dst_bv->bv_page); + src_p =kmap_atomic (src_bv.bv_page); + dst_p =kmap_atomic (dst_bv.bv_page); -memcpy (dst_p + dst_offset, - src_p + src_offset, +memcpy (dst_p + dst_bv.bv_offset, + src_p + src_bv.bv_offset, bytes);kunmap_atomic (dst_p);kunmap_atomic (src_p); - src_offset += bytes; - dst_offset += bytes; +bio_advance_iter (src, &src_iter, bytes); +bio_advance_iter (dst, &dst_iter, bytes); } }EXPORT_SYMBOL (bio_copy_data);
Signature · 1 line
1.8.4.4
PATCH 10/25 bio-integrity: Convert to bvec_iter
In reply to Kent OverstreetThe bio integrity is also stored in a bvec array, so if we use the bvec iter code we just added, the integrity code won't need to implement its own iteration stuff (bio_integrity_mark_head(), bio_integrity_mark_tail())
--- block/blk-integrity.c | 40 ++++++++++--------- drivers/scsi/sd_dif.c | 30 +++++++------- fs/bio-integrity.c | 108 ++++++++++++-------------------------------------- include/linux/bio.h | 19 ++++----- 4 files changed, 71 insertions(+), 126 deletions(-)
block/blk-integrity.c +22 -18
@@ -43,30 +43,32 @@ static const char *bi_unsupported_name = "unsupported";*/ int blk_rq_count_integrity_sg (struct request_queue *q,struct bio *bio) { -struct bio_vec *iv, *ivprv =NULL ; +struct bio_vec iv, ivprv = {NULL };unsigned int segments =0 ;unsigned int seg_size =0 ; -unsigned int i =0 ; +struct bvec_iter iter; +int prev =0 ; -bio_for_each_integrity_vec (iv, bio, i) { +bio_for_each_integrity_vec (iv, bio, iter) { -if (ivprv) { -if (!BIOVEC_PHYS_MERGEABLE (ivprv, iv)) +if (prev) { +if (!BIOVEC_PHYS_MERGEABLE (&ivprv, &iv)) goto new_segment; -if (!BIOVEC_SEG_BOUNDARY (q, ivprv, iv)) +if (!BIOVEC_SEG_BOUNDARY (q, &ivprv, &iv)) goto new_segment; -if (seg_size + iv->bv_len >queue_max_segment_size (q)) +if (seg_size + iv.bv_len >queue_max_segment_size (q)) goto new_segment; - seg_size += iv->bv_len; + seg_size += iv.bv_len; }else { new_segment: segments++; - seg_size = iv->bv_len; + seg_size = iv.bv_len; } + prev =1 ; ivprv = iv; }
@@ -87,24 +89,25 @@ EXPORT_SYMBOL(blk_rq_count_integrity_sg);int blk_rq_map_integrity_sg (struct request_queue *q,struct bio *bio,struct scatterlist *sglist) { -struct bio_vec *iv, *ivprv =NULL ; +struct bio_vec iv, ivprv = {NULL };struct scatterlist *sg =NULL ;unsigned int segments =0 ; -unsigned int i =0 ; +struct bvec_iter iter; +int prev =0 ; -bio_for_each_integrity_vec (iv, bio, i) { +bio_for_each_integrity_vec (iv, bio, iter) { -if (ivprv) { -if (!BIOVEC_PHYS_MERGEABLE (ivprv, iv)) +if (prev) { +if (!BIOVEC_PHYS_MERGEABLE (&ivprv, &iv)) goto new_segment; -if (!BIOVEC_SEG_BOUNDARY (q, ivprv, iv)) +if (!BIOVEC_SEG_BOUNDARY (q, &ivprv, &iv)) goto new_segment; -if (sg->length + iv->bv_len >queue_max_segment_size (q)) +if (sg->length + iv.bv_len >queue_max_segment_size (q)) goto new_segment; - sg->length += iv->bv_len; + sg->length += iv.bv_len; }else { new_segment:if (!sg)
@@ -114,10 +117,11 @@ new_segment: sg =sg_next (sg); } -sg_set_page (sg, iv->bv_page, iv->bv_len, iv->bv_offset); +sg_set_page (sg, iv.bv_page, iv.bv_len, iv.bv_offset); segments++; } + prev =1 ; ivprv = iv; }
drivers/scsi/sd_dif.c +16 -14
@@ -365,7 +365,6 @@ void sd_dif_prepare(struct request *rq, sector_t hw_sector,struct bio *bio;struct scsi_disk *sdkp;struct sd_dif_tuple *sdt; -unsigned int i, j;u32 phys, virt; sdkp = rq->bio->bi_bdev->bd_disk->private_data;
@@ -376,19 +375,21 @@ void sd_dif_prepare(struct request *rq, sector_t hw_sector, phys = hw_sector &0xffffffff ;__rq_for_each_bio (bio, rq) { -struct bio_vec *iv; +struct bio_vec iv; +struct bvec_iter iter; +unsigned int j;/* Already remapped? */ if (bio_flagged (bio,BIO_MAPPED_INTEGRITY ))break ; - virt = bio->bi_integrity->bip_sector &0xffffffff ; + virt = bio->bi_integrity->bip_iter.bi_sector &0xffffffff ; -bip_for_each_vec (iv, bio->bi_integrity, i) { - sdt =kmap_atomic (iv->bv_page) - + iv->bv_offset; +bip_for_each_vec (iv, bio->bi_integrity, iter) { + sdt =kmap_atomic (iv.bv_page) + + iv.bv_offset; -for (j =0 ; j < iv->bv_len ; j += tuple_sz, sdt++) { +for (j =0 ; j < iv.bv_len; j += tuple_sz, sdt++) {if (be32_to_cpu (sdt->ref_tag) == virt) sdt->ref_tag =cpu_to_be32 (phys);
@@ -414,7 +415,7 @@ void sd_dif_complete(struct scsi_cmnd *scmd, unsigned int good_bytes)struct scsi_disk *sdkp;struct bio *bio;struct sd_dif_tuple *sdt; -unsigned int i, j, sectors, sector_sz; +unsigned int j, sectors, sector_sz;u32 phys, virt; sdkp =scsi_disk (scmd->request->rq_disk);
@@ -430,15 +431,16 @@ void sd_dif_complete(struct scsi_cmnd *scmd, unsigned int good_bytes) phys >>=3 ;__rq_for_each_bio (bio, scmd->request) { -struct bio_vec *iv; +struct bio_vec iv; +struct bvec_iter iter; - virt = bio->bi_integrity->bip_sector &0xffffffff ; + virt = bio->bi_integrity->bip_iter.bi_sector &0xffffffff ; -bip_for_each_vec (iv, bio->bi_integrity, i) { - sdt =kmap_atomic (iv->bv_page) - + iv->bv_offset; +bip_for_each_vec (iv, bio->bi_integrity, iter) { + sdt =kmap_atomic (iv.bv_page) + + iv.bv_offset; -for (j =0 ; j < iv->bv_len ; j += tuple_sz, sdt++) { +for (j =0 ; j < iv.bv_len; j += tuple_sz, sdt++) {if (sectors ==0 ) {kunmap_atomic (sdt);
fs/bio-integrity.c +26 -82
191 lines not on this page · raw message
include/linux/bio.h +7 -12
@@ -244,16 +244,15 @@ static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter,struct bio_integrity_payload {struct bio *bip_bio;/* parent bio */ -sector_t bip_sector;/* virtual start sector */ +struct bvec_iter bip_iter; +/* kill - should just use bip_vec */ void *bip_buf;/* generated integrity data */ -bio_end_io_t *bip_end_io;/* saved I/O completion fn */ -unsigned int bip_size; +bio_end_io_t *bip_end_io;/* saved I/O completion fn */ unsigned short bip_slab;/* slab the bip came from */ unsigned short bip_vcnt;/* # of integrity bio_vecs */ -unsigned short bip_idx;/* current bip_vec index */ unsigned bip_owns_buf:1 ;/* should free bip_buf */ struct work_struct bip_work;/* I/O completion */
@@ -626,16 +625,12 @@ struct biovec_slab {#if defined(CONFIG_BLK_DEV_INTEGRITY ) -#define bip_vec_idx (bip, idx) (&(bip->bip_vec[(idx)])) -#define bip_vec (bip) bip_vec_idx(bip, 0) -#define __bip_for_each_vec (bvl, bip, i, start_idx) \ - for (bvl = bip_vec_idx((bip), (start_idx)), i = (start_idx); \ - i < (bip)->bip_vcnt; \ - bvl++, i++) -#define bip_for_each_vec (bvl, bip, i) \ - __bip_for_each_vec(bvl, bip, i, (bip)->bip_idx) +#define bip_vec_idx (bip, idx) (&(bip->bip_vec[(idx)])) + +#define bip_for_each_vec (bvl, bip, iter) \ + for_each_bvec(bvl, (bip)->bip_vec, iter, (bip)->bip_iter)#define bio_for_each_integrity_vec (_bvl, _bio, _iter) \ for_each_bio(_bio) \
Signature · 1 line
1.8.4.4
PATCH 11/25 block: Kill bio_segments()/bi_vcnt usage
In reply to Kent OverstreetWhen we start sharing biovecs, keeping bi_vcnt accurate for splits is going to be error prone - and unnecessary, if we refactor some code.
So bio_segments() has to go - but most of the existing users just needed to know if the bio had multiple segments, which is easier - add a bio_multiple_segments() for them.
(Two of the current uses of bio_segments() are going to go away in a couple patches, but the current implementation of bio_segments() is unsafe as soon as we start doing driver conversions for immutable biovecs - so implement a dumb version for bisectability, it'll go away in a couple patches)
--- drivers/block/ps3disk.c | 7 ++- drivers/md/bcache/io.c | 53 +++++++++------------ drivers/md/raid0.c | 2 +- drivers/md/raid10.c | 2 +- drivers/message/fusion/mptsas.c | 8 ++-- drivers/scsi/libsas/sas_expander.c | 8 ++-- drivers/scsi/mpt2sas/mpt2sas_transport.c | 10 ++-- drivers/scsi/mpt3sas/mpt3sas_transport.c | 8 ++-- fs/bio.c | 2 +- include/linux/bio.h | 81 +++++++++++++++++++------------- 10 files changed, 94 insertions(+), 87 deletions(-)
drivers/block/ps3disk.c +3 -4
@@ -101,10 +101,9 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev,rq_for_each_segment (bvec, req, iter) {unsigned long flags; -dev_dbg (&dev->sbd.core, -"%s:%u: bio %u: %u segs %u sectors from %lu\n" , - __func__, __LINE__, i,bio_segments (iter.bio), -bio_sectors (iter.bio), iter.bio->bi_iter.bi_sector); +dev_dbg (&dev->sbd.core,"%s:%u: bio %u: %u sectors from %lu\n" , + __func__, __LINE__, i,bio_sectors (iter.bio), + iter.bio->bi_iter.bi_sector); size = bvec.bv_len; buf =bvec_kmap_irq (&bvec, &flags);
drivers/md/bcache/io.c +23 -30
77 lines not on this page · raw message
drivers/md/raid0.c +1 -1
@@ -528,7 +528,7 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)sector_t sector = bio->bi_iter.bi_sector;struct bio_pair *bp;/* Sanity check -- queue functions should prevent this happening */ -if (bio_segments (bio) >1 ) +if (bio_multiple_segments (bio)) goto bad_map;/* This is a one page bio that upper layers * refuse to split for us, so we need to split it.
drivers/md/raid10.c +1 -1
@@ -1188,7 +1188,7 @@ static void make_request(struct mddev *mddev, struct bio * bio) || conf->prev.near_copies < conf->prev.raid_disks))) {struct bio_pair *bp;/* Sanity check -- queue functions should prevent this happening */ -if (bio_segments (bio) >1 ) +if (bio_multiple_segments (bio)) goto bad_map;/* This is a one page bio that upper layers * refuse to split for us, so we need to split it.
drivers/message/fusion/mptsas.c +4 -4
@@ -2235,10 +2235,10 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, }/* do we need to support multiple segments? */ -if (bio_segments (req->bio) >1 ||bio_segments (rsp->bio) >1 ) { -printk (MYIOC_s_ERR_FMT"%s: multiple segments req %u %u, rsp %u %u\n" , - ioc->name, __func__,bio_segments (req->bio),blk_rq_bytes (req), -bio_segments (rsp->bio),blk_rq_bytes (rsp)); +if (bio_multiple_segments (req->bio) || +bio_multiple_segments (rsp->bio)) { +printk (MYIOC_s_ERR_FMT"%s: multiple segments req %u, rsp %u\n" , + ioc->name, __func__,blk_rq_bytes (req),blk_rq_bytes (rsp));return -EINVAL ; }
drivers/scsi/libsas/sas_expander.c +4 -4
@@ -2163,10 +2163,10 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, }/* do we need to support multiple segments? */ -if (bio_segments (req->bio) >1 ||bio_segments (rsp->bio) >1 ) { -printk ("%s: multiple segments req %u %u, rsp %u %u\n" , - __func__,bio_segments (req->bio),blk_rq_bytes (req), -bio_segments (rsp->bio),blk_rq_bytes (rsp)); +if (bio_multiple_segments (req->bio) || +bio_multiple_segments (rsp->bio)) { +printk ("%s: multiple segments req %u, rsp %u\n" , + __func__,blk_rq_bytes (req),blk_rq_bytes (rsp));return -EINVAL ; }
drivers/scsi/mpt2sas/mpt2sas_transport.c +5 -5
@@ -1943,7 +1943,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, ioc->transport_cmds.status =MPT2_CMD_PENDING ;/* Check if the request is split across multiple segments */ -if (bio_segments (req->bio) >1 ) { +if (bio_multiple_segments (req->bio)) {u32 offset =0 ;/* Allocate memory and copy the request */
@@ -1975,7 +1975,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,/* Check if the response needs to be populated across * multiple segments */ -if (bio_segments (rsp->bio) >1 ) { +if (bio_multiple_segments (rsp->bio)) { pci_addr_in =pci_alloc_consistent (ioc->pdev,blk_rq_bytes (rsp), &pci_dma_in);if (!pci_addr_in) {
@@ -2042,7 +2042,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, sgl_flags = (MPI2_SGE_FLAGS_SIMPLE_ELEMENT |MPI2_SGE_FLAGS_END_OF_BUFFER |MPI2_SGE_FLAGS_HOST_TO_IOC ); sgl_flags = sgl_flags <<MPI2_SGE_FLAGS_SHIFT ; -if (bio_segments (req->bio) >1 ) { +if (bio_multiple_segments (req->bio)) { ioc->base_add_sg_single (psge, sgl_flags | (blk_rq_bytes (req) -4 ), pci_dma_out); }else {
@@ -2058,7 +2058,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,MPI2_SGE_FLAGS_LAST_ELEMENT |MPI2_SGE_FLAGS_END_OF_BUFFER | MPI2_SGE_FLAGS_END_OF_LIST); sgl_flags = sgl_flags <<MPI2_SGE_FLAGS_SHIFT ; -if (bio_segments (rsp->bio) >1 ) { +if (bio_multiple_segments (rsp->bio)) { ioc->base_add_sg_single (psge, sgl_flags | (blk_rq_bytes (rsp) +4 ), pci_dma_in); }else {
@@ -2103,7 +2103,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,le16_to_cpu (mpi_reply->ResponseDataLength);/* check if the resp needs to be copied from the allocated * pci mem */ -if (bio_segments (rsp->bio) >1 ) { +if (bio_multiple_segments (rsp->bio)) {u32 offset =0 ;u32 bytes_to_copy =le16_to_cpu (mpi_reply->ResponseDataLength);
drivers/scsi/mpt3sas/mpt3sas_transport.c +4 -4
@@ -1926,7 +1926,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, ioc->transport_cmds.status =MPT3_CMD_PENDING ;/* Check if the request is split across multiple segments */ -if (req->bio->bi_vcnt >1 ) { +if (bio_multiple_segments (req->bio)) {u32 offset =0 ;/* Allocate memory and copy the request */
@@ -1958,7 +1958,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,/* Check if the response needs to be populated across * multiple segments */ -if (rsp->bio->bi_vcnt >1 ) { +if (bio_multiple_segments (rsp->bio)) { pci_addr_in =pci_alloc_consistent (ioc->pdev,blk_rq_bytes (rsp), &pci_dma_in);if (!pci_addr_in) {
@@ -2019,7 +2019,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, mpi_request->RequestDataLength =cpu_to_le16 (blk_rq_bytes (req) -4 ); psge = &mpi_request->SGL; -if (req->bio->bi_vcnt >1 ) +if (bio_multiple_segments (req->bio)) ioc->build_sg (ioc, psge, pci_dma_out, (blk_rq_bytes (req) -4 ), pci_dma_in, (blk_rq_bytes (rsp) +4 ));else
@@ -2064,7 +2064,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,/* check if the resp needs to be copied from the allocated * pci mem */ -if (rsp->bio->bi_vcnt >1 ) { +if (bio_multiple_segments (rsp->bio)) {u32 offset =0 ;u32 bytes_to_copy =le16_to_cpu (mpi_reply->ResponseDataLength);
fs/bio.c +1 -1
@@ -1733,7 +1733,7 @@ struct bio_pair *bio_split(struct bio *bi, int first_sectors)trace_block_split (bdev_get_queue (bi->bi_bdev), bi, bi->bi_iter.bi_sector + first_sectors); -BUG_ON (bio_segments (bi) >1 ); +BUG_ON (bio_multiple_segments (bi));atomic_set (&bp->cnt,3 ); bp->error =0 ; bp->bio1 = *bi;
include/linux/bio.h +48 -33
110 lines not on this page · raw message
Signature · 1 line
1.8.4.4
PATCH 12/25 block: Convert drivers to immutable biovecs
In reply to Kent OverstreetNow that we've got a mechanism for immutable biovecs - bi_iter.bi_bvec_done - we need to convert drivers to use primitives that respect it instead of using the bvec array directly.
--- drivers/block/umem.c | 50 ++++++++++++++++++++++-------------------------- drivers/md/dm-crypt.c | 49 +++++++++++++++++------------------------------ drivers/md/dm-io.c | 31 ++++++++++++++++-------------- drivers/md/dm-raid1.c | 8 ++++---- drivers/md/dm-verity.c | 52 ++++++++++++++------------------------------------ fs/bio.c | 14 +++++++++++--- include/linux/dm-io.h | 4 ++-- 7 files changed, 89 insertions(+), 119 deletions(-)
drivers/block/umem.c +23 -27
@@ -108,8 +108,7 @@ struct cardinfo {* have been written */ struct bio *bio, *currentbio, **biotail; -int current_idx; -sector_t current_sector; +struct bvec_iter current_iter;struct request_queue *queue;
@@ -118,7 +117,7 @@ struct cardinfo {struct mm_dma_desc *desc;int cnt, headcnt;struct bio *bio, **biotail; -int idx; +struct bvec_iter iter; } mm_pages[2 ];#define DESC_PER_PAGE ((PAGE_SIZE*2)/sizeof(struct mm_dma_desc))
@@ -344,16 +343,13 @@ static int add_bio(struct cardinfo *card)dma_addr_t dma_handle;int offset;struct bio *bio; -struct bio_vec *vec; -int idx; +struct bio_vec vec;int rw; -int len; bio = card->currentbio;if (!bio && card->bio) { card->currentbio = card->bio; - card->current_idx = card->bio->bi_iter.bi_idx; - card->current_sector = card->bio->bi_iter.bi_sector; + card->current_iter = card->bio->bi_iter; card->bio = card->bio->bi_next;if (card->bio ==NULL ) card->biotail = &card->bio;
@@ -362,18 +358,17 @@ static int add_bio(struct cardinfo *card) }if (!bio)return 0 ; - idx = card->current_idx; rw =bio_rw (bio);if (card->mm_pages[card->Ready].cnt >=DESC_PER_PAGE )return 0 ; - vec =bio_iovec_idx (bio, idx); - len = vec->bv_len; + vec =bio_iter_iovec (bio, card->current_iter); + dma_handle =pci_map_page (card->dev, - vec->bv_page, - vec->bv_offset, - len, + vec.bv_page, + vec.bv_offset, + vec.bv_len, (rw ==READ ) ?PCI_DMA_FROMDEVICE :PCI_DMA_TODEVICE );
@@ -381,7 +376,7 @@ static int add_bio(struct cardinfo *card) desc = &p->desc[p->cnt]; p->cnt++;if (p->bio ==NULL ) - p->idx = idx; + p->iter = card->current_iter;if ((p->biotail) != &bio->bi_next) { *(p->biotail) = bio; p->biotail = &(bio->bi_next);
@@ -391,8 +386,8 @@ static int add_bio(struct cardinfo *card) desc->data_dma_handle = dma_handle; desc->pci_addr =cpu_to_le64 ((u64 )desc->data_dma_handle); - desc->local_addr =cpu_to_le64 (card->current_sector <<9 ); - desc->transfer_size =cpu_to_le32 (len); + desc->local_addr =cpu_to_le64 (card->current_iter.bi_sector <<9 ); + desc->transfer_size =cpu_to_le32 (vec.bv_len); offset = (((char *)&desc->sem_control_bits) - ((char *)p->desc)); desc->sem_addr =cpu_to_le64 ((u64)(p->page_dma+offset)); desc->zero1 = desc->zero2 =0 ;
@@ -407,10 +402,9 @@ static int add_bio(struct cardinfo *card) desc->control_bits |=cpu_to_le32 (DMASCR_TRANSFER_READ ); desc->sem_control_bits = desc->control_bits; - card->current_sector += (len >>9 ); - idx++; - card->current_idx = idx; -if (idx >= bio->bi_vcnt) + +bio_advance_iter (bio, &card->current_iter, vec.bv_len); +if (!card->current_iter.bi_size) card->currentbio =NULL ;return 1 ;
@@ -439,23 +433,25 @@ static void process_page(unsigned long data)struct mm_dma_desc *desc = &page->desc[page->headcnt];int control =le32_to_cpu (desc->sem_control_bits);int last =0 ; -int idx; +struct bio_vec vec;if (!(control &DMASCR_DMA_COMPLETE )) { control = dma_status; last =1 ; } + page->headcnt++; - idx = page->idx; - page->idx++; -if (page->idx >= bio->bi_vcnt) { + vec =bio_iter_iovec (bio, page->iter); +bio_advance_iter (bio, &page->iter, vec.bv_len); + +if (!page->iter.bi_size) { page->bio = bio->bi_next;if (page->bio) - page->idx = page->bio->bi_iter.bi_idx; + page->iter = page->bio->bi_iter; }pci_unmap_page (card->dev, desc->data_dma_handle, -bio_iovec_idx (bio, idx)->bv_len, + vec.bv_len, (control &DMASCR_TRANSFER_READ ) ?PCI_DMA_TODEVICE :PCI_DMA_FROMDEVICE );if (control &DMASCR_HARD_ERROR ) {
drivers/md/dm-crypt.c +18 -31
100 lines not on this page · raw message
drivers/md/dm-io.c +17 -14
@@ -201,26 +201,29 @@ static void list_dp_init(struct dpages *dp, struct page_list *pl, unsigned offse/* * Functions for getting the pages from a bvec. */ -static void bvec_get_page (struct dpages *dp, +static void bio_get_page (struct dpages *dp,struct page **p,unsigned long *len,unsigned *offset) { -struct bio_vec *bvec = (struct bio_vec *) dp->context_ptr; - *p = bvec->bv_page; - *len = bvec->bv_len; - *offset = bvec->bv_offset; +struct bio *bio = dp->context_ptr; +struct bio_vec bvec =bio_iovec (bio); + *p = bvec.bv_page; + *len = bvec.bv_len; + *offset = bvec.bv_offset; } -static void bvec_next_page (struct dpages *dp) +static void bio_next_page (struct dpages *dp) { -struct bio_vec *bvec = (struct bio_vec *) dp->context_ptr; - dp->context_ptr = bvec +1 ; +struct bio *bio = dp->context_ptr; +struct bio_vec bvec =bio_iovec (bio); + +bio_advance (bio, bvec.bv_len); } -static void bvec_dp_init (struct dpages *dp,struct bio_vec *bvec) +static void bio_dp_init (struct dpages *dp,struct bio *bio) { - dp->get_page = bvec_get_page; - dp->next_page = bvec_next_page; - dp->context_ptr = bvec; + dp->get_page = bio_get_page; + dp->next_page = bio_next_page; + dp->context_ptr = bio; }/*
@@ -457,8 +460,8 @@ static int dp_init(struct dm_io_request *io_req, struct dpages *dp,list_dp_init (dp, io_req->mem.ptr.pl, io_req->mem.offset);break ; -case DM_IO_BVEC : -bvec_dp_init (dp, io_req->mem.ptr.bvec); +case DM_IO_BIO : +bio_dp_init (dp, io_req->mem.ptr.bio);break ;case DM_IO_VMA :
drivers/md/dm-raid1.c +4 -4
@@ -526,8 +526,8 @@ static void read_async_bio(struct mirror *m, struct bio *bio)struct dm_io_region io;struct dm_io_request io_req = { .bi_rw =READ , - .mem.type =DM_IO_BVEC , - .mem.ptr.bvec = bio->bi_io_vec + bio->bi_iter.bi_idx, + .mem.type =DM_IO_BIO , + .mem.ptr.bio = bio, .notify.fn = read_callback, .notify.context = bio, .client = m->ms->io_client,
@@ -629,8 +629,8 @@ static void do_write(struct mirror_set *ms, struct bio *bio)struct mirror *m;struct dm_io_request io_req = { .bi_rw =WRITE | (bio->bi_rw &WRITE_FLUSH_FUA ), - .mem.type =DM_IO_BVEC , - .mem.ptr.bvec = bio->bi_io_vec + bio->bi_iter.bi_idx, + .mem.type =DM_IO_BIO , + .mem.ptr.bio = bio, .notify.fn = write_callback, .notify.context = bio, .client = ms->io_client,
drivers/md/dm-verity.c +14 -38
99 lines not on this page · raw message
fs/bio.c +11 -3
@@ -525,8 +525,17 @@ EXPORT_SYMBOL(bio_phys_segments);*/ void __bio_clone (struct bio *bio,struct bio *bio_src) { -memcpy (bio->bi_io_vec, bio_src->bi_io_vec, - bio_src->bi_max_vecs *sizeof (struct bio_vec )); +if (bio_is_rw (bio_src)) { +struct bio_vec bv; +struct bvec_iter iter; + +bio_for_each_segment (bv, bio_src, iter) + bio->bi_io_vec[bio->bi_vcnt++] = bv; + }else if (bio_has_data (bio_src)) { +memcpy (bio->bi_io_vec, bio_src->bi_io_vec, + bio_src->bi_max_vecs *sizeof (struct bio_vec )); + bio->bi_vcnt = bio_src->bi_vcnt; + }/* * most users will be overriding ->bi_bdev with a new target,
@@ -535,7 +544,6 @@ void __bio_clone(struct bio *bio, struct bio *bio_src) bio->bi_bdev = bio_src->bi_bdev; bio->bi_flags |=1 <<BIO_CLONED ; bio->bi_rw = bio_src->bi_rw; - bio->bi_vcnt = bio_src->bi_vcnt; bio->bi_iter = bio_src->bi_iter; }EXPORT_SYMBOL (__bio_clone);
include/linux/dm-io.h +2 -2
@@ -29,7 +29,7 @@ typedef void (*io_notify_fn)(unsigned long error, void *context);enum dm_io_mem_type {DM_IO_PAGE_LIST ,/* Page list */ -DM_IO_BVEC ,/* Bio vector */ +DM_IO_BIO ,/* Bio vector */ DM_IO_VMA ,/* Virtual memory area */ DM_IO_KMEM ,/* Kernel memory */ };
@@ -41,7 +41,7 @@ struct dm_io_memory {union {struct page_list *pl; -struct bio_vec *bvec; +struct bio *bio;void *vma;void *addr; } ptr;
Signature · 1 line
1.8.4.4
PATCH 13/25 aoe: Convert to immutable biovecs
In reply to Kent OverstreetNow that we've got a mechanism for immutable biovecs - bi_iter.bi_bvec_done - we need to convert drivers to use primitives that respect it instead of using the bvec array directly.
The aoe code no longer has to manually iterate over partial bvecs, so some struct members go away - other struct members are effectively renamed:
buf->resid -> buf->iter.bi_sizebuf->sector -> buf->iter.bi_sector
f->bcnt -> f->iter.bi_sizef->lba -> f->iter.bi_sector
--- drivers/block/aoe/aoe.h | 10 +--- drivers/block/aoe/aoecmd.c | 135 +++++++++++++++++---------------------------- 2 files changed, 53 insertions(+), 92 deletions(-)
drivers/block/aoe/aoe.h +2 -8
@@ -100,11 +100,8 @@ enum {struct buf {ulong nframesout; -ulong resid; -ulong bv_resid; -sector_t sector;struct bio *bio; -struct bio_vec *bv; +struct bvec_iter iter;struct request *rq; };
@@ -120,13 +117,10 @@ struct frame {ulong waited;ulong waited_total;struct aoetgt *t;/* parent target I belong to */ -sector_t lba;struct sk_buff *skb;/* command skb freed on module exit */ struct sk_buff *r_skb;/* response skb for async processing */ struct buf *buf; -struct bio_vec *bv; -ulong bcnt; -ulong bv_off; +struct bvec_iter iter;char flags; };
drivers/block/aoe/aoecmd.c +51 -84
235 lines not on this page · raw message
Signature · 1 line
1.8.4.4
PATCH 14/25 ceph: Convert to immutable biovecs
In reply to Kent OverstreetNow that we've got a mechanism for immutable biovecs - bi_iter.bi_bvec_done - we need to convert drivers to use primitives that respect it instead of using the bvec array directly.
--- include/linux/ceph/messenger.h | 4 ++-- net/ceph/messenger.c | 43 +++++++++++++++++------------------------- 2 files changed, 19 insertions(+), 28 deletions(-)
include/linux/ceph/messenger.h +2 -2
@@ -1,6 +1,7 @@#ifndef __FS_CEPH_MESSENGER_H#define __FS_CEPH_MESSENGER_H +#include <linux/blk_types.h> #include <linux/kref.h> #include <linux/mutex.h> #include <linux/net.h>
@@ -119,8 +120,7 @@ struct ceph_msg_data_cursor {#ifdef CONFIG_BLOCK struct {/* bio */ struct bio *bio;/* bio from list */ -unsigned int vector_index;/* vector from bio */ -unsigned int vector_offset;/* bytes from vector */ +struct bvec_iter bvec_iter; };#endif /* CONFIG_BLOCK */ struct {/* pages */
net/ceph/messenger.c +17 -26
101 lines not on this page · raw message
Signature · 1 line
1.8.4.4
PATCH 15/25 block: Kill bio_iovec_idx(), __bio_iovec()
In reply to Kent Overstreetbio_iovec_idx() and __bio_iovec() don't have any valid uses anymore - previous users have been converted to bio_iovec_iter() or other methods.
__BVEC_END() has to go too - the bvec array can't be used directly for the last biovec because we might only be using the first portion of it, we have to iterate over the bvec array with bio_for_each_segment() which checks against the current value of bi_iter.bi_size.
--- block/blk-merge.c | 13 +++++++++++-- include/linux/bio.h | 26 ++++++++------------------ 2 files changed, 19 insertions(+), 20 deletions(-)
block/blk-merge.c +11 -2
@@ -86,6 +86,9 @@ EXPORT_SYMBOL(blk_recount_segments);static int blk_phys_contig_segment (struct request_queue *q,struct bio *bio,struct bio *nxt) { +struct bio_vec end_bv, nxt_bv; +struct bvec_iter iter; +if (!blk_queue_cluster (q))return 0 ;
@@ -96,14 +99,20 @@ static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,if (!bio_has_data (bio))return 1 ; -if (!BIOVEC_PHYS_MERGEABLE (__BVEC_END (bio),__BVEC_START (nxt))) +bio_for_each_segment (end_bv, bio, iter) +if (end_bv.bv_len == iter.bi_size) +break ; + + nxt_bv =bio_iovec (nxt); + +if (!BIOVEC_PHYS_MERGEABLE (&end_bv, &nxt_bv))return 0 ;/* * bio and nxt are contiguous in memory; check if the queue allows * these two to be merged into one */ -if (BIO_SEG_BOUNDARY (q, bio, nxt)) +if (BIOVEC_SEG_BOUNDARY (q, &end_bv, &nxt_bv))return 1 ;return 0 ;
include/linux/bio.h +8 -18
@@ -61,9 +61,6 @@* various member access, note that bio_data should of course not be used * on highmem page vectors */ -#define bio_iovec_idx (bio, idx) (&((bio)->bi_io_vec[(idx)])) -#define __bio_iovec (bio) bio_iovec_idx((bio), (bio)->bi_iter.bi_idx) -#define __bvec_iter_bvec (bvec, iter) (&(bvec)[(iter).bi_idx])#define bvec_iter_page (bvec, iter) \
@@ -162,19 +159,16 @@ static inline void *bio_data(struct bio *bio)* permanent PIO fall back, user is probably better off disabling highmem * I/O completely on that queue (see ide-dma for example) */ -#define __bio_kmap_atomic (bio, idx) \ - (kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page) + \ - bio_iovec_idx((bio), (idx))->bv_offset) +#define __bio_kmap_atomic (bio, iter) \ + (kmap_atomic(bio_iter_iovec((bio), (iter)).bv_page) + \ + bio_iter_iovec((bio), (iter)).bv_offset) -#define __bio_kunmap_atomic (addr) kunmap_atomic(addr) +#define __bio_kunmap_atomic (addr) kunmap_atomic(addr)/* * merge helpers etc */ -#define __BVEC_END (bio) bio_iovec_idx((bio), (bio)->bi_vcnt - 1) -#define __BVEC_START (bio) bio_iovec_idx((bio), (bio)->bi_iter.bi_idx) -/* Default implementation of BIOVEC_PHYS_MERGEABLE */ #define __BIOVEC_PHYS_MERGEABLE (vec1, vec2) \ ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2)))
@@ -191,8 +185,6 @@ static inline void *bio_data(struct bio *bio) (((addr1) | (mask)) == (((addr2) - 1) | (mask)))#define BIOVEC_SEG_BOUNDARY (q, b1, b2) \ __BIO_SEG_BOUNDARY(bvec_to_phys((b1)), bvec_to_phys((b2)) + (b2)->bv_len, queue_segment_boundary((q))) -#define BIO_SEG_BOUNDARY (q, b1, b2) \ - BIOVEC_SEG_BOUNDARY((q), __BVEC_END((b1)), __BVEC_START((b2)))#define bio_io_error (bio) bio_endio((bio), -EIO)
@@ -201,9 +193,7 @@ static inline void *bio_data(struct bio *bio)* before it got to the driver and the driver won't own all of it */ #define bio_for_each_segment_all (bvl, bio, i) \ - for (i = 0; \ - bvl = bio_iovec_idx((bio), (i)), i < (bio)->bi_vcnt; \ - i++) + for (i = 0, bvl = (bio)->bi_io_vec; i < (bio)->bi_vcnt; i++, bvl++)static inline void bvec_iter_advance (struct bio_vec *bv,struct bvec_iter *iter,unsigned bytes)
@@ -468,15 +458,15 @@ static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags) }#endif -static inline char *__bio_kmap_irq (struct bio *bio,unsigned short idx, +static inline char *__bio_kmap_irq (struct bio *bio,struct bvec_iter iter,unsigned long *flags) { -return bvec_kmap_irq (bio_iovec_idx (bio, idx), flags); +return bvec_kmap_irq (&bio_iter_iovec (bio, iter), flags); }#define __bio_kunmap_irq (buf, flags) bvec_kunmap_irq(buf, flags)#define bio_kmap_irq (bio, flags) \ - __bio_kmap_irq((bio), (bio)->bi_iter.bi_idx, (flags)) + __bio_kmap_irq((bio), (bio)->bi_iter, (flags))#define bio_kunmap_irq (buf,flags) __bio_kunmap_irq(buf, flags)/*
Signature · 1 line
1.8.4.4
PATCH 16/25 block: Refactor bio_clone_bioset() for immutable biovecs
In reply to Kent Overstreetbio_clone() needs to produce a bio that's suitable for the caller to munge with the biovec. Part of the immutable biovec patch series is fixing stuff up so that submitting partially completed bios is safe and
works: thus, we now need bio_clone() on a partially completed bio to produce a bio for which bi_idx and bi_bvec done are 0 - like they would be if the caller had just allocated a new bio.
--- fs/bio.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 47 insertions(+), 13 deletions(-)
fs/bio.c +47 -13
@@ -549,36 +549,70 @@ void __bio_clone(struct bio *bio, struct bio *bio_src)EXPORT_SYMBOL (__bio_clone);/** -* bio_clone_bioset - clone a bio -* @bio: bio to clone +* bio_clone_bioset - clone a bio +* @bio_src: bio to clone * @gfp_mask: allocation priority * @bs: bio_set to allocate from * -* Like __bio_clone, only also allocates the returned bio +* Clone bio. Caller will own the returned bio, but not the actual data it +* points to. Reference count of returned bio will be one. */ -struct bio *bio_clone_bioset (struct bio *bio,gfp_t gfp_mask, +struct bio *bio_clone_bioset (struct bio *bio_src,gfp_t gfp_mask,struct bio_set *bs) { -struct bio *b; +unsigned nr_iovecs =0 ; +struct bvec_iter iter; +struct bio_vec bv; +struct bio *bio; + +/* +* Pre immutable biovecs, __bio_clone() used to just do a memcpy from +* bio_src->bi_io_vec to bio->bi_io_vec. +* +* We can't do that anymore, because: +* +* - The point of cloning the biovec is to produce a bio with a biovec +* the caller can modify: bi_idx and bi_bvec_done should be 0. +* +* - The original bio could've had more than BIO_MAX_PAGES biovecs; if +* we tried to clone the whole thing bio_alloc_bioset() would fail. +* But the clone should succeed as long as the number of biovecs we +* actually need to allocate is fewer than BIO_MAX_PAGES. +* +* - Lastly, bi_vcnt should not be looked at or relied upon by code +* that does not own the bio - reason being drivers don't use it for +* iterating over the biovec anymore, so expecting it to be kept up +* to date (i.e. for clones that share the parent biovec) is just +* asking for trouble and would force extra work on +* __bio_clone_fast() anyways. +*/ + +bio_for_each_segment (bv, bio_src, iter) + nr_iovecs++; - b =bio_alloc_bioset (gfp_mask, bio->bi_max_vecs, bs); -if (!b) + bio =bio_alloc_bioset (gfp_mask, nr_iovecs, bs); +if (!bio)return NULL ; -__bio_clone (b, bio); + bio->bi_bdev = bio_src->bi_bdev; + bio->bi_rw = bio_src->bi_rw; + bio->bi_iter.bi_sector = bio_src->bi_iter.bi_sector; + bio->bi_iter.bi_size = bio_src->bi_iter.bi_size; -if (bio_integrity (bio)) { -int ret; +bio_for_each_segment (bv, bio_src, iter) + bio->bi_io_vec[bio->bi_vcnt++] = bv; - ret =bio_integrity_clone (b, bio, gfp_mask); +if (bio_integrity (bio_src)) { +int ret; + ret =bio_integrity_clone (bio, bio_src, gfp_mask);if (ret <0 ) { -bio_put (b); +bio_put (bio);return NULL ; } } -return b; +return bio; }EXPORT_SYMBOL (bio_clone_bioset);
Signature · 1 line
1.8.4.4
PATCH 18/25 rbd: Refactor bio cloning
In reply to Kent OverstreetNow that we've got drivers converted to the new immutable bvec primitives, bio splitting becomes much easier - this is how the new bio_split() will work. (Someone more familiar with the ceph code could probably use bio_clone_fast() instead of bio_clone() here).
--- drivers/block/rbd.c | 64 ++--------------------------------------------------- 1 file changed, 2 insertions(+), 62 deletions(-)
drivers/block/rbd.c +2 -62
@@ -1173,73 +1173,13 @@ static struct bio *bio_clone_range(struct bio *bio_src, unsigned int len, gfp_t gfpmask) { -struct bio_vec bv; -struct bvec_iter iter; -struct bvec_iter end_iter; -unsigned int resid; -unsigned int voff; -unsigned short vcnt;struct bio *bio; -/* Handle the easy case for the caller */ - -if (!offset && len == bio_src->bi_iter.bi_size) -return bio_clone (bio_src, gfpmask); - -if (WARN_ON_ONCE (!len)) -return NULL ; -if (WARN_ON_ONCE (len > bio_src->bi_iter.bi_size)) -return NULL ; -if (WARN_ON_ONCE (offset > bio_src->bi_iter.bi_size - len)) -return NULL ; - -/* Find first affected segment... */ - - resid = offset; -bio_for_each_segment (bv, bio_src, iter) { -if (resid < bv.bv_len) -break ; - resid -= bv.bv_len; - } - voff = resid; - -/* ...and the last affected segment */ - - resid += len; -__bio_for_each_segment (bv, bio_src, end_iter, iter) { -if (resid <= bv.bv_len) -break ; - resid -= bv.bv_len; - } - vcnt = end_iter.bi_idx = iter.bi_idx +1 ; - -/* Build the clone */ - - bio =bio_alloc (gfpmask, (unsigned int ) vcnt); + bio =bio_clone (bio_src, gfpmask);if (!bio)return NULL ;/* ENOMEM */ - bio->bi_bdev = bio_src->bi_bdev; - bio->bi_iter.bi_sector = bio_src->bi_iter.bi_sector + - (offset >>SECTOR_SHIFT ); - bio->bi_rw = bio_src->bi_rw; - bio->bi_flags |=1 <<BIO_CLONED ; - -/* -* Copy over our part of the bio_vec, then update the first -* and last (or only) entries. -*/ -memcpy (&bio->bi_io_vec[0 ], &bio_src->bi_io_vec[iter.bi_idx], - vcnt *sizeof (struct bio_vec )); - bio->bi_io_vec[0 ].bv_offset += voff; -if (vcnt >1 ) { - bio->bi_io_vec[0 ].bv_len -= voff; - bio->bi_io_vec[vcnt -1 ].bv_len = resid; - }else { - bio->bi_io_vec[0 ].bv_len = len; - } - - bio->bi_vcnt = vcnt; +bio_advance (bio, offset); bio->bi_iter.bi_size = len;return bio;
Signature · 1 line
1.8.4.4
PATCH 19/25 dm: Refactor for new bio cloning/splitting
In reply to Kent OverstreetWe need to convert the dm code to the new bvec_iter primitives which respect bi_bvec_done; they also allow us to drastically simplify dm's bio splitting code.
Also, it's no longer necessary to save/restore the bvec array anymore - driver conversions for immutable bvecs are done, so drivers should never be modifying it.
Also kill bio_sector_offset(), dm was the only user and it doesn't make much sense anymore.
--- drivers/md/dm-bio-record.h | 25 ------- drivers/md/dm.c | 174 ++++++--------------------------------------- fs/bio.c | 72 ------------------- include/linux/bio.h | 2 - 4 files changed, 20 insertions(+), 253 deletions(-)
drivers/md/dm-bio-record.h +0 -25
@@ -17,49 +17,24 @@* original bio state. */ -struct dm_bio_vec_details { -#if PAGE_SIZE <65536 -__u16 bv_len; -__u16 bv_offset; -#else -unsigned bv_len; -unsigned bv_offset; -#endif -}; -struct dm_bio_details {struct block_device *bi_bdev;unsigned long bi_flags;struct bvec_iter bi_iter; -struct dm_bio_vec_details bi_io_vec[BIO_MAX_PAGES ]; };static inline void dm_bio_record (struct dm_bio_details *bd,struct bio *bio) { -unsigned i; - bd->bi_bdev = bio->bi_bdev; bd->bi_flags = bio->bi_flags; bd->bi_iter = bio->bi_iter; - -for (i =0 ; i < bio->bi_vcnt; i++) { - bd->bi_io_vec[i].bv_len = bio->bi_io_vec[i].bv_len; - bd->bi_io_vec[i].bv_offset = bio->bi_io_vec[i].bv_offset; - } }static inline void dm_bio_restore (struct dm_bio_details *bd,struct bio *bio) { -unsigned i; - bio->bi_bdev = bd->bi_bdev; bio->bi_flags = bd->bi_flags; bio->bi_iter = bd->bi_iter; - -for (i =0 ; i < bio->bi_vcnt; i++) { - bio->bi_io_vec[i].bv_len = bd->bi_io_vec[i].bv_len; - bio->bi_io_vec[i].bv_offset = bd->bi_io_vec[i].bv_offset; - } }#endif
drivers/md/dm.c +20 -154
239 lines not on this page · raw message
fs/bio.c +0 -72
84 lines not on this page · raw message
include/linux/bio.h +0 -2
@@ -330,7 +330,6 @@ extern void bio_put(struct bio *);extern void __bio_clone_fast (struct bio *,struct bio *);extern struct bio *bio_clone_fast (struct bio *,gfp_t ,struct bio_set *); -extern void __bio_clone (struct bio *,struct bio *);extern struct bio *bio_clone_bioset (struct bio *,gfp_t ,struct bio_set *bs);extern struct bio_set *fs_bio_set;
@@ -370,7 +369,6 @@ extern int bio_add_page(struct bio *, struct page *, unsigned int,unsigned int);extern int bio_add_pc_page (struct request_queue *,struct bio *,struct page *,unsigned int ,unsigned int );extern int bio_get_nr_vecs (struct block_device *); -extern sector_t bio_sector_offset (struct bio *,unsigned short ,unsigned int );extern struct bio *bio_map_user (struct request_queue *,struct block_device *,unsigned long ,unsigned int ,int ,gfp_t );struct sg_iovec ;
Signature · 1 line
1.8.4.4
PATCH 20/25 block: Don't save/copy bvec array anymore
In reply to Kent OverstreetNow that drivers have been converted to the bvec_iter primitives, they shouldn't be modifying the biovec anymore and thus saving it is unnecessary - code that was previously making a backup of the bvec array can now just save bio->bi_iter.
--- fs/bio.c | 54 +++++++++++++----------------------------------------- 1 file changed, 13 insertions(+), 41 deletions(-)
fs/bio.c +13 -41
@@ -967,60 +967,33 @@ void bio_copy_data(struct bio *dst, struct bio *src)EXPORT_SYMBOL (bio_copy_data);struct bio_map_data { -struct bio_vec *iovecs; -struct sg_iovec *sgvecs;int nr_sgvecs;int is_our_pages; +struct sg_iovec sgvecs[]; };static void bio_set_map_data (struct bio_map_data *bmd,struct bio *bio,struct sg_iovec *iov,int iov_count,int is_our_pages) { -memcpy (bmd->iovecs, bio->bi_io_vec,sizeof (struct bio_vec ) * bio->bi_vcnt);memcpy (bmd->sgvecs, iov,sizeof (struct sg_iovec ) * iov_count); bmd->nr_sgvecs = iov_count; bmd->is_our_pages = is_our_pages; bio->bi_private = bmd; } -static void bio_free_map_data (struct bio_map_data *bmd) -{ -kfree (bmd->iovecs); -kfree (bmd->sgvecs); -kfree (bmd); -} -static struct bio_map_data *bio_alloc_map_data (int nr_segs,unsigned int iov_count,gfp_t gfp_mask) { -struct bio_map_data *bmd; -if (iov_count >UIO_MAXIOV )return NULL ; - bmd =kmalloc (sizeof (*bmd), gfp_mask); -if (!bmd) -return NULL ; - - bmd->iovecs =kmalloc (sizeof (struct bio_vec ) * nr_segs, gfp_mask); -if (!bmd->iovecs) { -kfree (bmd); -return NULL ; - } - - bmd->sgvecs =kmalloc (sizeof (struct sg_iovec ) * iov_count, gfp_mask); -if (bmd->sgvecs) -return bmd; - -kfree (bmd->iovecs); -kfree (bmd); -return NULL ; +return kmalloc (sizeof (struct bio_map_data ) + +sizeof (struct sg_iovec ) * iov_count, gfp_mask); } -static int __bio_copy_iov (struct bio *bio,struct bio_vec *iovecs, -struct sg_iovec *iov,int iov_count, +static int __bio_copy_iov (struct bio *bio,struct sg_iovec *iov,int iov_count,int to_user,int from_user,int do_free_page) {int ret =0 , i;
@@ -1030,7 +1003,7 @@ static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs,bio_for_each_segment_all (bvec, bio, i) {char *bv_addr =page_address (bvec->bv_page); -unsigned int bv_len = iovecs[i].bv_len; +unsigned int bv_len = bvec->bv_len;while (bv_len && iov_idx < iov_count) {unsigned int bytes;
@@ -1090,14 +1063,14 @@ int bio_uncopy_user(struct bio *bio)* don't copy into a random user address space, just free. */ if (current->mm) - ret =__bio_copy_iov (bio, bmd->iovecs, bmd->sgvecs, - bmd->nr_sgvecs,bio_data_dir (bio) ==READ , + ret =__bio_copy_iov (bio, bmd->sgvecs, bmd->nr_sgvecs, +bio_data_dir (bio) ==READ ,0 , bmd->is_our_pages);else if (bmd->is_our_pages)bio_for_each_segment_all (bvec, bio, i)__free_page (bvec->bv_page); } -bio_free_map_data (bmd); +kfree (bmd);bio_put (bio);return ret; }
@@ -1211,7 +1184,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,*/ if ((!write_to_vm && (!map_data || !map_data->null_mapped)) || (map_data && map_data->from_user)) { - ret =__bio_copy_iov (bio, bio->bi_io_vec, iov, iov_count,0 ,1 ,0 ); + ret =__bio_copy_iov (bio, iov, iov_count,0 ,1 ,0 );if (ret) goto cleanup; }
@@ -1225,7 +1198,7 @@ cleanup:bio_put (bio); out_bmd: -bio_free_map_data (bmd); +kfree (bmd);return ERR_PTR (ret); }
@@ -1542,16 +1515,15 @@ static void bio_copy_kern_endio(struct bio *bio, int err)bio_for_each_segment_all (bvec, bio, i) {char *addr =page_address (bvec->bv_page); -int len = bmd->iovecs[i].bv_len;if (read) -memcpy (p, addr, len); +memcpy (p, addr, bvec->bv_len);__free_page (bvec->bv_page); - p += len; + p += bvec->bv_len; } -bio_free_map_data (bmd); +kfree (bmd);bio_put (bio); }
Signature · 1 line
1.8.4.4
PATCH 22/25 block: Generic bio chaining
In reply to Kent OverstreetThis adds a generic mechanism for chaining bio completions. This is going to be used for a bio_split() replacement, and it turns out to be very useful in a fair amount of driver code - a fair number of drivers were implementing this in their own roundabout ways, often painfully.
Note that this means it's no longer to call bio_endio() more than once on the same bio! This can cause problems for drivers that save/restore bi_end_io. Arguably they shouldn't be saving/restoring bi_end_io at all
- in all but the simplest cases they'd be better off just cloning the bio, and immutable biovecs is making bio cloning cheaper. But for now, we add a bio_endio_nodec() for these cases.
--- drivers/md/bcache/io.c | 2 +- drivers/md/dm-cache-target.c | 6 ++++ drivers/md/dm-snap.c | 1 + drivers/md/dm-thin.c | 8 +++-- drivers/md/dm-verity.c | 2 +- fs/bio-integrity.c | 2 +- fs/bio.c | 76 ++++++++++++++++++++++++++++++++++++++++---- include/linux/bio.h | 2 ++ include/linux/blk_types.h | 2 ++ 9 files changed, 90 insertions(+), 11 deletions(-)
drivers/md/bcache/io.c +1 -1
@@ -133,7 +133,7 @@ static void bch_bio_submit_split_done(struct closure *cl) s->bio->bi_end_io = s->bi_end_io; s->bio->bi_private = s->bi_private; -bio_endio (s->bio,0 ); +bio_endio_nodec (s->bio,0 );closure_debug_destroy (&s->cl);mempool_free (s, s->p->bio_split_hook);
drivers/md/dm-cache-target.c +6 -0
@@ -765,6 +765,12 @@ static void writethrough_endio(struct bio *bio, int err)dm_unhook_bio (&pb->hook_info, bio); +/* +* Must bump bi_remaining to allow bio to complete with +* restored bi_end_io. +*/ +atomic_inc (&bio->bi_remaining); +if (err) {bio_endio (bio, err);return ;
drivers/md/dm-snap.c +1 -0
@@ -1415,6 +1415,7 @@ out:if (full_bio) { full_bio->bi_end_io = pe->full_bio_end_io; full_bio->bi_private = pe->full_bio_private; +atomic_inc (&full_bio->bi_remaining); }free_pending_exception (pe);
drivers/md/dm-thin.c +6 -2
@@ -611,8 +611,10 @@ static void cell_defer_no_holder(struct thin_c *tc, struct dm_bio_prison_cell *cstatic void process_prepared_mapping_fail (struct dm_thin_new_mapping *m) { -if (m->bio) +if (m->bio) { m->bio->bi_end_io = m->saved_bi_end_io; +atomic_inc (&m->bio->bi_remaining); + }cell_error (m->tc->pool, m->cell);list_del (&m->list);mempool_free (m, m->tc->pool->mapping_pool);
@@ -626,8 +628,10 @@ static void process_prepared_mapping(struct dm_thin_new_mapping *m)int r; bio = m->bio; -if (bio) +if (bio) { bio->bi_end_io = m->saved_bi_end_io; +atomic_inc (&bio->bi_remaining); + }if (m->err) {cell_error (pool, m->cell);
drivers/md/dm-verity.c +1 -1
@@ -385,7 +385,7 @@ static void verity_finish_io(struct dm_verity_io *io, int error) bio->bi_end_io = io->orig_bi_end_io; bio->bi_private = io->orig_bi_private; -bio_endio (bio, error); +bio_endio_nodec (bio, error); }static void verity_work (struct work_struct *w)
fs/bio-integrity.c +1 -1
@@ -502,7 +502,7 @@ static void bio_integrity_verify_fn(struct work_struct *work)/* Restore original bio completion handler */ bio->bi_end_io = bip->bip_end_io; -bio_endio (bio, error); +bio_endio_nodec (bio, error); }/**
fs/bio.c +70 -6
101 lines not on this page · raw message
include/linux/bio.h +2 -0
@@ -356,6 +356,7 @@ static inline struct bio *bio_clone_kmalloc(struct bio *bio, gfp_t gfp_mask) }extern void bio_endio (struct bio *,int ); +extern void bio_endio_nodec (struct bio *,int );struct request_queue ;extern int bio_phys_segments (struct request_queue *,struct bio *);
@@ -364,6 +365,7 @@ extern void bio_advance(struct bio *, unsigned);extern void bio_init (struct bio *);extern void bio_reset (struct bio *); +void bio_chain (struct bio *,struct bio *);extern int bio_add_page (struct bio *,struct page *,unsigned int ,unsigned int ); extern int bio_add_pc_page(struct request_queue *, struct bio *, struct page *,
include/linux/blk_types.h +2 -0
@@ -65,6 +65,8 @@ struct bio {unsigned int bi_seg_front_size;unsigned int bi_seg_back_size; +atomic_t bi_remaining; +bio_end_io_t *bi_end_io;void *bi_private;
Signature · 1 line
1.8.4.4
PATCH 24/25 block: Introduce new bio_split()
In reply to Kent OverstreetThe new bio_split() can split arbitrary bios - it's not restricted to single page bios, like the old bio_split() (previously renamed to bio_pair_split()). It also has different semantics - it doesn't allocate a struct bio_pair, leaving it up to the caller to handle completions.
Then convert the existing bio_pair_split() users to the new bio_split()
- and also nvme, which was open coding bio splitting.
(We have to take that BUG_ON() out of bio_integrity_trim() because this bio_split() needs to use it, and there's no reason it has to be used on bios marked as cloned; BIO_CLONED doesn't seem to have clearly documented semantics anyways.)
--- drivers/block/nvme-core.c | 106 +++------------------------------- drivers/block/pktcdvd.c | 136 ++++++++++++++++++++++++-------------------- drivers/md/bcache/bcache.h | 1 - drivers/md/bcache/io.c | 82 +------------------------- drivers/md/bcache/request.c | 12 ++-- drivers/md/linear.c | 96 +++++++++++++++---------------- drivers/md/raid0.c | 77 +++++++++---------------- drivers/md/raid10.c | 113 +++++++++++++++--------------------- fs/bio.c | 36 ++++++++++++ include/linux/bio.h | 22 +++++++ 10 files changed, 272 insertions(+), 409 deletions(-)
drivers/block/nvme-core.c +9 -97
@@ -441,104 +441,19 @@ int nvme_setup_prps(struct nvme_dev *dev, struct nvme_common_command *cmd,return total_len; } -struct nvme_bio_pair { -struct bio b1, b2, *parent; -struct bio_vec *bv1, *bv2; -int err; -atomic_t cnt; -}; - -static void nvme_bio_pair_endio (struct bio *bio,int err) -{ -struct nvme_bio_pair *bp = bio->bi_private; - -if (err) - bp->err = err; - -if (atomic_dec_and_test (&bp->cnt)) { -bio_endio (bp->parent, bp->err); -kfree (bp->bv1); -kfree (bp->bv2); -kfree (bp); - } -} - -static struct nvme_bio_pair *nvme_bio_split (struct bio *bio,int idx, -int len,int offset) -{ -struct nvme_bio_pair *bp; - -BUG_ON (len > bio->bi_iter.bi_size); -BUG_ON (idx > bio->bi_vcnt); - - bp =kmalloc (sizeof (*bp),GFP_ATOMIC ); -if (!bp) -return NULL ; - bp->err =0 ; - - bp->b1 = *bio; - bp->b2 = *bio; - - bp->b1.bi_iter.bi_size = len; - bp->b2.bi_iter.bi_size -= len; - bp->b1.bi_vcnt = idx; - bp->b2.bi_iter.bi_idx = idx; - bp->b2.bi_iter.bi_sector += len >>9 ; - -if (offset) { - bp->bv1 =kmalloc (bio->bi_max_vecs *sizeof (struct bio_vec ), -GFP_ATOMIC ); -if (!bp->bv1) - goto split_fail_1; - - bp->bv2 =kmalloc (bio->bi_max_vecs *sizeof (struct bio_vec ), -GFP_ATOMIC ); -if (!bp->bv2) - goto split_fail_2; - -memcpy (bp->bv1, bio->bi_io_vec, - bio->bi_max_vecs *sizeof (struct bio_vec )); -memcpy (bp->bv2, bio->bi_io_vec, - bio->bi_max_vecs *sizeof (struct bio_vec )); - - bp->b1.bi_io_vec = bp->bv1; - bp->b2.bi_io_vec = bp->bv2; - bp->b2.bi_io_vec[idx].bv_offset += offset; - bp->b2.bi_io_vec[idx].bv_len -= offset; - bp->b1.bi_io_vec[idx].bv_len = offset; - bp->b1.bi_vcnt++; - }else - bp->bv1 = bp->bv2 =NULL ; - - bp->b1.bi_private = bp; - bp->b2.bi_private = bp; - - bp->b1.bi_end_io = nvme_bio_pair_endio; - bp->b2.bi_end_io = nvme_bio_pair_endio; - - bp->parent = bio; -atomic_set (&bp->cnt,2 ); - -return bp; - - split_fail_2: -kfree (bp->bv1); - split_fail_1: -kfree (bp); -return NULL ; -} -static int nvme_split_and_submit (struct bio *bio,struct nvme_queue *nvmeq, -int idx,int len,int offset) +int len) { -struct nvme_bio_pair *bp =nvme_bio_split (bio, idx, len, offset); -if (!bp) +struct bio *split =bio_split (bio, len >>9 ,GFP_ATOMIC ,NULL ); +if (!split)return -ENOMEM ; +bio_chain (split, bio); +if (bio_list_empty (&nvmeq->sq_cong))add_wait_queue (&nvmeq->sq_full, &nvmeq->sq_cong_wait); -bio_list_add (&nvmeq->sq_cong, &bp->b1); -bio_list_add (&nvmeq->sq_cong, &bp->b2); +bio_list_add (&nvmeq->sq_cong, split); +bio_list_add (&nvmeq->sq_cong, bio);return 0 ; }
@@ -568,8 +483,7 @@ static int nvme_map_bio(struct nvme_queue *nvmeq, struct nvme_iod *iod, }else {if (!first &&BIOVEC_NOT_VIRT_MERGEABLE (&bvprv, &bvec))return nvme_split_and_submit (bio, nvmeq, - iter.bi_idx, - length,0 ); + length); sg = sg ? sg +1 : iod->sg; sg_set_page(sg, bvec.bv_page,
@@ -578,9 +492,7 @@ static int nvme_map_bio(struct nvme_queue *nvmeq, struct nvme_iod *iod, }if (split_len - length < bvec.bv_len) -return nvme_split_and_submit (bio, nvmeq, iter.bi_idx, - split_len, - split_len - length); +return nvme_split_and_submit (bio, nvmeq, split_len); length += bvec.bv_len; bvprv = bvec; first =0 ;
drivers/block/pktcdvd.c +74 -62
155 lines not on this page · raw message
drivers/md/bcache/bcache.h +0 -1
@@ -901,7 +901,6 @@ void bch_bbio_endio(struct cache_set *, struct bio *, int, const char *);void bch_bbio_free (struct bio *,struct cache_set *);struct bio *bch_bbio_alloc (struct cache_set *); -struct bio *bch_bio_split (struct bio *,int ,gfp_t ,struct bio_set *);void bch_generic_make_request (struct bio *,struct bio_split_pool *);void __bch_submit_bbio (struct bio *,struct cache_set *);void bch_submit_bbio (struct bio *,struct cache_set *,struct bkey *,unsigned );
drivers/md/bcache/io.c +2 -80
94 lines not on this page · raw message
drivers/md/bcache/request.c +6 -6
@@ -371,7 +371,7 @@ static void bch_data_insert_start(struct closure *cl) op->writeback)) goto err; - n =bch_bio_split (bio,KEY_SIZE (k),GFP_NOIO , split); + n =bio_next_split (bio,KEY_SIZE (k),GFP_NOIO , split); n->bi_end_io = bch_data_insert_endio; n->bi_private = cl;
@@ -679,9 +679,9 @@ static int cache_lookup_fn(struct btree_op *op, struct btree *b, struct bkey *k)if (KEY_DIRTY (k)) s->read_dirty_data = true; - n =bch_bio_split (bio,min_t (uint64_t,INT_MAX , -KEY_OFFSET (k) - bio->bi_iter.bi_sector), -GFP_NOIO , s->d->bio_split); + n =bio_next_split (bio,min_t (uint64_t,INT_MAX , +KEY_OFFSET (k) - bio->bi_iter.bi_sector), +GFP_NOIO , s->d->bio_split); bio_key = &container_of(n, struct bbio, bio)->key;bch_bkey_copy_single_ptr (bio_key, k, ptr);
@@ -920,7 +920,7 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s,struct bio *miss, *cache_bio;if (s->cache_miss || s->iop.bypass) { - miss =bch_bio_split (bio, sectors,GFP_NOIO , s->d->bio_split); + miss =bio_next_split (bio, sectors,GFP_NOIO , s->d->bio_split); ret = miss == bio ?MAP_DONE :MAP_CONTINUE ; goto out_submit; }
@@ -943,7 +943,7 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s, s->iop.replace = true; - miss =bch_bio_split (bio, sectors,GFP_NOIO , s->d->bio_split); + miss =bio_next_split (bio, sectors,GFP_NOIO , s->d->bio_split);/* btree_search_recurse()'s btree iterator is no good anymore */ ret = miss == bio ?MAP_DONE : -EINTR ;
drivers/md/linear.c +48 -48
113 lines not on this page · raw message
drivers/md/raid0.c +28 -49
93 lines not on this page · raw message
drivers/md/raid10.c +47 -66
136 lines not on this page · raw message
fs/bio.c +36 -0
@@ -1793,6 +1793,42 @@ void bio_endio_nodec(struct bio *bio, int error) }EXPORT_SYMBOL (bio_endio_nodec); +/** +* bio_split - split a bio +* @bio: bio to split +* @sectors: number of sectors to split from the front of @bio +* @gfp: gfp mask +* @bs: bio set to allocate from +* +* Allocates and returns a new bio which represents @sectors from the start of +* @bio, and updates @bio to represent the remaining sectors. +* +* The newly allocated bio will point to @bio's bi_io_vec; it is the caller's +* responsibility to ensure that @bio is not freed before the split. +*/ +struct bio *bio_split (struct bio *bio,int sectors, +gfp_t gfp,struct bio_set *bs) +{ +struct bio *split =NULL ; + +BUG_ON (sectors <=0 ); +BUG_ON (sectors >=bio_sectors (bio)); + + split =bio_clone_fast (bio, gfp, bs); +if (!split) +return NULL ; + + split->bi_iter.bi_size = sectors <<9 ; + +if (bio_integrity (split)) +bio_integrity_trim (split,0 , sectors); + +bio_advance (bio, split->bi_iter.bi_size); + +return split; +} +EXPORT_SYMBOL (bio_split); +void bio_pair_release (struct bio_pair *bp) {if (atomic_dec_and_test (&bp->cnt)) {
include/linux/bio.h +22 -0
@@ -321,6 +321,28 @@ extern struct bio_pair *bio_pair_split(struct bio *bi, int first_sectors);extern void bio_pair_release (struct bio_pair *dbio);extern void bio_trim (struct bio *bio,int offset,int size); +extern struct bio *bio_split (struct bio *bio,int sectors, +gfp_t gfp,struct bio_set *bs); + +/** +* bio_next_split - get next @sectors from a bio, splitting if necessary +* @bio: bio to split +* @sectors: number of sectors to split from the front of @bio +* @gfp: gfp mask +* @bs: bio set to allocate from +* +* Returns a bio representing the next @sectors of @bio - if the bio is smaller +* than @sectors, returns the original bio unchanged. +*/ +static inline struct bio *bio_next_split (struct bio *bio,int sectors, +gfp_t gfp,struct bio_set *bs) +{ +if (sectors >=bio_sectors (bio)) +return bio; + +return bio_split (bio, sectors, gfp, bs); +} +extern struct bio_set *bioset_create (unsigned int ,unsigned int );extern void bioset_free (struct bio_set *);extern mempool_t *biovec_create_pool (struct bio_set *bs,int pool_entries);
Signature · 1 line
1.8.4.4
PATCH 25/25 block: Kill bio_pair_split()
In reply to Kent Overstreet--- fs/bio-integrity.c | 45 --------------------------- fs/bio.c | 90 ----------------------------------------------------- include/linux/bio.h | 30 ------------------ 3 files changed, 165 deletions(-)
fs/bio-integrity.c +0 -45
@@ -581,51 +581,6 @@ void bio_integrity_trim(struct bio *bio, unsigned int offset,EXPORT_SYMBOL (bio_integrity_trim);/** -* bio_integrity_split - Split integrity metadata -* @bio: Protected bio -* @bp: Resulting bio_pair -* @sectors: Offset -* -* Description: Splits an integrity page into a bio_pair. -*/ -void bio_integrity_split (struct bio *bio,struct bio_pair *bp,int sectors) -{ -struct blk_integrity *bi; -struct bio_integrity_payload *bip = bio->bi_integrity; -unsigned int nr_sectors; - -if (bio_integrity (bio) ==0 ) -return ; - - bi =bdev_get_integrity (bio->bi_bdev); -BUG_ON (bi ==NULL ); -BUG_ON (bip->bip_vcnt !=1 ); - - nr_sectors =bio_integrity_hw_sectors (bi, sectors); - - bp->bio1.bi_integrity = &bp->bip1; - bp->bio2.bi_integrity = &bp->bip2; - - bp->iv1 = bip->bip_vec[bip->bip_iter.bi_idx]; - bp->iv2 = bip->bip_vec[bip->bip_iter.bi_idx]; - - bp->bip1.bip_vec = &bp->iv1; - bp->bip2.bip_vec = &bp->iv2; - - bp->iv1.bv_len = sectors * bi->tuple_size; - bp->iv2.bv_offset += sectors * bi->tuple_size; - bp->iv2.bv_len -= sectors * bi->tuple_size; - - bp->bip1.bip_iter.bi_sector = bio->bi_integrity->bip_iter.bi_sector; - bp->bip2.bip_iter.bi_sector = - bio->bi_integrity->bip_iter.bi_sector + nr_sectors; - - bp->bip1.bip_vcnt = bp->bip2.bip_vcnt =1 ; - bp->bip1.bip_iter.bi_idx = bp->bip2.bip_iter.bi_idx =0 ; -} -EXPORT_SYMBOL (bio_integrity_split); - -/** * bio_integrity_clone - Callback for cloning bios with integrity metadata * @bio: New bio * @bio_src: Original bio
fs/bio.c +0 -90
108 lines not on this page · raw message
include/linux/bio.h +0 -30
@@ -297,30 +297,7 @@ struct bio_integrity_payload { };#endif /* CONFIG_BLK_DEV_INTEGRITY */ -/* -* A bio_pair is used when we need to split a bio. -* This can only happen for a bio that refers to just one -* page of data, and in the unusual situation when the -* page crosses a chunk/device boundary -* -* The address of the master bio is stored in bio1.bi_private -* The address of the pool the pair was allocated from is stored -* in bio2.bi_private -*/ -struct bio_pair { -struct bio bio1, bio2; -struct bio_vec bv1, bv2; -#if defined(CONFIG_BLK_DEV_INTEGRITY ) -struct bio_integrity_payload bip1, bip2; -struct bio_vec iv1, iv2; -#endif -atomic_t cnt; -int error; -}; -extern struct bio_pair *bio_pair_split (struct bio *bi,int first_sectors); -extern void bio_pair_release (struct bio_pair *dbio);extern void bio_trim (struct bio *bio,int offset,int size); -extern struct bio *bio_split (struct bio *bio,int sectors,gfp_t gfp,struct bio_set *bs);
@@ -677,7 +654,6 @@ extern int bio_integrity_prep(struct bio *);extern void bio_integrity_endio (struct bio *,int );extern void bio_integrity_advance (struct bio *,unsigned int );extern void bio_integrity_trim (struct bio *,unsigned int ,unsigned int ); -extern void bio_integrity_split (struct bio *,struct bio_pair *,int );extern int bio_integrity_clone (struct bio *,struct bio *,gfp_t );extern int bioset_integrity_create (struct bio_set *,int );extern void bioset_integrity_free (struct bio_set *);
@@ -721,12 +697,6 @@ static inline int bio_integrity_clone(struct bio *bio, struct bio *bio_src,return 0 ; } -static inline void bio_integrity_split (struct bio *bio,struct bio_pair *bp, -int sectors) -{ -return ; -} -static inline void bio_integrity_advance (struct bio *bio,unsigned int bytes_done) {
Signature · 1 line
1.8.4.4
PATCH 17/25 block: Add bio_clone_fast()
In reply to Kent Overstreetbio_clone() just got more expensive - however, most users of bio_clone() don't actually need to modify the biovec. If they aren't modifying the biovec, and they can guarantee that the original bio isn't freed before the clone (also true in most cases), we can just point the clone at the original bio's biovec.
--- drivers/md/bcache/request.c | 8 ++---- fs/bio.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/bio.h | 2 ++ 3 files changed, 64 insertions(+), 6 deletions(-)
drivers/md/bcache/request.c +2 -6
@@ -613,7 +613,6 @@ struct search {struct btree_op op;struct data_insert_op iop; -struct bio_vec bv[BIO_MAX_PAGES ]; };static void bch_cache_read_endio (struct bio *bio,int error)
@@ -761,9 +760,7 @@ static void do_bio_hook(struct search *s)struct bio *bio = &s->bio.bio;bio_init (bio); - bio->bi_io_vec = s->bv; - bio->bi_max_vecs =BIO_MAX_PAGES ; -__bio_clone (bio, s->orig_bio); +__bio_clone_fast (bio, s->orig_bio); bio->bi_end_io = request_endio; bio->bi_private = &s->cl;
@@ -1065,8 +1062,7 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s)closure_bio_submit (flush, cl, s->d); } }else { - s->iop.bio =bio_clone_bioset (bio,GFP_NOIO , - dc->disk.bio_split); + s->iop.bio =bio_clone_fast (bio,GFP_NOIO , dc->disk.bio_split);closure_bio_submit (bio, cl, s->d); }
fs/bio.c +60 -0
66 lines not on this page · raw message
include/linux/bio.h +2 -0
@@ -328,6 +328,8 @@ extern mempool_t *biovec_create_pool(struct bio_set *bs, int pool_entries);extern struct bio *bio_alloc_bioset (gfp_t ,int ,struct bio_set *);extern void bio_put (struct bio *); +extern void __bio_clone_fast (struct bio *,struct bio *); +extern struct bio *bio_clone_fast (struct bio *,gfp_t ,struct bio_set *);extern void __bio_clone (struct bio *,struct bio *);extern struct bio *bio_clone_bioset (struct bio *,gfp_t ,struct bio_set *bs);
Signature · 1 line
1.8.4.4
PATCH 21/25 block: Remove bi_idx hacks
In reply to Kent OverstreetNow that drivers have been converted to the new bvec_iter primitives, there's no need to trim the bvec before we submit it; and we can't trim it once we start sharing bvecs.
It used to be that passing a partially completed bio (i.e. one with nonzero bi_idx) to generic_make_request() was a dangerous thing - various drivers would choke on such things. But with immutable biovecs and our new bio splitting that shares the biovecs, submitting partially completed bios has to work (and should work, now that all the drivers have been completed to the new primitives)
--- drivers/md/bcache/io.c | 47 ++--------------------------------------------- fs/bio.c | 23 ----------------------- 2 files changed, 2 insertions(+), 68 deletions(-)
drivers/md/bcache/io.c +2 -45
@@ -11,49 +11,6 @@#include <linux/blkdev.h> -static void bch_bi_idx_hack_endio (struct bio *bio,int error) -{ -struct bio *p = bio->bi_private; - -bio_endio (p, error); -bio_put (bio); -} - -static void bch_generic_make_request_hack (struct bio *bio) -{ -if (bio->bi_iter.bi_idx) { -struct bio_vec bv; -struct bvec_iter iter; -unsigned segs =bio_segments (bio); -struct bio *clone =bio_alloc (GFP_NOIO , segs); - -bio_for_each_segment (bv, bio, iter) - clone->bi_io_vec[clone->bi_vcnt++] = bv; - - clone->bi_iter.bi_sector = bio->bi_iter.bi_sector; - clone->bi_bdev = bio->bi_bdev; - clone->bi_rw = bio->bi_rw; - clone->bi_vcnt = segs; - clone->bi_iter.bi_size = bio->bi_iter.bi_size; - - clone->bi_private = bio; - clone->bi_end_io = bch_bi_idx_hack_endio; - - bio = clone; - } - -/* -* Hack, since drivers that clone bios clone up to bi_max_vecs, but our -* bios might have had more than that (before we split them per device -* limitations). -* -* To be taken out once immutable bvec stuff is in. -*/ - bio->bi_max_vecs = bio->bi_vcnt; - -generic_make_request (bio); -} -/** * bch_bio_split - split a bio * @bio: bio to split
@@ -222,12 +179,12 @@ void bch_generic_make_request(struct bio *bio, struct bio_split_pool *p) n->bi_private = &s->cl;closure_get (&s->cl); -bch_generic_make_request_hack (n); +generic_make_request (n); }while (n != bio);continue_at (&s->cl, bch_bio_submit_split_done,NULL ); submit: -bch_generic_make_request_hack (bio); +generic_make_request (bio); }/* Bios with headers */
fs/bio.c +0 -23
@@ -1822,11 +1822,7 @@ void bio_trim(struct bio *bio, int offset, int size) {/* 'bio' is a cloned bio which we need to trim to match * the given offset and size. -* This requires adjusting bi_sector, bi_size, and bi_io_vec */ -int i; -struct bio_vec *bvec; -int sofar =0 ; size <<=9 ;if (offset ==0 && size == bio->bi_iter.bi_size)
@@ -1837,25 +1833,6 @@ void bio_trim(struct bio *bio, int offset, int size)bio_advance (bio, offset <<9 ); bio->bi_iter.bi_size = size; - -/* avoid any complications with bi_idx being non-zero*/ -if (bio->bi_iter.bi_idx) { -memmove (bio->bi_io_vec, bio->bi_io_vec+bio->bi_iter.bi_idx, - (bio->bi_vcnt - bio->bi_iter.bi_idx) * -sizeof (struct bio_vec )); - bio->bi_vcnt -= bio->bi_iter.bi_idx; - bio->bi_iter.bi_idx =0 ; - } -/* Make sure vcnt and last bv are not too big */ -bio_for_each_segment_all (bvec, bio, i) { -if (sofar + bvec->bv_len > size) - bvec->bv_len = size - sofar; -if (bvec->bv_len ==0 ) { - bio->bi_vcnt = i; -break ; - } - sofar += bvec->bv_len; - } }EXPORT_SYMBOL_GPL (bio_trim);
Signature · 1 line
1.8.4.4
PATCH 23/25 block: Rename bio_split() -> bio_pair_split()
In reply to Kent OverstreetThis is prep work for introducing a more general bio_split().
--- drivers/block/pktcdvd.c | 2 +- drivers/md/linear.c | 2 +- drivers/md/raid0.c | 6 +++--- drivers/md/raid10.c | 2 +- fs/bio.c | 4 ++-- include/linux/bio.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-)
drivers/block/pktcdvd.c +1 -1
@@ -2399,7 +2399,7 @@ static void pkt_make_request(struct request_queue *q, struct bio *bio)if (last_zone != zone) {BUG_ON (last_zone != zone + pd->settings.size); first_sectors = last_zone - bio->bi_iter.bi_sector; - bp =bio_split (bio, first_sectors); + bp =bio_pair_split (bio, first_sectors);BUG_ON (!bp);pkt_make_request (q, &bp->bio1);pkt_make_request (q, &bp->bio2);
drivers/md/linear.c +1 -1
@@ -326,7 +326,7 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio)rcu_read_unlock (); - bp =bio_split (bio, end_sector - bio->bi_iter.bi_sector); + bp =bio_pair_split (bio, end_sector - bio->bi_iter.bi_sector);linear_make_request (mddev, &bp->bio1);linear_make_request (mddev, &bp->bio2);
drivers/md/raid0.c +3 -3
@@ -534,11 +534,11 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)* refuse to split for us, so we need to split it. */ if (likely (is_power_of_2 (chunk_sects))) - bp =bio_split (bio, chunk_sects - (sector & + bp =bio_pair_split (bio, chunk_sects - (sector & (chunk_sects-1 )));else - bp =bio_split (bio, chunk_sects - -sector_div (sector, chunk_sects)); + bp =bio_pair_split (bio, chunk_sects - +sector_div (sector, chunk_sects));raid0_make_request (mddev, &bp->bio1);raid0_make_request (mddev, &bp->bio2);bio_pair_release (bp);
drivers/md/raid10.c +1 -1
@@ -1193,7 +1193,7 @@ static void make_request(struct mddev *mddev, struct bio * bio)/* This is a one page bio that upper layers * refuse to split for us, so we need to split it. */ - bp =bio_split (bio, chunk_sects - + bp =bio_pair_split (bio, chunk_sects - (bio->bi_iter.bi_sector & (chunk_sects -1 )));/* Each of these 'make_request' calls will call 'wait_barrier'.
fs/bio.c +2 -2
@@ -1827,7 +1827,7 @@ static void bio_pair_end_2(struct bio *bi, int err)/* * split a bio - only worry about a bio with a single page in its iovec */ -struct bio_pair *bio_split (struct bio *bi,int first_sectors) +struct bio_pair *bio_pair_split (struct bio *bi,int first_sectors) {struct bio_pair *bp =mempool_alloc (bio_split_pool,GFP_NOIO );
@@ -1874,7 +1874,7 @@ struct bio_pair *bio_split(struct bio *bi, int first_sectors)return bp; } -EXPORT_SYMBOL (bio_split); +EXPORT_SYMBOL (bio_pair_split);/** * bio_trim - trim a bio
include/linux/bio.h +1 -1
@@ -317,7 +317,7 @@ struct bio_pair {atomic_t cnt;int error; }; -extern struct bio_pair *bio_split (struct bio *bi,int first_sectors); +extern struct bio_pair *bio_pair_split (struct bio *bi,int first_sectors);extern void bio_pair_release (struct bio_pair *dbio);extern void bio_trim (struct bio *bio,int offset,int size);
Signature · 1 line
1.8.4.4
Jens Axboe
maintainerQuoted 13 lines · Kent Overstreet
Quoted 6 lines · Christoph Hellwig
Quoted 2 lines · Kent Overstreet
Jens - here's immutable biovecs, rebased and ready for 3.14. Changes since the last version of the series:
Can you do a resend of the patch series to all involved lists first so we can have a detailed look at the current version?
Sure thing.
Quoted 3 lines
Quoted 2 lines
*
bio_clone_bioset()retains the old behaviour, as previously discussed -bio_clone_fast()is being used by bcache, dm and the newbio_split().
Quoted 6 lines
Quoted 3 lines
Any chance to have a more descriptive name than
bio_clone_fast? Also without having the actual patches in front of me, did you make sure to document the different in semantics in detail?I haven't been able to think of anything I don't hate, I'm open to suggestions.
Don't think it's super important, as it will die off pretty quickly anyway. _fast implies it takes certain shortcuts and you need to be more careful, so I don't think it's that bad.
Signature · 1 line
Jens Axboe
Re: [PATCH 04/25] block: Abstract out bvec iterator
In reply to Kent OverstreetQuoted 7 lines · Kent Overstreet
Immutable biovecs are going to require an explicit iterator. To implement immutable bvecs, a later patch is going to add a
bi_bvec_donemember to this struct; for now, this patch effectively just renames things.drivers/block/ps3disk.c | 2 +- drivers/block/ps3vram.c | 2 +-
The PS3 parts look OK. Please try to test a powerpc build with ps3_defconfig.
Geert Uytterhoeven
maintainerRe: [PATCH 04/25] block: Abstract out bvec iterator
In reply to Kent OverstreetQuoted 4 lines · Kent Overstreet
Immutable biovecs are going to require an explicit iterator. To implement immutable bvecs, a later patch is going to add a
bi_bvec_donemember to this struct; for now, this patch effectively just renames things.
You missed xtensa simdisk:
arch/xtensa/platforms/iss/simdisk.c:108:23: error: 'struct bio' has no member named 'bi_sector'
http://kisskb.ellerman.id.au/kisskb/buildresult/10477507/
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds