[bpf-next] selftests/bpf: Fixes tests for filesystem kfuncs

Commit Message

Manu Bretelle Dec. 11, 2023, 6:07 p.m. UTC

`fs_kfuncs.c`'s `test_xattr` would fail the test even when the
filesystem did not support xattr, for instance when /tmp is mounted as
tmpfs.

This change checks errno when setxattr fail. If the failure is due to
the operation being unsupported, we will skip the test (just like we
would if verity was not enabled on the FS.

Before the change, fs_kfuncs test would fail in test_axattr:

 $ vmtest -k $(make -s image_name) './tools/testing/selftests/bpf/test_progs -a fs_kfuncs'
 => bzImage
 ===> Booting
 [    0.000000] rcu:        RCU restricting CPUs from NR_CPUS=128 to
 nr_cpu_
 ===> Setting up VM
 ===> Running command
 [    4.157491] bpf_testmod: loading out-of-tree module taints kernel.
 [    4.161515] bpf_testmod: module verification failed: signature and/or
 required key missing - tainting kernel
 test_xattr:PASS:create_file 0 nsec
 test_xattr:FAIL:setxattr unexpected error: -1 (errno 95)
 #90/1    fs_kfuncs/xattr:FAIL
 #90/2    fs_kfuncs/fsverity:SKIP
 #90      fs_kfuncs:FAIL

 All error logs:
 test_xattr:PASS:create_file 0 nsec
 test_xattr:FAIL:setxattr unexpected error: -1 (errno 95)
 #90/1    fs_kfuncs/xattr:FAIL
 #90      fs_kfuncs:FAIL

 Summary: 0/0 PASSED, 1 SKIPPED, 1 FAILED

Test plan:

  $ touch tmpfs_file && truncate -s 1G tmpfs_file && mkfs.ext4 tmpfs_file
  # /tmp mounted as tmpfs
  $ vmtest -k $(make -s image_name) './tools/testing/selftests/bpf/test_progs -a fs_kfuncs'
  => bzImage
  ===> Booting
  ===> Setting up VM
  ===> Running command
  WARNING! Selftests relying on bpf_testmod.ko will be skipped.
  Can't find bpf_testmod.ko kernel module: -2
  #90/1    fs_kfuncs/xattr:SKIP
  #90/2    fs_kfuncs/fsverity:SKIP
  #90      fs_kfuncs:SKIP
  Summary: 1/0 PASSED, 2 SKIPPED, 0 FAILED
  # /tmp mounted as ext4 with xattr enabled but not verity
  $ vmtest -k $(make -s image_name) 'mount -o loop tmpfs_file /tmp && \
    /tools/testing/selftests/bpf/test_progs -a fs_kfuncs'
  => bzImage
  ===> Booting
  ===> Setting up VM
  ===> Running command
  [    4.067071] loop0: detected capacity change from 0 to 2097152
  [    4.191882] EXT4-fs (loop0): mounted filesystem
  407ffa36-4553-4c8c-8c78-134443630f69 r/w with ordered data mode. Quota
  mode: none.
  WARNING! Selftests relying on bpf_testmod.ko will be skipped.
  Can't find bpf_testmod.ko kernel module: -2
  #90/1    fs_kfuncs/xattr:OK
  #90/2    fs_kfuncs/fsverity:SKIP
  #90      fs_kfuncs:OK (SKIP: 1/2)
  Summary: 1/1 PASSED, 1 SKIPPED, 0 FAILED
  $ tune2fs -O verity tmpfs_file
  # /tmp as ext4 with both xattr and verity enabled
  $ vmtest -k $(make -s image_name) 'mount -o loop tmpfs_file /tmp && \
    ./tools/testing/selftests/bpf/test_progs -a fs_kfuncs'
  => bzImage
  ===> Booting
  ===> Setting up VM
  ===> Running command
  [    4.291434] loop0: detected capacity change from 0 to 2097152
  [    4.460828] EXT4-fs (loop0): recovery complete
  [    4.468631] EXT4-fs (loop0): mounted filesystem
  7b4a7b7f-c442-4b06-9ede-254e63cceb52 r/w with ordered data mode. Quota
  mode: none.
  [    4.988074] fs-verity: sha256 using implementation "sha256-generic"
  WARNING! Selftests relying on bpf_testmod.ko will be skipped.
  Can't find bpf_testmod.ko kernel module: -2
  #90/1    fs_kfuncs/xattr:OK
  #90/2    fs_kfuncs/fsverity:OK
  #90      fs_kfuncs:OK
  Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED

Fixes: 341f06fdddf7 ("selftests/bpf: Add tests for filesystem kfuncs")
Signed-off-by: Manu Bretelle <[e-mail]>
---
 tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

John Fastabend Dec. 11, 2023, 9:01 p.m. UTC | #1

Manu Bretelle wrote:
> `fs_kfuncs.c`'s `test_xattr` would fail the test even when the
> filesystem did not support xattr, for instance when /tmp is mounted as
> tmpfs.
> 
> This change checks errno when setxattr fail. If the failure is due to
> the operation being unsupported, we will skip the test (just like we
> would if verity was not enabled on the FS.
> 
> Before the change, fs_kfuncs test would fail in test_axattr:
> 

...

> Fixes: 341f06fdddf7 ("selftests/bpf: Add tests for filesystem kfuncs")
> Signed-off-by: Manu Bretelle <[e-mail]>
> ---

Acked-by: John Fastabend <[e-mail]>

[e-mail] Dec. 12, 2023, 6 p.m. UTC | #2

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <[e-mail]>:

On Mon, 11 Dec 2023 10:07:33 -0800 you wrote:
> `fs_kfuncs.c`'s `test_xattr` would fail the test even when the
> filesystem did not support xattr, for instance when /tmp is mounted as
> tmpfs.
> 
> This change checks errno when setxattr fail. If the failure is due to
> the operation being unsupported, we will skip the test (just like we
> would if verity was not enabled on the FS.
> 
> [...]

Here is the summary with links:
  - [bpf-next] selftests/bpf: Fixes tests for filesystem kfuncs
    https://git.kernel.org/bpf/bpf-next/c/f77d795618b9

You are awesome, thank you!

Song Liu Dec. 12, 2023, 6:12 p.m. UTC | #3

On Mon, Dec 11, 2023 at 10:08 AM Manu Bretelle <[e-mail]> wrote:
>
[...]
>   ===> Booting
>   ===> Setting up VM
>   ===> Running command
>   [    4.291434] loop0: detected capacity change from 0 to 2097152
>   [    4.460828] EXT4-fs (loop0): recovery complete
>   [    4.468631] EXT4-fs (loop0): mounted filesystem
>   7b4a7b7f-c442-4b06-9ede-254e63cceb52 r/w with ordered data mode. Quota
>   mode: none.
>   [    4.988074] fs-verity: sha256 using implementation "sha256-generic"
>   WARNING! Selftests relying on bpf_testmod.ko will be skipped.
>   Can't find bpf_testmod.ko kernel module: -2
>   #90/1    fs_kfuncs/xattr:OK
>   #90/2    fs_kfuncs/fsverity:OK
>   #90      fs_kfuncs:OK
>   Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
>
> Fixes: 341f06fdddf7 ("selftests/bpf: Add tests for filesystem kfuncs")
> Signed-off-by: Manu Bretelle <[e-mail]>

Thanks for the fix!

[...]

Patch

diff --git a/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c b/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c
index d3196a4b089f..37056ba73847 100644
--- a/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c
+++ b/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c
@@ -25,6 +25,14 @@  static void test_xattr(void)
 	fd = -1;
 
 	err = setxattr(testfile, "user.kfuncs", "hello", sizeof("hello"), 0);
+	if (err && errno == EOPNOTSUPP) {
+		printf("%s:SKIP:local fs doesn't support xattr (%d)\n"
+		       "To run this test, make sure /tmp filesystem supports xattr.\n",
+		       __func__, errno);
+		test__skip();
+		goto out;
+	}
+
 	if (!ASSERT_OK(err, "setxattr"))
 		goto out;