From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Yu Kuai <yukuai3@huawei.com>, Song Liu <song@kernel.org>,
Sasha Levin <sashal@kernel.org>,
linux-raid@vger.kernel.org
Subject: [PATCH AUTOSEL 6.1 27/49] md: fix soft lockup in status_resync
Date: Thu, 4 May 2023 15:46:04 -0400 [thread overview]
Message-ID: <20230504194626.3807438-27-sashal@kernel.org> (raw)
In-Reply-To: <20230504194626.3807438-1-sashal@kernel.org>
From: Yu Kuai <yukuai3@huawei.com>
[ Upstream commit 6efddf1e32e2a264694766ca485a4f5e04ee82a7 ]
status_resync() will calculate 'curr_resync - recovery_active' to show
user a progress bar like following:
[============>........] resync = 61.4%
'curr_resync' and 'recovery_active' is updated in md_do_sync(), and
status_resync() can read them concurrently, hence it's possible that
'curr_resync - recovery_active' can overflow to a huge number. In this
case status_resync() will be stuck in the loop to print a large amount
of '=', which will end up soft lockup.
Fix the problem by setting 'resync' to MD_RESYNC_ACTIVE in this case,
this way resync in progress will be reported to user.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20230310073855.1337560-3-yukuai1@huaweicloud.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/md/md.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index d5c362b1602b6..bb73a541bb193 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -8028,16 +8028,16 @@ static int status_resync(struct seq_file *seq, struct mddev *mddev)
} else if (resync > max_sectors) {
resync = max_sectors;
} else {
- resync -= atomic_read(&mddev->recovery_active);
- if (resync < MD_RESYNC_ACTIVE) {
- /*
- * Resync has started, but the subtraction has
- * yielded one of the special values. Force it
- * to active to ensure the status reports an
- * active resync.
- */
+ res = atomic_read(&mddev->recovery_active);
+ /*
+ * Resync has started, but the subtraction has overflowed or
+ * yielded one of the special values. Force it to active to
+ * ensure the status reports an active resync.
+ */
+ if (resync < res || resync - res < MD_RESYNC_ACTIVE)
resync = MD_RESYNC_ACTIVE;
- }
+ else
+ resync -= res;
}
if (resync == MD_RESYNC_NONE) {
--
2.39.2
next prev parent reply other threads:[~2023-05-04 19:54 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-04 19:45 [PATCH AUTOSEL 6.1 01/49] wifi: ath: Silence memcpy run-time false positive warning Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 02/49] bpf: Annotate data races in bpf_local_storage Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 03/49] wifi: brcmfmac: pcie: Provide a buffer of random bytes to the device Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 04/49] wifi: brcmfmac: cfg80211: Pass the PMK in binary instead of hex Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 05/49] bpf, mips: Implement DADDI workarounds for JIT Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 06/49] ext2: Check block size validity during mount Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 07/49] scsi: lpfc: Prevent lpfc_debugfs_lockstat_write() buffer overflow Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 08/49] scsi: lpfc: Correct used_rpi count when devloss tmo fires with no recovery Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 09/49] wifi: brcmfmac: slab-out-of-bounds read in brcmf_get_assoc_ies() Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 10/49] bnxt: avoid overflow in bnxt_get_nvram_directory() Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 11/49] net: pasemi: Fix return type of pasemi_mac_start_tx() Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 12/49] net: Catch invalid index in XPS mapping Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 13/49] netdev: Enforce index cap in netdev_get_tx_queue Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 14/49] scsi: target: iscsit: Free cmds before session free Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 15/49] lib: cpu_rmap: Avoid use after free on rmap->obj array entries Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 16/49] scsi: message: mptlan: Fix use after free bug in mptlan_remove() due to race condition Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 17/49] gfs2: Fix inode height consistency check Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 18/49] scsi: ufs: ufs-pci: Add support for Intel Lunar Lake Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 19/49] ext4: set goal start correctly in ext4_mb_normalize_request Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 20/49] ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa() Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 21/49] crypto: jitter - permanent and intermittent health errors Sasha Levin
2023-05-04 19:45 ` [PATCH AUTOSEL 6.1 22/49] f2fs: Fix system crash due to lack of free space in LFS Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 23/49] f2fs: fix to drop all dirty pages during umount() if cp_error is set Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 24/49] f2fs: fix to check readonly condition correctly Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 25/49] samples/bpf: Fix fout leak in hbm's run_bpf_prog Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 26/49] bpf: Add preempt_count_{sub,add} into btf id deny list Sasha Levin
2023-05-04 19:46 ` Sasha Levin [this message]
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 28/49] wifi: iwlwifi: pcie: fix possible NULL pointer dereference Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 29/49] wifi: iwlwifi: add a new PCI device ID for BZ device Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 30/49] wifi: iwlwifi: pcie: Fix integer overflow in iwl_write_to_user_buf Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 31/49] wifi: iwlwifi: mvm: fix ptk_pn memory leak Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 32/49] block, bfq: Fix division by zero error on zero wsum Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 33/49] wifi: ath11k: Ignore frags from uninitialized peer in dp Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 34/49] wifi: iwlwifi: fix iwl_mvm_max_amsdu_size() for MLO Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 35/49] null_blk: Always check queue mode setting from configfs Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 36/49] wifi: iwlwifi: dvm: Fix memcpy: detected field-spanning write backtrace Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 37/49] wifi: ath11k: Fix SKB corruption in REO destination ring Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 38/49] nbd: fix incomplete validation of ioctl arg Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 39/49] ipvs: Update width of source for ip_vs_sync_conn_options Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 40/49] Bluetooth: btusb: Add new PID/VID 04ca:3801 for MT7663 Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 41/49] Bluetooth: Add new quirk for broken local ext features page 2 Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 42/49] Bluetooth: btrtl: add support for the RTL8723CS Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 43/49] Bluetooth: Improve support for Actions Semi ATS2851 based devices Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 44/49] Bluetooth: btrtl: check for NULL in btrtl_set_quirks() Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 45/49] Bluetooth: btintel: Add LE States quirk support Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 46/49] Bluetooth: hci_bcm: Fall back to getting bdaddr from EFI if not set Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 47/49] Bluetooth: Add new quirk for broken set random RPA timeout for ATS2851 Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 48/49] Bluetooth: L2CAP: fix "bad unlock balance" in l2cap_disconnect_rsp Sasha Levin
2023-05-04 19:46 ` [PATCH AUTOSEL 6.1 49/49] Bluetooth: btrtl: Add the support for RTL8851B Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230504194626.3807438-27-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=song@kernel.org \
--cc=stable@vger.kernel.org \
--cc=yukuai3@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox