| Message ID | 20240603125815.2199072-13-yukuai3@huawei.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | md: refacotor and some fixes related to sync_thread | expand |
| Context | Check | Description |
|---|---|---|
| mdraidci/vmtest-md-6_11-VM_Test-7 | pending | Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17 |
| mdraidci/vmtest-md-6_11-VM_Test-8 | pending | Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17 and -O2 optimization |
| mdraidci/vmtest-md-6_11-VM_Test-9 | pending | Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18 |
| mdraidci/vmtest-md-6_11-VM_Test-2 | success | Logs for Unittests |
| mdraidci/vmtest-md-6_11-VM_Test-1 | success | Logs for ShellCheck |
| mdraidci/vmtest-md-6_11-VM_Test-3 | success | Logs for Validate matrix.py |
| mdraidci/vmtest-md-6_11-VM_Test-10 | pending | Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18 and -O2 optimization |
| mdraidci/vmtest-md-6_11-VM_Test-5 | pending | Logs for x86_64-gcc / build / build for x86_64 with gcc |
| mdraidci/vmtest-md-6_11-VM_Test-4 | success | Logs for set-matrix |
| mdraidci/vmtest-md-6_11-VM_Test-6 | success | Logs for x86_64-gcc / build-release |
| mdraidci/vmtest-md-6_11-PR | success | PR summary |
| mdraidci/vmtest-md-6_11-VM_Test-0 | success | Logs for build-kernel |
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 69a083ca41a3..d4c30a94e4e4 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -6255,7 +6255,9 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, int *sk safepos = conf->reshape_safe; sector_div(safepos, data_disks); if (mddev->reshape_backwards) { - BUG_ON(writepos < reshape_sectors); + if (WARN_ON(writepos < reshape_sectors)) + return MaxSector; + writepos -= reshape_sectors; readpos += reshape_sectors; safepos += reshape_sectors; @@ -6273,14 +6275,18 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, int *sk * to set 'stripe_addr' which is where we will write to. */ if (mddev->reshape_backwards) { - BUG_ON(conf->reshape_progress == 0); + if (WARN_ON(conf->reshape_progress == 0)) + return MaxSector; + stripe_addr = writepos; - BUG_ON((mddev->dev_sectors & - ~((sector_t)reshape_sectors - 1)) - - reshape_sectors - stripe_addr - != sector_nr); + if (WARN_ON((mddev->dev_sectors & + ~((sector_t)reshape_sectors - 1)) - + reshape_sectors - stripe_addr != sector_nr)) + return MaxSector; } else { - BUG_ON(writepos != sector_nr + reshape_sectors); + if (WARN_ON(writepos != sector_nr + reshape_sectors)) + return MaxSector; + stripe_addr = sector_nr; }
Currently, mdadm support --revert-reshape to abort the reshape while reassembling, as the test 07revert-grow. However, following BUG_ON() can be triggerred by the test: kernel BUG at drivers/md/raid5.c:6278! invalid opcode: 0000 [#1] PREEMPT SMP PTI irq event stamp: 158985 CPU: 6 PID: 891 Comm: md0_reshape Not tainted 6.9.0-03335-g7592a0b0049a #94 RIP: 0010:reshape_request+0x3f1/0xe60 Call Trace: <TASK> raid5_sync_request+0x43d/0x550 md_do_sync+0xb7a/0x2110 md_thread+0x294/0x2b0 kthread+0x147/0x1c0 ret_from_fork+0x59/0x70 ret_from_fork_asm+0x1a/0x30 </TASK> Root cause is that --revert-reshape update the raid_disks from 5 to 4, while reshape position is still set, and after reassembling the array, reshape position will be read from super block, then during reshape the checking of 'writepos' that is caculated by old reshape position will fail. Fix this panic the easy way first, by converting the BUG_ON() to WARN_ON(), and stop the reshape if checkings fail. Noted that mdadm must fix --revert-shape as well, and probably md/raid should enhance metadata validation as well, however this means reassemble will fail and there must be user tools to fix the wrong metadata. Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- drivers/md/raid5.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)