Commit a484bc73 authored by Xiao Ni's avatar Xiao Ni Committed by Kleber Sacilotto de Souza

RAID10 BUG_ON in raise_barrier when force is true and conf->barrier is 0

BugLink: https://bugs.launchpad.net/bugs/1798770

[ Upstream commit 1d0ffd26 ]

In raid10 reshape_request it gets max_sectors in read_balance. If the underlayer disks
have bad blocks, the max_sectors is less than last. It will call goto read_more many
times. It calls raise_barrier(conf, sectors_done != 0) every time. In this condition
sectors_done is not 0. So the value passed to the argument force of raise_barrier is
true.

In raise_barrier it checks conf->barrier when force is true. If force is true and
conf->barrier is 0, it panic. In this case reshape_request submits bio to under layer
disks. And in the callback function of the bio it calls lower_barrier. If the bio
finishes before calling raise_barrier again, it can trigger the BUG_ON.

Add one pair of raise_barrier/lower_barrier to fix this bug.
Signed-off-by: default avatarXiao Ni <xni@redhat.com>
Suggested-by: default avatarNeil Brown <neilb@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent e4485423
...@@ -4336,11 +4336,12 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, ...@@ -4336,11 +4336,12 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr,
allow_barrier(conf); allow_barrier(conf);
} }
raise_barrier(conf, 0);
read_more: read_more:
/* Now schedule reads for blocks from sector_nr to last */ /* Now schedule reads for blocks from sector_nr to last */
r10_bio = mempool_alloc(conf->r10buf_pool, GFP_NOIO); r10_bio = mempool_alloc(conf->r10buf_pool, GFP_NOIO);
r10_bio->state = 0; r10_bio->state = 0;
raise_barrier(conf, sectors_done != 0); raise_barrier(conf, 1);
atomic_set(&r10_bio->remaining, 0); atomic_set(&r10_bio->remaining, 0);
r10_bio->mddev = mddev; r10_bio->mddev = mddev;
r10_bio->sector = sector_nr; r10_bio->sector = sector_nr;
...@@ -4445,6 +4446,8 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, ...@@ -4445,6 +4446,8 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr,
if (sector_nr <= last) if (sector_nr <= last)
goto read_more; goto read_more;
lower_barrier(conf);
/* Now that we have done the whole section we can /* Now that we have done the whole section we can
* update reshape_progress * update reshape_progress
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment