* [PATCH bpf-next] selftests/bpf: consolidate VIRTIO/9P configs in the generic config file
@ 2023-10-27 21:23 Manu Bretelle
2023-10-27 21:33 ` Song Liu
2023-10-27 21:38 ` Andrii Nakryiko
0 siblings, 2 replies; 5+ messages in thread
From: Manu Bretelle @ 2023-10-27 21:23 UTC (permalink / raw)
To: bpf, quentin, andrii, daniel, ast, martin.lau, song,
john.fastabend, kpsingh, sdf, haoluo, jolsa
Those configs are needed to be able to run VM somewhat consistently.
For instance, ATM, s390x is missing the `CONFIG_VIRTIO_CONSOLE` which
prevents s390x kernels built in CI to leverage qemu-guest-agent.
By moving them to `config`, we should have selftest kernels which are
equal in term of functionalities.
The set of config unabled were picked using
grep -h -E '(_9P|_VIRTIO)' config.x86_64 config | sort | uniq
added to `config` and then
grep -vE '(_9P|_VIRTIO)' config.{x86_64,aarch64,s390x}
as a side-effect, some config may have disappeared to the aarch64 and
s390x kernels, but they should not be needed. CI will tell.
Signed-off-by: Manu Bretelle <chantr4@gmail.com>
---
tools/testing/selftests/bpf/config | 13 +++++++++++++
tools/testing/selftests/bpf/config.aarch64 | 16 ----------------
tools/testing/selftests/bpf/config.s390x | 9 ---------
tools/testing/selftests/bpf/config.x86_64 | 12 ------------
4 files changed, 13 insertions(+), 37 deletions(-)
diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config
index 3ec5927ec3e5..c22a068bc1de 100644
--- a/tools/testing/selftests/bpf/config
+++ b/tools/testing/selftests/bpf/config
@@ -86,3 +86,16 @@ CONFIG_VXLAN=y
CONFIG_XDP_SOCKETS=y
CONFIG_XFRM_INTERFACE=y
CONFIG_VSOCKETS=y
+# VIRTIO/9P configs to run in VMs
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_9P_FS=y
+CONFIG_CRYPTO_DEV_VIRTIO=y
+CONFIG_NET_9P_VIRTIO=y
+CONFIG_NET_9P=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_VSOCKETS_COMMON=y
diff --git a/tools/testing/selftests/bpf/config.aarch64 b/tools/testing/selftests/bpf/config.aarch64
index 253821494884..fa8ecf626c73 100644
--- a/tools/testing/selftests/bpf/config.aarch64
+++ b/tools/testing/selftests/bpf/config.aarch64
@@ -1,4 +1,3 @@
-CONFIG_9P_FS=y
CONFIG_ARCH_VEXPRESS=y
CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
CONFIG_ARM_SMMU_V3=y
@@ -46,7 +45,6 @@ CONFIG_DEBUG_SG=y
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_DEVTMPFS=y
-CONFIG_DRM_VIRTIO_GPU=y
CONFIG_DRM=y
CONFIG_DUMMY=y
CONFIG_EXPERT=y
@@ -67,7 +65,6 @@ CONFIG_HAVE_KRETPROBES=y
CONFIG_HEADERS_INSTALL=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_HUGETLBFS=y
-CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM=y
CONFIG_HZ_100=y
CONFIG_IDLE_PAGE_TRACKING=y
@@ -99,8 +96,6 @@ CONFIG_MEMCG=y
CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_NAMESPACES=y
-CONFIG_NET_9P_VIRTIO=y
-CONFIG_NET_9P=y
CONFIG_NET_ACT_BPF=y
CONFIG_NET_ACT_GACT=y
CONFIG_NETDEVICES=y
@@ -140,7 +135,6 @@ CONFIG_SCHED_TRACER=y
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_SCSI_VIRTIO=y
CONFIG_SCSI=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
@@ -167,16 +161,6 @@ CONFIG_UPROBES=y
CONFIG_USELIB=y
CONFIG_USER_NS=y
CONFIG_VETH=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_VIRTIO_FS=y
-CONFIG_VIRTIO_INPUT=y
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_VIRTIO_NET=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_VSOCKETS_COMMON=y
CONFIG_VLAN_8021Q=y
CONFIG_VSOCKETS=y
CONFIG_VSOCKETS_LOOPBACK=y
diff --git a/tools/testing/selftests/bpf/config.s390x b/tools/testing/selftests/bpf/config.s390x
index 2ba92167be35..e93330382849 100644
--- a/tools/testing/selftests/bpf/config.s390x
+++ b/tools/testing/selftests/bpf/config.s390x
@@ -1,4 +1,3 @@
-CONFIG_9P_FS=y
CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
CONFIG_AUDIT=y
CONFIG_BLK_CGROUP=y
@@ -84,8 +83,6 @@ CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_NAMESPACES=y
CONFIG_NET=y
-CONFIG_NET_9P=y
-CONFIG_NET_9P_VIRTIO=y
CONFIG_NET_ACT_BPF=y
CONFIG_NET_ACT_GACT=y
CONFIG_NET_KEY=y
@@ -114,7 +111,6 @@ CONFIG_SAMPLE_SECCOMP=y
CONFIG_SAMPLES=y
CONFIG_SCHED_TRACER=y
CONFIG_SCSI=y
-CONFIG_SCSI_VIRTIO=y
CONFIG_SECURITY_NETWORK=y
CONFIG_STACK_TRACER=y
CONFIG_STATIC_KEYS_SELFTEST=y
@@ -136,11 +132,6 @@ CONFIG_UPROBES=y
CONFIG_USELIB=y
CONFIG_USER_NS=y
CONFIG_VETH=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_NET=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_VSOCKETS_COMMON=y
CONFIG_VLAN_8021Q=y
CONFIG_VSOCKETS=y
CONFIG_VSOCKETS_LOOPBACK=y
diff --git a/tools/testing/selftests/bpf/config.x86_64 b/tools/testing/selftests/bpf/config.x86_64
index 2e70a6048278..f7bfb2b09c82 100644
--- a/tools/testing/selftests/bpf/config.x86_64
+++ b/tools/testing/selftests/bpf/config.x86_64
@@ -1,6 +1,3 @@
-CONFIG_9P_FS=y
-CONFIG_9P_FS_POSIX_ACL=y
-CONFIG_9P_FS_SECURITY=y
CONFIG_AGP=y
CONFIG_AGP_AMD64=y
CONFIG_AGP_INTEL=y
@@ -45,7 +42,6 @@ CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPUSETS=y
CONFIG_CRC_T10DIF=y
CONFIG_CRYPTO_BLAKE2B=y
-CONFIG_CRYPTO_DEV_VIRTIO=y
CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_XXHASH=y
CONFIG_DCB=y
@@ -145,8 +141,6 @@ CONFIG_MEMORY_FAILURE=y
CONFIG_MINIX_SUBPARTITION=y
CONFIG_NAMESPACES=y
CONFIG_NET=y
-CONFIG_NET_9P=y
-CONFIG_NET_9P_VIRTIO=y
CONFIG_NET_ACT_BPF=y
CONFIG_NET_CLS_CGROUP=y
CONFIG_NET_EMATCH=y
@@ -228,12 +222,6 @@ CONFIG_USER_NS=y
CONFIG_VALIDATE_FS_PARSER=y
CONFIG_VETH=y
CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_VIRTIO_NET=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_VSOCKETS_COMMON=y
CONFIG_VLAN_8021Q=y
CONFIG_VSOCKETS=y
CONFIG_VSOCKETS_LOOPBACK=y
--
2.39.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH bpf-next] selftests/bpf: consolidate VIRTIO/9P configs in the generic config file
2023-10-27 21:23 [PATCH bpf-next] selftests/bpf: consolidate VIRTIO/9P configs in the generic config file Manu Bretelle
@ 2023-10-27 21:33 ` Song Liu
2023-10-28 0:53 ` Manu Bretelle
2023-10-27 21:38 ` Andrii Nakryiko
1 sibling, 1 reply; 5+ messages in thread
From: Song Liu @ 2023-10-27 21:33 UTC (permalink / raw)
To: Manu Bretelle
Cc: bpf, quentin, andrii, daniel, ast, martin.lau, john.fastabend,
kpsingh, sdf, haoluo, jolsa
On Fri, Oct 27, 2023 at 2:23 PM Manu Bretelle <chantr4@gmail.com> wrote:
>
> Those configs are needed to be able to run VM somewhat consistently.
> For instance, ATM, s390x is missing the `CONFIG_VIRTIO_CONSOLE` which
> prevents s390x kernels built in CI to leverage qemu-guest-agent.
>
> By moving them to `config`, we should have selftest kernels which are
> equal in term of functionalities.
>
> The set of config unabled were picked using
>
> grep -h -E '(_9P|_VIRTIO)' config.x86_64 config | sort | uniq
>
> added to `config` and then
> grep -vE '(_9P|_VIRTIO)' config.{x86_64,aarch64,s390x}
>
> as a side-effect, some config may have disappeared to the aarch64 and
> s390x kernels, but they should not be needed. CI will tell.
>
> Signed-off-by: Manu Bretelle <chantr4@gmail.com>
> ---
> tools/testing/selftests/bpf/config | 13 +++++++++++++
> tools/testing/selftests/bpf/config.aarch64 | 16 ----------------
> tools/testing/selftests/bpf/config.s390x | 9 ---------
> tools/testing/selftests/bpf/config.x86_64 | 12 ------------
> 4 files changed, 13 insertions(+), 37 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config
> index 3ec5927ec3e5..c22a068bc1de 100644
> --- a/tools/testing/selftests/bpf/config
> +++ b/tools/testing/selftests/bpf/config
> @@ -86,3 +86,16 @@ CONFIG_VXLAN=y
> CONFIG_XDP_SOCKETS=y
> CONFIG_XFRM_INTERFACE=y
> CONFIG_VSOCKETS=y
> +# VIRTIO/9P configs to run in VMs
> +CONFIG_9P_FS_POSIX_ACL=y
> +CONFIG_9P_FS_SECURITY=y
> +CONFIG_9P_FS=y
> +CONFIG_CRYPTO_DEV_VIRTIO=y
> +CONFIG_NET_9P_VIRTIO=y
> +CONFIG_NET_9P=y
> +CONFIG_VIRTIO_BALLOON=y
> +CONFIG_VIRTIO_BLK=y
> +CONFIG_VIRTIO_CONSOLE=y
> +CONFIG_VIRTIO_NET=y
> +CONFIG_VIRTIO_PCI=y
> +CONFIG_VIRTIO_VSOCKETS_COMMON=y
Please keep these in alphabetical order.
Thanks,
Song
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH bpf-next] selftests/bpf: consolidate VIRTIO/9P configs in the generic config file
2023-10-27 21:33 ` Song Liu
@ 2023-10-28 0:53 ` Manu Bretelle
0 siblings, 0 replies; 5+ messages in thread
From: Manu Bretelle @ 2023-10-28 0:53 UTC (permalink / raw)
To: Song Liu
Cc: bpf, quentin, andrii, daniel, ast, martin.lau, john.fastabend,
kpsingh, sdf, haoluo, jolsa
On Fri, Oct 27, 2023 at 02:33:34PM -0700, Song Liu wrote:
> On Fri, Oct 27, 2023 at 2:23 PM Manu Bretelle <chantr4@gmail.com> wrote:
> >
> > Those configs are needed to be able to run VM somewhat consistently.
> > For instance, ATM, s390x is missing the `CONFIG_VIRTIO_CONSOLE` which
> > prevents s390x kernels built in CI to leverage qemu-guest-agent.
> >
> > By moving them to `config`, we should have selftest kernels which are
> > equal in term of functionalities.
> >
> > The set of config unabled were picked using
> >
> > grep -h -E '(_9P|_VIRTIO)' config.x86_64 config | sort | uniq
> >
> > added to `config` and then
> > grep -vE '(_9P|_VIRTIO)' config.{x86_64,aarch64,s390x}
> >
> > as a side-effect, some config may have disappeared to the aarch64 and
> > s390x kernels, but they should not be needed. CI will tell.
> >
> > Signed-off-by: Manu Bretelle <chantr4@gmail.com>
> > ---
> > tools/testing/selftests/bpf/config | 13 +++++++++++++
> > tools/testing/selftests/bpf/config.aarch64 | 16 ----------------
> > tools/testing/selftests/bpf/config.s390x | 9 ---------
> > tools/testing/selftests/bpf/config.x86_64 | 12 ------------
> > 4 files changed, 13 insertions(+), 37 deletions(-)
> >
> > diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config
> > index 3ec5927ec3e5..c22a068bc1de 100644
> > --- a/tools/testing/selftests/bpf/config
> > +++ b/tools/testing/selftests/bpf/config
> > @@ -86,3 +86,16 @@ CONFIG_VXLAN=y
> > CONFIG_XDP_SOCKETS=y
> > CONFIG_XFRM_INTERFACE=y
> > CONFIG_VSOCKETS=y
> > +# VIRTIO/9P configs to run in VMs
> > +CONFIG_9P_FS_POSIX_ACL=y
> > +CONFIG_9P_FS_SECURITY=y
> > +CONFIG_9P_FS=y
> > +CONFIG_CRYPTO_DEV_VIRTIO=y
> > +CONFIG_NET_9P_VIRTIO=y
> > +CONFIG_NET_9P=y
> > +CONFIG_VIRTIO_BALLOON=y
> > +CONFIG_VIRTIO_BLK=y
> > +CONFIG_VIRTIO_CONSOLE=y
> > +CONFIG_VIRTIO_NET=y
> > +CONFIG_VIRTIO_PCI=y
> > +CONFIG_VIRTIO_VSOCKETS_COMMON=y
>
> Please keep these in alphabetical order.
>
ACK, I wanted to keep those related configs together, but by moving it to a
different file, per Andrii comment, that will address 2 birds with one stone.
While at it, I can probably sort the current files, which seem out of order
(per sort result).
> Thanks,
> Song
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: consolidate VIRTIO/9P configs in the generic config file
2023-10-27 21:23 [PATCH bpf-next] selftests/bpf: consolidate VIRTIO/9P configs in the generic config file Manu Bretelle
2023-10-27 21:33 ` Song Liu
@ 2023-10-27 21:38 ` Andrii Nakryiko
2023-10-28 0:48 ` Manu Bretelle
1 sibling, 1 reply; 5+ messages in thread
From: Andrii Nakryiko @ 2023-10-27 21:38 UTC (permalink / raw)
To: Manu Bretelle
Cc: bpf, quentin, andrii, daniel, ast, martin.lau, song,
john.fastabend, kpsingh, sdf, haoluo, jolsa
On Fri, Oct 27, 2023 at 2:23 PM Manu Bretelle <chantr4@gmail.com> wrote:
>
> Those configs are needed to be able to run VM somewhat consistently.
> For instance, ATM, s390x is missing the `CONFIG_VIRTIO_CONSOLE` which
> prevents s390x kernels built in CI to leverage qemu-guest-agent.
>
> By moving them to `config`, we should have selftest kernels which are
> equal in term of functionalities.
>
> The set of config unabled were picked using
>
> grep -h -E '(_9P|_VIRTIO)' config.x86_64 config | sort | uniq
>
> added to `config` and then
> grep -vE '(_9P|_VIRTIO)' config.{x86_64,aarch64,s390x}
>
> as a side-effect, some config may have disappeared to the aarch64 and
> s390x kernels, but they should not be needed. CI will tell.
>
> Signed-off-by: Manu Bretelle <chantr4@gmail.com>
> ---
> tools/testing/selftests/bpf/config | 13 +++++++++++++
> tools/testing/selftests/bpf/config.aarch64 | 16 ----------------
> tools/testing/selftests/bpf/config.s390x | 9 ---------
> tools/testing/selftests/bpf/config.x86_64 | 12 ------------
> 4 files changed, 13 insertions(+), 37 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config
> index 3ec5927ec3e5..c22a068bc1de 100644
> --- a/tools/testing/selftests/bpf/config
> +++ b/tools/testing/selftests/bpf/config
This config is meant to specify configuration necessary to run
selftests in general, not necessarily in BPF CI. So it's confusing and
unnecessary to add 9P_FS here, as strictly speaking that's not a
dependency.
So perhaps instead we should just have a "config.ci" file with all the
common configuration options necessary for BPF CI workflows to work?
> @@ -86,3 +86,16 @@ CONFIG_VXLAN=y
> CONFIG_XDP_SOCKETS=y
> CONFIG_XFRM_INTERFACE=y
> CONFIG_VSOCKETS=y
> +# VIRTIO/9P configs to run in VMs
> +CONFIG_9P_FS_POSIX_ACL=y
> +CONFIG_9P_FS_SECURITY=y
> +CONFIG_9P_FS=y
> +CONFIG_CRYPTO_DEV_VIRTIO=y
> +CONFIG_NET_9P_VIRTIO=y
> +CONFIG_NET_9P=y
> +CONFIG_VIRTIO_BALLOON=y
> +CONFIG_VIRTIO_BLK=y
> +CONFIG_VIRTIO_CONSOLE=y
> +CONFIG_VIRTIO_NET=y
> +CONFIG_VIRTIO_PCI=y
> +CONFIG_VIRTIO_VSOCKETS_COMMON=y
> diff --git a/tools/testing/selftests/bpf/config.aarch64 b/tools/testing/selftests/bpf/config.aarch64
> index 253821494884..fa8ecf626c73 100644
> --- a/tools/testing/selftests/bpf/config.aarch64
> +++ b/tools/testing/selftests/bpf/config.aarch64
> @@ -1,4 +1,3 @@
> -CONFIG_9P_FS=y
> CONFIG_ARCH_VEXPRESS=y
> CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
> CONFIG_ARM_SMMU_V3=y
> @@ -46,7 +45,6 @@ CONFIG_DEBUG_SG=y
> CONFIG_DETECT_HUNG_TASK=y
> CONFIG_DEVTMPFS_MOUNT=y
> CONFIG_DEVTMPFS=y
> -CONFIG_DRM_VIRTIO_GPU=y
> CONFIG_DRM=y
> CONFIG_DUMMY=y
> CONFIG_EXPERT=y
> @@ -67,7 +65,6 @@ CONFIG_HAVE_KRETPROBES=y
> CONFIG_HEADERS_INSTALL=y
> CONFIG_HIGH_RES_TIMERS=y
> CONFIG_HUGETLBFS=y
> -CONFIG_HW_RANDOM_VIRTIO=y
> CONFIG_HW_RANDOM=y
> CONFIG_HZ_100=y
> CONFIG_IDLE_PAGE_TRACKING=y
> @@ -99,8 +96,6 @@ CONFIG_MEMCG=y
> CONFIG_MEMORY_HOTPLUG=y
> CONFIG_MEMORY_HOTREMOVE=y
> CONFIG_NAMESPACES=y
> -CONFIG_NET_9P_VIRTIO=y
> -CONFIG_NET_9P=y
> CONFIG_NET_ACT_BPF=y
> CONFIG_NET_ACT_GACT=y
> CONFIG_NETDEVICES=y
> @@ -140,7 +135,6 @@ CONFIG_SCHED_TRACER=y
> CONFIG_SCSI_CONSTANTS=y
> CONFIG_SCSI_LOGGING=y
> CONFIG_SCSI_SCAN_ASYNC=y
> -CONFIG_SCSI_VIRTIO=y
> CONFIG_SCSI=y
> CONFIG_SECURITY_NETWORK=y
> CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
> @@ -167,16 +161,6 @@ CONFIG_UPROBES=y
> CONFIG_USELIB=y
> CONFIG_USER_NS=y
> CONFIG_VETH=y
> -CONFIG_VIRTIO_BALLOON=y
> -CONFIG_VIRTIO_BLK=y
> -CONFIG_VIRTIO_CONSOLE=y
> -CONFIG_VIRTIO_FS=y
> -CONFIG_VIRTIO_INPUT=y
> -CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
> -CONFIG_VIRTIO_MMIO=y
> -CONFIG_VIRTIO_NET=y
> -CONFIG_VIRTIO_PCI=y
> -CONFIG_VIRTIO_VSOCKETS_COMMON=y
> CONFIG_VLAN_8021Q=y
> CONFIG_VSOCKETS=y
> CONFIG_VSOCKETS_LOOPBACK=y
> diff --git a/tools/testing/selftests/bpf/config.s390x b/tools/testing/selftests/bpf/config.s390x
> index 2ba92167be35..e93330382849 100644
> --- a/tools/testing/selftests/bpf/config.s390x
> +++ b/tools/testing/selftests/bpf/config.s390x
> @@ -1,4 +1,3 @@
> -CONFIG_9P_FS=y
> CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
> CONFIG_AUDIT=y
> CONFIG_BLK_CGROUP=y
> @@ -84,8 +83,6 @@ CONFIG_MEMORY_HOTPLUG=y
> CONFIG_MEMORY_HOTREMOVE=y
> CONFIG_NAMESPACES=y
> CONFIG_NET=y
> -CONFIG_NET_9P=y
> -CONFIG_NET_9P_VIRTIO=y
> CONFIG_NET_ACT_BPF=y
> CONFIG_NET_ACT_GACT=y
> CONFIG_NET_KEY=y
> @@ -114,7 +111,6 @@ CONFIG_SAMPLE_SECCOMP=y
> CONFIG_SAMPLES=y
> CONFIG_SCHED_TRACER=y
> CONFIG_SCSI=y
> -CONFIG_SCSI_VIRTIO=y
> CONFIG_SECURITY_NETWORK=y
> CONFIG_STACK_TRACER=y
> CONFIG_STATIC_KEYS_SELFTEST=y
> @@ -136,11 +132,6 @@ CONFIG_UPROBES=y
> CONFIG_USELIB=y
> CONFIG_USER_NS=y
> CONFIG_VETH=y
> -CONFIG_VIRTIO_BALLOON=y
> -CONFIG_VIRTIO_BLK=y
> -CONFIG_VIRTIO_NET=y
> -CONFIG_VIRTIO_PCI=y
> -CONFIG_VIRTIO_VSOCKETS_COMMON=y
> CONFIG_VLAN_8021Q=y
> CONFIG_VSOCKETS=y
> CONFIG_VSOCKETS_LOOPBACK=y
> diff --git a/tools/testing/selftests/bpf/config.x86_64 b/tools/testing/selftests/bpf/config.x86_64
> index 2e70a6048278..f7bfb2b09c82 100644
> --- a/tools/testing/selftests/bpf/config.x86_64
> +++ b/tools/testing/selftests/bpf/config.x86_64
> @@ -1,6 +1,3 @@
> -CONFIG_9P_FS=y
> -CONFIG_9P_FS_POSIX_ACL=y
> -CONFIG_9P_FS_SECURITY=y
> CONFIG_AGP=y
> CONFIG_AGP_AMD64=y
> CONFIG_AGP_INTEL=y
> @@ -45,7 +42,6 @@ CONFIG_CPU_IDLE_GOV_LADDER=y
> CONFIG_CPUSETS=y
> CONFIG_CRC_T10DIF=y
> CONFIG_CRYPTO_BLAKE2B=y
> -CONFIG_CRYPTO_DEV_VIRTIO=y
> CONFIG_CRYPTO_SEQIV=y
> CONFIG_CRYPTO_XXHASH=y
> CONFIG_DCB=y
> @@ -145,8 +141,6 @@ CONFIG_MEMORY_FAILURE=y
> CONFIG_MINIX_SUBPARTITION=y
> CONFIG_NAMESPACES=y
> CONFIG_NET=y
> -CONFIG_NET_9P=y
> -CONFIG_NET_9P_VIRTIO=y
> CONFIG_NET_ACT_BPF=y
> CONFIG_NET_CLS_CGROUP=y
> CONFIG_NET_EMATCH=y
> @@ -228,12 +222,6 @@ CONFIG_USER_NS=y
> CONFIG_VALIDATE_FS_PARSER=y
> CONFIG_VETH=y
> CONFIG_VIRT_DRIVERS=y
> -CONFIG_VIRTIO_BALLOON=y
> -CONFIG_VIRTIO_BLK=y
> -CONFIG_VIRTIO_CONSOLE=y
> -CONFIG_VIRTIO_NET=y
> -CONFIG_VIRTIO_PCI=y
> -CONFIG_VIRTIO_VSOCKETS_COMMON=y
> CONFIG_VLAN_8021Q=y
> CONFIG_VSOCKETS=y
> CONFIG_VSOCKETS_LOOPBACK=y
> --
> 2.39.3
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH bpf-next] selftests/bpf: consolidate VIRTIO/9P configs in the generic config file
2023-10-27 21:38 ` Andrii Nakryiko
@ 2023-10-28 0:48 ` Manu Bretelle
0 siblings, 0 replies; 5+ messages in thread
From: Manu Bretelle @ 2023-10-28 0:48 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: bpf, quentin, andrii, daniel, ast, martin.lau, song,
john.fastabend, kpsingh, sdf, haoluo, jolsa
On Fri, Oct 27, 2023 at 02:38:36PM -0700, Andrii Nakryiko wrote:
> On Fri, Oct 27, 2023 at 2:23 PM Manu Bretelle <chantr4@gmail.com> wrote:
> >
> > Those configs are needed to be able to run VM somewhat consistently.
> > For instance, ATM, s390x is missing the `CONFIG_VIRTIO_CONSOLE` which
> > prevents s390x kernels built in CI to leverage qemu-guest-agent.
> >
> > By moving them to `config`, we should have selftest kernels which are
> > equal in term of functionalities.
> >
> > The set of config unabled were picked using
> >
> > grep -h -E '(_9P|_VIRTIO)' config.x86_64 config | sort | uniq
> >
> > added to `config` and then
> > grep -vE '(_9P|_VIRTIO)' config.{x86_64,aarch64,s390x}
> >
> > as a side-effect, some config may have disappeared to the aarch64 and
> > s390x kernels, but they should not be needed. CI will tell.
> >
> > Signed-off-by: Manu Bretelle <chantr4@gmail.com>
> > ---
> > tools/testing/selftests/bpf/config | 13 +++++++++++++
> > tools/testing/selftests/bpf/config.aarch64 | 16 ----------------
> > tools/testing/selftests/bpf/config.s390x | 9 ---------
> > tools/testing/selftests/bpf/config.x86_64 | 12 ------------
> > 4 files changed, 13 insertions(+), 37 deletions(-)
> >
> > diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config
> > index 3ec5927ec3e5..c22a068bc1de 100644
> > --- a/tools/testing/selftests/bpf/config
> > +++ b/tools/testing/selftests/bpf/config
>
> This config is meant to specify configuration necessary to run
> selftests in general, not necessarily in BPF CI. So it's confusing and
> unnecessary to add 9P_FS here, as strictly speaking that's not a
> dependency.
>
BPF CI is one, but there is also the *not so well maintained* vmtest.sh [0]
that relies on running in a VM.
> So perhaps instead we should just have a "config.ci" file with all the
> common configuration options necessary for BPF CI workflows to work?
>
>
That being said, I am fine moving it to a `config.ci` or `config.vm` and
updating vmtest.sh to include it if this is more desirable.
[0] https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/tree/tools/testing/selftests/bpf/vmtest.sh?h=for-next&id=6808918343a8b4b6970ba52ba2d1d511a0976748
> > @@ -86,3 +86,16 @@ CONFIG_VXLAN=y
> > CONFIG_XDP_SOCKETS=y
> > CONFIG_XFRM_INTERFACE=y
> > CONFIG_VSOCKETS=y
> > +# VIRTIO/9P configs to run in VMs
> > +CONFIG_9P_FS_POSIX_ACL=y
> > +CONFIG_9P_FS_SECURITY=y
> > +CONFIG_9P_FS=y
> > +CONFIG_CRYPTO_DEV_VIRTIO=y
> > +CONFIG_NET_9P_VIRTIO=y
> > +CONFIG_NET_9P=y
> > +CONFIG_VIRTIO_BALLOON=y
> > +CONFIG_VIRTIO_BLK=y
> > +CONFIG_VIRTIO_CONSOLE=y
> > +CONFIG_VIRTIO_NET=y
> > +CONFIG_VIRTIO_PCI=y
> > +CONFIG_VIRTIO_VSOCKETS_COMMON=y
> > diff --git a/tools/testing/selftests/bpf/config.aarch64 b/tools/testing/selftests/bpf/config.aarch64
> > index 253821494884..fa8ecf626c73 100644
> > --- a/tools/testing/selftests/bpf/config.aarch64
> > +++ b/tools/testing/selftests/bpf/config.aarch64
> > @@ -1,4 +1,3 @@
> > -CONFIG_9P_FS=y
> > CONFIG_ARCH_VEXPRESS=y
> > CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
> > CONFIG_ARM_SMMU_V3=y
> > @@ -46,7 +45,6 @@ CONFIG_DEBUG_SG=y
> > CONFIG_DETECT_HUNG_TASK=y
> > CONFIG_DEVTMPFS_MOUNT=y
> > CONFIG_DEVTMPFS=y
> > -CONFIG_DRM_VIRTIO_GPU=y
> > CONFIG_DRM=y
> > CONFIG_DUMMY=y
> > CONFIG_EXPERT=y
> > @@ -67,7 +65,6 @@ CONFIG_HAVE_KRETPROBES=y
> > CONFIG_HEADERS_INSTALL=y
> > CONFIG_HIGH_RES_TIMERS=y
> > CONFIG_HUGETLBFS=y
> > -CONFIG_HW_RANDOM_VIRTIO=y
> > CONFIG_HW_RANDOM=y
> > CONFIG_HZ_100=y
> > CONFIG_IDLE_PAGE_TRACKING=y
> > @@ -99,8 +96,6 @@ CONFIG_MEMCG=y
> > CONFIG_MEMORY_HOTPLUG=y
> > CONFIG_MEMORY_HOTREMOVE=y
> > CONFIG_NAMESPACES=y
> > -CONFIG_NET_9P_VIRTIO=y
> > -CONFIG_NET_9P=y
> > CONFIG_NET_ACT_BPF=y
> > CONFIG_NET_ACT_GACT=y
> > CONFIG_NETDEVICES=y
> > @@ -140,7 +135,6 @@ CONFIG_SCHED_TRACER=y
> > CONFIG_SCSI_CONSTANTS=y
> > CONFIG_SCSI_LOGGING=y
> > CONFIG_SCSI_SCAN_ASYNC=y
> > -CONFIG_SCSI_VIRTIO=y
> > CONFIG_SCSI=y
> > CONFIG_SECURITY_NETWORK=y
> > CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
> > @@ -167,16 +161,6 @@ CONFIG_UPROBES=y
> > CONFIG_USELIB=y
> > CONFIG_USER_NS=y
> > CONFIG_VETH=y
> > -CONFIG_VIRTIO_BALLOON=y
> > -CONFIG_VIRTIO_BLK=y
> > -CONFIG_VIRTIO_CONSOLE=y
> > -CONFIG_VIRTIO_FS=y
> > -CONFIG_VIRTIO_INPUT=y
> > -CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
> > -CONFIG_VIRTIO_MMIO=y
> > -CONFIG_VIRTIO_NET=y
> > -CONFIG_VIRTIO_PCI=y
> > -CONFIG_VIRTIO_VSOCKETS_COMMON=y
> > CONFIG_VLAN_8021Q=y
> > CONFIG_VSOCKETS=y
> > CONFIG_VSOCKETS_LOOPBACK=y
> > diff --git a/tools/testing/selftests/bpf/config.s390x b/tools/testing/selftests/bpf/config.s390x
> > index 2ba92167be35..e93330382849 100644
> > --- a/tools/testing/selftests/bpf/config.s390x
> > +++ b/tools/testing/selftests/bpf/config.s390x
> > @@ -1,4 +1,3 @@
> > -CONFIG_9P_FS=y
> > CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
> > CONFIG_AUDIT=y
> > CONFIG_BLK_CGROUP=y
> > @@ -84,8 +83,6 @@ CONFIG_MEMORY_HOTPLUG=y
> > CONFIG_MEMORY_HOTREMOVE=y
> > CONFIG_NAMESPACES=y
> > CONFIG_NET=y
> > -CONFIG_NET_9P=y
> > -CONFIG_NET_9P_VIRTIO=y
> > CONFIG_NET_ACT_BPF=y
> > CONFIG_NET_ACT_GACT=y
> > CONFIG_NET_KEY=y
> > @@ -114,7 +111,6 @@ CONFIG_SAMPLE_SECCOMP=y
> > CONFIG_SAMPLES=y
> > CONFIG_SCHED_TRACER=y
> > CONFIG_SCSI=y
> > -CONFIG_SCSI_VIRTIO=y
> > CONFIG_SECURITY_NETWORK=y
> > CONFIG_STACK_TRACER=y
> > CONFIG_STATIC_KEYS_SELFTEST=y
> > @@ -136,11 +132,6 @@ CONFIG_UPROBES=y
> > CONFIG_USELIB=y
> > CONFIG_USER_NS=y
> > CONFIG_VETH=y
> > -CONFIG_VIRTIO_BALLOON=y
> > -CONFIG_VIRTIO_BLK=y
> > -CONFIG_VIRTIO_NET=y
> > -CONFIG_VIRTIO_PCI=y
> > -CONFIG_VIRTIO_VSOCKETS_COMMON=y
> > CONFIG_VLAN_8021Q=y
> > CONFIG_VSOCKETS=y
> > CONFIG_VSOCKETS_LOOPBACK=y
> > diff --git a/tools/testing/selftests/bpf/config.x86_64 b/tools/testing/selftests/bpf/config.x86_64
> > index 2e70a6048278..f7bfb2b09c82 100644
> > --- a/tools/testing/selftests/bpf/config.x86_64
> > +++ b/tools/testing/selftests/bpf/config.x86_64
> > @@ -1,6 +1,3 @@
> > -CONFIG_9P_FS=y
> > -CONFIG_9P_FS_POSIX_ACL=y
> > -CONFIG_9P_FS_SECURITY=y
> > CONFIG_AGP=y
> > CONFIG_AGP_AMD64=y
> > CONFIG_AGP_INTEL=y
> > @@ -45,7 +42,6 @@ CONFIG_CPU_IDLE_GOV_LADDER=y
> > CONFIG_CPUSETS=y
> > CONFIG_CRC_T10DIF=y
> > CONFIG_CRYPTO_BLAKE2B=y
> > -CONFIG_CRYPTO_DEV_VIRTIO=y
> > CONFIG_CRYPTO_SEQIV=y
> > CONFIG_CRYPTO_XXHASH=y
> > CONFIG_DCB=y
> > @@ -145,8 +141,6 @@ CONFIG_MEMORY_FAILURE=y
> > CONFIG_MINIX_SUBPARTITION=y
> > CONFIG_NAMESPACES=y
> > CONFIG_NET=y
> > -CONFIG_NET_9P=y
> > -CONFIG_NET_9P_VIRTIO=y
> > CONFIG_NET_ACT_BPF=y
> > CONFIG_NET_CLS_CGROUP=y
> > CONFIG_NET_EMATCH=y
> > @@ -228,12 +222,6 @@ CONFIG_USER_NS=y
> > CONFIG_VALIDATE_FS_PARSER=y
> > CONFIG_VETH=y
> > CONFIG_VIRT_DRIVERS=y
> > -CONFIG_VIRTIO_BALLOON=y
> > -CONFIG_VIRTIO_BLK=y
> > -CONFIG_VIRTIO_CONSOLE=y
> > -CONFIG_VIRTIO_NET=y
> > -CONFIG_VIRTIO_PCI=y
> > -CONFIG_VIRTIO_VSOCKETS_COMMON=y
> > CONFIG_VLAN_8021Q=y
> > CONFIG_VSOCKETS=y
> > CONFIG_VSOCKETS_LOOPBACK=y
> > --
> > 2.39.3
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-10-28 0:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-27 21:23 [PATCH bpf-next] selftests/bpf: consolidate VIRTIO/9P configs in the generic config file Manu Bretelle
2023-10-27 21:33 ` Song Liu
2023-10-28 0:53 ` Manu Bretelle
2023-10-27 21:38 ` Andrii Nakryiko
2023-10-28 0:48 ` Manu Bretelle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox