diff options
| author | Magnus Karlsson <magnus.karlsson@intel.com> | 2020-12-10 17:34:07 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-30 11:53:49 +0100 |
| commit | 81ef603e86161b76087a9043e3d811146e3d0184 (patch) | |
| tree | ce32fdad310b77e8b7e953cc63ab3dcb8e81a714 /samples | |
| parent | 4d0721cb10aa55027bd6c8075aab62ce08fe0c57 (diff) | |
| download | linux-stable-81ef603e86161b76087a9043e3d811146e3d0184.tar.gz linux-stable-81ef603e86161b76087a9043e3d811146e3d0184.tar.bz2 linux-stable-81ef603e86161b76087a9043e3d811146e3d0184.zip | |
samples/bpf: Fix possible hang in xdpsock with multiple threads
[ Upstream commit 092fde0f863b72b67c4d6dc03844f5658fc00a35 ]
Fix a possible hang in xdpsock that can occur when using multiple
threads. In this case, one or more of the threads might get stuck in
the while-loop in tx_only after the user has signaled the main thread
to stop execution. In this case, no more Tx packets will be sent, so a
thread might get stuck in the aforementioned while-loop. Fix this by
introducing a test inside the while-loop to check if the benchmark has
been terminated. If so, return from the function.
Fixes: cd9e72b6f210 ("samples/bpf: xdpsock: Add option to specify batch size")
Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20201210163407.22066-1-magnus.karlsson@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/bpf/xdpsock_user.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c index 1149e94ca32f..33c58de58626 100644 --- a/samples/bpf/xdpsock_user.c +++ b/samples/bpf/xdpsock_user.c @@ -1250,6 +1250,8 @@ static void tx_only(struct xsk_socket_info *xsk, u32 *frame_nb, int batch_size) while (xsk_ring_prod__reserve(&xsk->tx, batch_size, &idx) < batch_size) { complete_tx_only(xsk, batch_size); + if (benchmark_done) + return; } for (i = 0; i < batch_size; i++) { |