Skip to content

Commit d347ee5

Browse files
torvaldstorvalds
committed
Merge tag 'for-5.18/alloc-cleanups-2022-03-18' of git://git.kernel.dk/linux-block
Pull bio_alloc() cleanups from Jens Axboe: "Filesystem cleanups to pass the bio op to bio_alloc() instead of setting it just before bio submission". * tag 'for-5.18/alloc-cleanups-2022-03-18' of git://git.kernel.dk/linux-block: f2fs: pass the bio operation to bio_alloc_bioset f2fs: don't pass a bio to f2fs_target_device nilfs2: pass the operation to bio_alloc ext4: pass the operation to bio_alloc mpage: pass the operation to bio_alloc
2 parents 69d1dea + 64bf0ee commit d347ee5

5 files changed

Lines changed: 73 additions & 95 deletions

File tree

‎fs/ext4/page-io.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,9 @@ void ext4_io_submit(struct ext4_io_submit *io)
371371
struct bio *bio = io->io_bio;
372372

373373
if (bio) {
374-
int io_op_flags = io->io_wbc->sync_mode == WB_SYNC_ALL ?
375-
REQ_SYNC : 0;
374+
if (io->io_wbc->sync_mode == WB_SYNC_ALL)
375+
io->io_bio->bi_opf |= REQ_SYNC;
376376
io->io_bio->bi_write_hint = io->io_end->inode->i_write_hint;
377-
bio_set_op_attrs(io->io_bio, REQ_OP_WRITE, io_op_flags);
378377
submit_bio(io->io_bio);
379378
}
380379
io->io_bio = NULL;
@@ -397,7 +396,7 @@ static void io_submit_init_bio(struct ext4_io_submit *io,
397396
* bio_alloc will _always_ be able to allocate a bio if
398397
* __GFP_DIRECT_RECLAIM is set, see comments for bio_alloc_bioset().
399398
*/
400-
bio = bio_alloc(bh->b_bdev, BIO_MAX_VECS, 0, GFP_NOIO);
399+
bio = bio_alloc(bh->b_bdev, BIO_MAX_VECS, REQ_OP_WRITE, GFP_NOIO);
401400
fscrypt_set_bio_crypt_ctx_bh(bio, bh, GFP_NOIO);
402401
bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
403402
bio->bi_end_io = ext4_end_bio;

‎fs/f2fs/data.c‎

Lines changed: 39 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ static void f2fs_write_end_io(struct bio *bio)
354354
}
355355

356356
struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,
357-
block_t blk_addr, struct bio *bio)
357+
block_t blk_addr, sector_t *sector)
358358
{
359359
struct block_device *bdev = sbi->sb->s_bdev;
360360
int i;
@@ -369,10 +369,9 @@ struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,
369369
}
370370
}
371371
}
372-
if (bio) {
373-
bio_set_dev(bio, bdev);
374-
bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(blk_addr);
375-
}
372+
373+
if (sector)
374+
*sector = SECTOR_FROM_BLOCK(blk_addr);
376375
return bdev;
377376
}
378377

@@ -389,14 +388,40 @@ int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr)
389388
return 0;
390389
}
391390

