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: Remove entries from config.{arch} already present in config

`config.{arch}` had entries already present in `config`.

When generating the config used by vmtest, concatenate the `config` file
with the `config.{arch}` one, making those entries duplicated, so remove
those duplications.

Use the following command to get the differences:

$ comm -1 -2 <(sort tools/testing/selftests/bpf/config.x86_64) <(sort tools/testing/selftests/bpf/config)
$ comm -1 -2 <(sort tools/testing/selftests/bpf/config.aarch64) <(sort tools/testing/selftests/bpf/config)
$ comm -1 -2 <(sort tools/testing/selftests/bpf/config.riscv64) <(sort tools/testing/selftests/bpf/config)
$ comm -1 -2 <(sort tools/testing/selftests/bpf/config.ppc64el) <(sort tools/testing/selftests/bpf/config)
$ comm -1 -2 <(sort tools/testing/selftests/bpf/config.s390x) <(sort tools/testing/selftests/bpf/config)

This is similar with commit 7a42af4b94f1 ("selftests/bpf: Remove entries
from config.s390x already present in config").

Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20250826065057.11415-1-yangtiezhu@loongson.cn

authored by

Tiezhu Yang and committed by
Daniel Borkmann d0f27ff2 f4c227cc

-30
-12
tools/testing/selftests/bpf/config.aarch64
··· 31 31 CONFIG_CPUSETS=y 32 32 CONFIG_CRASH_DUMP=y 33 33 CONFIG_CRYPTO_USER_API_RNG=y 34 - CONFIG_CRYPTO_USER_API_SKCIPHER=y 35 34 CONFIG_DEBUG_ATOMIC_SLEEP=y 36 - CONFIG_DEBUG_INFO_BTF=y 37 - CONFIG_DEBUG_INFO_DWARF4=y 38 35 CONFIG_DEBUG_INFO_REDUCED=n 39 36 CONFIG_DEBUG_LIST=y 40 37 CONFIG_DEBUG_LOCKDEP=y ··· 43 46 CONFIG_DEVTMPFS_MOUNT=y 44 47 CONFIG_DEVTMPFS=y 45 48 CONFIG_DRM=y 46 - CONFIG_DUMMY=y 47 49 CONFIG_EXPERT=y 48 50 CONFIG_EXT4_FS_POSIX_ACL=y 49 51 CONFIG_EXT4_FS_SECURITY=y ··· 66 70 CONFIG_IDLE_PAGE_TRACKING=y 67 71 CONFIG_IKHEADERS=y 68 72 CONFIG_INET6_ESP=y 69 - CONFIG_INET_ESP=y 70 73 CONFIG_INET=y 71 74 CONFIG_INPUT_EVDEV=y 72 75 CONFIG_IP_ADVANCED_ROUTER=y 73 76 CONFIG_IP_MULTICAST=y 74 77 CONFIG_IP_MULTIPLE_TABLES=y 75 - CONFIG_IP_NF_IPTABLES=y 76 78 CONFIG_IPV6_SEG6_LWTUNNEL=y 77 79 CONFIG_IPVLAN=y 78 80 CONFIG_JUMP_LABEL=y ··· 91 97 CONFIG_MEMORY_HOTREMOVE=y 92 98 CONFIG_NAMESPACES=y 93 99 CONFIG_NET_ACT_BPF=y 94 - CONFIG_NET_ACT_GACT=y 95 100 CONFIG_NETDEVICES=y 96 101 CONFIG_NETFILTER_XT_MATCH_BPF=y 97 102 CONFIG_NETFILTER_XT_TARGET_MARK=y 98 103 CONFIG_NET_KEY=y 99 - CONFIG_NET_SCH_FQ=y 100 104 CONFIG_NET_VRF=y 101 105 CONFIG_NET=y 102 - CONFIG_NF_TABLES=y 103 106 CONFIG_NLMON=y 104 107 CONFIG_NO_HZ_IDLE=y 105 108 CONFIG_NR_CPUS=256 106 109 CONFIG_NUMA=y 107 110 CONFIG_OVERLAY_FS=y 108 111 CONFIG_PACKET_DIAG=y 109 - CONFIG_PACKET=y 110 112 CONFIG_PANIC_ON_OOPS=y 111 113 CONFIG_PARTITION_ADVANCED=y 112 114 CONFIG_PCI_HOST_GENERIC=y ··· 139 149 CONFIG_TCG_TIS=y 140 150 CONFIG_TCG_TPM=y 141 151 CONFIG_TCP_CONG_ADVANCED=y 142 - CONFIG_TCP_CONG_DCTCP=y 143 152 CONFIG_TLS=y 144 153 CONFIG_TMPFS_POSIX_ACL=y 145 154 CONFIG_TMPFS=y ··· 150 161 CONFIG_USER_NS=y 151 162 CONFIG_VETH=y 152 163 CONFIG_VLAN_8021Q=y 153 - CONFIG_VSOCKETS=y 154 164 CONFIG_VSOCKETS_LOOPBACK=y 155 165 CONFIG_XFRM_USER=y
-1
tools/testing/selftests/bpf/config.ppc64el
··· 54 54 CONFIG_NO_HZ_IDLE=y 55 55 CONFIG_NONPORTABLE=y 56 56 CONFIG_NR_CPUS=256 57 - CONFIG_PACKET=y 58 57 CONFIG_PANIC_ON_OOPS=y 59 58 CONFIG_PARTITION_ADVANCED=y 60 59 CONFIG_PCI_HOST_GENERIC=y
-1
tools/testing/selftests/bpf/config.riscv64
··· 48 48 CONFIG_NONPORTABLE=y 49 49 CONFIG_NO_HZ_IDLE=y 50 50 CONFIG_NR_CPUS=256 51 - CONFIG_PACKET=y 52 51 CONFIG_PANIC_ON_OOPS=y 53 52 CONFIG_PARTITION_ADVANCED=y 54 53 CONFIG_PCI=y
-11
tools/testing/selftests/bpf/config.s390x
··· 22 22 CONFIG_CPUSETS=y 23 23 CONFIG_CRASH_DUMP=y 24 24 CONFIG_CRYPTO_USER_API_RNG=y 25 - CONFIG_CRYPTO_USER_API_SKCIPHER=y 26 25 CONFIG_DEBUG_ATOMIC_SLEEP=y 27 - CONFIG_DEBUG_INFO_BTF=y 28 - CONFIG_DEBUG_INFO_DWARF4=y 29 26 CONFIG_DEBUG_LIST=y 30 27 CONFIG_DEBUG_LOCKDEP=y 31 28 CONFIG_DEBUG_NOTIFIERS=y ··· 53 56 CONFIG_IKHEADERS=y 54 57 CONFIG_INET6_ESP=y 55 58 CONFIG_INET=y 56 - CONFIG_INET_ESP=y 57 59 CONFIG_IP_ADVANCED_ROUTER=y 58 60 CONFIG_IP_MULTICAST=y 59 61 CONFIG_IP_MULTIPLE_TABLES=y 60 - CONFIG_IP_NF_IPTABLES=y 61 62 CONFIG_IPV6_SEG6_LWTUNNEL=y 62 63 CONFIG_IPVLAN=y 63 64 CONFIG_JUMP_LABEL=y ··· 78 83 CONFIG_NAMESPACES=y 79 84 CONFIG_NET=y 80 85 CONFIG_NET_ACT_BPF=y 81 - CONFIG_NET_ACT_GACT=y 82 86 CONFIG_NET_KEY=y 83 - CONFIG_NET_SCH_FQ=y 84 87 CONFIG_NET_VRF=y 85 88 CONFIG_NETDEVICES=y 86 89 CONFIG_NETFILTER_XT_MATCH_BPF=y 87 90 CONFIG_NETFILTER_XT_TARGET_MARK=y 88 - CONFIG_NF_TABLES=y 89 91 CONFIG_NO_HZ_IDLE=y 90 92 CONFIG_NR_CPUS=256 91 93 CONFIG_NUMA=y 92 - CONFIG_PACKET=y 93 94 CONFIG_PANIC_ON_OOPS=y 94 95 CONFIG_PARTITION_ADVANCED=y 95 96 CONFIG_PCI=y ··· 110 119 CONFIG_TASK_XACCT=y 111 120 CONFIG_TASKSTATS=y 112 121 CONFIG_TCP_CONG_ADVANCED=y 113 - CONFIG_TCP_CONG_DCTCP=y 114 122 CONFIG_TLS=y 115 123 CONFIG_TMPFS=y 116 124 CONFIG_TMPFS_POSIX_ACL=y ··· 121 131 CONFIG_USER_NS=y 122 132 CONFIG_VETH=y 123 133 CONFIG_VLAN_8021Q=y 124 - CONFIG_VSOCKETS=y 125 134 CONFIG_VSOCKETS_LOOPBACK=y 126 135 CONFIG_XFRM_USER=y
-5
tools/testing/selftests/bpf/config.x86_64
··· 44 44 CONFIG_CRYPTO_XXHASH=y 45 45 CONFIG_DCB=y 46 46 CONFIG_DEBUG_ATOMIC_SLEEP=y 47 - CONFIG_DEBUG_INFO_BTF=y 48 47 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y 49 48 CONFIG_DEBUG_MEMORY_INIT=y 50 49 CONFIG_DEFAULT_FQ_CODEL=y ··· 103 104 CONFIG_INET=y 104 105 CONFIG_INPUT_EVDEV=y 105 106 CONFIG_INTEL_POWERCLAMP=y 106 - CONFIG_IP6_NF_IPTABLES=y 107 107 CONFIG_IP_ADVANCED_ROUTER=y 108 108 CONFIG_IP_MROUTE=y 109 109 CONFIG_IP_MULTICAST=y 110 110 CONFIG_IP_MULTIPLE_TABLES=y 111 - CONFIG_IP_NF_IPTABLES=y 112 111 CONFIG_IP_PIMSM_V1=y 113 112 CONFIG_IP_PIMSM_V2=y 114 113 CONFIG_IP_ROUTE_MULTIPATH=y ··· 159 162 CONFIG_NUMA_BALANCING=y 160 163 CONFIG_NVMEM=y 161 164 CONFIG_OSF_PARTITION=y 162 - CONFIG_PACKET=y 163 165 CONFIG_PANIC_ON_OOPS=y 164 166 CONFIG_PARTITION_ADVANCED=y 165 167 CONFIG_PCI=y ··· 216 220 CONFIG_VETH=y 217 221 CONFIG_VIRT_DRIVERS=y 218 222 CONFIG_VLAN_8021Q=y 219 - CONFIG_VSOCKETS=y 220 223 CONFIG_VSOCKETS_LOOPBACK=y 221 224 CONFIG_X86_ACPI_CPUFREQ=y 222 225 CONFIG_X86_CPUID=y