fstests: Vertify dir permissions when creating a stub subvolume
PATCH v4 1/1 fstests: Vertify dir permissions when creating a stub subvolume
btrfs supports creating nesting subvolumes however snapshots are not recurive. When a snapshot is taken of a volume which contains a subvolume the subvolume is replaced with a stub subvolume which has the same name and uses inode number 2. This test validates that the stub volume copies permissions of the original volume.
---
v4:
- Removed extra blank line in common/rc
- Allowed caller to pass extra options to _require_unshare to check for support. -f -r -m -p -U have been supported by util-linux and busybox for awhile and are typical options.
- Moved _registry_cleanup to right after _begin_fstest.
- Added "cd /;rm -rf $tmp.*" from standard cleanup to 300 cleanup.
- Added rm -rf $test_dir before running test to ensure its in a clean state. v3:
- Fixed whitepsace in 300.out due to find command not using './' before %P v2:
- Migrated _require_unshare from overlay/020 into common_rc. Updated the error message as most Linux systems should have unshare from util-linux.
- Added note about why the test must be done in one subshell process.
- chown command now uses $qa_user:$qa_group instead of hard coded values.
common/rc | 5 +++++
tests/btrfs/300 | 49 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/300.out | 18 +++++++++++++++++ tests/overlay/020 | 7 +------ 4 files changed, 73 insertions(+), 6 deletions(-) create mode 100755 tests/btrfs/300 create mode 100644 tests/btrfs/300.out
common/rc +5 -0
@@ -5224,6 +5224,11 @@ _soak_loop_running() { return 0 } +_require_unshare() { + unshare -f -r -m -p -U $@ true &>/dev/null || \ + _notrun "unshare: command not found, should be in util-linux" +} + init_rc ################################################################################
tests/btrfs/300 new file +49 -0
49 lines not on this page · raw message
tests/btrfs/300.out new file +18 -0
@@ -0,0 +1,18 @@ +QA output created by 300 +Create subvolume './subvol' +Create subvolume 'subvol/subsubvol' +Create a snapshot of 'subvol' in './snapshot' +drwxr-xr-x fsgqa fsgqa ./ +drwxr-xr-x fsgqa fsgqa ./subvol +-rw-r--r-- fsgqa fsgqa ./subvol/1 +-rw-r--r-- fsgqa fsgqa ./subvol/2 +-rw-r--r-- fsgqa fsgqa ./subvol/3 +drwxr-xr-x fsgqa fsgqa ./subvol/subsubvol +-rw-r--r-- fsgqa fsgqa ./subvol/subsubvol/4 +-rw-r--r-- fsgqa fsgqa ./subvol/subsubvol/5 +-rw-r--r-- fsgqa fsgqa ./subvol/subsubvol/6 +drwxr-xr-x fsgqa fsgqa ./snapshot +-rw-r--r-- fsgqa fsgqa ./snapshot/1 +-rw-r--r-- fsgqa fsgqa ./snapshot/2 +-rw-r--r-- fsgqa fsgqa ./snapshot/3 +drwxr-xr-x fsgqa fsgqa ./snapshot/subsubvol
tests/overlay/020 +1 -6
@@ -16,18 +16,13 @@ _begin_fstest auto quick copyup perms # real QA test starts here -require_unshare() { - unshare -f -r "$@" true &>/dev/null || \ - _notrun "unshare $@: not supported" -} - # Modify as appropriate. _supported_fs overlay _fixed_by_kernel_commit 3fe6e52f0626 \ "ovl: override creds with the ones from the superblock mounter" _require_scratch -require_unshare -m -p -U +_require_unshare # Remove all files from previous tests _scratch_mkfs
Signature · 1 line
2.34.1
Quoted 6 lines · Lee Trager
btrfs supports creating nesting subvolumes however snapshots are not recurive. When a snapshot is taken of a volume which contains a subvolume the subvolume is replaced with a stub subvolume which has the same name and uses inode number 2. This test validates that the stub volume copies permissions of the original volume.
Signed-off-by Lee Trager <[email protected]>
Quoted 9 lines
---
v4:
- Removed extra blank line in common/rc
- Allowed caller to pass extra options to_require_unshareto check for support. -f -r -m -p -U have been supported by util-linux and busybox for awhile and are typical options.
- Moved_registry_cleanupto right after_begin_fstest.
- Added "cd /;rm -rf $tmp.*" from standard cleanup to 300 cleanup.
- Added rm -rf $test_dir before running test to ensure its in a clean state.
Thanks for this change.
Is there a known upstream 'fix' for this test? Due to it failed [1] when I tried to run it. If there's a known fix, please use _fixed_by_kernel_commit or _fixed_by_git_commit to point out.
Thanks,
Zorro
[1]
# uname -r 6.5.0-0.rc6.43.fc40.x86_64 # rpm -q btrfs-progs btrfs-progs-6.3.2-3.fc39.x86_64 # ./check -s simpledev btrfs/300 SECTION -- simpledev FSTYP -- btrfs PLATFORM -- Linux/x86_64 hp-xxxxxx-01 6.5.0-0.rc6.43.fc40.x86_64 #1 SMP PREEMPT_DYNAMIC Mon Jul 24 13:32:24 UTC 2023 MKFS_OPTIONS -- /dev/sda3 MOUNT_OPTIONS -- -o context=system_u:object_r:root_t:s0 /dev/sda3 /mnt/scratch
btrfs/300 - output mismatch (see /root/git/xfstests/results//simpledev/btrfs/300.out.bad)
--- tests/btrfs/300.out 2023-08-16 17:53:23.408870265 +0800
+++ /root/git/xfstests/results//simpledev/btrfs/300.out.bad 2023-08-16 17:54:02.925281855 +0800
@@ -15,4 +15,4 @@
-rw-r--r-- fsgqa fsgqa ./snapshot/1
-rw-r--r-- fsgqa fsgqa ./snapshot/2
-rw-r--r-- fsgqa fsgqa ./snapshot/3
-drwxr-xr-x fsgqa fsgqa ./snapshot/subsubvol
+drwxr-xr-x root root ./snapshot/subsubvol
...
(Run 'diff -u /root/git/xfstests/tests/btrfs/300.out /root/git/xfstests/results//simpledev/btrfs/300.out.bad' to see the entire diff)Ran: btrfs/300
Failures: btrfs/300
Failed 1 of 1 tests
SECTION -- simpledev
=========================
Ran: btrfs/300
Failures: btrfs/300
Failed 1 of 1 tests
Quoted 137 lines
v3:
- Fixed whitepsace in 300.out due to find command not using './' before %P v2:
- Migrated_require_unsharefrom overlay/020 intocommon_rc. Updated the error message as most Linux systems should have unshare from util-linux.
- Added note about why the test must be done in one subshell process.
- chown command now uses $qa_user:$qa_group instead of hard coded values.
common/rc | 5 +++++tests/btrfs/300 | 49 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/300.out | 18 +++++++++++++++++ tests/overlay/020 | 7 +------ 4 files changed, 73 insertions(+), 6 deletions(-) create mode 100755 tests/btrfs/300 create mode 100644 tests/btrfs/300.outcommon/rc +5
-0@@ -5224,6 +5224,11 @@ _soak_loop_running() { return 0 } +_require_unshare() { + unshare -f -r -m -p -U $@ true &>/dev/null || \ + _notrun "unshare: command not found, should be in util-linux" +} + init_rc ################################################################################tests/btrfs/300 new file +49
-0@@ -0,0 +1,49 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022 Meta Platforms, Inc. All Rights Reserved. +# +# FS QA Test 300 +# +# Validate that snapshots taken while in a remapped namespace preserve +# the permissions of the user. +# +. ./common/preamble +_begin_fstest auto quick subvol snapshot +_register_cleanup "cleanup" + +_supported_fs btrfs + +_require_test +_require_user +_require_group +_require_unix_perm_checking +_require_unshare + +test_dir="${TEST_DIR}/${seq}" +cleanup() { + rm -rf $test_dir + cd / + rm -rf $tmp.* +} + +rm -rf $test_dir +mkdir $test_dir +chown $qa_user:$qa_group $test_dir + +# _user_do executes each command as $qa_user in its own subshell. unshare +# sets the namespace for the running shell. The test must run in one user +# subshell to preserve the namespace over multiple commands. +_user_do " +cd ${test_dir}; +unshare --user --keep-caps --map-auto --map-root-user; +$BTRFS_UTIL_PROG subvolume create subvol; +touch subvol/{1,2,3}; +$BTRFS_UTIL_PROG subvolume create subvol/subsubvol; +touch subvol/subsubvol/{4,5,6}; +$BTRFS_UTIL_PROG subvolume snapshot subvol snapshot; +" + +find $test_dir/. -printf "%M %u %g ./%P\n" + +status=0 +exittests/btrfs/300.out new file +18
-0@@ -0,0 +1,18 @@ +QA output created by 300 +Create subvolume './subvol' +Create subvolume 'subvol/subsubvol' +Create a snapshot of 'subvol' in './snapshot' +drwxr-xr-x fsgqa fsgqa ./ +drwxr-xr-x fsgqa fsgqa ./subvol +-rw-r--r-- fsgqa fsgqa ./subvol/1 +-rw-r--r-- fsgqa fsgqa ./subvol/2 +-rw-r--r-- fsgqa fsgqa ./subvol/3 +drwxr-xr-x fsgqa fsgqa ./subvol/subsubvol +-rw-r--r-- fsgqa fsgqa ./subvol/subsubvol/4 +-rw-r--r-- fsgqa fsgqa ./subvol/subsubvol/5 +-rw-r--r-- fsgqa fsgqa ./subvol/subsubvol/6 +drwxr-xr-x fsgqa fsgqa ./snapshot +-rw-r--r-- fsgqa fsgqa ./snapshot/1 +-rw-r--r-- fsgqa fsgqa ./snapshot/2 +-rw-r--r-- fsgqa fsgqa ./snapshot/3 +drwxr-xr-x fsgqa fsgqa ./snapshot/subsubvoltests/overlay/020 +1
-6@@ -16,18 +16,13 @@ _begin_fstest auto quick copyup perms # real QA test starts here -require_unshare() { - unshare -f -r "$@" true &>/dev/null || \ - _notrun "unshare $@: not supported" -} - # Modify as appropriate. _supported_fs overlay _fixed_by_kernel_commit 3fe6e52f0626 \ "ovl: override creds with the ones from the superblock mounter" _require_scratch -require_unshare -m -p -U +_require_unshare # Remove all files from previous tests _scratch_mkfsSignature · 1 line
2.34.1