391+
static void __attach_io_flag(struct f2fs_io_info *fio, unsigned int io_flag)
392+
{
393+
unsigned int temp_mask = (1 << NR_TEMP_TYPE) - 1;
394+
unsigned int fua_flag = io_flag & temp_mask;
395+
unsigned int meta_flag = (io_flag >> NR_TEMP_TYPE) & temp_mask;
396+
397+
/*
398+
* data/node io flag bits per temp:
399+
* REQ_META | REQ_FUA |
400+
* 5 | 4 | 3 | 2 | 1 | 0 |
401+
* Cold | Warm | Hot | Cold | Warm | Hot |
402+
*/
403+
if ((1 << fio->temp) & meta_flag)
404+
fio->op_flags |= REQ_META;
405+
if ((1 << fio->temp) & fua_flag)
406+
fio->op_flags |= REQ_FUA;
407+
}
408+
392409
static struct bio *__bio_alloc(struct f2fs_io_info *fio, int npages)
393410
{
394411
struct f2fs_sb_info *sbi = fio->sbi;
412+
struct block_device *bdev;
413+
sector_t sector;
395414
struct bio *bio;
396415

397-
bio = bio_alloc_bioset(NULL, npages, 0, GFP_NOIO, &f2fs_bioset);
416+
if (fio->type == DATA)
417+
__attach_io_flag(fio, sbi->data_io_flag);
418+
else if (fio->type == NODE)
419+
__attach_io_flag(fio, sbi->node_io_flag);
398420

399-
f2fs_target_device(sbi, fio->new_blkaddr, bio);
421+
bdev = f2fs_target_device(sbi, fio->new_blkaddr, &sector);
422+
bio = bio_alloc_bioset(bdev, npages, fio->op | fio->op_flags, GFP_NOIO,
423+
&f2fs_bioset);
424+
bio->bi_iter.bi_sector = sector;
400425
if (is_read_io(fio->op)) {
401426
bio->bi_end_io = f2fs_read_end_io;
402427
bio->bi_private = NULL;
@@ -500,44 +525,13 @@ void f2fs_submit_bio(struct f2fs_sb_info *sbi,
500525
__submit_bio(sbi, bio, type);
501526
}
502527

503-
static void __attach_io_flag(struct f2fs_io_info *fio)
504-
{
505-
struct f2fs_sb_info *sbi = fio->sbi;
506-
unsigned int temp_mask = (1 << NR_TEMP_TYPE) - 1;
507-
unsigned int io_flag, fua_flag, meta_flag;
508-
509-
if (fio->type == DATA)
510-
io_flag = sbi->data_io_flag;
511-
else if (fio->type == NODE)
512-
io_flag = sbi->node_io_flag;
513-
else
514-
return;
515-
516-
fua_flag = io_flag & temp_mask;
517-
meta_flag = (io_flag >> NR_TEMP_TYPE) & temp_mask;
518-
519-
/*
520-
* data/node io flag bits per temp:
521-
* REQ_META | REQ_FUA |
522-
* 5 | 4 | 3 | 2 | 1 | 0 |
523-
* Cold | Warm | Hot | Cold | Warm | Hot |
524-
*/
525-
if ((1 << fio->temp) & meta_flag)
526-
fio->op_flags |= REQ_META;
527-
if ((1 << fio->temp) & fua_flag)
528-
fio->op_flags |= REQ_FUA;
529-
}
530-
531528
static void __submit_merged_bio(struct f2fs_bio_info *io)
532529
{
533530
struct f2fs_io_info *fio = &io->fio;
534531

535532
if (!io->bio)
536533
return;
537534

538-
__attach_io_flag(fio);
539-
bio_set_op_attrs(io->bio, fio->op, fio->op_flags);
540-
541535
if (is_read_io(fio->op))
542536
trace_f2fs_prepare_read_bio(io->sbi->sb, fio->type, io->bio);
543537
else
@@ -595,10 +589,9 @@ static void __f2fs_submit_merged_write(struct f2fs_sb_info *sbi,
595589
/* change META to META_FLUSH in the checkpoint procedure */
596590
if (type >= META_FLUSH) {
597591
io->fio.type = META_FLUSH;
598-
io->fio.op = REQ_OP_WRITE;
599-
io->fio.op_flags = REQ_META | REQ_PRIO | REQ_SYNC;
592+
io->bio->bi_opf |= REQ_META | REQ_PRIO | REQ_SYNC;
600593
if (!test_opt(sbi, NOBARRIER))
601-
io->fio.op_flags |= REQ_PREFLUSH | REQ_FUA;
594+
io->bio->bi_opf |= REQ_PREFLUSH | REQ_FUA;
602595
}
603596
__submit_merged_bio(io);
604597
up_write(&io->io_rwsem);
@@ -679,9 +672,6 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
679672
if (fio->io_wbc && !is_read_io(fio->op))
680673
wbc_account_cgroup_owner(fio->io_wbc, page, PAGE_SIZE);
681674

682-
__attach_io_flag(fio);
683-
bio_set_op_attrs(bio, fio->op, fio->op_flags);
684-
685675
inc_page_count(fio->sbi, is_read_io(fio->op) ?
686676
__read_io_type(page): WB_DATA_TYPE(fio->page));
687677

@@ -875,10 +865,8 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
875865
alloc_new:
876866
if (!bio) {
877867
bio = __bio_alloc(fio, BIO_MAX_VECS);
878-
__attach_io_flag(fio);
879868
f2fs_set_bio_crypt_ctx(bio, fio->page->mapping->host,
880869
fio->page->index, fio, GFP_NOIO);
881-
bio_set_op_attrs(bio, fio->op, fio->op_flags);
882870

883871
add_bio_entry(fio->sbi, bio, page, fio->temp);
884872
} else {
@@ -984,15 +972,16 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr,
984972
struct bio *bio;
985973
struct bio_post_read_ctx *ctx = NULL;
986974
unsigned int post_read_steps = 0;
975+
sector_t sector;
976+
struct block_device *bdev = f2fs_target_device(sbi, blkaddr, &sector);
987977

988-
bio = bio_alloc_bioset(NULL, bio_max_segs(nr_pages), REQ_OP_READ,
978+
bio = bio_alloc_bioset(bdev, bio_max_segs(nr_pages),
979+
REQ_OP_READ | op_flag,
989980
for_write ? GFP_NOIO : GFP_KERNEL, &f2fs_bioset);
990981
if (!bio)
991982
return ERR_PTR(-ENOMEM);
992-
983+
bio->bi_iter.bi_sector = sector;
993984
f2fs_set_bio_crypt_ctx(bio, inode, first_idx, NULL, GFP_NOFS);
994-
995-
f2fs_target_device(sbi, blkaddr, bio);
996985
bio->bi_end_io = f2fs_read_end_io;
997986

998987
if (fscrypt_inode_uses_fs_layer_crypto(inode))

‎fs/f2fs/f2fs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3631,7 +3631,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio);
36313631
int f2fs_merge_page_bio(struct f2fs_io_info *fio);
36323632
void f2fs_submit_page_write(struct f2fs_io_info *fio);
36333633
struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,
3634-
block_t blk_addr, struct bio *bio);
3634+
block_t blk_addr, sector_t *sector);
36353635
int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr);
36363636
void f2fs_set_data_blkaddr(struct dnode_of_data *dn);
36373637
void f2fs_update_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr);

‎fs/mpage.c‎

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@ static void mpage_end_io(struct bio *bio)
5757
bio_put(bio);
5858
}
5959

