lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

samples/bpf: xdp_fwd rename devmap name to be xdp_tx_ports

Browse Source 
The devmap name 'tx_port' came from a copy-paste from xdp_redirect_map
which only have a single TX port. Change name to xdp_tx_ports
to make it more descriptive.

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Acked-by: Yonghong Song <yhs@fb.com>
Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Jesper Dangaard Brouer 2019-08-08 18:17:37 +02:00 committed by Daniel Borkmann
parent d9973cec9d
commit 3783d43752
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
samples/bpf/xdp_fwd_kern.c
View File

@ -23,7 +23,8 @@
#define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF) #define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF)
struct bpf_map_def SEC("maps") tx_port = { /* 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, .type = BPF_MAP_TYPE_DEVMAP,
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(int), .value_size = sizeof(int),
@ -117,7 +118,7 @@ static __always_inline int xdp_fwd_flags(struct xdp_md *ctx, u32 flags)
memcpy(eth->h_dest, fib_params.dmac, ETH_ALEN); memcpy(eth->h_dest, fib_params.dmac, ETH_ALEN);
memcpy(eth->h_source, fib_params.smac, ETH_ALEN); memcpy(eth->h_source, fib_params.smac, ETH_ALEN);
return bpf_redirect_map(&tx_port, fib_params.ifindex, 0); return bpf_redirect_map(&xdp_tx_ports, fib_params.ifindex, 0);
} }
return XDP_PASS; return XDP_PASS;

2
samples/bpf/xdp_fwd_user.c
View File

@ -113,7 +113,7 @@ int main(int argc, char **argv)
return 1; return 1;
} }
map_fd = bpf_map__fd(bpf_object__find_map_by_name(obj, map_fd = bpf_map__fd(bpf_object__find_map_by_name(obj,
"tx_port")); "xdp_tx_ports"));
if (map_fd < 0) { if (map_fd < 0) {
printf("map not found: %s\n", strerror(map_fd)); printf("map not found: %s\n", strerror(map_fd));
return 1; return 1;