summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKev Jackson <foamdino@gmail.com>2021-06-07 16:08:35 +0300
committerAndrii Nakryiko <andrii@kernel.org>2021-06-08 03:44:03 +0300
commit11fc79fc9f2e395aa39fa5baccae62767c5d8280 (patch)
treec717125b61a601eb7fa7e0581b49022aa0396773
parent1a8024239dacf53fcf39c0f07fbf2712af22864f (diff)
downloadlinux-11fc79fc9f2e395aa39fa5baccae62767c5d8280.tar.xz
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 <foamdino@gmail.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Yonghong Song <yhs@fb.com> Link: https://lore.kernel.org/bpf/YL4aU4f3Aaik7CN0@linux-dev
-rw-r--r--tools/lib/bpf/xsk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c
index 6061431ee04c..e9b619aa0cdf 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);