From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795043821; b=XylFvB0AT40t54PZok43teA2sQDigDV08haoi4qfK+RL9ao3HddMVZXIrEmdN97vOVpW +qNUJLgCj5wAxeMvDj/2t4bwu7uxRE6GVZ5m//XzVYD68Tquw4CgipTkSYxh6M5N88i7F HqoBpwng3mkUeoFB9Lzn0rwukG7sWYTIJnat7MfA6QUvAbKSoNiaIdWhgF3K64m146/dA F4wmD3DDqlExCXIz5/ZDt1VrncgVkiOoJTeleKzSU2ZlqhjJ8J2+sxSG9Cv1nT0cCWGXZ 1SBKyiJsWsD1VRCet+E/HKAZMLXWOxRPgZygu59C+gWB5sg0g3tuWrCvzxR6fUicLXg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795043821; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=WgF1DdMvdl60BeORtxp8wQee1/90/WZqPdq53JSamJE=; b=EHi6uhEIBun1mGKOd3fR7iSI8mpsne9J17jFvlBFsvALmxz9DE38t7qC2zP6gHgwHHry 7E1jSX8TQ7o/OZkkSWEYasZl7uWZhgEVxOmh9/YbBLhode3fTzsqXCFhLI/bcU3NauQgU u7hKfICU6heDJtVcw6wtDR9ncEA+73jylLiwA/y31hgL151ol/mK7mvBFnRp0rfdZPT/t 7UXj7rPsLOoqK7jFmkzhKntJ+mOoWE73EbD7rKz8lf4XvkO6JalnztE0tw8jqj4++SNdS sZJCPaEYBlFxwc9rMAhTNZ4yyMLAqRTOX1/U70rqzqnr51qvVpKNv4tRTTbZ6j1MBAQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=A1Wn4lmU; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1584B606A32A; Wed, 18 Nov 2026 23:17:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=A1Wn4lmU Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93F541F000C4; Wed, 18 Nov 2026 23:17:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795043820; bh=WgF1DdMvdl60BeORtxp8wQee1/90/WZqPdq53JSamJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=A1Wn4lmUD4rV+d/X9RzyiWFMlFzRHlzIJBfoq0XmZFYRR0d0xggY3zr3z9U4nRXbV YBMK3DawMzmc4r8kGOIUShQmnyQmxPx5613yqWD9BfDO/lRueuV95fvFRiQOxtBoWq 6V+eenGx2VuhOTMU245VtSaEsh0OsfUfREp/Ly0s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Filipe Manana , Qu Wenruo , David Sterba , Sasha Levin Subject: [PATCH 6.1 0347/2857] btrfs: do not overwrite NODATASUM flag when removing NODATACOW flag Date: Wed, 18 Nov 2026 15:23:01 +0100 Message-ID: <20261118150213.937555056@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Qu Wenruo [ Upstream commit 15f7c86215e8d5f14b24127fa88af6c79363d50e ] [TEST FAILURE] The test case generic/628 will fail if MOUNT_OPTIONS is set to "-o nodatasum": FSTYP -- btrfs PLATFORM -- Linux/x86_64 btrfs-vm 7.1.0-rc4-custom+ #383 SMP PREEMPT_DYNAMIC Sat May 30 07:35:42 ACST 2026 MKFS_OPTIONS -- -O bgt -K /dev/mapper/test-scratch1 MOUNT_OPTIONS -- -o nodatasum /dev/mapper/test-scratch1 /mnt/scratch # generic/628 1s ... - output mismatch (see /home/adam/xfstests/results//generic/628.out.bad) # --- tests/generic/628.out 2022-05-11 11:25:30.816666664 +0930 # +++ /home/adam/xfstests/results//generic/628.out.bad 2026-06-08 18:56:49.878542927 +0930 # @@ -8,8 +8,9 @@ # 310f146ce52077fcd3308dcbe7632bb2 SCRATCH_MNT/a # 310f146ce52077fcd3308dcbe7632bb2 SCRATCH_MNT/d # test reflink flag not set iflag # +XFS_IOC_CLONE: Invalid argument # 310f146ce52077fcd3308dcbe7632bb2 SCRATCH_MNT/a # -310f146ce52077fcd3308dcbe7632bb2 SCRATCH_MNT/b # +d41d8cd98f00b204e9800998ecf8427e SCRATCH_MNT/b # ... [CAUSE] The direct cause is that after "chattr +S", the btrfs inode will lose its NODATASUM flag inherited from the mount option. E.g.: # mkfs.btrfs -f $dev # mount $dev $mnt -o nodatasum # touch $mnt/foobar # sync # btrfs ins dump-tree -t 5 $dev | grep "(257 INODE_ITEM 0) itemoff" -A 3 item 4 key (257 INODE_ITEM 0) itemoff 15879 itemsize 160 generation 9 transid 9 size 0 nbytes 0 block group 0 mode 100644 links 1 uid 0 gid 0 rdev 0 sequence 1 flags 0x1(NODATASUM) ^^^^^^^^^ Proper NODATASUM flag # chattr +S $mnt/foobar # sync # btrfs ins dump-tree -t 5 $dev | grep "(257 INODE_ITEM 0) itemoff" -A 3 item 4 key (257 INODE_ITEM 0) itemoff 15879 itemsize 160 generation 9 transid 10 size 0 nbytes 0 block group 0 mode 100644 links 1 uid 0 gid 0 rdev 0 sequence 2 flags 0x20(SYNC) ^^^^ Only the new SYNC flag This makes the inode drop the old NODATASUM flag, while the new reflink destination will still inherit the NODATASUM flag. The mismatching NODATASUM flags will cause the reflink to fail. The root cause is that, inside btrfs_fileattr_set() if no FS_NOCOW_FL is set, we remove both NODATASUM and NODATACOW flag. However we should not touch NODATASUM flag, as data COW doesn't require checksum. Only NODATACOW implies NODATASUM, but DATACOW doesn't imply DATASUM. The deeper problems are: - Fileattr API is too binary It either clears or sets a flag, there is no "do not change" option. So that why "chattr +S" implies "chattr -C", and is forcing us to change NODATACOW along with NODATASUM flag. - No way to change NODATASUM through fileattr API In fact NODATASUM can only be modified through mount option. The deeper problems are much harder to attack. [FIX] Remove NODATACOW flag when FS_NOCOW_FL is not set, but only remove NODATASUM if "nodatasum" mount option is not set. This allows the existing "chattr +C" then "chattr -C" to remove both NODATACOW and NODATASUM flags on a default mount. But for a mount with "nodatasum" option, the NODATASUM inode flag will persist through either "chattr +C" and "chattr -C". Fixes: 7e97b8daf634 ("btrfs: allow setting NOCOW for a zero sized file via ioctl") Cc: stable@vger.kernel.org Reviewed-by: Filipe Manana Signed-off-by: Qu Wenruo Reviewed-by: David Sterba Signed-off-by: David Sterba [ sashal: Adapted inode->vfs_inode.i_size/i_mode to plain inode->i_size/i_mode and renamed inode_flags to binode_flags to match the older btrfs_fileattr_set() layout. ] Signed-off-by: Sasha Levin --- fs/btrfs/ioctl.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 46534e5d40bca..760da6706f4f9 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -310,14 +310,21 @@ int btrfs_fileattr_set(struct user_namespace *mnt_userns, binode_flags |= BTRFS_INODE_NODATACOW; } } else { - /* - * Revert back under same assumptions as above - */ - if (S_ISREG(inode->i_mode)) { - if (inode->i_size == 0) - binode_flags &= ~(BTRFS_INODE_NODATACOW | - BTRFS_INODE_NODATASUM); - } else { + /* We can only change NODATACOW for zero-sized regular file. */ + if (S_ISREG(inode->i_mode) && (inode->i_size == 0)) { + binode_flags &= ~BTRFS_INODE_NODATACOW; + /* + * There is currently no way to change NODATASUM flag + * through fileattr API. If we unconditionally keep the + * current NODATASUM flag, chattr +C then chattr -C will + * keep the NODATASUM flag, and no way to remove that + * flag. + * + * So respect the current mount option for NODATASUM flag. + */ + if (!btrfs_test_opt(fs_info, NODATASUM)) + binode_flags &= ~BTRFS_INODE_NODATASUM; + } else if (!S_ISREG(inode->i_mode)) { binode_flags &= ~BTRFS_INODE_NODATACOW; } } -- 2.53.0