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 7BF8A1448C3; Tue, 27 Feb 2024 13:29:38 +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=1709040578; cv=none; b=NC99pu1WcEw8cACqO1IUeWFtkCssOBI/kJNM+xpxQNKPxcXEheuivVNw2C94aerAmrJBNacF//FmeDT2P2sa7wPxhteeNveprZmAwKlh/H5Ro+2AuI5iKj/gULuFSbv+Volye9EtqLCiOQWTdW7g8PDoJYZ6MACtIC34Dmkwx2c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709040578; c=relaxed/simple; bh=GzPtIV48Ma9336SxWFs8Kp9vB6RmyqTTAr935Pt/Mao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SNSKPLrbIxJCIOawsOCRvWSi/UwuL/bFUtpTsCRP0zYcQugHueNU1qH20+TAgI5Ny649u3ikAzAIcl/hE6o5Rx5Byi7IuY6zkkRubi6ui4AXeEjTITZdWbWYscb0SYF4QXTVn0qjp5TjzS+lSCbD6TG2fUo0A7knU6GZ3dJ5UOE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AmgbVY1+; 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="AmgbVY1+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 091DCC433F1; Tue, 27 Feb 2024 13:29:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709040578; bh=GzPtIV48Ma9336SxWFs8Kp9vB6RmyqTTAr935Pt/Mao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AmgbVY1+sh30Ebvu1/Ippr9LuKqUhASUmJn/62wwC8NhQXj+Tbo/9bmg/ph3v+HKs Mt7isfNaR2VKwkPFRRCBBnPphqbp1UHMgY259/IBTZxMOBYQykWmLOWLiGt4GB//V6 TqrlS/z6SydGyGuUTR4uPG/bJ/0idmHLGFW9U+Hc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Baokun Li , Jan Kara , Theodore Tso , Sasha Levin Subject: [PATCH 6.7 035/334] ext4: avoid allocating blocks from corrupted group in ext4_mb_try_best_found() Date: Tue, 27 Feb 2024 14:18:13 +0100 Message-ID: <20240227131631.725708165@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131630.636392135@linuxfoundation.org> References: <20240227131630.636392135@linuxfoundation.org> User-Agent: quilt/0.67 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.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Baokun Li [ Upstream commit 4530b3660d396a646aad91a787b6ab37cf604b53 ] Determine if the group block bitmap is corrupted before using ac_b_ex in ext4_mb_try_best_found() to avoid allocating blocks from a group with a corrupted block bitmap in the following concurrency and making the situation worse. ext4_mb_regular_allocator ext4_lock_group(sb, group) ext4_mb_good_group // check if the group bbitmap is corrupted ext4_mb_complex_scan_group // Scan group gets ac_b_ex but doesn't use it ext4_unlock_group(sb, group) ext4_mark_group_bitmap_corrupted(group) // The block bitmap was corrupted during // the group unlock gap. ext4_mb_try_best_found ext4_lock_group(ac->ac_sb, group) ext4_mb_use_best_found mb_mark_used // Allocating blocks in block bitmap corrupted group Signed-off-by: Baokun Li Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20240104142040.2835097-7-libaokun1@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/mballoc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 528d15630a94f..1bc615d621917 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2305,6 +2305,9 @@ void ext4_mb_try_best_found(struct ext4_allocation_context *ac, return; ext4_lock_group(ac->ac_sb, group); + if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(e4b->bd_info))) + goto out; + max = mb_find_extent(e4b, ex.fe_start, ex.fe_len, &ex); if (max > 0) { @@ -2312,6 +2315,7 @@ void ext4_mb_try_best_found(struct ext4_allocation_context *ac, ext4_mb_use_best_found(ac, e4b); } +out: ext4_unlock_group(ac->ac_sb, group); ext4_mb_unload_buddy(e4b); } -- 2.43.0