From patchwork Fri Feb 8 17:41:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiong Wang X-Patchwork-Id: 1038835 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="t5+9FYm8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43x2YM6sYkz9sMr for ; Sat, 9 Feb 2019 04:41:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727984AbfBHRli (ORCPT ); Fri, 8 Feb 2019 12:41:38 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39679 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727824AbfBHRlg (ORCPT ); Fri, 8 Feb 2019 12:41:36 -0500 Received: by mail-wm1-f67.google.com with SMTP id f16so4343313wmh.4 for ; Fri, 08 Feb 2019 09:41:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FQBled6ulSCWhxt64TOVZbuU+9e7UgyVI0FEOTAX9aA=; b=t5+9FYm8ZjsMOrGdtj6RRyZ0cJtfLVRgPtdSv0SRsksdBHQyST/z91JQQfwRnRnLHk 7zaFklrb36UyJ2ZxRmUUUOBGOSSLfpIZzqy6YneU9c9H8R/NkQwXP/74P3IHs0JUdWPt 6ZO22ygf7guxV1HSASacoJoQewyxvukvR3F3ofEsEYTfsO7VkUNBI8paq8DNGM3RTZfA 61NahPVARzUl0T0TrB+507OW8q4olyPkoXE5JePKgXe6HqZbFU8KWJegOdrQRfWOboND uiRoziWH7N8owK39QAcWYXv26cBB09XYww7Ci2SwegICORLAiGYzC1lo3oALRlTVxaLP MQSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FQBled6ulSCWhxt64TOVZbuU+9e7UgyVI0FEOTAX9aA=; b=ReKJvKWdGsFSGYCFmyoi7HneSFhHyhQ76I8JzB95g25cP8ZIfk9K0a57+34BPk8xBc zkN4ur5QyK//1cPYsbiB6uLyWPV5Mh5AfbRySbYMiMdXOlGQTZyVmP0vvwl2G06w8C2+ tOUw3yrVcy0EixXKCUKNF/Ilvsq8H0V6XPBh24bcmH39pSMySFB7/ChmPZxBOa57taga KnrPZ5bPo38qyomjffS/BnUPoV9lxG+L+Rc/TIJw3qXB/bTFWElb/5xGERZ+G7c40dzv K9So6Qm9B7b38+uQAsfIRx03Bi22QSSFijo2RwrMVWe0DkkOecesRHHHkbWOeiVYHUuV WWcA== X-Gm-Message-State: AHQUAubj7110QOFJs1oriRzit79sbg/COMOkHlYbN8GLyi4MR4ymtvfV XmOBqOyX42wAMJXNrz/xQU2mIA== X-Google-Smtp-Source: AHgI3Ib2Qt8RjxgaAHU+xmgEAaRYyZMUNVsVthZdvP3F3D8DnT292IH13qdsXUt76sXT4apy1Kl/xg== X-Received: by 2002:adf:824b:: with SMTP id 69mr6602627wrb.24.1549647691750; Fri, 08 Feb 2019 09:41:31 -0800 (PST) Received: from cbtest28.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id w16sm2944138wrp.1.2019.02.08.09.41.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Feb 2019 09:41:31 -0800 (PST) From: Jiong Wang To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jiong Wang Subject: [PATCH bpf-next 3/3] selftests: bpf: centre kernel bpf objects under new subdir "kern_progs" Date: Fri, 8 Feb 2019 17:41:21 +0000 Message-Id: <1549647681-13818-4-git-send-email-jiong.wang@netronome.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1549647681-13818-1-git-send-email-jiong.wang@netronome.com> References: <1549647681-13818-1-git-send-email-jiong.wang@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org At the moment, all kernel bpf objects are listed under BPF_OBJ_FILES. Listing them manually sometimes causing patch conflict when people are adding new testcases simultaneously. It is better to centre all the related source files under a subdir "kern_progs", then auto-generate the object file list. Suggested-by: Alexei Starovoitov Reviewed-by: Jakub Kicinski Signed-off-by: Jiong Wang --- tools/testing/selftests/bpf/Makefile | 26 +++++----------------- .../selftests/bpf/{ => kern_progs}/bpf_flow.c | 0 .../selftests/bpf/{ => kern_progs}/connect4_prog.c | 0 .../selftests/bpf/{ => kern_progs}/connect6_prog.c | 0 .../selftests/bpf/{ => kern_progs}/dev_cgroup.c | 0 .../bpf/{ => kern_progs}/get_cgroup_id_kern.c | 0 .../selftests/bpf/{ => kern_progs}/netcnt_prog.c | 0 .../bpf/{ => kern_progs}/sample_map_ret0.c | 0 .../selftests/bpf/{ => kern_progs}/sample_ret0.c | 0 .../selftests/bpf/{ => kern_progs}/sendmsg4_prog.c | 0 .../selftests/bpf/{ => kern_progs}/sendmsg6_prog.c | 0 .../bpf/{ => kern_progs}/socket_cookie_prog.c | 0 .../bpf/{ => kern_progs}/sockmap_parse_prog.c | 0 .../bpf/{ => kern_progs}/sockmap_tcp_msg_prog.c | 0 .../bpf/{ => kern_progs}/sockmap_verdict_prog.c | 0 .../bpf/{ => kern_progs}/test_adjust_tail.c | 0 .../bpf/{ => kern_progs}/test_btf_haskv.c | 0 .../selftests/bpf/{ => kern_progs}/test_btf_nokv.c | 0 .../bpf/{ => kern_progs}/test_get_stack_rawtp.c | 0 .../selftests/bpf/{ => kern_progs}/test_l4lb.c | 0 .../bpf/{ => kern_progs}/test_l4lb_noinline.c | 0 .../bpf/{ => kern_progs}/test_lirc_mode2_kern.c | 0 .../bpf/{ => kern_progs}/test_lwt_seg6local.c | 0 .../bpf/{ => kern_progs}/test_map_in_map.c | 0 .../selftests/bpf/{ => kern_progs}/test_map_lock.c | 0 .../selftests/bpf/{ => kern_progs}/test_obj_id.c | 0 .../bpf/{ => kern_progs}/test_pkt_access.c | 0 .../bpf/{ => kern_progs}/test_pkt_md_access.c | 0 .../bpf/{ => kern_progs}/test_queue_map.c | 0 .../{ => kern_progs}/test_select_reuseport_kern.c | 0 .../bpf/{ => kern_progs}/test_sk_lookup_kern.c | 0 .../bpf/{ => kern_progs}/test_skb_cgroup_id_kern.c | 0 .../bpf/{ => kern_progs}/test_sockhash_kern.c | 0 .../bpf/{ => kern_progs}/test_sockmap_kern.c | 0 .../bpf/{ => kern_progs}/test_spin_lock.c | 0 .../bpf/{ => kern_progs}/test_stack_map.c | 0 .../{ => kern_progs}/test_stacktrace_build_id.c | 0 .../bpf/{ => kern_progs}/test_stacktrace_map.c | 0 .../bpf/{ => kern_progs}/test_tcp_estats.c | 0 .../bpf/{ => kern_progs}/test_tcpbpf_kern.c | 0 .../bpf/{ => kern_progs}/test_tcpnotify_kern.c | 0 .../bpf/{ => kern_progs}/test_tracepoint.c | 0 .../bpf/{ => kern_progs}/test_tunnel_kern.c | 0 .../selftests/bpf/{ => kern_progs}/test_xdp.c | 0 .../selftests/bpf/{ => kern_progs}/test_xdp_meta.c | 0 .../bpf/{ => kern_progs}/test_xdp_noinline.c | 0 .../bpf/{ => kern_progs}/test_xdp_redirect.c | 0 .../selftests/bpf/{ => kern_progs}/test_xdp_vlan.c | 0 .../selftests/bpf/{ => kern_progs}/xdp_dummy.c | 0 49 files changed, 5 insertions(+), 21 deletions(-) rename tools/testing/selftests/bpf/{ => kern_progs}/bpf_flow.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/connect4_prog.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/connect6_prog.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/dev_cgroup.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/get_cgroup_id_kern.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/netcnt_prog.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/sample_map_ret0.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/sample_ret0.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/sendmsg4_prog.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/sendmsg6_prog.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/socket_cookie_prog.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/sockmap_parse_prog.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/sockmap_tcp_msg_prog.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/sockmap_verdict_prog.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_adjust_tail.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_btf_haskv.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_btf_nokv.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_get_stack_rawtp.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_l4lb.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_l4lb_noinline.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_lirc_mode2_kern.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_lwt_seg6local.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_map_in_map.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_map_lock.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_obj_id.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_pkt_access.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_pkt_md_access.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_queue_map.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_select_reuseport_kern.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_sk_lookup_kern.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_skb_cgroup_id_kern.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_sockhash_kern.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_sockmap_kern.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_spin_lock.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_stack_map.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_stacktrace_build_id.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_stacktrace_map.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_tcp_estats.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_tcpbpf_kern.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_tcpnotify_kern.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_tracepoint.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_tunnel_kern.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_xdp.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_xdp_meta.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_xdp_noinline.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_xdp_redirect.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/test_xdp_vlan.c (100%) rename tools/testing/selftests/bpf/{ => kern_progs}/xdp_dummy.c (100%) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 70b2570..2965855 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -25,24 +25,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test test_socket_cookie test_cgroup_storage test_select_reuseport test_section_names \ test_netcnt test_tcpnotify_user -BPF_OBJ_FILES = \ - test_xdp_redirect.o test_xdp_meta.o sockmap_parse_prog.o \ - sockmap_verdict_prog.o dev_cgroup.o sample_ret0.o \ - test_tcpnotify_kern.o sample_map_ret0.o test_tcpbpf_kern.o \ - sockmap_tcp_msg_prog.o connect4_prog.o connect6_prog.o \ - test_btf_haskv.o test_btf_nokv.o test_sockmap_kern.o \ - test_tunnel_kern.o test_sockhash_kern.o test_lwt_seg6local.o \ - sendmsg4_prog.o sendmsg6_prog.o test_lirc_mode2_kern.o \ - get_cgroup_id_kern.o socket_cookie_prog.o test_select_reuseport_kern.o \ - test_skb_cgroup_id_kern.o bpf_flow.o netcnt_prog.o test_xdp_vlan.o \ - xdp_dummy.o test_map_in_map.o test_spin_lock.o test_map_lock.o \ - test_pkt_access.o test_xdp.o test_adjust_tail.o test_l4lb.o \ - test_l4lb_noinline.o test_xdp_noinline.o test_tcp_estats.o \ - test_obj_id.o test_pkt_md_access.o test_tracepoint.o \ - test_stacktrace_map.o test_stacktrace_build_id.o \ - test_get_stack_rawtp.o test_sk_lookup_kern.o test_queue_map.o \ - test_stack_map.o - +BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard kern_progs/*.c))) TEST_GEN_FILES = $(BPF_OBJ_FILES) # Also test sub-register code-gen if LLVM + kernel both has eBPF v3 processor @@ -183,7 +166,8 @@ $(ALU32_BUILD_DIR)/test_progs_32: test_progs.c $(ALU32_BUILD_DIR) \ $(CC) $(CFLAGS) -o $(ALU32_BUILD_DIR)/test_progs_32 $< \ trace_helpers.c $(OUTPUT)/libbpf.a $(LDLIBS) -$(ALU32_BUILD_DIR)/%.o: %.c $(ALU32_BUILD_DIR) $(ALU32_BUILD_DIR)/test_progs_32 +$(ALU32_BUILD_DIR)/%.o: kern_progs/%.c $(ALU32_BUILD_DIR) \ + $(ALU32_BUILD_DIR)/test_progs_32 $(CLANG) $(CLANG_FLAGS) \ -O2 -target bpf -emit-llvm -c $< -o - | \ $(LLC) -march=bpf -mattr=+alu32 -mcpu=$(CPU) $(LLC_FLAGS) \ @@ -195,7 +179,7 @@ endif # Have one program compiled without "-target bpf" to test whether libbpf loads # it successfully -$(OUTPUT)/test_xdp.o: test_xdp.c +$(OUTPUT)/test_xdp.o: kern_progs/test_xdp.c $(CLANG) $(CLANG_FLAGS) \ -O2 -emit-llvm -c $< -o - | \ $(LLC) -march=bpf -mcpu=$(CPU) $(LLC_FLAGS) -filetype=obj -o $@ @@ -203,7 +187,7 @@ ifeq ($(DWARF2BTF),y) $(BTF_PAHOLE) -J $@ endif -$(OUTPUT)/%.o: %.c +$(OUTPUT)/%.o: kern_progs/%.c $(CLANG) $(CLANG_FLAGS) \ -O2 -target bpf -emit-llvm -c $< -o - | \ $(LLC) -march=bpf -mcpu=$(CPU) $(LLC_FLAGS) -filetype=obj -o $@ diff --git a/tools/testing/selftests/bpf/bpf_flow.c b/tools/testing/selftests/bpf/kern_progs/bpf_flow.c similarity index 100% rename from tools/testing/selftests/bpf/bpf_flow.c rename to tools/testing/selftests/bpf/kern_progs/bpf_flow.c diff --git a/tools/testing/selftests/bpf/connect4_prog.c b/tools/testing/selftests/bpf/kern_progs/connect4_prog.c similarity index 100% rename from tools/testing/selftests/bpf/connect4_prog.c rename to tools/testing/selftests/bpf/kern_progs/connect4_prog.c diff --git a/tools/testing/selftests/bpf/connect6_prog.c b/tools/testing/selftests/bpf/kern_progs/connect6_prog.c similarity index 100% rename from tools/testing/selftests/bpf/connect6_prog.c rename to tools/testing/selftests/bpf/kern_progs/connect6_prog.c diff --git a/tools/testing/selftests/bpf/dev_cgroup.c b/tools/testing/selftests/bpf/kern_progs/dev_cgroup.c similarity index 100% rename from tools/testing/selftests/bpf/dev_cgroup.c rename to tools/testing/selftests/bpf/kern_progs/dev_cgroup.c diff --git a/tools/testing/selftests/bpf/get_cgroup_id_kern.c b/tools/testing/selftests/bpf/kern_progs/get_cgroup_id_kern.c similarity index 100% rename from tools/testing/selftests/bpf/get_cgroup_id_kern.c rename to tools/testing/selftests/bpf/kern_progs/get_cgroup_id_kern.c diff --git a/tools/testing/selftests/bpf/netcnt_prog.c b/tools/testing/selftests/bpf/kern_progs/netcnt_prog.c similarity index 100% rename from tools/testing/selftests/bpf/netcnt_prog.c rename to tools/testing/selftests/bpf/kern_progs/netcnt_prog.c diff --git a/tools/testing/selftests/bpf/sample_map_ret0.c b/tools/testing/selftests/bpf/kern_progs/sample_map_ret0.c similarity index 100% rename from tools/testing/selftests/bpf/sample_map_ret0.c rename to tools/testing/selftests/bpf/kern_progs/sample_map_ret0.c diff --git a/tools/testing/selftests/bpf/sample_ret0.c b/tools/testing/selftests/bpf/kern_progs/sample_ret0.c similarity index 100% rename from tools/testing/selftests/bpf/sample_ret0.c rename to tools/testing/selftests/bpf/kern_progs/sample_ret0.c diff --git a/tools/testing/selftests/bpf/sendmsg4_prog.c b/tools/testing/selftests/bpf/kern_progs/sendmsg4_prog.c similarity index 100% rename from tools/testing/selftests/bpf/sendmsg4_prog.c rename to tools/testing/selftests/bpf/kern_progs/sendmsg4_prog.c diff --git a/tools/testing/selftests/bpf/sendmsg6_prog.c b/tools/testing/selftests/bpf/kern_progs/sendmsg6_prog.c similarity index 100% rename from tools/testing/selftests/bpf/sendmsg6_prog.c rename to tools/testing/selftests/bpf/kern_progs/sendmsg6_prog.c diff --git a/tools/testing/selftests/bpf/socket_cookie_prog.c b/tools/testing/selftests/bpf/kern_progs/socket_cookie_prog.c similarity index 100% rename from tools/testing/selftests/bpf/socket_cookie_prog.c rename to tools/testing/selftests/bpf/kern_progs/socket_cookie_prog.c diff --git a/tools/testing/selftests/bpf/sockmap_parse_prog.c b/tools/testing/selftests/bpf/kern_progs/sockmap_parse_prog.c similarity index 100% rename from tools/testing/selftests/bpf/sockmap_parse_prog.c rename to tools/testing/selftests/bpf/kern_progs/sockmap_parse_prog.c diff --git a/tools/testing/selftests/bpf/sockmap_tcp_msg_prog.c b/tools/testing/selftests/bpf/kern_progs/sockmap_tcp_msg_prog.c similarity index 100% rename from tools/testing/selftests/bpf/sockmap_tcp_msg_prog.c rename to tools/testing/selftests/bpf/kern_progs/sockmap_tcp_msg_prog.c diff --git a/tools/testing/selftests/bpf/sockmap_verdict_prog.c b/tools/testing/selftests/bpf/kern_progs/sockmap_verdict_prog.c similarity index 100% rename from tools/testing/selftests/bpf/sockmap_verdict_prog.c rename to tools/testing/selftests/bpf/kern_progs/sockmap_verdict_prog.c diff --git a/tools/testing/selftests/bpf/test_adjust_tail.c b/tools/testing/selftests/bpf/kern_progs/test_adjust_tail.c similarity index 100% rename from tools/testing/selftests/bpf/test_adjust_tail.c rename to tools/testing/selftests/bpf/kern_progs/test_adjust_tail.c diff --git a/tools/testing/selftests/bpf/test_btf_haskv.c b/tools/testing/selftests/bpf/kern_progs/test_btf_haskv.c similarity index 100% rename from tools/testing/selftests/bpf/test_btf_haskv.c rename to tools/testing/selftests/bpf/kern_progs/test_btf_haskv.c diff --git a/tools/testing/selftests/bpf/test_btf_nokv.c b/tools/testing/selftests/bpf/kern_progs/test_btf_nokv.c similarity index 100% rename from tools/testing/selftests/bpf/test_btf_nokv.c rename to tools/testing/selftests/bpf/kern_progs/test_btf_nokv.c diff --git a/tools/testing/selftests/bpf/test_get_stack_rawtp.c b/tools/testing/selftests/bpf/kern_progs/test_get_stack_rawtp.c similarity index 100% rename from tools/testing/selftests/bpf/test_get_stack_rawtp.c rename to tools/testing/selftests/bpf/kern_progs/test_get_stack_rawtp.c diff --git a/tools/testing/selftests/bpf/test_l4lb.c b/tools/testing/selftests/bpf/kern_progs/test_l4lb.c similarity index 100% rename from tools/testing/selftests/bpf/test_l4lb.c rename to tools/testing/selftests/bpf/kern_progs/test_l4lb.c diff --git a/tools/testing/selftests/bpf/test_l4lb_noinline.c b/tools/testing/selftests/bpf/kern_progs/test_l4lb_noinline.c similarity index 100% rename from tools/testing/selftests/bpf/test_l4lb_noinline.c rename to tools/testing/selftests/bpf/kern_progs/test_l4lb_noinline.c diff --git a/tools/testing/selftests/bpf/test_lirc_mode2_kern.c b/tools/testing/selftests/bpf/kern_progs/test_lirc_mode2_kern.c similarity index 100% rename from tools/testing/selftests/bpf/test_lirc_mode2_kern.c rename to tools/testing/selftests/bpf/kern_progs/test_lirc_mode2_kern.c diff --git a/tools/testing/selftests/bpf/test_lwt_seg6local.c b/tools/testing/selftests/bpf/kern_progs/test_lwt_seg6local.c similarity index 100% rename from tools/testing/selftests/bpf/test_lwt_seg6local.c rename to tools/testing/selftests/bpf/kern_progs/test_lwt_seg6local.c diff --git a/tools/testing/selftests/bpf/test_map_in_map.c b/tools/testing/selftests/bpf/kern_progs/test_map_in_map.c similarity index 100% rename from tools/testing/selftests/bpf/test_map_in_map.c rename to tools/testing/selftests/bpf/kern_progs/test_map_in_map.c diff --git a/tools/testing/selftests/bpf/test_map_lock.c b/tools/testing/selftests/bpf/kern_progs/test_map_lock.c similarity index 100% rename from tools/testing/selftests/bpf/test_map_lock.c rename to tools/testing/selftests/bpf/kern_progs/test_map_lock.c diff --git a/tools/testing/selftests/bpf/test_obj_id.c b/tools/testing/selftests/bpf/kern_progs/test_obj_id.c similarity index 100% rename from tools/testing/selftests/bpf/test_obj_id.c rename to tools/testing/selftests/bpf/kern_progs/test_obj_id.c diff --git a/tools/testing/selftests/bpf/test_pkt_access.c b/tools/testing/selftests/bpf/kern_progs/test_pkt_access.c similarity index 100% rename from tools/testing/selftests/bpf/test_pkt_access.c rename to tools/testing/selftests/bpf/kern_progs/test_pkt_access.c diff --git a/tools/testing/selftests/bpf/test_pkt_md_access.c b/tools/testing/selftests/bpf/kern_progs/test_pkt_md_access.c similarity index 100% rename from tools/testing/selftests/bpf/test_pkt_md_access.c rename to tools/testing/selftests/bpf/kern_progs/test_pkt_md_access.c diff --git a/tools/testing/selftests/bpf/test_queue_map.c b/tools/testing/selftests/bpf/kern_progs/test_queue_map.c similarity index 100% rename from tools/testing/selftests/bpf/test_queue_map.c rename to tools/testing/selftests/bpf/kern_progs/test_queue_map.c diff --git a/tools/testing/selftests/bpf/test_select_reuseport_kern.c b/tools/testing/selftests/bpf/kern_progs/test_select_reuseport_kern.c similarity index 100% rename from tools/testing/selftests/bpf/test_select_reuseport_kern.c rename to tools/testing/selftests/bpf/kern_progs/test_select_reuseport_kern.c diff --git a/tools/testing/selftests/bpf/test_sk_lookup_kern.c b/tools/testing/selftests/bpf/kern_progs/test_sk_lookup_kern.c similarity index 100% rename from tools/testing/selftests/bpf/test_sk_lookup_kern.c rename to tools/testing/selftests/bpf/kern_progs/test_sk_lookup_kern.c diff --git a/tools/testing/selftests/bpf/test_skb_cgroup_id_kern.c b/tools/testing/selftests/bpf/kern_progs/test_skb_cgroup_id_kern.c similarity index 100% rename from tools/testing/selftests/bpf/test_skb_cgroup_id_kern.c rename to tools/testing/selftests/bpf/kern_progs/test_skb_cgroup_id_kern.c diff --git a/tools/testing/selftests/bpf/test_sockhash_kern.c b/tools/testing/selftests/bpf/kern_progs/test_sockhash_kern.c similarity index 100% rename from tools/testing/selftests/bpf/test_sockhash_kern.c rename to tools/testing/selftests/bpf/kern_progs/test_sockhash_kern.c diff --git a/tools/testing/selftests/bpf/test_sockmap_kern.c b/tools/testing/selftests/bpf/kern_progs/test_sockmap_kern.c similarity index 100% rename from tools/testing/selftests/bpf/test_sockmap_kern.c rename to tools/testing/selftests/bpf/kern_progs/test_sockmap_kern.c diff --git a/tools/testing/selftests/bpf/test_spin_lock.c b/tools/testing/selftests/bpf/kern_progs/test_spin_lock.c similarity index 100% rename from tools/testing/selftests/bpf/test_spin_lock.c rename to tools/testing/selftests/bpf/kern_progs/test_spin_lock.c diff --git a/tools/testing/selftests/bpf/test_stack_map.c b/tools/testing/selftests/bpf/kern_progs/test_stack_map.c similarity index 100% rename from tools/testing/selftests/bpf/test_stack_map.c rename to tools/testing/selftests/bpf/kern_progs/test_stack_map.c diff --git a/tools/testing/selftests/bpf/test_stacktrace_build_id.c b/tools/testing/selftests/bpf/kern_progs/test_stacktrace_build_id.c similarity index 100% rename from tools/testing/selftests/bpf/test_stacktrace_build_id.c rename to tools/testing/selftests/bpf/kern_progs/test_stacktrace_build_id.c diff --git a/tools/testing/selftests/bpf/test_stacktrace_map.c b/tools/testing/selftests/bpf/kern_progs/test_stacktrace_map.c similarity index 100% rename from tools/testing/selftests/bpf/test_stacktrace_map.c rename to tools/testing/selftests/bpf/kern_progs/test_stacktrace_map.c diff --git a/tools/testing/selftests/bpf/test_tcp_estats.c b/tools/testing/selftests/bpf/kern_progs/test_tcp_estats.c similarity index 100% rename from tools/testing/selftests/bpf/test_tcp_estats.c rename to tools/testing/selftests/bpf/kern_progs/test_tcp_estats.c diff --git a/tools/testing/selftests/bpf/test_tcpbpf_kern.c b/tools/testing/selftests/bpf/kern_progs/test_tcpbpf_kern.c similarity index 100% rename from tools/testing/selftests/bpf/test_tcpbpf_kern.c rename to tools/testing/selftests/bpf/kern_progs/test_tcpbpf_kern.c diff --git a/tools/testing/selftests/bpf/test_tcpnotify_kern.c b/tools/testing/selftests/bpf/kern_progs/test_tcpnotify_kern.c similarity index 100% rename from tools/testing/selftests/bpf/test_tcpnotify_kern.c rename to tools/testing/selftests/bpf/kern_progs/test_tcpnotify_kern.c diff --git a/tools/testing/selftests/bpf/test_tracepoint.c b/tools/testing/selftests/bpf/kern_progs/test_tracepoint.c similarity index 100% rename from tools/testing/selftests/bpf/test_tracepoint.c rename to tools/testing/selftests/bpf/kern_progs/test_tracepoint.c diff --git a/tools/testing/selftests/bpf/test_tunnel_kern.c b/tools/testing/selftests/bpf/kern_progs/test_tunnel_kern.c similarity index 100% rename from tools/testing/selftests/bpf/test_tunnel_kern.c rename to tools/testing/selftests/bpf/kern_progs/test_tunnel_kern.c diff --git a/tools/testing/selftests/bpf/test_xdp.c b/tools/testing/selftests/bpf/kern_progs/test_xdp.c similarity index 100% rename from tools/testing/selftests/bpf/test_xdp.c rename to tools/testing/selftests/bpf/kern_progs/test_xdp.c diff --git a/tools/testing/selftests/bpf/test_xdp_meta.c b/tools/testing/selftests/bpf/kern_progs/test_xdp_meta.c similarity index 100% rename from tools/testing/selftests/bpf/test_xdp_meta.c rename to tools/testing/selftests/bpf/kern_progs/test_xdp_meta.c diff --git a/tools/testing/selftests/bpf/test_xdp_noinline.c b/tools/testing/selftests/bpf/kern_progs/test_xdp_noinline.c similarity index 100% rename from tools/testing/selftests/bpf/test_xdp_noinline.c rename to tools/testing/selftests/bpf/kern_progs/test_xdp_noinline.c diff --git a/tools/testing/selftests/bpf/test_xdp_redirect.c b/tools/testing/selftests/bpf/kern_progs/test_xdp_redirect.c similarity index 100% rename from tools/testing/selftests/bpf/test_xdp_redirect.c rename to tools/testing/selftests/bpf/kern_progs/test_xdp_redirect.c diff --git a/tools/testing/selftests/bpf/test_xdp_vlan.c b/tools/testing/selftests/bpf/kern_progs/test_xdp_vlan.c similarity index 100% rename from tools/testing/selftests/bpf/test_xdp_vlan.c rename to tools/testing/selftests/bpf/kern_progs/test_xdp_vlan.c diff --git a/tools/testing/selftests/bpf/xdp_dummy.c b/tools/testing/selftests/bpf/kern_progs/xdp_dummy.c similarity index 100% rename from tools/testing/selftests/bpf/xdp_dummy.c rename to tools/testing/selftests/bpf/kern_progs/xdp_dummy.c