60-
static struct bio *mpage_bio_submit(int op, int op_flags, struct bio *bio)
60+
static struct bio *mpage_bio_submit(struct bio *bio)
6161
{
6262
bio->bi_end_io = mpage_end_io;
63-
bio_set_op_attrs(bio, op, op_flags);
6463
guard_bio_eod(bio);
6564
submit_bio(bio);
6665
return NULL;
@@ -146,16 +145,15 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)
146145
struct block_device *bdev = NULL;
147146
int length;
148147
int fully_mapped = 1;
149-
int op_flags;
148+
int op = REQ_OP_READ;
150149
unsigned nblocks;
151150
unsigned relative_block;
152151
gfp_t gfp;
153152

154153
if (args->is_readahead) {
155-
op_flags = REQ_RAHEAD;
154+
op |= REQ_RAHEAD;
156155
gfp = readahead_gfp_mask(page->mapping);
157156
} else {
158-
op_flags = 0;
159157
gfp = mapping_gfp_constraint(page->mapping, GFP_KERNEL);
160158
}
161159

@@ -264,7 +262,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)
264262
* This page will go to BIO. Do we need to send this BIO off first?
265263
*/
266264
if (args->bio && (args->last_block_in_bio != blocks[0] - 1))
267-
args->bio = mpage_bio_submit(REQ_OP_READ, op_flags, args->bio);
265+
args->bio = mpage_bio_submit(args->bio);
268266

269267
alloc_new:
270268
if (args->bio == NULL) {
@@ -273,7 +271,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)
273271
page))
274272
goto out;
275273
}
276-
args->bio = bio_alloc(bdev, bio_max_segs(args->nr_pages), 0,
274+
args->bio = bio_alloc(bdev, bio_max_segs(args->nr_pages), op,
277275
gfp);
278276
if (args->bio == NULL)
279277
goto confused;
@@ -282,23 +280,23 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)
282280

283281
length = first_hole << blkbits;
284282
if (bio_add_page(args->bio, page, length, 0) < length) {
285-
args->bio = mpage_bio_submit(REQ_OP_READ, op_flags, args->bio);
283+
args->bio = mpage_bio_submit(args->bio);
286284
goto alloc_new;
287285
}
288286

289287
relative_block = block_in_file - args->first_logical_block;
290288
nblocks = map_bh->b_size >> blkbits;
291289
if ((buffer_boundary(map_bh) && relative_block == nblocks) ||
292290
(first_hole != blocks_per_page))
293-
args->bio = mpage_bio_submit(REQ_OP_READ, op_flags, args->bio);
291+
args->bio = mpage_bio_submit(args->bio);
294292
else
295293
args->last_block_in_bio = blocks[blocks_per_page - 1];
296294
out:
297295
return args->bio;
298296

299297
confused:
300298
if (args->bio)
301-
args->bio = mpage_bio_submit(REQ_OP_READ, op_flags, args->bio);
299+
args->bio = mpage_bio_submit(args->bio);
302300
if (!PageUptodate(page))
303301
block_read_full_page(page, args->get_block);
304302
else
@@ -361,7 +359,7 @@ void mpage_readahead(struct readahead_control *rac, get_block_t get_block)
361359
put_page(page);
362360
}
363361
if (args.bio)
364-
mpage_bio_submit(REQ_OP_READ, REQ_RAHEAD, args.bio);
362+
mpage_bio_submit(args.bio);
365363
}
366364
EXPORT_SYMBOL(mpage_readahead);
367365

