Skip to content

Commit 67b5613

Browse files
axboeaxboe
committed
Merge branch 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.18/drivers
Pull MD updates from Song: "This set contains raid5 bio handling cleanups for raid5." * 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md: raid5: initialize the stripe_head embeeded bios as needed raid5-cache: statically allocate the recovery ra bio raid5-cache: fully initialize flush_bio when needed raid5-ppl: fully initialize the bio in ppl_new_iounit
2 parents a2daeab + 03a6b19 commit 67b5613

3 files changed

Lines changed: 26 additions & 37 deletions

File tree

‎drivers/md/raid5-cache.c‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,6 +1266,8 @@ static void r5l_log_flush_endio(struct bio *bio)
12661266
r5l_io_run_stripes(io);
12671267
list_splice_tail_init(&log->flushing_ios, &log->finished_ios);
12681268
spin_unlock_irqrestore(&log->io_list_lock, flags);
1269+
1270+
bio_uninit(bio);
12691271
}
12701272

12711273
/*
@@ -1301,7 +1303,7 @@ void r5l_flush_stripe_to_raid(struct r5l_log *log)
13011303

13021304
if (!do_flush)
13031305
return;
1304-
bio_reset(&log->flush_bio, log->rdev->bdev,
1306+
bio_init(&log->flush_bio, log->rdev->bdev, NULL, 0,
13051307
REQ_OP_WRITE | REQ_PREFLUSH);
13061308
log->flush_bio.bi_end_io = r5l_log_flush_endio;
13071309
submit_bio(&log->flush_bio);
@@ -1621,22 +1623,17 @@ struct r5l_recovery_ctx {
16211623
* just copy data from the pool.
16221624
*/
16231625
struct page *ra_pool[R5L_RECOVERY_PAGE_POOL_SIZE];
1626+
struct bio_vec ra_bvec[R5L_RECOVERY_PAGE_POOL_SIZE];
16241627
sector_t pool_offset; /* offset of first page in the pool */
16251628
int total_pages; /* total allocated pages */
16261629
int valid_pages; /* pages with valid data */
1627-
struct bio *ra_bio; /* bio to do the read ahead */
16281630
};
16291631

16301632
static int r5l_recovery_allocate_ra_pool(struct r5l_log *log,
16311633
struct r5l_recovery_ctx *ctx)
16321634
{
16331635
struct page *page;
16341636

1635-
ctx->ra_bio = bio_alloc_bioset(NULL, BIO_MAX_VECS, 0, GFP_KERNEL,
1636-
&log->bs);
1637-
if (!ctx->ra_bio)
1638-
return -ENOMEM;
1639-
16401637
ctx->valid_pages = 0;
16411638
ctx->total_pages = 0;
16421639
while (ctx->total_pages < R5L_RECOVERY_PAGE_POOL_SIZE) {
@@ -1648,10 +1645,8 @@ static int r5l_recovery_allocate_ra_pool(struct r5l_log *log,
16481645
ctx->total_pages += 1;
16491646
}
16501647

1651-
if (ctx->total_pages == 0) {
1652-
bio_put(ctx->ra_bio);
1648+
if (ctx->total_pages == 0)
16531649
return -ENOMEM;
1654-
}
16551650

16561651
ctx->pool_offset = 0;
16571652
return 0;
@@ -1664,7 +1659,6 @@ static void r5l_recovery_free_ra_pool(struct r5l_log *log,
16641659

16651660
for (i = 0; i < ctx->total_pages; ++i)
16661661
put_page(ctx->ra_pool[i]);
1667-
bio_put(ctx->ra_bio);
16681662
}
16691663

16701664
/*
@@ -1677,15 +1671,19 @@ static int r5l_recovery_fetch_ra_pool(struct r5l_log *log,
16771671
struct r5l_recovery_ctx *ctx,
16781672
sector_t offset)
16791673
{
1680-
bio_reset(ctx->ra_bio, log->rdev->bdev, REQ_OP_READ);
1681-
ctx->ra_bio->bi_iter.bi_sector = log->rdev->data_offset + offset;
1674+
struct bio bio;
1675+
int ret;
1676+
1677+
bio_init(&bio, log->rdev->bdev, ctx->ra_bvec,
1678+
R5L_RECOVERY_PAGE_POOL_SIZE, REQ_OP_READ);
1679+
bio.bi_iter.bi_sector = log->rdev->data_offset + offset;
16821680

16831681
ctx->valid_pages = 0;
16841682
ctx->pool_offset = offset;
16851683

16861684
while (ctx->valid_pages < ctx->total_pages) {
1687-
bio_add_page(ctx->ra_bio,
1688-
ctx->ra_pool[ctx->valid_pages], PAGE_SIZE, 0);
1685+
__bio_add_page(&bio, ctx->ra_pool[ctx->valid_pages], PAGE_SIZE,
1686+
0);
16891687
ctx->valid_pages += 1;
16901688

16911689
offset = r5l_ring_add(log, offset, BLOCK_SECTORS);
@@ -1694,7 +1692,9 @@ static int r5l_recovery_fetch_ra_pool(struct r5l_log *log,
16941692
break;
16951693
}
16961694

1697-
return submit_bio_wait(ctx->ra_bio);
1695+
ret = submit_bio_wait(&bio);
1696+
bio_uninit(&bio);
1697+
return ret;
16981698
}
16991699

17001700
/*
@@ -3105,7 +3105,6 @@ int r5l_init_log(struct r5conf *conf, struct md_rdev *rdev)
31053105
INIT_LIST_HEAD(&log->io_end_ios);
31063106
INIT_LIST_HEAD(&log->flushing_ios);
31073107
INIT_LIST_HEAD(&log->finished_ios);
3108-
bio_init(&log->flush_bio, NULL, NULL, 0, 0);
31093108

31103109
log->io_kc = KMEM_CACHE(r5l_io_unit, 0);
31113110
if (!log->io_kc)

‎drivers/md/raid5-ppl.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ static struct ppl_io_unit *ppl_new_iounit(struct ppl_log *log,
250250
INIT_LIST_HEAD(&io->stripe_list);
251251
atomic_set(&io->pending_stripes, 0);
252252
atomic_set(&io->pending_flushes, 0);
253-
bio_init(&io->bio, NULL, io->biovec, PPL_IO_INLINE_BVECS, 0);
253+
bio_init(&io->bio, log->rdev->bdev, io->biovec, PPL_IO_INLINE_BVECS,
254+
REQ_OP_WRITE | REQ_FUA);
254255

255256
pplhdr = page_address(io->header_page);
256257
clear_page(pplhdr);
@@ -465,8 +466,6 @@ static void ppl_submit_iounit(struct ppl_io_unit *io)
465466

466467

467468
bio->bi_end_io = ppl_log_endio;
468-
bio->bi_opf = REQ_OP_WRITE | REQ_FUA;
469-
bio_set_dev(bio, log->rdev->bdev);
470469
bio->bi_iter.bi_sector = log->next_io_sector;
471470
bio_add_page(bio, io->header_page, PAGE_SIZE, 0);
472471
bio->bi_write_hint = ppl_conf->write_hint;

‎drivers/md/raid5.c‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,6 +1060,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
10601060
int i, disks = sh->disks;
10611061
struct stripe_head *head_sh = sh;
10621062
struct bio_list pending_bios = BIO_EMPTY_LIST;
1063+
struct r5dev *dev;
10631064
bool should_defer;
10641065

10651066
might_sleep();
@@ -1094,8 +1095,9 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
10941095
op_flags |= REQ_SYNC;
10951096

10961097
again:
1097-
bi = &sh->dev[i].req;
1098-
rbi = &sh->dev[i].rreq; /* For writing to replacement */
1098+
dev = &sh->dev[i];
1099+
bi = &dev->req;
1100+
rbi = &dev->rreq; /* For writing to replacement */
10991101

11001102
rcu_read_lock();
11011103
rrdev = rcu_dereference(conf->disks[i].replacement);
@@ -1171,8 +1173,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
11711173

11721174
set_bit(STRIPE_IO_STARTED, &sh->state);
11731175

1174-
bio_set_dev(bi, rdev->bdev);
1175-
bio_set_op_attrs(bi, op, op_flags);
1176+
bio_init(bi, rdev->bdev, &dev->vec, 1, op | op_flags);
11761177
bi->bi_end_io = op_is_write(op)
11771178
? raid5_end_write_request
11781179
: raid5_end_read_request;
@@ -1238,8 +1239,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
12381239

12391240
set_bit(STRIPE_IO_STARTED, &sh->state);
12401241

1241-
bio_set_dev(rbi, rrdev->bdev);
1242-
bio_set_op_attrs(rbi, op, op_flags);
1242+
bio_init(rbi, rrdev->bdev, &dev->rvec, 1, op | op_flags);
12431243
BUG_ON(!op_is_write(op));
12441244
rbi->bi_end_io = raid5_end_write_request;
12451245
rbi->bi_private = sh;
@@ -2294,7 +2294,6 @@ static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp,
22942294
int disks, struct r5conf *conf)
22952295
{
22962296
struct stripe_head *sh;
2297-
int i;
22982297

22992298
sh = kmem_cache_zalloc(sc, gfp);
23002299
if (sh) {
@@ -2307,12 +2306,6 @@ static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp,
23072306
atomic_set(&sh->count, 1);
23082307
sh->raid_conf = conf;
23092308
sh->log_start = MaxSector;
2310-
for (i = 0; i < disks; i++) {
2311-
struct r5dev *dev = &sh->dev[i];
2312-
2313-
bio_init(&dev->req, NULL, &dev->vec, 1, 0);
2314-
bio_init(&dev->rreq, NULL, &dev->rvec, 1, 0);
2315-
}
23162309

23172310
if (raid5_has_ppl(conf)) {
23182311
sh->ppl_page = alloc_page(gfp);
@@ -2677,7 +2670,6 @@ static void raid5_end_read_request(struct bio * bi)
26772670
(unsigned long long)sh->sector, i, atomic_read(&sh->count),
26782671
bi->bi_status);
26792672
if (i == disks) {
2680-
bio_reset(bi, NULL, 0);
26812673
BUG();
26822674
return;
26832675
}
@@ -2785,7 +2777,7 @@ static void raid5_end_read_request(struct bio * bi)
27852777
}
27862778
}
27872779
rdev_dec_pending(rdev, conf->mddev);
2788-
bio_reset(bi, NULL, 0);
2780+
bio_uninit(bi);
27892781
clear_bit(R5_LOCKED, &sh->dev[i].flags);
27902782
set_bit(STRIPE_HANDLE, &sh->state);
27912783
raid5_release_stripe(sh);
@@ -2823,7 +2815,6 @@ static void raid5_end_write_request(struct bio *bi)
28232815
(unsigned long long)sh->sector, i, atomic_read(&sh->count),
28242816
bi->bi_status);
28252817
if (i == disks) {
2826-
bio_reset(bi, NULL, 0);
28272818
BUG();
28282819
return;
28292820
}
@@ -2860,7 +2851,7 @@ static void raid5_end_write_request(struct bio *bi)
28602851
if (sh->batch_head && bi->bi_status && !replacement)
28612852
set_bit(STRIPE_BATCH_ERR, &sh->batch_head->state);
28622853

2863-
bio_reset(bi, NULL, 0);
2854+
bio_uninit(bi);
28642855
if (!test_and_clear_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags))
28652856
clear_bit(R5_LOCKED, &sh->dev[i].flags);
28662857
set_bit(STRIPE_HANDLE, &sh->state);

0 commit comments

Comments
 (0)