bpf: include <lib/endian.h> where relevant, skip <lib/utils.h>

Header files <lib/common.h> and <lib/static_data.h> use bpf_ntohs() which is defined in <lib/endian.h>, non included in common.h. This forces the other source files to include <lib/endian.h> through <lib/utils.h>. Let's include <lib/endian.h> from those headers so we do not have to include <lib/utils.h> just for that definition. We can then remove <lib/utils.h> from most source files, although it is indirectly pulled from <node_config.h> for the majority of the files. Signed-off-by: Quentin Monnet <quentin@isovalent.com>
cilium · Aug 10, 2020 · 5195789 · 5195789
1 parent eb57338
commit 5195789
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 8 deletions.
diff --git a/bpf/bpf_host.c b/bpf/bpf_host.c
@@ -25,7 +25,6 @@
 # undef ENABLE_HOST_FIREWALL
 #endif
 
-#include "lib/utils.h"
 #include "lib/common.h"
 #include "lib/arp.h"
 #include "lib/maps.h"

diff --git a/bpf/bpf_lxc.c b/bpf/bpf_lxc.c
@@ -12,7 +12,6 @@
 #define EVENT_SOURCE LXC_ID
 
 #include "lib/tailcall.h"
-#include "lib/utils.h"
 #include "lib/common.h"
 #include "lib/config.h"
 #include "lib/maps.h"

diff --git a/bpf/bpf_network.c b/bpf/bpf_network.c
@@ -7,7 +7,6 @@
 #include <node_config.h>
 #include <netdev_config.h>
 
-#include "lib/utils.h"
 #include "lib/common.h"
 #include "lib/maps.h"
 #include "lib/ipv6.h"

diff --git a/bpf/bpf_overlay.c b/bpf/bpf_overlay.c
@@ -10,7 +10,6 @@
 #define IS_BPF_OVERLAY 1
 
 #include "lib/tailcall.h"
-#include "lib/utils.h"
 #include "lib/common.h"
 #include "lib/maps.h"
 #include "lib/ipv6.h"

diff --git a/bpf/bpf_sock.c b/bpf/bpf_sock.c
@@ -10,7 +10,6 @@
 #define SKIP_POLICY_MAP	1
 #define SKIP_CALLS_MAP	1
 
-#include "lib/utils.h"
 #include "lib/common.h"
 #include "lib/lb.h"
 #include "lib/eps.h"

diff --git a/bpf/bpf_xdp.c b/bpf/bpf_xdp.c
@@ -10,7 +10,6 @@
 
 #define SKIP_POLICY_MAP 1
 
-#include "lib/utils.h"
 #include "lib/common.h"
 #include "lib/maps.h"
 #include "lib/eps.h"

diff --git a/bpf/lib/common.h b/bpf/lib/common.h
@@ -11,6 +11,7 @@
 #include <linux/ipv6.h>
 #include <linux/in.h>
 
+#include "endian.h"
 #include "mono.h"
 
 /* FIXME: GH-3239 LRU logic is not handling timeouts gracefully enough

diff --git a/bpf/lib/static_data.h b/bpf/lib/static_data.h
@@ -7,6 +7,8 @@
 #include <bpf/ctx/ctx.h>
 #include <bpf/api.h>
 
+#include "endian.h"
+
 /* fetch_* macros assist in fetching variously sized static data */
 #define fetch_u32(x) __fetch(x)
 #define fetch_u32_i(x, i) __fetch(x ## _ ## i)

diff --git a/bpf/sockops/bpf_redir.c b/bpf/sockops/bpf_redir.c
@@ -13,7 +13,6 @@
 
 #define SOCKMAP 1
 
-#include "../lib/utils.h"
 #include "../lib/common.h"
 #include "../lib/maps.h"
 #include "../lib/lb.h"

diff --git a/bpf/sockops/bpf_sockops.c b/bpf/sockops/bpf_sockops.c
@@ -13,7 +13,6 @@
 
 #define SOCKMAP 1
 
-#include "../lib/utils.h"
 #include "../lib/common.h"
 #include "../lib/maps.h"
 #include "../lib/lb.h"