samples: bpf: remove unnecessary include options in Makefile
Subsystems (5)
PATCH 1/2 samples: bpf: remove unnecessary include options in Makefile
Due to recent change of include path at commit b552d33c80a9 ("samples/bpf: fix include path in Makefile"), some of the previous include options became unnecessary.
This commit removes duplicated include options in Makefile.
Signed-off-by Daniel T. Lee <[email protected]>
--- samples/bpf/Makefile | 9 --------- 1 file changed, 9 deletions(-)
samples/bpf/Makefile +0 -9
@@ -176,15 +176,6 @@ KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/ -I$(srctree)/tools/include KBUILD_HOSTCFLAGS += -I$(srctree)/tools/perf HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable -HOSTCFLAGS_trace_helpers.o += -I$(srctree)/tools/lib/bpf/ - -HOSTCFLAGS_trace_output_user.o += -I$(srctree)/tools/lib/bpf/ -HOSTCFLAGS_offwaketime_user.o += -I$(srctree)/tools/lib/bpf/ -HOSTCFLAGS_spintest_user.o += -I$(srctree)/tools/lib/bpf/ -HOSTCFLAGS_trace_event_user.o += -I$(srctree)/tools/lib/bpf/ -HOSTCFLAGS_sampleip_user.o += -I$(srctree)/tools/lib/bpf/ -HOSTCFLAGS_task_fd_query_user.o += -I$(srctree)/tools/lib/bpf/ -HOSTCFLAGS_xdp_sample_pkts_user.o += -I$(srctree)/tools/lib/bpf/ KBUILD_HOSTLDLIBS += $(LIBBPF) -lelf HOSTLDLIBS_tracex4 += -lrt
Signature · 1 line
2.17.1
PATCH 2/2 samples: bpf: refactor header include path
Currently, header inclusion in each file is inconsistent. For example, "libbpf.h" header is included as multiple ways.
#include "bpf/libbpf.h"
#include "libbpf.h"Due to commit b552d33c80a9 ("samples/bpf: fix include path in Makefile"), $(srctree)/tools/lib/bpf/ path had been included during build, path "bpf/" in header isn't necessary anymore.
This commit removes path "bpf/" in header inclusion.
Signed-off-by Daniel T. Lee <[email protected]>
--- samples/bpf/fds_example.c | 2 +- samples/bpf/hbm.c | 4 ++-- samples/bpf/ibumad_user.c | 2 +- samples/bpf/sockex1_user.c | 2 +- samples/bpf/sockex2_user.c | 2 +- samples/bpf/xdp1_user.c | 4 ++-- samples/bpf/xdp_adjust_tail_user.c | 4 ++-- samples/bpf/xdp_fwd_user.c | 2 +- samples/bpf/xdp_redirect_cpu_user.c | 2 +- samples/bpf/xdp_redirect_map_user.c | 2 +- samples/bpf/xdp_redirect_user.c | 2 +- samples/bpf/xdp_router_ipv4_user.c | 2 +- samples/bpf/xdp_rxq_info_user.c | 4 ++-- samples/bpf/xdp_tx_iptunnel_user.c | 2 +- samples/bpf/xdpsock_user.c | 4 ++-- 15 files changed, 20 insertions(+), 20 deletions(-)
samples/bpf/fds_example.c +1 -1
@@ -14,7 +14,7 @@#include <bpf/bpf.h> -#include "bpf/libbpf.h" +#include "libbpf.h" #include "bpf_insn.h" #include "sock_example.h"
samples/bpf/hbm.c +2 -2
@@ -50,8 +50,8 @@#include "cgroup_helpers.h" #include "hbm.h" #include "bpf_util.h" -#include "bpf/bpf.h" -#include "bpf/libbpf.h" +#include "bpf.h" +#include "libbpf.h" bool outFlag = true;int minRate =1000 ;/* cgroup rate limit in Mbps */
samples/bpf/ibumad_user.c +1 -1
@@ -25,7 +25,7 @@#include "bpf_load.h" #include "bpf_util.h" -#include "bpf/libbpf.h" +#include "libbpf.h" static void dump_counts (int fd) {
samples/bpf/sockex1_user.c +1 -1
@@ -3,7 +3,7 @@#include <assert.h> #include <linux/bpf.h> #include <bpf/bpf.h> -#include "bpf/libbpf.h" +#include "libbpf.h" #include "sock_example.h" #include <unistd.h> #include <arpa/inet.h>
samples/bpf/sockex2_user.c +1 -1
@@ -3,7 +3,7 @@#include <assert.h> #include <linux/bpf.h> #include <bpf/bpf.h> -#include "bpf/libbpf.h" +#include "libbpf.h" #include "sock_example.h" #include <unistd.h> #include <arpa/inet.h>
samples/bpf/xdp1_user.c +2 -2
@@ -18,8 +18,8 @@#include <net/if.h> #include "bpf_util.h" -#include "bpf/bpf.h" -#include "bpf/libbpf.h" +#include "bpf.h" +#include "libbpf.h" static int ifindex;static __u32 xdp_flags =XDP_FLAGS_UPDATE_IF_NOEXIST ;
samples/bpf/xdp_adjust_tail_user.c +2 -2
@@ -18,8 +18,8 @@#include <netinet/ether.h> #include <unistd.h> #include <time.h> -#include "bpf/bpf.h" -#include "bpf/libbpf.h" +#include "bpf.h" +#include "libbpf.h" #define STATS_INTERVAL_S 2U
samples/bpf/xdp_fwd_user.c +1 -1
@@ -24,7 +24,7 @@#include <fcntl.h> #include <libgen.h> -#include "bpf/libbpf.h" +#include "libbpf.h" #include <bpf/bpf.h>
samples/bpf/xdp_redirect_cpu_user.c +1 -1
@@ -25,7 +25,7 @@ static const char *__doc__ =#define MAX_PROG 6#include <bpf/bpf.h> -#include "bpf/libbpf.h" +#include "libbpf.h" #include "bpf_util.h"
samples/bpf/xdp_redirect_map_user.c +1 -1
@@ -24,7 +24,7 @@#include "bpf_util.h" #include <bpf/bpf.h> -#include "bpf/libbpf.h" +#include "libbpf.h" static int ifindex_in;static int ifindex_out;
samples/bpf/xdp_redirect_user.c +1 -1
@@ -24,7 +24,7 @@#include "bpf_util.h" #include <bpf/bpf.h> -#include "bpf/libbpf.h" +#include "libbpf.h" static int ifindex_in;static int ifindex_out;
samples/bpf/xdp_router_ipv4_user.c +1 -1
@@ -24,7 +24,7 @@#include <sys/ioctl.h> #include <sys/syscall.h> #include "bpf_util.h" -#include "bpf/libbpf.h" +#include "libbpf.h" #include <sys/resource.h> #include <libgen.h>
samples/bpf/xdp_rxq_info_user.c +2 -2
@@ -22,8 +22,8 @@ static const char *__doc__ = " XDP RX-queue info extract example\n\n"#include <arpa/inet.h> #include <linux/if_link.h> -#include "bpf/bpf.h" -#include "bpf/libbpf.h" +#include "bpf.h" +#include "libbpf.h" #include "bpf_util.h" static int ifindex =-1 ;
samples/bpf/xdp_tx_iptunnel_user.c +1 -1
@@ -17,7 +17,7 @@#include <netinet/ether.h> #include <unistd.h> #include <time.h> -#include "bpf/libbpf.h" +#include "libbpf.h" #include <bpf/bpf.h> #include "bpf_util.h" #include "xdp_tx_iptunnel_common.h"
samples/bpf/xdpsock_user.c +2 -2
@@ -27,8 +27,8 @@#include <time.h> #include <unistd.h> -#include "bpf/libbpf.h" -#include "bpf/xsk.h" +#include "libbpf.h" +#include "xsk.h" #include <bpf/bpf.h> #ifndef SOL_XDP
Signature · 1 line
2.17.1