From: Kev Jackson Date: Mon, 7 Jun 2021 13:08:35 +0000 (+0100) Subject: libbpf: Fixes incorrect rx_ring_setup_done X-Git-Tag: v5.15~952^2~28^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11fc79fc9f2e395aa39fa5baccae62767c5d8280;p=platform%2Fkernel%2Flinux-starfive.git libbpf: Fixes incorrect rx_ring_setup_done When calling xsk_socket__create_shared(), the logic at line 1097 marks a boolean flag true within the xsk_umem structure to track setup progress in order to support multiple calls to the function. However, instead of marking umem->tx_ring_setup_done, the code incorrectly sets umem->rx_ring_setup_done. This leads to improper behaviour when creating and destroying xsk and umem structures. Multiple calls to this function is documented as supported. Fixes: ca7a83e2487a ("libbpf: Only create rx and tx XDP rings when necessary") Signed-off-by: Kev Jackson Signed-off-by: Andrii Nakryiko Acked-by: Yonghong Song Link: https://lore.kernel.org/bpf/YL4aU4f3Aaik7CN0@linux-dev --- diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c index 6061431..e9b619a 100644 --- a/tools/lib/bpf/xsk.c +++ b/tools/lib/bpf/xsk.c @@ -1094,7 +1094,7 @@ int xsk_socket__create_shared(struct xsk_socket **xsk_ptr, goto out_put_ctx; } if (xsk->fd == umem->fd) - umem->rx_ring_setup_done = true; + umem->tx_ring_setup_done = true; } err = xsk_get_mmap_offsets(xsk->fd, &off);