| Message ID | 20210128071133.60335-1-chaitanya.kulkarni@wdc.com |
|---|---|
| Headers | show |
| Series | block: introduce bio_new() | expand |
On 2021/01/28 16:12, Chaitanya Kulkarni wrote: > 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 <chaitanya.kulkarni@wdc.com> > --- > 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); I think that depending on the gfp_mask passed, bio can be NULL. So this should be checked. > + > + bio_set_dev(bio, bdev); > + bio->bi_iter.bi_sector = sector; > + bio_set_op_attrs(bio, op, op_flags); This function is obsolete. Open code this. > + > + return bio; > +} > > #endif /* __LINUX_BIO_H */ >
On 2021/01/28 16:21, Damien Le Moal wrote: > On 2021/01/28 16:12, Chaitanya Kulkarni wrote: >> 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 <chaitanya.kulkarni@wdc.com> >> --- >> 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); > > I think that depending on the gfp_mask passed, bio can be NULL. So this should > be checked. > >> + >> + bio_set_dev(bio, bdev); >> + bio->bi_iter.bi_sector = sector; >> + bio_set_op_attrs(bio, op, op_flags); > > This function is obsolete. Open code this. And that also mean that you could remove one argument to bio_new(): combine op and op_flags into "unsigned int opf" > >> + >> + return bio; >> +} >> >> #endif /* __LINUX_BIO_H */ >> > >
FYI your email is completely unreadable to those not using html. I can't tell what you wrote and what Damien wrote. On Thu, Jan 28, 2021 at 08:33:10AM +0000, Chaitanya Kulkarni wrote: > On 1/27/21 11:21 PM, Damien Le Moal wrote: > > On 2021/01/28 16:12, Chaitanya Kulkarni wrote: > > > 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 <chaitanya.kulkarni@wdc.com><mailto:chaitanya.kulkarni@wdc.com> > --- > 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); > > > I think that depending on the gfp_mask passed, bio can be NULL. So this should > be checked. > > > true, I'll add that check. > > > > > + > + bio_set_dev(bio, bdev); > + bio->bi_iter.bi_sector = sector; > + bio_set_op_attrs(bio, op, op_flags); > > > This function is obsolete. Open code this. > > > true, will do. > > > > > + > + return bio; > +} > > #endif /* __LINUX_BIO_H */ > > > > Thanks for the comments Damien. > _______________________________________________ > Ocfs2-devel mailing list > Ocfs2-devel@oss.oracle.com > https://oss.oracle.com/mailman/listinfo/ocfs2-devel
On Wed, Jan 27, 2021 at 11:11:26PM -0800, Chaitanya Kulkarni wrote: > Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/xfs/xfs_buf.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c > index f8400bbd6473..3ff6235e4f94 100644 > --- a/fs/xfs/xfs_buf.c > +++ b/fs/xfs/xfs_buf.c > @@ -1507,12 +1507,10 @@ xfs_buf_ioapply_map( > atomic_inc(&bp->b_io_remaining); > nr_pages = min(total_nr_pages, BIO_MAX_PAGES); > > - bio = bio_alloc(GFP_NOIO, nr_pages); > - bio_set_dev(bio, bp->b_target->bt_bdev); > - bio->bi_iter.bi_sector = sector; > + bio = bio_new(bp->b_target->bt_bdev, sector, op, 0, nr_pages, > + GFP_NOIO); > bio->bi_end_io = xfs_buf_bio_end_io; > bio->bi_private = bp; > - bio->bi_opf = op; > > for (; size && nr_pages; nr_pages--, page_index++) { > int rbytes, nbytes = PAGE_SIZE - offset; > -- > 2.22.1 >
Hi! > > diff --git a/kernel/power/swap.c b/kernel/power/swap.c > index c73f2e295167..e92e36c053a6 100644 > --- a/kernel/power/swap.c > +++ b/kernel/power/swap.c > @@ -271,13 +271,12 @@ static int hib_submit_io(int op, int op_flags, pgoff_t page_off, void *addr, > struct hib_bio_batch *hb) > { > struct page *page = virt_to_page(addr); > + sector_t sect = page_off * (PAGE_SIZE >> 9); > struct bio *bio; > int error = 0; > > - bio = bio_alloc(GFP_NOIO | __GFP_HIGH, 1); > - bio->bi_iter.bi_sector = page_off * (PAGE_SIZE >> 9); > - bio_set_dev(bio, hib_resume_bdev); > - bio_set_op_attrs(bio, op, op_flags); > + bio = bio_new(hib_resume_bdev, sect, op, op_flags, 1, > + GFP_NOIO | __GFP_HIGH); > C function with 6 arguments... dunno. Old version looks comparable or even more readable... Best regards, Pavel -- http://www.livejournal.com/~pavelmachek
On 2/17/21 14:03, Pavel Machek wrote: > Hi! >> diff --git a/kernel/power/swap.c b/kernel/power/swap.c >> index c73f2e295167..e92e36c053a6 100644 >> --- a/kernel/power/swap.c >> +++ b/kernel/power/swap.c >> @@ -271,13 +271,12 @@ static int hib_submit_io(int op, int op_flags, pgoff_t page_off, void *addr, >> struct hib_bio_batch *hb) >> { >> struct page *page = virt_to_page(addr); >> + sector_t sect = page_off * (PAGE_SIZE >> 9); >> struct bio *bio; >> int error = 0; >> >> - bio = bio_alloc(GFP_NOIO | __GFP_HIGH, 1); >> - bio->bi_iter.bi_sector = page_off * (PAGE_SIZE >> 9); >> - bio_set_dev(bio, hib_resume_bdev); >> - bio_set_op_attrs(bio, op, op_flags); >> + bio = bio_new(hib_resume_bdev, sect, op, op_flags, 1, >> + GFP_NOIO | __GFP_HIGH); >> > C function with 6 arguments... dunno. Old version looks comparable or > even more readable... > > Best regards, > Pavel The library functions that are in the kernel tree which are used in different file-systems and fabrics drivers do take 6 arguments. Plus what is the point of duplicating code for mandatory parameters all over the kernel ?