From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0940C2BB43 for ; Sun, 14 Aug 2022 15:52:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241959AbiHNPw0 (ORCPT ); Sun, 14 Aug 2022 11:52:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242186AbiHNPvX (ORCPT ); Sun, 14 Aug 2022 11:51:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 075F71AD96; Sun, 14 Aug 2022 08:37:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7A56B60DD3; Sun, 14 Aug 2022 15:37:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34053C43148; Sun, 14 Aug 2022 15:37:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660491424; bh=JDjptrvKjJqW3xN16G0npcUJ09mDN43wulCP7Pndw5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C2Te9zSeG4ovfUetrFeu6GCwR3H4Jglx6UOn0zigMN+Ib33uwgbUZtDaKCW2vNd22 Y9y6O6BAuzkWus6M0hHjGLmd6DGJFWcsJRv3cenxcGqyQ7Cxeqb60Xeud36p4OyJQD AeHB390P7JDbXcuws7wrdvgO48+n+7+/eeGUVYlK5E5BFUjHvxW0lAb0fDeFVn0fWe YGvATBMCkGQwk0lmzCRxT/3E0nBZJFFXqIBuJ44jGUsukm6MSogZbPE9oapNe3d157 Fq51i6BDdEnClOq9EVM3gGFtXhynXF7yQKd44VaNzzub4Dw9RFdjWEsZMOmtXAjNwk cnkhy5Oee0xGg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Kiselev, Oleg" , Theodore Ts'o , Sasha Levin , adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 7/7] ext4: avoid resizing to a partial cluster size Date: Sun, 14 Aug 2022 11:36:52 -0400 Message-Id: <20220814153652.2380549-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814153652.2380549-1-sashal@kernel.org> References: <20220814153652.2380549-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: "Kiselev, Oleg" [ Upstream commit 69cb8e9d8cd97cdf5e293b26d70a9dee3e35e6bd ] This patch avoids an attempt to resize the filesystem to an unaligned cluster boundary. An online resize to a size that is not integral to cluster size results in the last iteration attempting to grow the fs by a negative amount, which trips a BUG_ON and leaves the fs with a corrupted in-memory superblock. Signed-off-by: Oleg Kiselev Link: https://lore.kernel.org/r/0E92A0AB-4F16-4F1A-94B7-702CC6504FDE@amazon.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/resize.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index c367129dcdc1..c16bcd3f2e6d 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1940,6 +1940,16 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count) } brelse(bh); + /* + * For bigalloc, trim the requested size to the nearest cluster + * boundary to avoid creating an unusable filesystem. We do this + * silently, instead of returning an error, to avoid breaking + * callers that blindly resize the filesystem to the full size of + * the underlying block device. + */ + if (ext4_has_feature_bigalloc(sb)) + n_blocks_count &= ~((1 << EXT4_CLUSTER_BITS(sb)) - 1); + retry: o_blocks_count = ext4_blocks_count(es); -- 2.35.1