diff options
| author |   Alan Maguire <alan.maguire@oracle.com> | 2024-07-10 16:00:51 +0100 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2024-07-10 11:39:47 -0700 |
| commit | eeb23b54e447ea62b247d89681f0140abab00d7f (patch) | |
| tree | 28585ec9c678fefd1bf61306ac24782ce77478b3 | |
| parent | bpf: Remove tst_run from lwt_seg6local_prog_ops. (diff) | |
| download | wireguard-linux-eeb23b54e447ea62b247d89681f0140abab00d7f.tar.xz wireguard-linux-eeb23b54e447ea62b247d89681f0140abab00d7f.zip | |
selftests/bpf: fix compilation failure when CONFIG_NF_FLOW_TABLE=m
In many cases, kernel netfilter functionality is built as modules.
If CONFIG_NF_FLOW_TABLE=m in particular, progs/xdp_flowtable.c
(and hence selftests) will fail to compile, so add a ___local
version of "struct flow_ports".
Fixes: c77e572d3a8c ("selftests/bpf: Add selftest for bpf_xdp_flow_lookup kfunc")
Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
Link: https://lore.kernel.org/r/20240710150051.192598-1-alan.maguire@oracle.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
| -rw-r--r-- | tools/testing/selftests/bpf/progs/xdp_flowtable.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/testing/selftests/bpf/progs/xdp_flowtable.c b/tools/testing/selftests/bpf/progs/xdp_flowtable.c index 15209650f73b..7fdc7b23ee74 100644 --- a/tools/testing/selftests/bpf/progs/xdp_flowtable.c +++ b/tools/testing/selftests/bpf/progs/xdp_flowtable.c @@ -58,6 +58,10 @@ static bool xdp_flowtable_offload_check_tcp_state(void *ports, void *data_end, return true; } +struct flow_ports___local { + __be16 source, dest; +} __attribute__((preserve_access_index)); + SEC("xdp.frags") int xdp_flowtable_do_lookup(struct xdp_md *ctx) { @@ -69,7 +73,7 @@ int xdp_flowtable_do_lookup(struct xdp_md *ctx) }; void *data = (void *)(long)ctx->data; struct ethhdr *eth = data; - struct flow_ports *ports; + struct flow_ports___local *ports; __u32 *val, key = 0; if (eth + 1 > data_end) @@ -79,7 +83,7 @@ int xdp_flowtable_do_lookup(struct xdp_md *ctx) case bpf_htons(ETH_P_IP): { struct iphdr *iph = data + sizeof(*eth); - ports = (struct flow_ports *)(iph + 1); + ports = (struct flow_ports___local *)(iph + 1); if (ports + 1 > data_end) return XDP_PASS; @@ -106,7 +110,7 @@ int xdp_flowtable_do_lookup(struct xdp_md *ctx) struct in6_addr *dst = (struct in6_addr *)tuple.ipv6_dst; struct ipv6hdr *ip6h = data + sizeof(*eth); - ports = (struct flow_ports *)(ip6h + 1); + ports = (struct flow_ports___local *)(ip6h + 1); if (ports + 1 > data_end) return XDP_PASS; |