cleanup bio_kmalloc v3
Subsystems (7)
Hi Jens,
this series finishes off the bio allocation interface cleanups by dealing with the weirdest member of the famility. bio_kmalloc combines a kmalloc for the bio and bio_vecs with a hidden bio_init call and magic cleanup semantics.
This series moves a few callers away from bio_kmalloc and then turns bio_kmalloc into a simple wrapper for a slab allocation of a bio and the inline biovecs. The callers need to manually call bio_init instead with all that entails and the magic that turns bio_put into a kfree goes away as well, allowing for a proper debug check in bio_put that catches accidental use on a bio_init()ed bio.
Changes since v2:
- rebased to 5.18-rc1
- fix bio freeing in squashfs
Changes since v1:
- update a pre-existing comment per maintainer suggestion
Diffstat:
block/bio.c | 47 ++++++++++++++----------------------- block/blk-crypto-fallback.c | 14 ++++++----- block/blk-map.c | 42 +++++++++++++++++++++------------ drivers/block/pktcdvd.c | 34 +++++++++++--------------- drivers/md/bcache/debug.c | 10 ++++--- drivers/md/dm-bufio.c | 9 +++---- drivers/md/raid1.c | 12 ++++++--- drivers/md/raid10.c | 21 +++++++++++----- drivers/target/target_core_pscsi.c | 36 ++++------------------------ fs/btrfs/disk-io.c | 8 +++--- fs/btrfs/volumes.c | 11 -------- fs/btrfs/volumes.h | 2 - fs/squashfs/block.c | 14 +++-------- include/linux/bio.h | 2 - 14 files changed, 116 insertions(+), 146 deletions(-)
--
dm-devel mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/dm-devel
PATCH 1/5 btrfs: simplify ->flush_bio handling
Use and embedded bios that is initialized when used instead of bio_kmalloc plus bio_reset.
--- fs/btrfs/disk-io.c | 8 +++++--- fs/btrfs/volumes.c | 11 ----------- fs/btrfs/volumes.h | 4 ++-- 3 files changed, 7 insertions(+), 16 deletions(-)
fs/btrfs/disk-io.c +5 -3
@@ -4225,6 +4225,7 @@ static int wait_dev_supers(struct btrfs_device *device, int max_mirrors)*/ static void btrfs_end_empty_barrier (struct bio *bio) { +bio_uninit (bio);complete (bio->bi_private); }
@@ -4234,7 +4235,7 @@ static void btrfs_end_empty_barrier(struct bio *bio)*/ static void write_dev_flush (struct btrfs_device *device) { -struct bio *bio = device->flush_bio; +struct bio *bio = &device->flush_bio;#ifndef CONFIG_BTRFS_FS_CHECK_INTEGRITY /*
@@ -4252,7 +4253,8 @@ static void write_dev_flush(struct btrfs_device *device)return ;#endif -bio_reset (bio, device->bdev,REQ_OP_WRITE |REQ_SYNC |REQ_PREFLUSH ); +bio_init (bio, device->bdev,NULL ,0 , +REQ_OP_WRITE |REQ_SYNC |REQ_PREFLUSH ); bio->bi_end_io = btrfs_end_empty_barrier;init_completion (&device->flush_wait); bio->bi_private = &device->flush_wait;
@@ -4266,7 +4268,7 @@ static void write_dev_flush(struct btrfs_device *device)*/ static blk_status_t wait_dev_flush (struct btrfs_device *device) { -struct bio *bio = device->flush_bio; +struct bio *bio = &device->flush_bio;if (!test_bit (BTRFS_DEV_STATE_FLUSH_SENT , &device->dev_state))return BLK_STS_OK ;
fs/btrfs/volumes.c +0 -11
@@ -405,7 +405,6 @@ void btrfs_free_device(struct btrfs_device *device)WARN_ON (!list_empty (&device->post_commit_list));rcu_string_free (device->name);extent_io_tree_release (&device->alloc_state); -bio_put (device->flush_bio);btrfs_destroy_dev_zone_info (device);kfree (device); }
@@ -6956,16 +6955,6 @@ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,if (!dev)return ERR_PTR (-ENOMEM ); -/* -* Preallocate a bio that's always going to be used for flushing device -* barriers and matches the device lifespan -*/ - dev->flush_bio =bio_kmalloc (GFP_KERNEL ,0 ); -if (!dev->flush_bio) { -kfree (dev); -return ERR_PTR (-ENOMEM ); - } -INIT_LIST_HEAD (&dev->dev_list);INIT_LIST_HEAD (&dev->dev_alloc_list);INIT_LIST_HEAD (&dev->post_commit_list);
fs/btrfs/volumes.h +2 -2
@@ -121,8 +121,8 @@ struct btrfs_device {/* bytes used on the current transaction */ u64 commit_bytes_used; -/* for sending down flush barriers */ -struct bio *flush_bio; +/* Bio used for flushing device barriers */ +struct bio flush_bio;struct completion flush_wait;/* per-device scrub information */
Signature · 6 lines
2.30.2 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
Re: [PATCH 1/5] btrfs: simplify ->flush_bio handling
Quoted 5 lines · Christoph Hellwig
Use and embedded bios that is initialized when used instead of
bio_kmallocplusbio_reset.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by David Sterba <[email protected]>
Looks good.
-ck
PATCH 2/5 squashfs: always use bio_kmalloc in squashfs_bio_read
In reply to Christoph HellwigIf a plain kmalloc that is not backed by a mempool is safe here for a large read (and the actual page allocations), it must also be for a small one, so simplify the code a bit.
--- fs/squashfs/block.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
fs/squashfs/block.c +3 -8
@@ -86,16 +86,11 @@ static int squashfs_bio_read(struct super_block *sb, u64 index, int length,int error, i;struct bio *bio; -if (page_count <=BIO_MAX_VECS ) { - bio =bio_alloc (sb->s_bdev, page_count,REQ_OP_READ ,GFP_NOIO ); - }else { - bio =bio_kmalloc (GFP_NOIO , page_count); -bio_set_dev (bio, sb->s_bdev); - bio->bi_opf =REQ_OP_READ ; - } - + bio =bio_kmalloc (GFP_NOIO , page_count);if (!bio)return -ENOMEM ; +bio_set_dev (bio, sb->s_bdev); + bio->bi_opf =REQ_OP_READ ; bio->bi_iter.bi_sector = block * (msblk->devblksize >>SECTOR_SHIFT );
Signature · 6 lines
2.30.2 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
Re: [PATCH 2/5] squashfs: always use bio_kmalloc in squashfs_bio_read
Quoted 7 lines · Christoph Hellwig
If a plain kmalloc that is not backed by a mempool is safe here for a large read (and the actual page allocations), it must also be for a small one, so simplify the code a bit.
Signed-off-by Christoph Hellwig <[email protected]>Acked-by Phillip Lougher <[email protected]>---
Looks good.
-ck
PATCH 3/5 target/pscsi: remove pscsi_get_bio
In reply to Christoph HellwigRemove pscsi_get_bio and simplify the code flow in the only caller.
--- drivers/target/target_core_pscsi.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-)
drivers/target/target_core_pscsi.c +2 -26
@@ -821,23 +821,6 @@ static void pscsi_bi_endio(struct bio *bio)bio_put (bio); } -static inline struct bio *pscsi_get_bio (int nr_vecs) -{ -struct bio *bio; -/* -* Use bio_malloc() following the comment in for bio -> struct request -* in block/blk-core.c:blk_make_request() -*/ - bio =bio_kmalloc (GFP_KERNEL , nr_vecs); -if (!bio) { -pr_err ("PSCSI: bio_kmalloc() failed\n" ); -return NULL ; - } - bio->bi_end_io = pscsi_bi_endio; - -return bio; -} -static sense_reason_t pscsi_map_sg (struct se_cmd *cmd,struct scatterlist *sgl,u32 sgl_nents,struct request *req)
@@ -878,12 +861,10 @@ pscsi_map_sg(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,if (!bio) { new_bio: nr_vecs =bio_max_segs (nr_pages); -/* -* Calls bio_kmalloc() and sets bio->bi_end_io() -*/ - bio =pscsi_get_bio (nr_vecs); + bio =bio_kmalloc (GFP_KERNEL , nr_vecs);if (!bio) goto fail; + bio->bi_end_io = pscsi_bi_endio;if (rw)bio_set_op_attrs (bio,REQ_OP_WRITE ,0 );
@@ -912,11 +893,6 @@ pscsi_map_sg(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, goto fail; } -/* -* Clear the pointer so that another bio will -* be allocated with pscsi_get_bio() above. -*/ - bio =NULL ; goto new_bio; }
Signature · 6 lines
2.30.2 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
Re: [PATCH 3/5] target/pscsi: remove pscsi_get_bio
Quoted 6 lines · Christoph Hellwig
Remove
pscsi_get_bioand simplify the code flow in the only caller.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good.
-ck
PATCH 4/5 block: turn bio_kmalloc into a simple kmalloc wrapper
In reply to Christoph HellwigRemove the magic autofree semantics and require the callers to explicitly call bio_init to initialize the bio.
This allows bio_free to catch accidental bio_put calls on bio_init()ed bios as well.
--- block/bio.c | 47 ++++++++++++------------------ block/blk-crypto-fallback.c | 14 +++++---- block/blk-map.c | 42 ++++++++++++++++---------- drivers/block/pktcdvd.c | 25 ++++++++-------- drivers/md/bcache/debug.c | 10 ++++--- drivers/md/dm-bufio.c | 9 +++--- drivers/md/raid1.c | 12 +++++--- drivers/md/raid10.c | 21 ++++++++----- drivers/target/target_core_pscsi.c | 10 +++---- fs/squashfs/block.c | 15 +++++----- include/linux/bio.h | 2 +- 11 files changed, 112 insertions(+), 95 deletions(-)
block/bio.c +18 -29
@@ -224,24 +224,13 @@ EXPORT_SYMBOL(bio_uninit);static void bio_free (struct bio *bio) {struct bio_set *bs = bio->bi_pool; -void *p; - -bio_uninit (bio); +void *p = bio; -if (bs) { -bvec_free (&bs->bvec_pool, bio->bi_io_vec, bio->bi_max_vecs); +WARN_ON_ONCE (!bs); -/* -* If we have front padding, adjust the bio pointer before freeing -*/ - p = bio; - p -= bs->front_pad; - -mempool_free (p, &bs->bio_pool); - }else { -/* Bio was allocated by bio_kmalloc() */ -kfree (bio); - } +bio_uninit (bio); +bvec_free (&bs->bvec_pool, bio->bi_io_vec, bio->bi_max_vecs); +mempool_free (p - bs->front_pad, &bs->bio_pool); }/*
@@ -528,28 +517,28 @@ struct bio *bio_alloc_bioset(struct block_device *bdev, unsigned short nr_vecs,EXPORT_SYMBOL (bio_alloc_bioset);/** -* bio_kmalloc - kmalloc a bio for I/O +* bio_kmalloc - kmalloc a bio +* @nr_vecs: number of bio_vecs to allocate * @gfp_mask: the GFP_* mask given to the slab allocator -* @nr_iovecs: number of iovecs to pre-allocate * -* Use kmalloc to allocate and initialize a bio. +* Use kmalloc to allocate a bio (including bvecs). The bio must be initialized +* using bio_init() before use. To free a bio returned from this function use +* kfree() after calling bio_uninit(). A bio returned from this function can +* be reused by calling bio_uninit() before calling bio_init() again. +* +* Note that unlike bio_alloc() or bio_alloc_bioset() allocations from this +* function are not backed by a mempool can can fail. Do not use this function +* for allocations in the file system I/O path. * * Returns: Pointer to new bio on success, NULL on failure. */ -struct bio *bio_kmalloc (gfp_t gfp_mask,unsigned short nr_iovecs) +struct bio *bio_kmalloc (unsigned short nr_vecs,gfp_t gfp_mask) {struct bio *bio; -if (nr_iovecs >UIO_MAXIOV ) +if (nr_vecs >UIO_MAXIOV )return NULL ; - - bio =kmalloc (struct_size (bio, bi_inline_vecs, nr_iovecs), gfp_mask); -if (unlikely (!bio)) -return NULL ; -bio_init (bio,NULL , nr_iovecs ? bio->bi_inline_vecs :NULL , nr_iovecs, -0 ); - bio->bi_pool =NULL ; -return bio; +return kmalloc (struct_size (bio, bi_inline_vecs, nr_vecs), gfp_mask); }EXPORT_SYMBOL (bio_kmalloc);
block/blk-crypto-fallback.c +8 -6
@@ -152,23 +152,25 @@ static void blk_crypto_fallback_encrypt_endio(struct bio *enc_bio) src_bio->bi_status = enc_bio->bi_status; -bio_put (enc_bio); +bio_uninit (enc_bio); +kfree (enc_bio);bio_endio (src_bio); }static struct bio *blk_crypto_fallback_clone_bio (struct bio *bio_src) { +unsigned int nr_segs =bio_segments (bio_src);struct bvec_iter iter;struct bio_vec bv;struct bio *bio; - bio =bio_kmalloc (GFP_NOIO ,bio_segments (bio_src)); + bio =bio_kmalloc (nr_segs,GFP_NOIO );if (!bio)return NULL ; - bio->bi_bdev = bio_src->bi_bdev; +bio_init (bio, bio_src->bi_bdev, bio->bi_inline_vecs, nr_segs, + bio_src->bi_opf);if (bio_flagged (bio_src,BIO_REMAPPED ))bio_set_flag (bio,BIO_REMAPPED ); - bio->bi_opf = bio_src->bi_opf; bio->bi_ioprio = bio_src->bi_ioprio; bio->bi_iter.bi_sector = bio_src->bi_iter.bi_sector; bio->bi_iter.bi_size = bio_src->bi_iter.bi_size;
@@ -363,8 +365,8 @@ static bool blk_crypto_fallback_encrypt_bio(struct bio **bio_ptr)blk_crypto_put_keyslot (slot); out_put_enc_bio:if (enc_bio) -bio_put (enc_bio); - +bio_uninit (enc_bio); +kfree (enc_bio);return ret; }
block/blk-map.c +27 -15
128 lines not on this page · raw message
drivers/block/pktcdvd.c +13 -12
@@ -522,9 +522,10 @@ static struct packet_data *pkt_alloc_packet_data(int frames) goto no_pkt; pkt->frames = frames; - pkt->w_bio =bio_kmalloc (GFP_KERNEL , frames); + pkt->w_bio =bio_kmalloc (frames,GFP_KERNEL );if (!pkt->w_bio) goto no_bio; +bio_init (pkt->w_bio,NULL , pkt->w_bio->bi_inline_vecs, frames,0 );for (i =0 ; i < frames /FRAMES_PER_PAGE ; i++) { pkt->pages[i] =alloc_page (GFP_KERNEL |__GFP_ZERO);
@@ -536,10 +537,10 @@ static struct packet_data *pkt_alloc_packet_data(int frames)bio_list_init (&pkt->orig_bios);for (i =0 ; i < frames; i++) { -struct bio *bio =bio_kmalloc (GFP_KERNEL ,1 ); +struct bio *bio =bio_kmalloc (1 ,GFP_KERNEL );if (!bio) goto no_rd_bio; - +bio_init (bio,NULL , bio->bi_inline_vecs,1 ,0 ); pkt->r_bios[i] = bio; }
@@ -547,16 +548,16 @@ static struct packet_data *pkt_alloc_packet_data(int frames) no_rd_bio:for (i =0 ; i < frames; i++) { -struct bio *bio = pkt->r_bios[i]; -if (bio) -bio_put (bio); +if (pkt->r_bios[i]) +bio_uninit (pkt->r_bios[i]); +kfree (pkt->r_bios[i]); } - no_page:for (i =0 ; i < frames /FRAMES_PER_PAGE ; i++)if (pkt->pages[i])__free_page (pkt->pages[i]); -bio_put (pkt->w_bio); +bio_uninit (pkt->w_bio); +kfree (pkt->w_bio); no_bio:kfree (pkt); no_pkt:
@@ -571,13 +572,13 @@ static void pkt_free_packet_data(struct packet_data *pkt)int i;for (i =0 ; i < pkt->frames; i++) { -struct bio *bio = pkt->r_bios[i]; -if (bio) -bio_put (bio); +bio_uninit (pkt->r_bios[i]); +kfree (pkt->r_bios[i]); }for (i =0 ; i < pkt->frames /FRAMES_PER_PAGE ; i++)__free_page (pkt->pages[i]); -bio_put (pkt->w_bio); +bio_uninit (pkt->w_bio); +kfree (pkt->w_bio);kfree (pkt); }
drivers/md/bcache/debug.c +6 -4
@@ -107,15 +107,16 @@ void bch_btree_verify(struct btree *b)void bch_data_verify (struct cached_dev *dc,struct bio *bio) { +unsigned int nr_segs =bio_segments (bio);struct bio *check;struct bio_vec bv, cbv;struct bvec_iter iter, citer = {0 }; - check =bio_kmalloc (GFP_NOIO ,bio_segments (bio)); + check =bio_kmalloc (nr_segs,GFP_NOIO );if (!check)return ; -bio_set_dev (check, bio->bi_bdev); - check->bi_opf =REQ_OP_READ ; +bio_init (check, bio->bi_bdev, check->bi_inline_vecs, nr_segs, +REQ_OP_READ ); check->bi_iter.bi_sector = bio->bi_iter.bi_sector; check->bi_iter.bi_size = bio->bi_iter.bi_size;
@@ -146,7 +147,8 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)bio_free_pages (check); out_put: - bio_put(check); +bio_uninit (check); + kfree(check); }#endif
drivers/md/dm-bufio.c +4 -5
@@ -611,7 +611,8 @@ static void bio_complete(struct bio *bio) {struct dm_buffer *b = bio->bi_private;blk_status_t status = bio->bi_status; -bio_put (bio); +bio_uninit (bio); +kfree (bio); b->end_io (b, status); }
@@ -626,16 +627,14 @@ static void use_bio(struct dm_buffer *b, int rw, sector_t sector,if (unlikely (b->c->sectors_per_block_bits <PAGE_SHIFT -SECTOR_SHIFT )) vec_size +=2 ; - bio =bio_kmalloc (GFP_NOWAIT | __GFP_NORETRY | __GFP_NOWARN, vec_size); + bio =bio_kmalloc (vec_size,GFP_NOWAIT | __GFP_NORETRY | __GFP_NOWARN);if (!bio) { dmio:use_dmio (b, rw, sector, n_sectors, offset);return ; } - +bio_init (bio, b->c->bdev, bio->bi_inline_vecs, vec_size, rw); bio->bi_iter.bi_sector = sector; -bio_set_dev (bio, b->c->bdev); -bio_set_op_attrs (bio, rw,0 ); bio->bi_end_io = bio_complete; bio->bi_private = b;
drivers/md/raid1.c +8 -4
@@ -165,9 +165,10 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)* Allocate bios : 1 for reading, n-1 for writing */ for (j = pi->raid_disks ; j-- ; ) { - bio =bio_kmalloc (gfp_flags,RESYNC_PAGES ); + bio =bio_kmalloc (RESYNC_PAGES , gfp_flags);if (!bio) goto out_free_bio; +bio_init (bio,NULL , bio->bi_inline_vecs,RESYNC_PAGES ,0 ); r1_bio->bios[j] = bio; }/*
@@ -206,8 +207,10 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)resync_free_pages (&rps[j]); out_free_bio: -while (++j < pi->raid_disks) -bio_put (r1_bio->bios[j]); +while (++j < pi->raid_disks) { +bio_uninit (r1_bio->bios[j]); +kfree (r1_bio->bios[j]); + }kfree (rps); out_free_r1bio:
@@ -225,7 +228,8 @@ static void r1buf_pool_free(void *__r1_bio, void *data)for (i = pi->raid_disks; i--; ) { rp =get_resync_pages (r1bio->bios[i]);resync_free_pages (rp); -bio_put (r1bio->bios[i]); +bio_uninit (r1bio->bios[i]); +kfree (r1bio->bios[i]); }/* resync pages array stored in the 1st bio's .bi_private */
drivers/md/raid10.c +14 -7
@@ -145,15 +145,17 @@ static void * r10buf_pool_alloc(gfp_t gfp_flags, void *data)* Allocate bios. */ for (j = nalloc ; j-- ; ) { - bio =bio_kmalloc (gfp_flags,RESYNC_PAGES ); + bio =bio_kmalloc (RESYNC_PAGES , gfp_flags);if (!bio) goto out_free_bio; +bio_init (bio,NULL , bio->bi_inline_vecs,RESYNC_PAGES ,0 ); r10_bio->devs[j].bio = bio;if (!conf->have_replacement)continue ; - bio =bio_kmalloc (gfp_flags,RESYNC_PAGES ); + bio =bio_kmalloc (RESYNC_PAGES , gfp_flags);if (!bio) goto out_free_bio; +bio_init (bio,NULL , bio->bi_inline_vecs,RESYNC_PAGES ,0 ); r10_bio->devs[j].repl_bio = bio; }/*
@@ -197,9 +199,11 @@ static void * r10buf_pool_alloc(gfp_t gfp_flags, void *data) out_free_bio:for ( ; j < nalloc; j++) {if (r10_bio->devs[j].bio) -bio_put (r10_bio->devs[j].bio); +bio_uninit (r10_bio->devs[j].bio); +kfree (r10_bio->devs[j].bio);if (r10_bio->devs[j].repl_bio) -bio_put (r10_bio->devs[j].repl_bio); +bio_uninit (r10_bio->devs[j].repl_bio); +kfree (r10_bio->devs[j].repl_bio); }kfree (rps); out_free_r10bio:
@@ -220,12 +224,15 @@ static void r10buf_pool_free(void *__r10_bio, void *data)if (bio) { rp =get_resync_pages (bio);resync_free_pages (rp); -bio_put (bio); +bio_uninit (bio); +kfree (bio); } bio = r10bio->devs[j].repl_bio; -if (bio) -bio_put (bio); +if (bio) { +bio_uninit (bio); +kfree (bio); + } }/* resync pages array stored in the 1st bio's .bi_private */
drivers/target/target_core_pscsi.c +5 -5
@@ -818,7 +818,8 @@ static ssize_t pscsi_show_configfs_dev_params(struct se_device *dev, char *b)static void pscsi_bi_endio (struct bio *bio) { -bio_put (bio); +bio_uninit (bio); +kfree (bio); } static sense_reason_t
@@ -861,14 +862,13 @@ pscsi_map_sg(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,if (!bio) { new_bio: nr_vecs =bio_max_segs (nr_pages); - bio =bio_kmalloc (GFP_KERNEL , nr_vecs); + bio =bio_kmalloc (nr_vecs,GFP_KERNEL );if (!bio) goto fail; +bio_init (bio,NULL , bio->bi_inline_vecs, nr_vecs, + rw ?REQ_OP_WRITE :REQ_OP_READ ); bio->bi_end_io = pscsi_bi_endio; -if (rw) -bio_set_op_attrs (bio,REQ_OP_WRITE ,0 ); -pr_debug ("PSCSI: Allocated bio: %p," " dir: %s nr_vecs: %d\n" , bio, (rw) ?"rw" :"r" , nr_vecs);
fs/squashfs/block.c +8 -7
@@ -86,12 +86,10 @@ static int squashfs_bio_read(struct super_block *sb, u64 index, int length,int error, i;struct bio *bio; - bio =bio_kmalloc (GFP_NOIO , page_count); + bio =bio_kmalloc (page_count,GFP_NOIO );if (!bio)return -ENOMEM ; -bio_set_dev (bio, sb->s_bdev); - bio->bi_opf =REQ_OP_READ ; - +bio_init (bio, sb->s_bdev, bio->bi_inline_vecs, page_count,REQ_OP_READ ); bio->bi_iter.bi_sector = block * (msblk->devblksize >>SECTOR_SHIFT );for (i =0 ; i < page_count; ++i) {
@@ -121,7 +119,8 @@ static int squashfs_bio_read(struct super_block *sb, u64 index, int length, out_free_bio:bio_free_pages (bio); -bio_put (bio); +bio_uninit (bio); +kfree (bio);return error; }
@@ -185,7 +184,8 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length, length |= data[0 ] <<8 ; }bio_free_pages (bio); -bio_put (bio); +bio_uninit (bio); +kfree (bio); compressed =SQUASHFS_COMPRESSED (length); length =SQUASHFS_COMPRESSED_SIZE (length);
@@ -219,7 +219,8 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length, out_free_bio:bio_free_pages (bio); -bio_put (bio); +bio_uninit (bio); +kfree (bio); out:if (res <0 ) {ERROR ("Failed to read block 0x%llx: %d\n" , index, res);
include/linux/bio.h +1 -1
@@ -407,7 +407,7 @@ struct bio *bio_alloc_bioset(struct block_device *bdev, unsigned short nr_vecs, struct bio_set *bs);struct bio *bio_alloc_kiocb (struct kiocb *kiocb,struct block_device *bdev,unsigned short nr_vecs,unsigned int opf,struct bio_set *bs); -struct bio *bio_kmalloc (gfp_t gfp_mask,unsigned short nr_iovecs); +struct bio *bio_kmalloc (unsigned short nr_vecs,gfp_t gfp_mask);extern void bio_put (struct bio *); struct bio *bio_alloc_clone(struct block_device *bdev, struct bio *bio_src,
Signature · 6 lines
2.30.2 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
Re: [PATCH 4/5] block: turn bio_kmalloc into a simple kmalloc wrapper
Quoted 20 lines · Christoph Hellwig
Remove the magic autofree semantics and require the callers to explicitly call
bio_initto initialize the bio.This allows
bio_freeto catch accidentalbio_putcalls on bio_init()ed bios as well.Signed-off-by Christoph Hellwig <[email protected]>--- block/bio.c | 47 ++++++++++++------------------ block/blk-crypto-fallback.c | 14 +++++---- block/blk-map.c | 42 ++++++++++++++++---------- drivers/block/pktcdvd.c | 25 ++++++++-------- drivers/md/bcache/debug.c | 10 ++++--- drivers/md/dm-bufio.c | 9 +++--- drivers/md/raid1.c | 12 +++++--- drivers/md/raid10.c | 21 ++++++++----- drivers/target/target_core_pscsi.c | 10 +++---- fs/squashfs/block.c | 15 +++++----- include/linux/bio.h | 2 +- 11 files changed, 112 insertions(+), 95 deletions(-)
[snipped]
Quoted 25 lines
drivers/md/bcache/debug.c +4
-3@@ -107,15 +107,16 @@ void bch_btree_verify(struct btree *b)void bch_data_verify (struct cached_dev *dc,struct bio *bio) { +unsigned int nr_segs =bio_segments (bio);struct bio *check;struct bio_vec bv, cbv;struct bvec_iter iter, citer = {0 }; - check =bio_kmalloc (GFP_NOIO ,bio_segments (bio)); + check =bio_kmalloc (nr_segs,GFP_NOIO );if (!check)return ; -bio_set_dev (check, bio->bi_bdev); - check->bi_opf =REQ_OP_READ ; +bio_init (check, bio->bi_bdev, check->bi_inline_vecs, nr_segs, +REQ_OP_READ ); check->bi_iter.bi_sector = bio->bi_iter.bi_sector; check->bi_iter.bi_size = bio->bi_iter.bi_size;
drivers/md/bcache/debug.c void bch_data_verify(struct cached_dev *dc, struct bio *bio) · line 154
Quoted 9 lines
drivers/md/bcache/debug.c +2
-1@@ -146,7 +147,8 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)bio_free_pages (check); out_put: - bio_put(check); +bio_uninit (check); + kfree(check); }#endif
[snipped]
For bcache part,
Coly Li
Re: [PATCH 4/5] block: turn bio_kmalloc into a simple kmalloc wrapper
In reply to Christoph HellwigQuoted 7 lines · Christoph Hellwig
Remove the magic autofree semantics and require the callers to explicitly call
bio_initto initialize the bio.This allows
bio_freeto catch accidentalbio_putcalls on bio_init()ed bios as well.Signed-off-by Christoph Hellwig <[email protected]>
PATCH 5/5 pktcdvd: stop using bio_reset
In reply to Christoph HellwigJust initialize the bios on-demand.
--- drivers/block/pktcdvd.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)
drivers/block/pktcdvd.c +9 -16
@@ -525,7 +525,6 @@ static struct packet_data *pkt_alloc_packet_data(int frames) pkt->w_bio =bio_kmalloc (frames,GFP_KERNEL );if (!pkt->w_bio) goto no_bio; -bio_init (pkt->w_bio,NULL , pkt->w_bio->bi_inline_vecs, frames,0 );for (i =0 ; i < frames /FRAMES_PER_PAGE ; i++) { pkt->pages[i] =alloc_page (GFP_KERNEL |__GFP_ZERO);
@@ -537,26 +536,20 @@ static struct packet_data *pkt_alloc_packet_data(int frames)bio_list_init (&pkt->orig_bios);for (i =0 ; i < frames; i++) { -struct bio *bio =bio_kmalloc (1 ,GFP_KERNEL ); -if (!bio) + pkt->r_bios[i] =bio_kmalloc (1 ,GFP_KERNEL ); +if (!pkt->r_bios[i]) goto no_rd_bio; -bio_init (bio,NULL , bio->bi_inline_vecs,1 ,0 ); - pkt->r_bios[i] = bio; }return pkt; no_rd_bio: -for (i =0 ; i < frames; i++) { -if (pkt->r_bios[i]) -bio_uninit (pkt->r_bios[i]); +for (i =0 ; i < frames; i++)kfree (pkt->r_bios[i]); - } no_page:for (i =0 ; i < frames /FRAMES_PER_PAGE ; i++)if (pkt->pages[i])__free_page (pkt->pages[i]); -bio_uninit (pkt->w_bio);kfree (pkt->w_bio); no_bio:kfree (pkt);
@@ -571,13 +564,10 @@ static void pkt_free_packet_data(struct packet_data *pkt) {int i; -for (i =0 ; i < pkt->frames; i++) { -bio_uninit (pkt->r_bios[i]); +for (i =0 ; i < pkt->frames; i++)kfree (pkt->r_bios[i]); - }for (i =0 ; i < pkt->frames /FRAMES_PER_PAGE ; i++)__free_page (pkt->pages[i]); -bio_uninit (pkt->w_bio);kfree (pkt->w_bio);kfree (pkt); }
@@ -952,6 +942,7 @@ static void pkt_end_io_read(struct bio *bio)if (bio->bi_status)atomic_inc (&pkt->io_errors); +bio_uninit (bio);if (atomic_dec_and_test (&pkt->io_wait)) {atomic_inc (&pkt->run_sm);wake_up (&pd->wqueue);
@@ -969,6 +960,7 @@ static void pkt_end_io_packet_write(struct bio *bio) pd->stats.pkt_ended++; +bio_uninit (bio);pkt_bio_finished (pd);atomic_dec (&pkt->io_wait);atomic_inc (&pkt->run_sm);
@@ -1023,7 +1015,7 @@ static void pkt_gather_data(struct pktcdvd_device *pd, struct packet_data *pkt)continue ; bio = pkt->r_bios[f]; -bio_reset (bio, pd->bdev,REQ_OP_READ ); +bio_init (bio, pd->bdev, bio->bi_inline_vecs,1 ,REQ_OP_READ ); bio->bi_iter.bi_sector = pkt->sector + f * (CD_FRAMESIZE >>9 ); bio->bi_end_io = pkt_end_io_read; bio->bi_private = pkt;
@@ -1236,7 +1228,8 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) {int f; -bio_reset (pkt->w_bio, pd->bdev,REQ_OP_WRITE ); +bio_init (pkt->w_bio, pd->bdev, pkt->w_bio->bi_inline_vecs, pkt->frames, +REQ_OP_WRITE ); pkt->w_bio->bi_iter.bi_sector = pkt->sector; pkt->w_bio->bi_end_io = pkt_end_io_packet_write; pkt->w_bio->bi_private = pkt;
Signature · 6 lines
2.30.2 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
Hi Jens,
can you pull this into 5.19/block? I'd like to send some bio cloning optimizations for Mike on top of this series.
--
dm-devel mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/dm-devel
Quoted 5 lines · Christoph Hellwig
this series finishes off the bio allocation interface cleanups by dealing with the weirdest member of the famility.
bio_kmalloccombines a kmalloc for the bio andbio_vecswith a hiddenbio_initcall and magic cleanup semantics.
Quoted 8 lines
This series moves a few callers away from
bio_kmallocand then turnsbio_kmallocinto a simple wrapper for a slab allocation of a bio and the inline biovecs. The callers need to manually callbio_initinstead with all that entails and the magic that turnsbio_putinto a kfree goes away as well, allowing for a proper debug check inbio_putthat catches accidental use on a bio_init()ed bio.[...]
Applied, thanks!
[1/5] btrfs: simplify ->flush_bio handling
commit: f9e69aa9ccd7e51c47b147e45e03987ea0ef9aa3
[2/5] squashfs: always use bio_kmalloc in squashfs_bio_read
commit: 46a2d4ccc49903923506685a8368ca88312bbdc9
[3/5] target/pscsi: remove pscsi_get_bio
commit: 7655db80932d95f501a0811544d9520ec720e38d
[4/5] block: turn bio_kmalloc into a simple kmalloc wrapper
commit: 066ff571011d8416e903d3d4f1f41e0b5eb91e1d
[5/5] pktcdvd: stop using bio_reset
commit: 852ad96cb03621f7995764b4b31cbff9801d8bcdBest regards,
Signature · 7 lines
Jens Axboe -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel