Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp3203059pxp; Mon, 14 Mar 2022 13:15:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxd+kBEuK3qyc4Hr+/CAgRfiPsLtFCvW0AQgBYCr6woiYnLVUjkHMRvWVQMVlm8slJ/Nz55 X-Received: by 2002:aa7:c401:0:b0:415:ce8a:9397 with SMTP id j1-20020aa7c401000000b00415ce8a9397mr22097379edq.389.1647288918411; Mon, 14 Mar 2022 13:15:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647288918; cv=none; d=google.com; s=arc-20160816; b=HWHem/vGOuF56jOygSqk11mZXrRq92JAE2rGEZccu01a+ik1ngBtXw4sGqdH6sqFTa y8YnjGSlbIQP/Lk5ZWE4NSELJ3oMzpxte74TEUYxfqDMDl3TF98KBppeXaFFpmxFUimo U6G43HfQTeVJdRCkFf3FQ2rYQPJ8jA/aQQHqH/0TVaZ9dTt2Hno7uZB6CTJkHoDE4Dgu j3oBjI638m5PYmGxjePsWtZYshb2+oKnHSPQkhKqRa54rU74mG2rWMQHAamnSvu9WMkj UrtchN17DOTAYej3FAdjWn5911lXP5+71U+OkpIbTvp6zu+AlBJZcAyjrpsUNcJDWfyL CSDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ABHlOOJPkefEpvH3ARM7vDziIJjCnKOyRKPafDabbpw=; b=qpPvrWzoKTERFpTEtqw3bsD6PYkqt85+w55yPu96vFDoFMdtS4kI8Fu9t5wPvS0Nkf qKV66BxrPpW+E/suGu3DI/bsIWPkvZqpWhsc1D6QhBZOmyUIyI3LQmMIFRrLDyRfhSXY RG7vWA9rEfWxzkA0AhVkhO6O1SxM5reWQbMtzi0eaVuPMnOLxh1dkEMbBz0BcMvuvdvS Vm1EO9F+UX2Ny4fO718VpBpl9TGiHkbrKa1nV2obp/x8nQ9o+2tSAXAq4J0w4YOgIvG0 Snfs/33GillqOELhyDxEuQ9gH6a6nwzCCVxFKnpd1jBcgQEucf8i2FZn9X8nykyQRx9W 8ueQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="1PUygYS/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f19-20020a0564021e9300b00416c8deffdcsi8809371edf.449.2022.03.14.13.14.52; Mon, 14 Mar 2022 13:15:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="1PUygYS/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240090AbiCNMAp (ORCPT + 99 others); Mon, 14 Mar 2022 08:00:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240004AbiCNMAX (ORCPT ); Mon, 14 Mar 2022 08:00:23 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 587482719; Mon, 14 Mar 2022 04:58:24 -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 sin.source.kernel.org (Postfix) with ESMTPS id 4A4A1CE1265; Mon, 14 Mar 2022 11:58:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 227B7C340E9; Mon, 14 Mar 2022 11:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1647259097; bh=M8ax33quUGmZY4WEvx5nH5KNIApyPzylG8aYXe9hmrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1PUygYS/+71FTFKMEelV2/12H69RUsMtRzMoywNk4PP6xQoIlD/VPSYUyKL5p21ch WvCzeSqD9wBJOVl0nGkpyGvfacEdH9ftVDByJ/g/nW8R93MsIGGDuE5r1CpxYMf9ko dX21fcMB+84ZY6CQt1S+AlYI/flsQyVJ3zTBDtNQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josh Triplett , Theodore Tso Subject: [PATCH 5.4 39/43] ext4: add check to prevent attempting to resize an fs with sparse_super2 Date: Mon, 14 Mar 2022 12:53:50 +0100 Message-Id: <20220314112735.516023170@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220314112734.415677317@linuxfoundation.org> References: <20220314112734.415677317@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josh Triplett commit b1489186cc8391e0c1e342f9fbc3eedf6b944c61 upstream. The in-kernel ext4 resize code doesn't support filesystem with the sparse_super2 feature. It fails with errors like this and doesn't finish the resize: EXT4-fs (loop0): resizing filesystem from 16640 to 7864320 blocks EXT4-fs warning (device loop0): verify_reserved_gdb:760: reserved GDT 2 missing grp 1 (32770) EXT4-fs warning (device loop0): ext4_resize_fs:2111: error (-22) occurred during file system resize EXT4-fs (loop0): resized filesystem to 2097152 To reproduce: mkfs.ext4 -b 4096 -I 256 -J size=32 -E resize=$((256*1024*1024)) -O sparse_super2 ext4.img 65M truncate -s 30G ext4.img mount ext4.img /mnt python3 -c 'import fcntl, os, struct ; fd = os.open("/mnt", os.O_RDONLY | os.O_DIRECTORY) ; fcntl.ioctl(fd, 0x40086610, struct.pack("Q", 30 * 1024 * 1024 * 1024 // 4096), False) ; os.close(fd)' dmesg | tail e2fsck ext4.img The userspace resize2fs tool has a check for this case: it checks if the filesystem has sparse_super2 set and if the kernel provides /sys/fs/ext4/features/sparse_super2. However, the former check requires manually reading and parsing the filesystem superblock. Detect this case in ext4_resize_begin and error out early with a clear error message. Signed-off-by: Josh Triplett Link: https://lore.kernel.org/r/74b8ae78405270211943cd7393e65586c5faeed1.1623093259.git.josh@joshtriplett.org Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/ext4/resize.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -74,6 +74,11 @@ int ext4_resize_begin(struct super_block return -EPERM; } + if (ext4_has_feature_sparse_super2(sb)) { + ext4_msg(sb, KERN_ERR, "Online resizing not supported with sparse_super2"); + return -EOPNOTSUPP; + } + if (test_and_set_bit_lock(EXT4_FLAGS_RESIZING, &EXT4_SB(sb)->s_ext4_flags)) ret = -EBUSY;