Hi,
This is a *compile only RFC* which adds a generic helper to initialize
the various fields of the bio that is repeated all the places in
file-systems, block layer, and drivers.
The new helper allows callers to initialize non-optional members of bio
such as bdev, sector, op, opflags, max_bvecs and gfp_mask by
encapsulating new bio allocation with bio alloc with initialization
at one place.
The objective of this RFC is to only start a discussion, this it not
completely tested at all.
-ck
Chaitanya Kulkarni (34):
block: move common code into blk_next_bio()
block: introduce and use bio_new
drdb: use bio_new in drdb
drdb: use bio_new() in submit_one_flush
xen-blkback: use bio_new
zram: use bio_new
dm: use bio_new in dm-log-writes
dm-zoned: use bio_new in get_mblock_slow
dm-zoned: use bio_new in dmz_write_mblock
dm-zoned: use bio_new in dmz_rdwr_block
nvmet: use bio_new in nvmet_bdev_execute_rw
scsi: target/iblock: use bio_new
block: use bio_new in __blkdev_direct_IO
fs/buffer: use bio_new in submit_bh_wbc
fscrypt: use bio_new in fscrypt_zeroout_range
fs/direct-io: use bio_new in dio_bio_alloc
iomap: use bio_new in iomap_dio_zero
iomap: use bio_new in iomap_dio_bio_actor
fs/jfs/jfs_logmgr.c: use bio_new in lbmRead
fs/jfs/jfs_logmgr.c: use bio_new in lbmStartIO
fs/jfs/jfs_metapage.c: use bio_new in metapage_writepage
fs/jfs/jfs_metapage.c: use bio_new in metapage_readpage
fs/mpage.c: use bio_new mpage_alloc
fs/nilfs: use bio_new nilfs_alloc_seg_bio
ocfs/cluster: use bio_new in dm-log-writes
xfs: use bio_new in xfs_rw_bdev
xfs: use bio_new in xfs_buf_ioapply_map
zonefs: use bio_new
power/swap: use bio_new in hib_submit_io
hfsplus: use bio_new in hfsplus_submit_bio()
iomap: use bio_new in iomap_readpage_actor
mm: use bio_new in __swap_writepage
mm: use bio_new in swap_readpage
mm: add swap_bio_new common bio helper
block/blk-lib.c | 34 ++++++++++-------------------
block/blk-zoned.c | 4 +---
block/blk.h | 5 +++--
drivers/block/drbd/drbd_receiver.c | 12 +++++-----
drivers/block/xen-blkback/blkback.c | 20 +++++++++++------
drivers/block/zram/zram_drv.c | 5 ++---
drivers/md/dm-log-writes.c | 30 +++++++++----------------
drivers/md/dm-zoned-metadata.c | 18 +++++----------
drivers/nvme/target/io-cmd-bdev.c | 9 +++-----
drivers/target/target_core_iblock.c | 5 ++---
fs/block_dev.c | 6 ++---
fs/buffer.c | 16 ++++++--------
fs/crypto/bio.c | 5 ++---
fs/direct-io.c | 6 ++---
fs/hfsplus/wrapper.c | 5 +----
fs/iomap/buffered-io.c | 12 +++++-----
fs/iomap/direct-io.c | 11 ++++------
fs/jfs/jfs_logmgr.c | 13 ++++-------
fs/jfs/jfs_metapage.c | 15 +++++--------
fs/mpage.c | 18 +++++----------
fs/nilfs2/segbuf.c | 10 ++-------
fs/ocfs2/cluster/heartbeat.c | 6 ++---
fs/xfs/xfs_bio_io.c | 7 ++----
fs/xfs/xfs_buf.c | 6 ++---
fs/zonefs/super.c | 6 ++---
include/linux/bio.h | 25 +++++++++++++++++++++
kernel/power/swap.c | 7 +++---
mm/page_io.c | 30 +++++++++++++------------
28 files changed, 151 insertions(+), 195 deletions(-)
--
2.22.1
Introduce bio_new() helper and use it in blk-lib.c to allocate and
initialize various non-optional or semi-optional members of the bio
along with bio allocation done with bio_alloc(). Here we also calmp the
max_bvecs for bio with BIO_MAX_PAGES before we pass to bio_alloc().
Signed-off-by: Chaitanya Kulkarni <[email protected]>
---
block/blk-lib.c | 6 +-----
include/linux/bio.h | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/block/blk-lib.c b/block/blk-lib.c
index fb486a0bdb58..ec29415f00dd 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -14,17 +14,13 @@ struct bio *blk_next_bio(struct bio *bio, struct block_device *bdev,
sector_t sect, unsigned op, unsigned opf,
unsigned int nr_pages, gfp_t gfp)
{
- struct bio *new = bio_alloc(gfp, nr_pages);
+ struct bio *new = bio_new(bdev, sect, op, opf, gfp, nr_pages);
if (bio) {
bio_chain(bio, new);
submit_bio(bio);
}
- new->bi_iter.bi_sector = sect;
- bio_set_dev(new, bdev);
- bio_set_op_attrs(new, op, opf);
-
return new;
}
diff --git a/include/linux/bio.h b/include/linux/bio.h
index c74857cf1252..2a09ba100546 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -826,5 +826,30 @@ static inline void bio_set_polled(struct bio *bio, struct kiocb *kiocb)
if (!is_sync_kiocb(kiocb))
bio->bi_opf |= REQ_NOWAIT;
}
+/**
+ * bio_new - allcate and initialize new bio
+ * @bdev: blockdev to issue discard for
+ * @sector: start sector
+ * @op: REQ_OP_XXX from enum req_opf
+ * @op_flags: REQ_XXX from enum req_flag_bits
+ * @max_bvecs: maximum bvec to be allocated for this bio
+ * @gfp_mask: memory allocation flags (for bio_alloc)
+ *
+ * Description:
+ * Allocates, initializes common members, and returns a new bio.
+ */
+static inline struct bio *bio_new(struct block_device *bdev, sector_t sector,
+ unsigned int op, unsigned int op_flags,
+ unsigned int max_bvecs, gfp_t gfp_mask)
+{
+ unsigned nr_bvec = clamp_t(unsigned int, max_bvecs, 0, BIO_MAX_PAGES);
+ struct bio *bio = bio_alloc(gfp_mask, nr_bvec);
+
+ bio_set_dev(bio, bdev);
+ bio->bi_iter.bi_sector = sector;
+ bio_set_op_attrs(bio, op, op_flags);
+
+ return bio;
+}
#endif /* __LINUX_BIO_H */
--
2.22.1