Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

veth: reduce XDP no_direct return section to fix race

As explain in commit fa349e396e48 ("veth: Fix race with AF_XDP exposing
old or uninitialized descriptors") for veth there is a chance after
napi_complete_done() that another CPU can manage start another NAPI
instance running veth_pool(). For NAPI this is correctly handled as the
napi_schedule_prep() check will prevent multiple instances from getting
scheduled, but for the remaining code in veth_pool() this can run
concurrent with the newly started NAPI instance.

The problem/race is that xdp_clear_return_frame_no_direct() isn't
designed to be nested.

Prior to commit 401cb7dae813 ("net: Reference bpf_redirect_info via
task_struct on PREEMPT_RT.") the temporary BPF net context
bpf_redirect_info was stored per CPU, where this wasn't an issue. Since
this commit the BPF context is stored in 'current' task_struct. When
running veth in threaded-NAPI mode, then the kthread becomes the storage
area. Now a race exists between two concurrent veth_pool() function calls
one exiting NAPI and one running new NAPI, both using the same BPF net
context.

Race is when another CPU gets within the xdp_set_return_frame_no_direct()
section before exiting veth_pool() calls the clear-function
xdp_clear_return_frame_no_direct().

Fixes: 401cb7dae8130 ("net: Reference bpf_redirect_info via task_struct on PREEMPT_RT.")
Signed-off-by: Jesper Dangaard Brouer <hawk@kernel.org>
Link: https://patch.msgid.link/176356963888.337072.4805242001928705046.stgit@firesoul
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Jesper Dangaard Brouer and committed by
Jakub Kicinski
a14602fc 4b4749b7

+3 -4
+3 -4
drivers/net/veth.c
··· 975 975 976 976 if (stats.xdp_redirect > 0) 977 977 xdp_do_flush(); 978 + if (stats.xdp_tx > 0) 979 + veth_xdp_flush(rq, &bq); 980 + xdp_clear_return_frame_no_direct(); 978 981 979 982 if (done < budget && napi_complete_done(napi, done)) { 980 983 /* Write rx_notify_masked before reading ptr_ring */ ··· 989 986 } 990 987 } 991 988 } 992 - 993 - if (stats.xdp_tx > 0) 994 - veth_xdp_flush(rq, &bq); 995 - xdp_clear_return_frame_no_direct(); 996 989 997 990 /* Release backpressure per NAPI poll */ 998 991 smp_rmb(); /* Paired with netif_tx_stop_queue set_bit */