diff options
| author | Björn Töpel <bjorn.topel@intel.com> | 2018-10-08 19:40:16 +0200 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-10-11 10:19:01 +0200 |
| commit | cee271678d0e3177a25d0fcb2fa5e051d48e4262 (patch) | |
| tree | b63781801b81ccc68cda0d24417764e90ec138c1 /net/xdp | |
| parent | 262f9d811c7608f1e74258ceecfe1fa213bdf912 (diff) | |
| download | linux-rpi-cee271678d0e3177a25d0fcb2fa5e051d48e4262.tar.gz linux-rpi-cee271678d0e3177a25d0fcb2fa5e051d48e4262.tar.bz2 linux-rpi-cee271678d0e3177a25d0fcb2fa5e051d48e4262.zip | |
xsk: do not call synchronize_net() under RCU read lock
The XSKMAP update and delete functions called synchronize_net(), which
can sleep. It is not allowed to sleep during an RCU read section.
Instead we need to make sure that the sock sk_destruct (xsk_destruct)
function is asynchronously called after an RCU grace period. Setting
the SOCK_RCU_FREE flag for XDP sockets takes care of this.
Fixes: fbfc504a24f5 ("bpf: introduce new bpf AF_XDP map type BPF_MAP_TYPE_XSKMAP")
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'net/xdp')
| -rw-r--r-- | net/xdp/xsk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index 4e937cd7c17d..661504042d30 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -744,6 +744,8 @@ static int xsk_create(struct net *net, struct socket *sock, int protocol, sk->sk_destruct = xsk_destruct; sk_refcnt_debug_inc(sk); + sock_set_flag(sk, SOCK_RCU_FREE); + xs = xdp_sk(sk); mutex_init(&xs->mutex); spin_lock_init(&xs->tx_completion_lock); |