From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Ojaswin Mujoo <ojaswin@linux.ibm.com>, Jan Kara <jack@suse.cz>,
Baokun Li <libaokun1@huawei.com>, Theodore Ts'o <tytso@mit.edu>,
Sasha Levin <sashal@kernel.org>,
adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org
Subject: [PATCH AUTOSEL 6.6 17/26] ext4: protect ext4_release_dquot against freezing
Date: Thu, 3 Apr 2025 15:07:36 -0400 [thread overview]
Message-ID: <20250403190745.2677620-17-sashal@kernel.org> (raw)
In-Reply-To: <20250403190745.2677620-1-sashal@kernel.org>
From: Ojaswin Mujoo <ojaswin@linux.ibm.com>
[ Upstream commit 530fea29ef82e169cd7fe048c2b7baaeb85a0028 ]
Protect ext4_release_dquot against freezing so that we
don't try to start a transaction when FS is frozen, leading
to warnings.
Further, avoid taking the freeze protection if a transaction
is already running so that we don't need end up in a deadlock
as described in
46e294efc355 ext4: fix deadlock with fs freezing and EA inodes
Suggested-by: Jan Kara <jack@suse.cz>
Signed-off-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
Reviewed-by: Baokun Li <libaokun1@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20241121123855.645335-3-ojaswin@linux.ibm.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/ext4/super.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index f019ce64eba48..26d693813a80f 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -6926,12 +6926,25 @@ static int ext4_release_dquot(struct dquot *dquot)
{
int ret, err;
handle_t *handle;
+ bool freeze_protected = false;
+
+ /*
+ * Trying to sb_start_intwrite() in a running transaction
+ * can result in a deadlock. Further, running transactions
+ * are already protected from freezing.
+ */
+ if (!ext4_journal_current_handle()) {
+ sb_start_intwrite(dquot->dq_sb);
+ freeze_protected = true;
+ }
handle = ext4_journal_start(dquot_to_inode(dquot), EXT4_HT_QUOTA,
EXT4_QUOTA_DEL_BLOCKS(dquot->dq_sb));
if (IS_ERR(handle)) {
/* Release dquot anyway to avoid endless cycle in dqput() */
dquot_release(dquot);
+ if (freeze_protected)
+ sb_end_intwrite(dquot->dq_sb);
return PTR_ERR(handle);
}
ret = dquot_release(dquot);
@@ -6942,6 +6955,10 @@ static int ext4_release_dquot(struct dquot *dquot)
err = ext4_journal_stop(handle);
if (!ret)
ret = err;
+
+ if (freeze_protected)
+ sb_end_intwrite(dquot->dq_sb);
+
return ret;
}
--
2.39.5
next prev parent reply other threads:[~2025-04-03 19:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-03 19:07 [PATCH AUTOSEL 6.6 01/26] wifi: ath12k: Fix invalid entry fetch in ath12k_dp_mon_srng_process Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 02/26] f2fs: don't retry IO for corrupted data scenario Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 03/26] scsi: target: spc: Fix RSOC parameter data header size Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 04/26] net: usb: asix_devices: add FiberGecko DeviceID Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 05/26] page_pool: avoid infinite loop to schedule delayed worker Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 06/26] jfs: Fix uninit-value access of imap allocated in the diMount() function Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 07/26] mptcp: move the whole rx path under msk socket lock protection Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 08/26] fs/jfs: cast inactags to s64 to prevent potential overflow Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 09/26] fs/jfs: Prevent integer overflow in AG size calculation Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 10/26] jfs: Prevent copying of nlink with value 0 from disk inode Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 11/26] jfs: add sanity check for agwidth in dbMount Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 12/26] ata: libata-eh: Do not use ATAPI DMA for a device limited to PIO mode Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 13/26] net: sfp: add quirk for 2.5G OEM BX SFP Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 14/26] wifi: ath12k: Fix invalid data access in ath12k_dp_rx_h_undecap_nwifi Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 15/26] f2fs: fix to avoid out-of-bounds access in f2fs_truncate_inode_blocks() Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 16/26] ahci: add PCI ID for Marvell 88SE9215 SATA Controller Sasha Levin
2025-04-03 19:07 ` Sasha Levin [this message]
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 18/26] Revert "f2fs: rebuild nat_bits during umount" Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 19/26] ext4: ignore xattrs past end Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 20/26] cdc_ether|r8152: ThinkPad Hybrid USB-C/A Dock quirk Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 21/26] scsi: st: Fix array overflow in st_setup() Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 22/26] wifi: mt76: mt76x2u: add TP-Link TL-WDN6200 ID to device table Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 23/26] net: vlan: don't propagate flags on open Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 24/26] tracing: fix return value in __ftrace_event_enable_disable for TRACE_REG_UNREGISTER Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 25/26] Bluetooth: hci_uart: fix race during initialization Sasha Levin
2025-04-03 19:07 ` [PATCH AUTOSEL 6.6 26/26] Bluetooth: qca: simplify WCN399x NVM loading Sasha Levin
2025-04-18 17:04 ` Pavel Machek
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=20250403190745.2677620-17-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=adilger.kernel@dilger.ca \
--cc=jack@suse.cz \
--cc=libaokun1@huawei.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ojaswin@linux.ibm.com \
--cc=stable@vger.kernel.org \
--cc=tytso@mit.edu \
/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