selftests/bpf: vm: add support for VIRTIO_FS
Subsystems (3)
PATCH v2 1/1 selftests/bpf: vm: add support for VIRTIO_FS
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
--- tools/testing/selftests/bpf/config.vm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/config.vm +5 -2
@@ -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
Signature · 1 line
2.43.5
Quoted 42 lines · Manu Bretelle
danobi/vmtest is going to migrate from using 9p to using
virtio_fsto mount the local rootfs: https://github.com/danobi/vmtest/pull/88BPF 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,relatimeChanges in v2:
* Sorted configs alphabeticallySigned-off-by Manu Bretelle <[email protected]>--- tools/testing/selftests/bpf/config.vm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)tools/testing/selftests/bpf/config.vm +0
-0
tools/testing/selftests/bpf/config.vm line 6
Quoted 8 lines
tools/testing/selftests/bpf/config.vm +3
-2@@ -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.
Quoted 12 lines
tools/testing/selftests/bpf/config.vm +2
-0CONFIG_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=ySignature · 1 line
2.43.5
Quoted 17 lines
Quoted 6 lines
tools/testing/selftests/bpf/config.vm +0
-0tools/testing/selftests/bpf/config.vm line 6
Quoted 8 lines
tools/testing/selftests/bpf/config.vm +3
-2@@ -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=yIn
fs/fuse/KconfigI seeCONFIG_FUSE_PASSTHROUGHdefaults on:
Quoted 8 lines
config
FUSE_PASSTHROUGH
bool "FUSE passthrough operations support" default y
depends onFUSE_FSSo 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.
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 10 lines · On Tue, 24 Sep 2024 17:22:10 -0700 you wrote:
danobi/vmtest is going to migrate from using 9p to using
virtio_fsto mount the local rootfs: https://github.com/danobi/vmtest/pull/88BPF 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!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html