AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

samples/bpf: Fix possible hang in xdpsock with multiple threads

Browse Source 
[ 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: cd9e72b6f2 ("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>
This commit is contained in:
Magnus Karlsson 2020-12-10 17:34:07 +01:00 committed by Greg Kroah-Hartman
parent 4d0721cb10
commit 81ef603e86
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/bpf/xdpsock_user.c
View File

@ -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) < while (xsk_ring_prod__reserve(&xsk->tx, batch_size, &idx) <
batch_size) { batch_size) {
complete_tx_only(xsk, batch_size); complete_tx_only(xsk, batch_size);
if (benchmark_done)
return;
} }
for (i = 0; i < batch_size; i++) { for (i = 0; i < batch_size; i++) {