diff options
| author | Daniel T. Lee <danieltimlee@gmail.com> | 2019-11-07 09:51:53 +0900 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-11-08 19:21:52 -0800 |
| commit | 451d1dc886b548d6e18c933adca326c1307023c9 (patch) | |
| tree | c920619afdfd1f62787fcf94f549b5a1c0ec3537 /samples/bpf/xdp_fwd_kern.c | |
| parent | afbe3c27d9ae151be33ccd6b05699d3c49dabad2 (diff) | |
| download | lwn-451d1dc886b548d6e18c933adca326c1307023c9.tar.gz lwn-451d1dc886b548d6e18c933adca326c1307023c9.zip | |
samples: bpf: update map definition to new syntax BTF-defined map
Since, the new syntax of BTF-defined map has been introduced,
the syntax for using maps under samples directory are mixed up.
For example, some are already using the new syntax, and some are using
existing syntax by calling them as 'legacy'.
As stated at commit abd29c931459 ("libbpf: allow specifying map
definitions using BTF"), the BTF-defined map has more compatablility
with extending supported map definition features.
The commit doesn't replace all of the map to new BTF-defined map,
because some of the samples still use bpf_load instead of libbpf, which
can't properly create BTF-defined map.
This will only updates the samples which uses libbpf API for loading bpf
program. (ex. bpf_prog_load_xattr)
Signed-off-by: Daniel T. Lee <danieltimlee@gmail.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'samples/bpf/xdp_fwd_kern.c')
| -rw-r--r-- | samples/bpf/xdp_fwd_kern.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/samples/bpf/xdp_fwd_kern.c b/samples/bpf/xdp_fwd_kern.c index 701a30f258b1..d013029aeaa2 100644 --- a/samples/bpf/xdp_fwd_kern.c +++ b/samples/bpf/xdp_fwd_kern.c @@ -23,13 +23,12 @@ #define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF) -/* For TX-traffic redirect requires net_device ifindex to be in this devmap */ -struct bpf_map_def SEC("maps") xdp_tx_ports = { - .type = BPF_MAP_TYPE_DEVMAP, - .key_size = sizeof(int), - .value_size = sizeof(int), - .max_entries = 64, -}; +struct { + __uint(type, BPF_MAP_TYPE_DEVMAP); + __uint(key_size, sizeof(int)); + __uint(value_size, sizeof(int)); + __uint(max_entries, 64); +} xdp_tx_ports SEC(".maps"); /* from include/net/ip.h */ static __always_inline int ip_decrease_ttl(struct iphdr *iph) |