tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

selftests/bpf: Consolidate VIRTIO/9P configs in config.vm file

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,vm`, we should have selftest kernels which are
equal in term of VM functionalities when they include this file.

The set of config unabled were picked using

grep -h -E '(_9P|_VIRTIO)' config.x86_64 config | sort | uniq

added to `config.vm` 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>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20231031212717.4037892-1-chantr4@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Manu Bretelle and committed by
Alexei Starovoitov b0cf0dcd e3499962

+15 -38
-16
tools/testing/selftests/bpf/config.aarch64
··· 1 - CONFIG_9P_FS=y 2 1 CONFIG_ARCH_VEXPRESS=y 3 2 CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y 4 3 CONFIG_ARM_SMMU_V3=y ··· 45 46 CONFIG_DETECT_HUNG_TASK=y 46 47 CONFIG_DEVTMPFS_MOUNT=y 47 48 CONFIG_DEVTMPFS=y 48 - CONFIG_DRM_VIRTIO_GPU=y 49 49 CONFIG_DRM=y 50 50 CONFIG_DUMMY=y 51 51 CONFIG_EXPERT=y ··· 65 67 CONFIG_HEADERS_INSTALL=y 66 68 CONFIG_HIGH_RES_TIMERS=y 67 69 CONFIG_HUGETLBFS=y 68 - CONFIG_HW_RANDOM_VIRTIO=y 69 70 CONFIG_HW_RANDOM=y 70 71 CONFIG_HZ_100=y 71 72 CONFIG_IDLE_PAGE_TRACKING=y ··· 96 99 CONFIG_MEMORY_HOTPLUG=y 97 100 CONFIG_MEMORY_HOTREMOVE=y 98 101 CONFIG_NAMESPACES=y 99 - CONFIG_NET_9P_VIRTIO=y 100 - CONFIG_NET_9P=y 101 102 CONFIG_NET_ACT_BPF=y 102 103 CONFIG_NET_ACT_GACT=y 103 104 CONFIG_NETDEVICES=y ··· 135 140 CONFIG_SCSI_CONSTANTS=y 136 141 CONFIG_SCSI_LOGGING=y 137 142 CONFIG_SCSI_SCAN_ASYNC=y 138 - CONFIG_SCSI_VIRTIO=y 139 143 CONFIG_SCSI=y 140 144 CONFIG_SECURITY_NETWORK=y 141 145 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y ··· 161 167 CONFIG_USELIB=y 162 168 CONFIG_USER_NS=y 163 169 CONFIG_VETH=y 164 - CONFIG_VIRTIO_BALLOON=y 165 - CONFIG_VIRTIO_BLK=y 166 - CONFIG_VIRTIO_CONSOLE=y 167 - CONFIG_VIRTIO_FS=y 168 - CONFIG_VIRTIO_INPUT=y 169 - CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y 170 - CONFIG_VIRTIO_MMIO=y 171 - CONFIG_VIRTIO_NET=y 172 - CONFIG_VIRTIO_PCI=y 173 - CONFIG_VIRTIO_VSOCKETS_COMMON=y 174 170 CONFIG_VLAN_8021Q=y 175 171 CONFIG_VSOCKETS=y 176 172 CONFIG_VSOCKETS_LOOPBACK=y
-9
tools/testing/selftests/bpf/config.s390x
··· 1 - CONFIG_9P_FS=y 2 1 CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y 3 2 CONFIG_AUDIT=y 4 3 CONFIG_BLK_CGROUP=y ··· 83 84 CONFIG_MEMORY_HOTREMOVE=y 84 85 CONFIG_NAMESPACES=y 85 86 CONFIG_NET=y 86 - CONFIG_NET_9P=y 87 - CONFIG_NET_9P_VIRTIO=y 88 87 CONFIG_NET_ACT_BPF=y 89 88 CONFIG_NET_ACT_GACT=y 90 89 CONFIG_NET_KEY=y ··· 111 114 CONFIG_SAMPLES=y 112 115 CONFIG_SCHED_TRACER=y 113 116 CONFIG_SCSI=y 114 - CONFIG_SCSI_VIRTIO=y 115 117 CONFIG_SECURITY_NETWORK=y 116 118 CONFIG_STACK_TRACER=y 117 119 CONFIG_STATIC_KEYS_SELFTEST=y ··· 132 136 CONFIG_USELIB=y 133 137 CONFIG_USER_NS=y 134 138 CONFIG_VETH=y 135 - CONFIG_VIRTIO_BALLOON=y 136 - CONFIG_VIRTIO_BLK=y 137 - CONFIG_VIRTIO_NET=y 138 - CONFIG_VIRTIO_PCI=y 139 - CONFIG_VIRTIO_VSOCKETS_COMMON=y 140 139 CONFIG_VLAN_8021Q=y 141 140 CONFIG_VSOCKETS=y 142 141 CONFIG_VSOCKETS_LOOPBACK=y
+12
tools/testing/selftests/bpf/config.vm
··· 1 + CONFIG_9P_FS=y 2 + CONFIG_9P_FS_POSIX_ACL=y 3 + CONFIG_9P_FS_SECURITY=y 4 + CONFIG_CRYPTO_DEV_VIRTIO=y 5 + CONFIG_NET_9P=y 6 + CONFIG_NET_9P_VIRTIO=y 7 + CONFIG_VIRTIO_BALLOON=y 8 + CONFIG_VIRTIO_BLK=y 9 + CONFIG_VIRTIO_CONSOLE=y 10 + CONFIG_VIRTIO_NET=y 11 + CONFIG_VIRTIO_PCI=y 12 + CONFIG_VIRTIO_VSOCKETS_COMMON=y
-12
tools/testing/selftests/bpf/config.x86_64
··· 1 - CONFIG_9P_FS=y 2 - CONFIG_9P_FS_POSIX_ACL=y 3 - CONFIG_9P_FS_SECURITY=y 4 1 CONFIG_AGP=y 5 2 CONFIG_AGP_AMD64=y 6 3 CONFIG_AGP_INTEL=y ··· 42 45 CONFIG_CPUSETS=y 43 46 CONFIG_CRC_T10DIF=y 44 47 CONFIG_CRYPTO_BLAKE2B=y 45 - CONFIG_CRYPTO_DEV_VIRTIO=y 46 48 CONFIG_CRYPTO_SEQIV=y 47 49 CONFIG_CRYPTO_XXHASH=y 48 50 CONFIG_DCB=y ··· 141 145 CONFIG_MINIX_SUBPARTITION=y 142 146 CONFIG_NAMESPACES=y 143 147 CONFIG_NET=y 144 - CONFIG_NET_9P=y 145 - CONFIG_NET_9P_VIRTIO=y 146 148 CONFIG_NET_ACT_BPF=y 147 149 CONFIG_NET_CLS_CGROUP=y 148 150 CONFIG_NET_EMATCH=y ··· 222 228 CONFIG_VALIDATE_FS_PARSER=y 223 229 CONFIG_VETH=y 224 230 CONFIG_VIRT_DRIVERS=y 225 - CONFIG_VIRTIO_BALLOON=y 226 - CONFIG_VIRTIO_BLK=y 227 - CONFIG_VIRTIO_CONSOLE=y 228 - CONFIG_VIRTIO_NET=y 229 - CONFIG_VIRTIO_PCI=y 230 - CONFIG_VIRTIO_VSOCKETS_COMMON=y 231 231 CONFIG_VLAN_8021Q=y 232 232 CONFIG_VSOCKETS=y 233 233 CONFIG_VSOCKETS_LOOPBACK=y
+3 -1
tools/testing/selftests/bpf/vmtest.sh
··· 36 36 MOUNT_DIR="mnt" 37 37 ROOTFS_IMAGE="root.img" 38 38 OUTPUT_DIR="$HOME/.bpf_selftests" 39 - KCONFIG_REL_PATHS=("tools/testing/selftests/bpf/config" "tools/testing/selftests/bpf/config.${ARCH}") 39 + KCONFIG_REL_PATHS=("tools/testing/selftests/bpf/config" 40 + "tools/testing/selftests/bpf/config.vm" 41 + "tools/testing/selftests/bpf/config.${ARCH}") 40 42 INDEX_URL="https://raw.githubusercontent.com/libbpf/ci/master/INDEX" 41 43 NUM_COMPILE_JOBS="$(nproc)" 42 44 LOG_FILE_BASE="$(date +"bpf_selftests.%Y-%m-%d_%H-%M-%S")"