diff options
| author |   Logan Gunthorpe <logang@deltatee.com> | 2022-08-25 09:46:27 -0600 |
|---|---|---|
| committer |   Song Liu <song@kernel.org> | 2022-09-22 00:05:04 -0700 |
| commit | e2eed85bc75138a9eeb63863d20f8904ac42a577 (patch) | |
| tree | 18bc71d8320d56d06083017a37c13dfb0dccabe6 /drivers/md/raid5.c | |
| parent | md/raid5: Don't read ->active_stripes if it's not needed (diff) | |
| download | linux-dev-e2eed85bc75138a9eeb63863d20f8904ac42a577.tar.xz linux-dev-e2eed85bc75138a9eeb63863d20f8904ac42a577.zip | |
md/raid5: Ensure stripe_fill happens on non-read IO with journal
When doing degrade/recover tests using the journal a kernel BUG
is hit at drivers/md/raid5.c:4381 in handle_parity_checks5():
BUG_ON(!test_bit(R5_UPTODATE, &dev->flags));
This was found to occur because handle_stripe_fill() was skipped
for stripes in the journal due to a condition in that function.
Thus blocks were not fetched and R5_UPTODATE was not set when
the code reached handle_parity_checks5().
To fix this, don't skip handle_stripe_fill() unless the stripe is
for read.
Fixes: 07e83364845e ("md/r5cache: shift complex rmw from read path to write path")
Link: https://lore.kernel.org/linux-raid/e05c4239-41a9-d2f7-3cfa-4aa9d2cea8c1@deltatee.com/
Suggested-by: Song Liu <song@kernel.org>
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Song Liu <song@kernel.org>
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index e0514bda7695..4e6d865a6456 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -4040,7 +4040,7 @@ static void handle_stripe_fill(struct stripe_head *sh, * back cache (prexor with orig_page, and then xor with * page) in the read path */ - if (s->injournal && s->failed) { + if (s->to_read && s->injournal && s->failed) { if (test_bit(STRIPE_R5C_CACHING, &sh->state)) r5c_make_stripe_write_out(sh); goto out; |