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 7BDE234F49A for ; Wed, 25 Feb 2026 13:23:05 +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=1772025785; cv=none; b=D09GPYX7MP9p0j8dlnGltTYuQf0SsTDZwOjB2+5NvtPruyfqQz2/jgLWMFAvQnSV4k8y3951fyYurfXtR9ZyrfL45Qi0yOEh0DLR3FG2O4TOaqX9HBThJ23hP/NwKNerwWZlfYLvmFh1few7dTRLC5FF5r2M8QjRYH9LhLVs2Wg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772025785; c=relaxed/simple; bh=6EwtloHH8zTNCsVXU2JNfULYTrkQVwF6+z9/CToBFtQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X6DBTX97zYvSurh+UcThoHDNgrFlkCyBXrmrSQpRtbsyvPBbvK9tKc7QlEB+c2LC7Jbs2YidZb+6YmvwIB8ND8uX07PVUUwlIzK4ytpbwHFlP6h7GIGpyhfZ0kpkaXj0LJkrVsA2jRTtx4KuKbK1YvGHKxhORH1uWF6HxHhHPGk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PzXNGGFw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PzXNGGFw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8531C2BC86; Wed, 25 Feb 2026 13:23:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772025785; bh=6EwtloHH8zTNCsVXU2JNfULYTrkQVwF6+z9/CToBFtQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PzXNGGFwBH+GDmHy0D9CIslagTCr8Rs+uOBDkIzMI4tAPu0gAQuyRf7/v1GRaFnWb HfA0xDtP8kvARL3LQAH0AEMXXtrN9RzkHXKoVDu6jfcvb+eCi6MhGre51tPhV3JYUk QgxoefdMec4dBdR6Mz99K5XjLtQDEmlRxJcMxYtD6SnbcdaYTZyBqFVlPqcVUyczz+ zmuwRnTwWhwBt7p0P3OocfNxc2B/bbmfaITjmXNlZHx1mClVdl8wlFrJ5qIEJ3FdnY xQlsaE9NVwxIbSpHdRHWgpZsIYK7M21wRLqX1dmB6v44CzuQaaupMpxsLrSm6n3cur V55OViayST6Xw== From: Sasha Levin To: stable@vger.kernel.org Cc: Theodore Ts'o , Sasha Levin Subject: [PATCH 6.1.y 2/6] ext4: convert some BUG_ON's in mballoc to use WARN_RATELIMITED instead Date: Wed, 25 Feb 2026 08:22:58 -0500 Message-ID: <20260225132302.222887-2-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260225132302.222887-1-sashal@kernel.org> References: <2026022401-arose-calm-3e73@gregkh> <20260225132302.222887-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Theodore Ts'o [ Upstream commit 19b8b035a776939ceb3de0f45aded4751d7849ef ] In cases where we have an obvious way of continuing, let's use WARN_RATELIMITED() instead of BUG_ON(). Signed-off-by: Theodore Ts'o Stable-dep-of: bdc56a9c46b2 ("ext4: fix e4b bitmap inconsistency reports") Signed-off-by: Sasha Levin --- fs/ext4/mballoc.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index bf53a6b283ae4..e44dd404fe407 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1533,7 +1533,13 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, put_page(page); page = find_or_create_page(inode->i_mapping, pnum, gfp); if (page) { - BUG_ON(page->mapping != inode->i_mapping); + if (WARN_RATELIMIT(page->mapping != inode->i_mapping, + "ext4: bitmap's paging->mapping != inode->i_mapping\n")) { + /* should never happen */ + unlock_page(page); + ret = -EINVAL; + goto err; + } if (!PageUptodate(page)) { ret = ext4_mb_init_cache(page, NULL, gfp); if (ret) { @@ -1569,7 +1575,13 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, put_page(page); page = find_or_create_page(inode->i_mapping, pnum, gfp); if (page) { - BUG_ON(page->mapping != inode->i_mapping); + if (WARN_RATELIMIT(page->mapping != inode->i_mapping, + "ext4: buddy bitmap's page->mapping != inode->i_mapping\n")) { + /* should never happen */ + unlock_page(page); + ret = -EINVAL; + goto err; + } if (!PageUptodate(page)) { ret = ext4_mb_init_cache(page, e4b->bd_bitmap, gfp); @@ -2288,7 +2300,9 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac, continue; buddy = mb_find_buddy(e4b, i, &max); - BUG_ON(buddy == NULL); + if (WARN_RATELIMIT(buddy == NULL, + "ext4: mb_simple_scan_group: mb_find_buddy failed, (%d)\n", i)) + continue; k = mb_find_next_zero_bit(buddy, max, 0); if (k >= max) { @@ -4314,15 +4328,14 @@ static void ext4_discard_allocated_blocks(struct ext4_allocation_context *ac) if (ac->ac_f_ex.fe_len == 0) return; err = ext4_mb_load_buddy(ac->ac_sb, ac->ac_f_ex.fe_group, &e4b); - if (err) { + if (WARN_RATELIMIT(err, + "ext4: mb_load_buddy failed (%d)", err)) /* * This should never happen since we pin the * pages in the ext4_allocation_context so * ext4_mb_load_buddy() should never fail. */ - WARN(1, "mb_load_buddy failed (%d)", err); return; - } ext4_lock_group(ac->ac_sb, ac->ac_f_ex.fe_group); mb_free_blocks(ac->ac_inode, &e4b, ac->ac_f_ex.fe_start, ac->ac_f_ex.fe_len); -- 2.51.0