hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICU4YT -------------------------------- Makefile will cover bpf prog files in samples/bpf directory. However, bpf_rvi_cpuinfo_x86.bpf.c and bpf_rvi_cpuinfo_arm64.bpf.c need to be built in different arch, or will cause compilation error. Let's move bpf_rvi_* progs to bpf_rvi directory to solve this issue. Fixes: 2e9e31a88708 ("samples/bpf: Add iterator program for cpuinfo_x86") Fixes: 9fc96fabefc7 ("samples/bpf: Add iterator program for cpuinfo_arm64") Signed-off-by: Pu Lehui <pulehui@huawei.com> --- samples/bpf/Makefile | 6 ++++-- samples/bpf/{ => bpf_rvi}/bpf_rvi_cpu_online.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_cpuinfo_arm64.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_cpuinfo_x86.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_diskstats.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_loadavg.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_meminfo.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_partitions.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_stat.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_swaps.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_uptime.bpf.c | 0 11 files changed, 4 insertions(+), 2 deletions(-) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_cpu_online.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_cpuinfo_arm64.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_cpuinfo_x86.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_diskstats.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_loadavg.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_meminfo.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_partitions.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_stat.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_swaps.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_uptime.bpf.c (100%) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 7627f996b5e5..6d4767f7e250 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -149,10 +149,12 @@ always-y += task_fd_query_kern.o always-y += ibumad_kern.o always-y += hbm_out_kern.o always-y += hbm_edt_kern.o + +# build for bpf_rvi ifeq ($(ARCH), x86) -always-$(CONFIG_BPF_RVI) += bpf_rvi_cpuinfo_x86.bpf.o +always-$(CONFIG_BPF_RVI) += bpf_rvi/bpf_rvi_cpuinfo_x86.bpf.o endif -always-$(CONFIG_BPF_RVI) += bpf_rvi_cpu_online.bpf.o +always-$(CONFIG_BPF_RVI) += bpf_rvi/bpf_rvi_cpu_online.bpf.o ifeq ($(ARCH), arm) # Strip all except -D__LINUX_ARM_ARCH__ option needed to handle linux diff --git a/samples/bpf/bpf_rvi_cpu_online.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_cpu_online.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_cpu_online.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_cpu_online.bpf.c diff --git a/samples/bpf/bpf_rvi_cpuinfo_arm64.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_cpuinfo_arm64.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_cpuinfo_arm64.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_cpuinfo_arm64.bpf.c diff --git a/samples/bpf/bpf_rvi_cpuinfo_x86.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_cpuinfo_x86.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_cpuinfo_x86.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_cpuinfo_x86.bpf.c diff --git a/samples/bpf/bpf_rvi_diskstats.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_diskstats.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_diskstats.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_diskstats.bpf.c diff --git a/samples/bpf/bpf_rvi_loadavg.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_loadavg.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_loadavg.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_loadavg.bpf.c diff --git a/samples/bpf/bpf_rvi_meminfo.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_meminfo.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_meminfo.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_meminfo.bpf.c diff --git a/samples/bpf/bpf_rvi_partitions.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_partitions.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_partitions.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_partitions.bpf.c diff --git a/samples/bpf/bpf_rvi_stat.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_stat.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_stat.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_stat.bpf.c diff --git a/samples/bpf/bpf_rvi_swaps.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_swaps.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_swaps.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_swaps.bpf.c diff --git a/samples/bpf/bpf_rvi_uptime.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_uptime.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_uptime.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_uptime.bpf.c -- 2.34.1