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 70038C25B06 for ; Sun, 14 Aug 2022 15:52:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241792AbiHNPwR (ORCPT ); Sun, 14 Aug 2022 11:52:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241951AbiHNPun (ORCPT ); Sun, 14 Aug 2022 11:50:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A712D167DC; Sun, 14 Aug 2022 08:36:10 -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 43F8960DDA; Sun, 14 Aug 2022 15:36:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00642C433D7; Sun, 14 Aug 2022 15:36:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660491369; bh=5UPJ1gQ/Tl9tcKWdYwWMLOm2gVJnQKZ6vmhSg9dzOes=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K9NkjSPc5HMIzyy9jQEZ7leFKBrrTAwVxVBjtF+r17oCG5M+fPLImg/UEskDXiryA Hst1iIBJpyVmmR2xMGePFPplD8bcWPG0bGK9e2Tf6W1Z7tD0uvzMvcH+MPXaQsxFPo cVxOzK45NbBeI/vFhXvd0CzMK5v06pAyCkAAGDKb5bjvFgbmzCNzWNBs1Gg4jDwfoe CrxM32CPhIzS26+AX/1Im/GaobEtVcMgIJPeXJSFwSUnyYNaeS5FAuozAuPygt5Hm/ +Dr4oJWWXnOuSp5QBKXLTCjMxYCiuKLwOTB6X/fvwglZOCYoDHqCFdScirZsNjN8vZ AZ9fxysXWktSw== 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 5.4 21/21] ext4: avoid resizing to a partial cluster size Date: Sun, 14 Aug 2022 11:35:31 -0400 Message-Id: <20220814153531.2379705-21-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814153531.2379705-1-sashal@kernel.org> References: <20220814153531.2379705-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 6410c1e098d3..76bb877693be 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1978,6 +1978,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