bpf: force inline functions

clang version 18.1.3 on Ubuntu 24.04.1 LTS ignores the hint 'inline' while compiling bpf/tcp-services.c, which, in turn, leads to Gatekeeper servers to fail to load that BPF. clang does this because some inline functions in bpf/tcp-services.c increase the number of jumping states a lot (see is_port_listed_forward() and is_port_listed_back()). Although clang's decision is smart from an optimization point of view, it breaks Gatekeeper because DPDK's BPF library does not support a BPF function to call another BPF function.
AltraMayor · Sep 27, 2024 · c512a5a · c512a5a
1 parent b069d04
commit c512a5a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/bpf/grantedv2.h b/bpf/grantedv2.h
@@ -101,7 +101,7 @@ struct grantedv2_state {
 	bool direct_if_possible;
 };
 
-static inline uint64_t
+static __rte_always_inline uint64_t
 grantedv2_init_inline(struct gk_bpf_init_ctx *ctx)
 {
 	struct gk_bpf_cookie *cookie = init_ctx_to_cookie(ctx);
@@ -124,7 +124,7 @@ grantedv2_init_inline(struct gk_bpf_init_ctx *ctx)
 	return GK_BPF_INIT_RET_OK;
 }
 
-static inline uint64_t
+static __rte_always_inline uint64_t
 grantedv2_pkt_begin(const struct gk_bpf_pkt_ctx *ctx,
 	struct grantedv2_state *state, uint32_t pkt_len)
 {
@@ -149,7 +149,7 @@ grantedv2_pkt_begin(const struct gk_bpf_pkt_ctx *ctx,
 	return GK_BPF_PKT_RET_FORWARD;
 }
 
-static inline uint64_t
+static __rte_always_inline uint64_t
 grantedv2_pkt_test_2nd_limit(struct grantedv2_state *state, uint32_t pkt_len)
 {
 	state->budget2_byte -= pkt_len;
@@ -158,7 +158,7 @@ grantedv2_pkt_test_2nd_limit(struct grantedv2_state *state, uint32_t pkt_len)
 	return GK_BPF_PKT_RET_FORWARD;
 }
 
-static inline uint64_t
+static __rte_always_inline uint64_t
 grantedv2_pkt_end(struct gk_bpf_pkt_ctx *ctx, struct grantedv2_state *state)
 {
 	uint8_t priority = PRIORITY_GRANTED;

diff --git a/bpf/libicmp.h b/bpf/libicmp.h
@@ -23,11 +23,12 @@
 #include <netinet/ip_icmp.h>
 #include <netinet/icmp6.h>
 
+#include <rte_common.h>
 #include <rte_mbuf_core.h>
 
 #include "gatekeeper_flow_bpf.h"
 
-static inline uint64_t
+static __rte_always_inline uint64_t
 check_icmp(struct gk_bpf_pkt_ctx *ctx, struct rte_mbuf *pkt)
 {
 	struct icmphdr *icmp_hdr;
@@ -58,7 +59,7 @@ check_icmp(struct gk_bpf_pkt_ctx *ctx, struct rte_mbuf *pkt)
 	return GK_BPF_PKT_RET_FORWARD;
 }
 
-static inline uint64_t
+static __rte_always_inline uint64_t
 check_icmp6(struct gk_bpf_pkt_ctx *ctx, struct rte_mbuf *pkt)
 {
 	struct icmp6_hdr *icmp6_hdr;

diff --git a/bpf/tcp-services.c b/bpf/tcp-services.c
@@ -110,13 +110,13 @@ struct tcpsrv_state {
 	struct tcpsrv_ports ports;
 };
 
-static inline int64_t
+static __rte_always_inline int64_t
 reset_budget1(const struct tcpsrv_state *state)
 {
 	return (int64_t)state->tx1_rate_kib_sec * 1024; /* 1024 B/KiB */
 }
 
-static inline void
+static __rte_always_inline void
 reset_budget2(struct tcpsrv_state *state)
 {
 	state->budget2_byte = reset_budget1(state) * 5 / 100; /* 5% */
@@ -151,7 +151,7 @@ tcpsrv_init(struct gk_bpf_init_ctx *ctx)
 	return GK_BPF_INIT_RET_OK;
 }
 
-static inline uint64_t
+static __rte_always_inline uint64_t
 tcpsrv_pkt_begin(const struct gk_bpf_pkt_ctx *ctx,
 	struct tcpsrv_state *state, uint32_t pkt_len)
 {
@@ -176,7 +176,7 @@ tcpsrv_pkt_begin(const struct gk_bpf_pkt_ctx *ctx,
 	return GK_BPF_PKT_RET_FORWARD;
 }
 
-static inline uint64_t
+static __rte_always_inline uint64_t
 tcpsrv_pkt_test_2nd_limit(struct tcpsrv_state *state, uint32_t pkt_len)
 {
 	state->budget2_byte -= pkt_len;
@@ -185,7 +185,7 @@ tcpsrv_pkt_test_2nd_limit(struct tcpsrv_state *state, uint32_t pkt_len)
 	return GK_BPF_PKT_RET_FORWARD;
 }
 
-static inline uint64_t
+static __rte_always_inline uint64_t
 tcpsrv_pkt_end(struct gk_bpf_pkt_ctx *ctx, struct tcpsrv_state *state)
 {
 	uint8_t priority = PRIORITY_GRANTED;
@@ -208,7 +208,7 @@ tcpsrv_pkt_end(struct gk_bpf_pkt_ctx *ctx, struct tcpsrv_state *state)
 			break
 #define FORWARD ports++
 
-static inline bool
+static __rte_always_inline bool
 is_port_listed_forward(const uint16_t *ports, uint8_t count, uint16_t port)
 {
 	RTE_BUILD_BUG_ON(TCPSRV_MAX_NUM_PORTS != 12);
@@ -233,7 +233,7 @@ is_port_listed_forward(const uint16_t *ports, uint8_t count, uint16_t port)
 	return *ports == port;
 }
 
-static inline bool
+static __rte_always_inline bool
 is_listening_port(struct tcpsrv_state *state, uint16_t port_be)
 {
 	return is_port_listed_forward(&state->ports.p[0],
@@ -242,7 +242,7 @@ is_listening_port(struct tcpsrv_state *state, uint16_t port_be)
 
 #define BACK ports--
 
-static inline bool
+static __rte_always_inline bool
 is_port_listed_back(const uint16_t *ports, uint8_t count, uint16_t port)
 {
 	RTE_BUILD_BUG_ON(TCPSRV_MAX_NUM_PORTS != 12);
@@ -267,7 +267,7 @@ is_port_listed_back(const uint16_t *ports, uint8_t count, uint16_t port)
 	return *ports == port;
 }
 
-static inline bool
+static __rte_always_inline bool
 is_remote_port(struct tcpsrv_state *state, uint16_t port_be)
 {
 	return is_port_listed_back(&state->ports.p[TCPSRV_MAX_NUM_PORTS - 1],