diff options
| author | Ilya Maximets <i.maximets@samsung.com> | 2019-07-03 14:09:16 +0200 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2019-07-09 01:43:26 +0200 |
| commit | bf0bdd1343efbbf65b4d53aef1fce14acbd79d50 (patch) | |
| tree | 596c5002c0217bb4c9ab8e1ea2fbf49cf0e78f75 /include/net/xdp_sock.h | |
| parent | selftests/bpf: fix test_reuseport_array on s390 (diff) | |
| download | linux-bf0bdd1343efbbf65b4d53aef1fce14acbd79d50.tar.xz linux-bf0bdd1343efbbf65b4d53aef1fce14acbd79d50.zip | |
xdp: fix race on generic receive path
Unlike driver mode, generic xdp receive could be triggered
by different threads on different CPU cores at the same time
leading to the fill and rx queue breakage. For example, this
could happen while sending packets from two processes to the
first interface of veth pair while the second part of it is
open with AF_XDP socket.
Need to take a lock for each generic receive to avoid race.
Fixes: c497176cb2e4 ("xsk: add Rx receive functions and poll support")
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>
Tested-by: William Tu <u9012063@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'include/net/xdp_sock.h')
| -rw-r--r-- | include/net/xdp_sock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h index 057b159ff8b9..de4e3a353df3 100644 --- a/include/net/xdp_sock.h +++ b/include/net/xdp_sock.h @@ -67,6 +67,8 @@ struct xdp_sock { * in the SKB destructor callback. */ spinlock_t tx_completion_lock; + /* Protects generic receive. */ + spinlock_t rx_lock; u64 rx_dropped; }; |