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

samples/bpf: unify bpf program suffix to .bpf with tracing programs

Currently, BPF programs typically have a suffix of .bpf.c. However,
some programs still utilize a mixture of _kern.c suffix alongside the
naming convention. In order to achieve consistency in the naming of
these programs, this commit unifies the inconsistency in the naming
convention of BPF kernel programs.

Signed-off-by: Daniel T. Lee <danieltimlee@gmail.com>
Link: https://lore.kernel.org/r/20230818090119.477441-4-danieltimlee@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Daniel T. Lee and committed by
Alexei Starovoitov 4a0ee788 e7e6c774

+17 -17
+9 -9
samples/bpf/Makefile
··· 124 124 always-y += sockex1_kern.o 125 125 always-y += sockex2_kern.o 126 126 always-y += sockex3_kern.o 127 - always-y += tracex1_kern.o 127 + always-y += tracex1.bpf.o 128 128 always-y += tracex2.bpf.o 129 - always-y += tracex3_kern.o 130 - always-y += tracex4_kern.o 131 - always-y += tracex5_kern.o 132 - always-y += tracex6_kern.o 133 - always-y += tracex7_kern.o 129 + always-y += tracex3.bpf.o 130 + always-y += tracex4.bpf.o 131 + always-y += tracex5.bpf.o 132 + always-y += tracex6.bpf.o 133 + always-y += tracex7.bpf.o 134 134 always-y += sock_flags.bpf.o 135 135 always-y += test_probe_write_user.bpf.o 136 136 always-y += trace_output.bpf.o 137 137 always-y += tcbpf1_kern.o 138 138 always-y += tc_l2_redirect_kern.o 139 139 always-y += lathist_kern.o 140 - always-y += offwaketime_kern.o 141 - always-y += spintest_kern.o 140 + always-y += offwaketime.bpf.o 141 + always-y += spintest.bpf.o 142 142 always-y += map_perf_test.bpf.o 143 143 always-y += test_overhead_tp.bpf.o 144 144 always-y += test_overhead_raw_tp.bpf.o ··· 333 333 $(obj)/xdp_monitor_user.o: $(obj)/xdp_monitor.skel.h 334 334 $(obj)/xdp_router_ipv4_user.o: $(obj)/xdp_router_ipv4.skel.h 335 335 336 - $(obj)/tracex5_kern.o: $(obj)/syscall_nrs.h 336 + $(obj)/tracex5.bpf.o: $(obj)/syscall_nrs.h 337 337 $(obj)/hbm_out_kern.o: $(src)/hbm.h $(src)/hbm_kern.h 338 338 $(obj)/hbm.o: $(src)/hbm.h 339 339 $(obj)/hbm_edt_kern.o: $(src)/hbm.h $(src)/hbm_kern.h
samples/bpf/offwaketime_kern.c samples/bpf/offwaketime.bpf.c
+1 -1
samples/bpf/offwaketime_user.c
··· 105 105 return 2; 106 106 } 107 107 108 - snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); 108 + snprintf(filename, sizeof(filename), "%s.bpf.o", argv[0]); 109 109 obj = bpf_object__open_file(filename, NULL); 110 110 if (libbpf_get_error(obj)) { 111 111 fprintf(stderr, "ERROR: opening BPF object file failed\n");
samples/bpf/spintest_kern.c samples/bpf/spintest.bpf.c
+1 -1
samples/bpf/spintest_user.c
··· 23 23 return 2; 24 24 } 25 25 26 - snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); 26 + snprintf(filename, sizeof(filename), "%s.bpf.o", argv[0]); 27 27 obj = bpf_object__open_file(filename, NULL); 28 28 if (libbpf_get_error(obj)) { 29 29 fprintf(stderr, "ERROR: opening BPF object file failed\n");
samples/bpf/tracex1_kern.c samples/bpf/tracex1.bpf.c
+1 -1
samples/bpf/tracex1_user.c
··· 12 12 char filename[256]; 13 13 FILE *f; 14 14 15 - snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); 15 + snprintf(filename, sizeof(filename), "%s.bpf.o", argv[0]); 16 16 obj = bpf_object__open_file(filename, NULL); 17 17 if (libbpf_get_error(obj)) { 18 18 fprintf(stderr, "ERROR: opening BPF object file failed\n");
samples/bpf/tracex3_kern.c samples/bpf/tracex3.bpf.c
+1 -1
samples/bpf/tracex3_user.c
··· 125 125 } 126 126 } 127 127 128 - snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); 128 + snprintf(filename, sizeof(filename), "%s.bpf.o", argv[0]); 129 129 obj = bpf_object__open_file(filename, NULL); 130 130 if (libbpf_get_error(obj)) { 131 131 fprintf(stderr, "ERROR: opening BPF object file failed\n");
samples/bpf/tracex4_kern.c samples/bpf/tracex4.bpf.c
+1 -1
samples/bpf/tracex4_user.c
··· 53 53 char filename[256]; 54 54 int map_fd, j = 0; 55 55 56 - snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); 56 + snprintf(filename, sizeof(filename), "%s.bpf.o", argv[0]); 57 57 obj = bpf_object__open_file(filename, NULL); 58 58 if (libbpf_get_error(obj)) { 59 59 fprintf(stderr, "ERROR: opening BPF object file failed\n");
samples/bpf/tracex5_kern.c samples/bpf/tracex5.bpf.c
+1 -1
samples/bpf/tracex5_user.c
··· 42 42 char filename[256]; 43 43 FILE *f; 44 44 45 - snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); 45 + snprintf(filename, sizeof(filename), "%s.bpf.o", argv[0]); 46 46 obj = bpf_object__open_file(filename, NULL); 47 47 if (libbpf_get_error(obj)) { 48 48 fprintf(stderr, "ERROR: opening BPF object file failed\n");
samples/bpf/tracex6_kern.c samples/bpf/tracex6.bpf.c
+1 -1
samples/bpf/tracex6_user.c
··· 180 180 char filename[256]; 181 181 int i = 0; 182 182 183 - snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); 183 + snprintf(filename, sizeof(filename), "%s.bpf.o", argv[0]); 184 184 obj = bpf_object__open_file(filename, NULL); 185 185 if (libbpf_get_error(obj)) { 186 186 fprintf(stderr, "ERROR: opening BPF object file failed\n");
samples/bpf/tracex7_kern.c samples/bpf/tracex7.bpf.c
+1 -1
samples/bpf/tracex7_user.c
··· 19 19 return 0; 20 20 } 21 21 22 - snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); 22 + snprintf(filename, sizeof(filename), "%s.bpf.o", argv[0]); 23 23 obj = bpf_object__open_file(filename, NULL); 24 24 if (libbpf_get_error(obj)) { 25 25 fprintf(stderr, "ERROR: opening BPF object file failed\n");