From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B627C256C82; Thu, 17 Apr 2025 17:59:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744912791; cv=none; b=TE3UDiu59qY/IRqI47TGjYIvFPxqMLA22ejbtRpDL6vnyEae+W2BhScC2dhREVgE99UhH4JdsCW/lnjLi2lYuZw0iZpY1hkMv4l+5Qv67kw7TNJW5chgArffkbT6QYbqh1cPIBIgWSUWGvTaKsnRzOb7uOJPZ1eieqVUbbv1s0k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744912791; c=relaxed/simple; bh=CG9Hx+jDLP38eCzk+suuZ62ohm4GNEDR9zdUXpEwymw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h1jqMgTAQZ8JxLCHDGfEkNN3HAh48W5dKSOXMpBaqDH/v2nD6n6h4crK5zDNbgdHDCFWFgqO03ILyUZ9aaeJv+c4vaj7BvVTYrJoHFEuV+TmCiRWyXY4tYysmv2LuSMYk0HMmPGCuNvjMRT92KE9poJUO8zGD51Vel540UmaJIc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OGtBQQZ7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="OGtBQQZ7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 461C3C4CEE4; Thu, 17 Apr 2025 17:59:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744912791; bh=CG9Hx+jDLP38eCzk+suuZ62ohm4GNEDR9zdUXpEwymw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OGtBQQZ7RU7Lu5msTuaSPj9ZZPKlO0e5fmatO59rfDnk25drS+HlLwRouyeezXMCU isVkb7cH7ZU2VQwj+ZBAQJSFflNTFt8SN4vVvVYWjAQ/JRa0r4VWVU/Wyo3wrJtWaR AB4PvIX0w/R3Htqfx+RBKGtotKKNu3n8LLp5b9CA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jan Kara , Ojaswin Mujoo , Baokun Li , Theodore Tso , Sasha Levin Subject: [PATCH 6.14 125/449] ext4: protect ext4_release_dquot against freezing Date: Thu, 17 Apr 2025 19:46:53 +0200 Message-ID: <20250417175122.997493715@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250417175117.964400335@linuxfoundation.org> References: <20250417175117.964400335@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ojaswin Mujoo [ 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 Signed-off-by: Ojaswin Mujoo Reviewed-by: Baokun Li Reviewed-by: Jan Kara Link: https://patch.msgid.link/20241121123855.645335-3-ojaswin@linux.ibm.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/super.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index dc46a7063f1e1..528979de0f7c1 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -6938,12 +6938,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); @@ -6954,6 +6967,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