From nobody Fri Oct 3 19:12:02 2025 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 069571F03EF; Tue, 26 Aug 2025 06:51:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756191071; cv=none; b=M3zvrKyb6vSKou5qI/v6Gt2uFVmxpOpi3LXTCLIGrZ9jF8vjfvecgheYWfMXmztx3UsvI8ZdQOPbIUp8SdGLOs0vPsrVCX5AKoFgLnNGtr4QcH/ypByV6q0+Ff0wBplS7nKgFOZjWpOTv7ay4V1/CTCNqg/G2zuIVKcJUUocWUI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756191071; c=relaxed/simple; bh=Dhcw2LVk+CjWFnJza20NnRyE5UvD3ExPFBohI1uSXPE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CyFssjOY7grf7XPD18vLSVjikBJTomnWtkXdVToB82CcL2mAO1fkyvsrCMaSamrfKa367WQRfPfyCKg8+Vw2ZDwYdf94PPnfg/fhxffWkempwD1GW+O9Pxhm4XNIahnWQdeALKeWcY/kKmkwHZC/nSLWptI/J5s0oWlcEL3qMEI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8Dxfb9TWa1owUEDAA--.5188S3; Tue, 26 Aug 2025 14:50:59 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by front1 (Coremail) with SMTP id qMiowJCxH8JRWa1oQG1pAA--.11176S2; Tue, 26 Aug 2025 14:50:58 +0800 (CST) From: Tiezhu Yang To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next] selftests/bpf: Remove entries from config.{arch} already present in config Date: Tue, 26 Aug 2025 14:50:57 +0800 Message-ID: <20250826065057.11415-1-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJCxH8JRWa1oQG1pAA--.11176S2 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoW3Jr4fuF4xGryDCrWrWF13WrX_yoW3Wr43pw 18Jw48tF18JF15ArWxCrWDGFZ8tFnrJFW7Gr13Jr15Zw18J3yxJr4xKF4UJrZ8WFZxXr4r Aas3KF13ZF4UJ3cCm3ZEXasCq-sJn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUk0b4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx1l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv67AK xVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Xr0_Ar1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I 0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUcCD7UUUUU Content-Type: text/plain; charset="utf-8" `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 to= ols/testing/selftests/bpf/config) $ comm -1 -2 <(sort tools/testing/selftests/bpf/config.aarch64) <(sort t= ools/testing/selftests/bpf/config) $ comm -1 -2 <(sort tools/testing/selftests/bpf/config.riscv64) <(sort t= ools/testing/selftests/bpf/config) $ comm -1 -2 <(sort tools/testing/selftests/bpf/config.ppc64el) <(sort t= ools/testing/selftests/bpf/config) $ comm -1 -2 <(sort tools/testing/selftests/bpf/config.s390x) <(sort too= ls/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 --- tools/testing/selftests/bpf/config.aarch64 | 12 ------------ tools/testing/selftests/bpf/config.ppc64el | 1 - tools/testing/selftests/bpf/config.riscv64 | 1 - tools/testing/selftests/bpf/config.s390x | 11 ----------- tools/testing/selftests/bpf/config.x86_64 | 5 ----- 5 files changed, 30 deletions(-) diff --git a/tools/testing/selftests/bpf/config.aarch64 b/tools/testing/sel= ftests/bpf/config.aarch64 index e1495a4bbc99..7efad36ceb26 100644 --- a/tools/testing/selftests/bpf/config.aarch64 +++ b/tools/testing/selftests/bpf/config.aarch64 @@ -31,10 +31,7 @@ CONFIG_COMPAT=3Dy CONFIG_CPUSETS=3Dy CONFIG_CRASH_DUMP=3Dy CONFIG_CRYPTO_USER_API_RNG=3Dy -CONFIG_CRYPTO_USER_API_SKCIPHER=3Dy CONFIG_DEBUG_ATOMIC_SLEEP=3Dy -CONFIG_DEBUG_INFO_BTF=3Dy -CONFIG_DEBUG_INFO_DWARF4=3Dy CONFIG_DEBUG_INFO_REDUCED=3Dn CONFIG_DEBUG_LIST=3Dy CONFIG_DEBUG_LOCKDEP=3Dy @@ -46,7 +43,6 @@ CONFIG_DETECT_HUNG_TASK=3Dy CONFIG_DEVTMPFS_MOUNT=3Dy CONFIG_DEVTMPFS=3Dy CONFIG_DRM=3Dy -CONFIG_DUMMY=3Dy CONFIG_EXPERT=3Dy CONFIG_EXT4_FS_POSIX_ACL=3Dy CONFIG_EXT4_FS_SECURITY=3Dy @@ -70,13 +66,11 @@ CONFIG_HZ_100=3Dy CONFIG_IDLE_PAGE_TRACKING=3Dy CONFIG_IKHEADERS=3Dy CONFIG_INET6_ESP=3Dy -CONFIG_INET_ESP=3Dy CONFIG_INET=3Dy CONFIG_INPUT_EVDEV=3Dy CONFIG_IP_ADVANCED_ROUTER=3Dy CONFIG_IP_MULTICAST=3Dy CONFIG_IP_MULTIPLE_TABLES=3Dy -CONFIG_IP_NF_IPTABLES=3Dy CONFIG_IPV6_SEG6_LWTUNNEL=3Dy CONFIG_IPVLAN=3Dy CONFIG_JUMP_LABEL=3Dy @@ -97,22 +91,18 @@ CONFIG_MEMORY_HOTPLUG=3Dy CONFIG_MEMORY_HOTREMOVE=3Dy CONFIG_NAMESPACES=3Dy CONFIG_NET_ACT_BPF=3Dy -CONFIG_NET_ACT_GACT=3Dy CONFIG_NETDEVICES=3Dy CONFIG_NETFILTER_XT_MATCH_BPF=3Dy CONFIG_NETFILTER_XT_TARGET_MARK=3Dy CONFIG_NET_KEY=3Dy -CONFIG_NET_SCH_FQ=3Dy CONFIG_NET_VRF=3Dy CONFIG_NET=3Dy -CONFIG_NF_TABLES=3Dy CONFIG_NLMON=3Dy CONFIG_NO_HZ_IDLE=3Dy CONFIG_NR_CPUS=3D256 CONFIG_NUMA=3Dy CONFIG_OVERLAY_FS=3Dy CONFIG_PACKET_DIAG=3Dy -CONFIG_PACKET=3Dy CONFIG_PANIC_ON_OOPS=3Dy CONFIG_PARTITION_ADVANCED=3Dy CONFIG_PCI_HOST_GENERIC=3Dy @@ -149,7 +139,6 @@ CONFIG_TASK_XACCT=3Dy CONFIG_TCG_TIS=3Dy CONFIG_TCG_TPM=3Dy CONFIG_TCP_CONG_ADVANCED=3Dy -CONFIG_TCP_CONG_DCTCP=3Dy CONFIG_TLS=3Dy CONFIG_TMPFS_POSIX_ACL=3Dy CONFIG_TMPFS=3Dy @@ -161,6 +150,5 @@ CONFIG_UPROBES=3Dy CONFIG_USER_NS=3Dy CONFIG_VETH=3Dy CONFIG_VLAN_8021Q=3Dy -CONFIG_VSOCKETS=3Dy CONFIG_VSOCKETS_LOOPBACK=3Dy CONFIG_XFRM_USER=3Dy diff --git a/tools/testing/selftests/bpf/config.ppc64el b/tools/testing/sel= ftests/bpf/config.ppc64el index 9acf389dc4ce..b53afb5e0b71 100644 --- a/tools/testing/selftests/bpf/config.ppc64el +++ b/tools/testing/selftests/bpf/config.ppc64el @@ -54,7 +54,6 @@ CONFIG_NET=3Dy CONFIG_NO_HZ_IDLE=3Dy CONFIG_NONPORTABLE=3Dy CONFIG_NR_CPUS=3D256 -CONFIG_PACKET=3Dy CONFIG_PANIC_ON_OOPS=3Dy CONFIG_PARTITION_ADVANCED=3Dy CONFIG_PCI_HOST_GENERIC=3Dy diff --git a/tools/testing/selftests/bpf/config.riscv64 b/tools/testing/sel= ftests/bpf/config.riscv64 index bb7043a80e1a..7bee24a79a71 100644 --- a/tools/testing/selftests/bpf/config.riscv64 +++ b/tools/testing/selftests/bpf/config.riscv64 @@ -48,7 +48,6 @@ CONFIG_NET_VRF=3Dy CONFIG_NONPORTABLE=3Dy CONFIG_NO_HZ_IDLE=3Dy CONFIG_NR_CPUS=3D256 -CONFIG_PACKET=3Dy CONFIG_PANIC_ON_OOPS=3Dy CONFIG_PARTITION_ADVANCED=3Dy CONFIG_PCI=3Dy diff --git a/tools/testing/selftests/bpf/config.s390x b/tools/testing/selft= ests/bpf/config.s390x index 26c3bc2ce11d..db61878148e4 100644 --- a/tools/testing/selftests/bpf/config.s390x +++ b/tools/testing/selftests/bpf/config.s390x @@ -22,10 +22,7 @@ CONFIG_CHECKPOINT_RESTORE=3Dy CONFIG_CPUSETS=3Dy CONFIG_CRASH_DUMP=3Dy CONFIG_CRYPTO_USER_API_RNG=3Dy -CONFIG_CRYPTO_USER_API_SKCIPHER=3Dy CONFIG_DEBUG_ATOMIC_SLEEP=3Dy -CONFIG_DEBUG_INFO_BTF=3Dy -CONFIG_DEBUG_INFO_DWARF4=3Dy CONFIG_DEBUG_LIST=3Dy CONFIG_DEBUG_LOCKDEP=3Dy CONFIG_DEBUG_NOTIFIERS=3Dy @@ -56,11 +53,9 @@ CONFIG_IDLE_PAGE_TRACKING=3Dy CONFIG_IKHEADERS=3Dy CONFIG_INET6_ESP=3Dy CONFIG_INET=3Dy -CONFIG_INET_ESP=3Dy CONFIG_IP_ADVANCED_ROUTER=3Dy CONFIG_IP_MULTICAST=3Dy CONFIG_IP_MULTIPLE_TABLES=3Dy -CONFIG_IP_NF_IPTABLES=3Dy CONFIG_IPV6_SEG6_LWTUNNEL=3Dy CONFIG_IPVLAN=3Dy CONFIG_JUMP_LABEL=3Dy @@ -83,18 +78,14 @@ CONFIG_MEMORY_HOTREMOVE=3Dy CONFIG_NAMESPACES=3Dy CONFIG_NET=3Dy CONFIG_NET_ACT_BPF=3Dy -CONFIG_NET_ACT_GACT=3Dy CONFIG_NET_KEY=3Dy -CONFIG_NET_SCH_FQ=3Dy CONFIG_NET_VRF=3Dy CONFIG_NETDEVICES=3Dy CONFIG_NETFILTER_XT_MATCH_BPF=3Dy CONFIG_NETFILTER_XT_TARGET_MARK=3Dy -CONFIG_NF_TABLES=3Dy CONFIG_NO_HZ_IDLE=3Dy CONFIG_NR_CPUS=3D256 CONFIG_NUMA=3Dy -CONFIG_PACKET=3Dy CONFIG_PANIC_ON_OOPS=3Dy CONFIG_PARTITION_ADVANCED=3Dy CONFIG_PCI=3Dy @@ -119,7 +110,6 @@ CONFIG_TASK_IO_ACCOUNTING=3Dy CONFIG_TASK_XACCT=3Dy CONFIG_TASKSTATS=3Dy CONFIG_TCP_CONG_ADVANCED=3Dy -CONFIG_TCP_CONG_DCTCP=3Dy CONFIG_TLS=3Dy CONFIG_TMPFS=3Dy CONFIG_TMPFS_POSIX_ACL=3Dy @@ -131,6 +121,5 @@ CONFIG_UPROBES=3Dy CONFIG_USER_NS=3Dy CONFIG_VETH=3Dy CONFIG_VLAN_8021Q=3Dy -CONFIG_VSOCKETS=3Dy CONFIG_VSOCKETS_LOOPBACK=3Dy CONFIG_XFRM_USER=3Dy diff --git a/tools/testing/selftests/bpf/config.x86_64 b/tools/testing/self= tests/bpf/config.x86_64 index 5e713ef7caa3..42ad817b00ae 100644 --- a/tools/testing/selftests/bpf/config.x86_64 +++ b/tools/testing/selftests/bpf/config.x86_64 @@ -44,7 +44,6 @@ CONFIG_CRYPTO_SEQIV=3Dy CONFIG_CRYPTO_XXHASH=3Dy CONFIG_DCB=3Dy CONFIG_DEBUG_ATOMIC_SLEEP=3Dy -CONFIG_DEBUG_INFO_BTF=3Dy CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=3Dy CONFIG_DEBUG_MEMORY_INIT=3Dy CONFIG_DEFAULT_FQ_CODEL=3Dy @@ -104,12 +103,10 @@ CONFIG_HZ_1000=3Dy CONFIG_INET=3Dy CONFIG_INPUT_EVDEV=3Dy CONFIG_INTEL_POWERCLAMP=3Dy -CONFIG_IP6_NF_IPTABLES=3Dy CONFIG_IP_ADVANCED_ROUTER=3Dy CONFIG_IP_MROUTE=3Dy CONFIG_IP_MULTICAST=3Dy CONFIG_IP_MULTIPLE_TABLES=3Dy -CONFIG_IP_NF_IPTABLES=3Dy CONFIG_IP_PIMSM_V1=3Dy CONFIG_IP_PIMSM_V2=3Dy CONFIG_IP_ROUTE_MULTIPATH=3Dy @@ -162,7 +159,6 @@ CONFIG_NUMA=3Dy CONFIG_NUMA_BALANCING=3Dy CONFIG_NVMEM=3Dy CONFIG_OSF_PARTITION=3Dy -CONFIG_PACKET=3Dy CONFIG_PANIC_ON_OOPS=3Dy CONFIG_PARTITION_ADVANCED=3Dy CONFIG_PCI=3Dy @@ -220,7 +216,6 @@ CONFIG_VALIDATE_FS_PARSER=3Dy CONFIG_VETH=3Dy CONFIG_VIRT_DRIVERS=3Dy CONFIG_VLAN_8021Q=3Dy -CONFIG_VSOCKETS=3Dy CONFIG_VSOCKETS_LOOPBACK=3Dy CONFIG_X86_ACPI_CPUFREQ=3Dy CONFIG_X86_CPUID=3Dy --=20 2.42.0