@@ -378,7 +376,7 @@ int mpage_readpage(struct page *page, get_block_t get_block)
378376

379377
args.bio = do_mpage_readpage(&args);
380378
if (args.bio)
381-
mpage_bio_submit(REQ_OP_READ, 0, args.bio);
379+
mpage_bio_submit(args.bio);
382380
return 0;
383381
}
384382
EXPORT_SYMBOL(mpage_readpage);
@@ -469,7 +467,6 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
469467
struct buffer_head map_bh;
470468
loff_t i_size = i_size_read(inode);
471469
int ret = 0;
472-
int op_flags = wbc_to_write_flags(wbc);
473470

474471
if (page_has_buffers(page)) {
475472
struct buffer_head *head = page_buffers(page);
@@ -577,7 +574,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
577574
* This page will go to BIO. Do we need to send this BIO off first?
578575
*/
579576
if (bio && mpd->last_block_in_bio != blocks[0] - 1)
580-
bio = mpage_bio_submit(REQ_OP_WRITE, op_flags, bio);
577+
bio = mpage_bio_submit(bio);
581578

582579
alloc_new:
583580
if (bio == NULL) {
@@ -586,9 +583,10 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
586583
page, wbc))
587584
goto out;
588585
}
589-
bio = bio_alloc(bdev, BIO_MAX_VECS, 0, GFP_NOFS);
586+
bio = bio_alloc(bdev, BIO_MAX_VECS,
587+
REQ_OP_WRITE | wbc_to_write_flags(wbc),
588+
GFP_NOFS);
590589
bio->bi_iter.bi_sector = blocks[0] << (blkbits - 9);
591-
592590
wbc_init_bio(wbc, bio);
593591
bio->bi_write_hint = inode->i_write_hint;
594592
}
@@ -601,7 +599,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
601599
wbc_account_cgroup_owner(wbc, page, PAGE_SIZE);
602600
length = first_unmapped << blkbits;
603601
if (bio_add_page(bio, page, length, 0) < length) {
604-
bio = mpage_bio_submit(REQ_OP_WRITE, op_flags, bio);
602+
bio = mpage_bio_submit(bio);
605603
goto alloc_new;
606604
}
607605

@@ -611,7 +609,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
611609
set_page_writeback(page);
612610
unlock_page(page);
613611
if (boundary || (first_unmapped != blocks_per_page)) {
614-
bio = mpage_bio_submit(REQ_OP_WRITE, op_flags, bio);
612+
bio = mpage_bio_submit(bio);
615613
if (boundary_block) {
616614
write_boundary_block(boundary_bdev,
617615
boundary_block, 1 << blkbits);
@@ -623,7 +621,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
623621

624622
confused:
625623
if (bio)
626-
bio = mpage_bio_submit(REQ_OP_WRITE, op_flags, bio);
624+
bio = mpage_bio_submit(bio);
627625

628626
if (mpd->use_writepage) {
629627
ret = mapping->a_ops->writepage(page, wbc);
@@ -679,11 +677,8 @@ mpage_writepages(struct address_space *mapping,
679677
};
680678

681679
ret = write_cache_pages(mapping, wbc, __mpage_writepage, &mpd);
682-
if (mpd.bio) {
683-
int op_flags = (wbc->sync_mode == WB_SYNC_ALL ?
684-
REQ_SYNC : 0);
685-
mpage_bio_submit(REQ_OP_WRITE, op_flags, mpd.bio);
686-
}
680+
if (mpd.bio)
681+
mpage_bio_submit(mpd.bio);
687682
}
688683
blk_finish_plug(&plug);
689684
return ret;
@@ -700,11 +695,8 @@ int mpage_writepage(struct page *page, get_block_t get_block,
700695
.use_writepage = 0,
701696
};
702697
int ret = __mpage_writepage(page, wbc, &mpd);
703-
if (mpd.bio) {
704-
int op_flags = (wbc->sync_mode == WB_SYNC_ALL ?
705-
REQ_SYNC : 0);
706-
mpage_bio_submit(REQ_OP_WRITE, op_flags, mpd.bio);
707-
}
698+
if (mpd.bio)
699+
mpage_bio_submit(mpd.bio);
708700
return ret;
709701
}
710702
EXPORT_SYMBOL(mpage_writepage);

0 commit comments

Comments
 (0)