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 DD57823D298; Wed, 23 Apr 2025 15:05:00 +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=1745420701; cv=none; b=NRBAy9x0V5pDZPYky9aKT9WKsz8RW3ed7nG+wcgzmc1ltin67qkWco1JmajRKUjuFZG9Vr1MPsvEl9i0GxTLLZ4D/hMuM8hrN0ctfZWUbUSHcDXINO1uFvqc9z1uqcIlgb53Z7OaRwsXJA8yPVBsS0I7xPhsXhe2XDTNaEmDKmc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745420701; c=relaxed/simple; bh=VkJdi2knADA+ewtbDCcZCKBz+MCDhvYJb0kmxU/Y/b8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R9eLOOmkKbopbvcJa3eOfxlL1odSSHm3fSX8fRYwwYLFOk84g2K9mTCColr1UBfdEEUd2RNf7daFSfserf+NVrT3//U9y1794d+uCO4kpCV6XZPN39ACtFjZikULRa/USTs488LSZBAgw3SQ6CVFE6RgmHmpysRqvQomnAYjXak= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XTZMc16w; 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="XTZMc16w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F24CC4CEE2; Wed, 23 Apr 2025 15:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745420700; bh=VkJdi2knADA+ewtbDCcZCKBz+MCDhvYJb0kmxU/Y/b8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XTZMc16w7U2jnWzU19gx86eNxqeO7aRnAvcXAw3MiAZvjRyVaV/nj+P2lnOBwoycr bkfwvnoivuUXFQf+QAGulB/9BD1bmxwvU8CxgT8CkhVhayIClrmNsSdG7GCNuN20Rx 46SMTVAKqn1rGLmdIQyimW6jM06E+HRYOkbiGNS8= 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.6 081/393] ext4: protect ext4_release_dquot against freezing Date: Wed, 23 Apr 2025 16:39:37 +0200 Message-ID: <20250423142646.646063637@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142643.246005366@linuxfoundation.org> References: <20250423142643.246005366@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-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 a4d7af7495b78..751c879271e05 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -6933,12 +6933,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); @@ -6949,6 +6962,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