diff mbox series

[-next] md: don't wait for MD_RECOVERY_NEEDED for HOT_REMOVE_DISK ioctl

Message ID 20240627112321.3044744-1-yukuai1@huaweicloud.com (mailing list archive)
State Accepted
Headers show
Series [-next] md: don't wait for MD_RECOVERY_NEEDED for HOT_REMOVE_DISK ioctl | expand

Checks

Context Check Description
mdraidci/vmtest-md-6_11-PR success PR summary
mdraidci/vmtest-md-6_11-VM_Test-0 success Logs for build-kernel

Commit Message

Yu Kuai June 27, 2024, 11:23 a.m. UTC 
From: Yu Kuai <yukuai3@huawei.com>

Commit 90f5f7ad4f38 ("md: Wait for md_check_recovery before attempting
device removal.") explained in the commit message that failed device
must be reomoved from the personality first by md_check_recovery(),
before it can be removed from the array. That's the reason the commit
add the code to wait for MD_RECOVERY_NEEDED.

However, this is not the case now, because remove_and_add_spares() is
called directly from hot_remove_disk() from ioctl path, hence failed
device(marked faulty) can be removed from the personality by ioctl.

On the other hand, the commit introduced a performance problem that
if MD_RECOVERY_NEEDED is set and the array is not running, ioctl will
wait for 5s before it can return failure to user.

Since the waiting is not needed now, fix the problem by removing the
waiting.

Fixes: 90f5f7ad4f38 ("md: Wait for md_check_recovery before attempting device removal.")
Reported-by: Mateusz Kusiak <mateusz.kusiak@linux.intel.com>
Closes: https://lore.kernel.org/all/814ff6ee-47a2-4ba0-963e-cf256ee4ecfa@linux.intel.com/
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
 drivers/md/md.c | 6 ------
 1 file changed, 6 deletions(-)

Comments

Song Liu July 4, 2024, 7:08 a.m. UTC | #1 
On Thu, Jun 27, 2024 at 7:24 PM Yu Kuai <yukuai1@huaweicloud.com> wrote:
>
> From: Yu Kuai <yukuai3@huawei.com>
>
> Commit 90f5f7ad4f38 ("md: Wait for md_check_recovery before attempting
> device removal.") explained in the commit message that failed device
> must be reomoved from the personality first by md_check_recovery(),
> before it can be removed from the array. That's the reason the commit
> add the code to wait for MD_RECOVERY_NEEDED.
>
> However, this is not the case now, because remove_and_add_spares() is
> called directly from hot_remove_disk() from ioctl path, hence failed
> device(marked faulty) can be removed from the personality by ioctl.
>
> On the other hand, the commit introduced a performance problem that
> if MD_RECOVERY_NEEDED is set and the array is not running, ioctl will
> wait for 5s before it can return failure to user.
>
> Since the waiting is not needed now, fix the problem by removing the
> waiting.
>
> Fixes: 90f5f7ad4f38 ("md: Wait for md_check_recovery before attempting device removal.")
> Reported-by: Mateusz Kusiak <mateusz.kusiak@linux.intel.com>
> Closes: https://lore.kernel.org/all/814ff6ee-47a2-4ba0-963e-cf256ee4ecfa@linux.intel.com/
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>

Applied to md-6.11. Thanks!

Song
diff mbox series

Patch

diff --git a/drivers/md/md.c b/drivers/md/md.c
index c0426a6d2fd1..da3065a3c2fb 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -7827,12 +7827,6 @@  static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
 		return get_bitmap_file(mddev, argp);
 	}
 
-	if (cmd == HOT_REMOVE_DISK)
-		/* need to ensure recovery thread has run */
-		wait_event_interruptible_timeout(mddev->sb_wait,
-						 !test_bit(MD_RECOVERY_NEEDED,
-							   &mddev->recovery),
-						 msecs_to_jiffies(5000));
 	if (cmd == STOP_ARRAY || cmd == STOP_ARRAY_RO) {
 		/* Need to flush page cache, and ensure no-one else opens
 		 * and writes