Skip to content

Commit

Permalink
samples/bpf: Fix map iteration in xdp1_user
Browse files Browse the repository at this point in the history
[ Upstream commit 05ee658 ]

BPF map iteration in xdp1_user results in endless loop without any
output, because the return value of bpf_map_get_next_key() is checked
against the wrong value.

Other call locations of bpf_map_get_next_key() check for equal 0 for
continuing the iteration. xdp1_user checks against unequal -1. This is
wrong for a function which can return arbitrary negative errno values,
because a return value of e.g. -2 results in an endless loop.

With this fix xdp1_user is printing statistics again:
proto 0:          1 pkt/s
proto 0:          1 pkt/s
proto 17:     107383 pkt/s
proto 17:     881655 pkt/s
proto 17:     882083 pkt/s
proto 17:     881758 pkt/s

Fixes: bd05410 ("libbpf: enforce strict libbpf 1.0 behaviors")
Signed-off-by: Gerhard Engleder <gerhard@engleder-embedded.com>
Acked-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20221013200922.17167-1-gerhard@engleder-embedded.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Gerhard Engleder authored and gregkh committed Dec 31, 2022
1 parent 22d569b commit 818b686
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion samples/bpf/xdp1_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ static void poll_stats(int map_fd, int interval)

sleep(interval);

while (bpf_map_get_next_key(map_fd, &key, &key) != -1) {
while (bpf_map_get_next_key(map_fd, &key, &key) == 0) {
__u64 sum = 0;

assert(bpf_map_lookup_elem(map_fd, &key, values) == 0);
Expand Down

0 comments on commit 818b686

Please sign in to comment.