diff mbox series

[v2,bpf-next] selftests/bpf: vm: add support for VIRTIO_FS

Message ID 20240925002210.501266-1-chantr4@gmail.com (mailing list archive)
State Accepted
Commit 903d4edb973aa410bfb1a7d4b3f127e4b91fcaf7
Delegated to: BPF
Headers show
Series [v2,bpf-next] selftests/bpf: vm: add support for VIRTIO_FS | expand

Checks

Context Check Description
bpf/vmtest-bpf-next-PR success PR summary
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for bpf-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 9 this patch: 9
netdev/build_tools success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers warning 8 maintainers not CCed: sdf@fomichev.me mykolal@fb.com haoluo@google.com jolsa@kernel.org shuah@kernel.org linux-kselftest@vger.kernel.org kpsingh@kernel.org john.fastabend@gmail.com
netdev/build_clang success Errors and warnings before: 7 this patch: 7
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 7 this patch: 7
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 17 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-12 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-8 success Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-7 success Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-15 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-19 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-17 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-11 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-18 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-VM_Test-13 success Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-14 success Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-38 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-39 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-40 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-32 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-31 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-22 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-26 success Logs for x86_64-gcc / veristat / veristat on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-1 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-3 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-4 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-6 success Logs for x86_64-gcc / build-release

Commit Message

Manu Bretelle Sept. 25, 2024, 12:22 a.m. UTC 
danobi/vmtest is going to migrate from using 9p to using virtio_fs to
mount the local rootfs: https://github.com/danobi/vmtest/pull/88

BPF CI uses danobi/vmtest to run bpf selftests and will need to support
VIRTIO_FS.

This change enables new kconfigs to be able to support the upcoming
danobi/vmtest.

Tested by building a new kernel with those config and confirming it
would successfully run with 9p (currently what is used by vmtest), and
with virtio_fs (using a local build of vmtest).

  $ vmtest -k arch/x86/boot/bzImage "findmnt /"
  => bzImage
  ===> Booting
  ===> Setting up VM
  ===> Running command
  TARGET SOURCE    FSTYPE OPTIONS
  /      /dev/root 9p     rw,relatime,cache=5,access=client,msize=512000,trans=virtio
  $ /home/chantra/local/danobi-vmtest/target/debug/vmtest -k arch/x86/boot/bzImage "findmnt /"
  => bzImage
  ===> Initializing host environment
  ===> Booting
  ===> Setting up VM
  ===> Running command
  TARGET SOURCE FSTYPE   OPTIONS
  /      rootfs virtiofs rw,relatime

Changes in v2:
* Sorted configs alphabetically

Signed-off-by: Manu Bretelle <chantr4@gmail.com>
---
 tools/testing/selftests/bpf/config.vm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Daniel Xu Sept. 25, 2024, 5:54 a.m. UTC | #1 
On Tue, Sep 24, 2024 at 05:22:10PM GMT, Manu Bretelle wrote:
> danobi/vmtest is going to migrate from using 9p to using virtio_fs to
> mount the local rootfs: https://github.com/danobi/vmtest/pull/88
> 
> BPF CI uses danobi/vmtest to run bpf selftests and will need to support
> VIRTIO_FS.
> 
> This change enables new kconfigs to be able to support the upcoming
> danobi/vmtest.
> 
> Tested by building a new kernel with those config and confirming it
> would successfully run with 9p (currently what is used by vmtest), and
> with virtio_fs (using a local build of vmtest).
> 
>   $ vmtest -k arch/x86/boot/bzImage "findmnt /"
>   => bzImage
>   ===> Booting
>   ===> Setting up VM
>   ===> Running command
>   TARGET SOURCE    FSTYPE OPTIONS
>   /      /dev/root 9p     rw,relatime,cache=5,access=client,msize=512000,trans=virtio
>   $ /home/chantra/local/danobi-vmtest/target/debug/vmtest -k arch/x86/boot/bzImage "findmnt /"
>   => bzImage
>   ===> Initializing host environment
>   ===> Booting
>   ===> Setting up VM
>   ===> Running command
>   TARGET SOURCE FSTYPE   OPTIONS
>   /      rootfs virtiofs rw,relatime
> 
> Changes in v2:
> * Sorted configs alphabetically
> 
> Signed-off-by: Manu Bretelle <chantr4@gmail.com>
> ---
>  tools/testing/selftests/bpf/config.vm | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/bpf/config.vm b/tools/testing/selftests/bpf/config.vm
> index a9746ca78777..da543b24c144 100644
> --- a/tools/testing/selftests/bpf/config.vm
> +++ b/tools/testing/selftests/bpf/config.vm
> @@ -1,12 +1,15 @@
> -CONFIG_9P_FS=y
>  CONFIG_9P_FS_POSIX_ACL=y
>  CONFIG_9P_FS_SECURITY=y
> +CONFIG_9P_FS=y
>  CONFIG_CRYPTO_DEV_VIRTIO=y
> -CONFIG_NET_9P=y
> +CONFIG_FUSE_FS=y
> +CONFIG_FUSE_PASSTHROUGH=y

In fs/fuse/Kconfig I see CONFIG_FUSE_PASSTHROUGH defaults on:

        config FUSE_PASSTHROUGH
                bool "FUSE passthrough operations support"
                default y
                depends on FUSE_FS

So is it necessary to set here? I suppose if it matters that we're sure
it's enabled, it's better to be explicit.


>  CONFIG_NET_9P_VIRTIO=y
> +CONFIG_NET_9P=y
>  CONFIG_VIRTIO_BALLOON=y
>  CONFIG_VIRTIO_BLK=y
>  CONFIG_VIRTIO_CONSOLE=y
> +CONFIG_VIRTIO_FS=y
>  CONFIG_VIRTIO_NET=y
>  CONFIG_VIRTIO_PCI=y
>  CONFIG_VIRTIO_VSOCKETS_COMMON=y
> -- 
> 2.43.5
> 

Acked-by: Daniel Xu <dxu@dxuuu.xyz>
Manu Bretelle Sept. 26, 2024, 4:21 p.m. UTC | #2 
> >
> > diff --git a/tools/testing/selftests/bpf/config.vm b/tools/testing/selftests/bpf/config.vm
> > index a9746ca78777..da543b24c144 100644
> > --- a/tools/testing/selftests/bpf/config.vm
> > +++ b/tools/testing/selftests/bpf/config.vm
> > @@ -1,12 +1,15 @@
> > -CONFIG_9P_FS=y
> >  CONFIG_9P_FS_POSIX_ACL=y
> >  CONFIG_9P_FS_SECURITY=y
> > +CONFIG_9P_FS=y
> >  CONFIG_CRYPTO_DEV_VIRTIO=y
> > -CONFIG_NET_9P=y
> > +CONFIG_FUSE_FS=y
> > +CONFIG_FUSE_PASSTHROUGH=y
>
> In fs/fuse/Kconfig I see CONFIG_FUSE_PASSTHROUGH defaults on:
>
>         config FUSE_PASSTHROUGH
>                 bool "FUSE passthrough operations support"
>                 default y
>                 depends on FUSE_FS
>
> So is it necessary to set here? I suppose if it matters that we're sure
> it's enabled, it's better to be explicit.
>
IIRC, this is what part of the diff that was generated after running:
  ./scripts/config -e FUSE_FS -e VIRTIO_FS
over my original .config, but I may be wrong.

I don't remember adding this explicitly.
patchwork-bot+netdevbpf@kernel.org Sept. 27, 2024, 8:40 p.m. UTC | #3 
Hello:

This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:

On Tue, 24 Sep 2024 17:22:10 -0700 you wrote:
> danobi/vmtest is going to migrate from using 9p to using virtio_fs to
> mount the local rootfs: https://github.com/danobi/vmtest/pull/88
> 
> BPF CI uses danobi/vmtest to run bpf selftests and will need to support
> VIRTIO_FS.
> 
> This change enables new kconfigs to be able to support the upcoming
> danobi/vmtest.
> 
> [...]

Here is the summary with links:
  - [v2,bpf-next] selftests/bpf: vm: add support for VIRTIO_FS
    https://git.kernel.org/bpf/bpf-next/c/903d4edb973a

You are awesome, thank you!
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/config.vm b/tools/testing/selftests/bpf/config.vm
index a9746ca78777..da543b24c144 100644
--- a/tools/testing/selftests/bpf/config.vm
+++ b/tools/testing/selftests/bpf/config.vm
@@ -1,12 +1,15 @@ 
-CONFIG_9P_FS=y
 CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
+CONFIG_9P_FS=y
 CONFIG_CRYPTO_DEV_VIRTIO=y
-CONFIG_NET_9P=y
+CONFIG_FUSE_FS=y
+CONFIG_FUSE_PASSTHROUGH=y
 CONFIG_NET_9P_VIRTIO=y
+CONFIG_NET_9P=y
 CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_CONSOLE=y
+CONFIG_VIRTIO_FS=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_VSOCKETS_COMMON=y