path: root/net/xdp
diff options
authorBjörn Töpel <bjorn.topel@intel.com>2018-12-19 13:09:31 +0100
committerDaniel Borkmann <daniel@iogearbox.net>2018-12-19 21:45:17 +0100
commite2ce3674883ecba2605370404208c9d4a07ae1c3 (patch)
treef902b59f4d749d997c415bfd998b76f3d65af2ba /net/xdp
parentbpf: log struct/union attribute for forward type (diff)
xsk: simplify AF_XDP socket teardown
Prior this commit, when the struct socket object was being released, the UMEM did not have its reference count decreased. Instead, this was done in the struct sock sk_destruct function. There is no reason to keep the UMEM reference around when the socket is being orphaned, so in this patch the xdp_put_mem is called in the xsk_release function. This results in that the xsk_destruct function can be removed! Note that, it still holds that a struct xsk_sock reference might still linger in the XSKMAP after the UMEM is released, e.g. if a user does not clear the XSKMAP prior to closing the process. This sock will be in a "released" zombie like state, until the XSKMAP is removed. Signed-off-by: Björn Töpel <bjorn.topel@intel.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'net/xdp')
1 files changed, 1 insertions, 15 deletions
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index 07156f43d295..a03268454a27 100644
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -366,6 +366,7 @@ static int xsk_release(struct socket *sock)
+ xdp_put_umem(xs->umem);
sock->sk = NULL;
@@ -713,18 +714,6 @@ static const struct proto_ops xsk_proto_ops = {
.sendpage = sock_no_sendpage,
-static void xsk_destruct(struct sock *sk)
- struct xdp_sock *xs = xdp_sk(sk);
- if (!sock_flag(sk, SOCK_DEAD))
- return;
- xdp_put_umem(xs->umem);
- sk_refcnt_debug_dec(sk);
static int xsk_create(struct net *net, struct socket *sock, int protocol,
int kern)
@@ -751,9 +740,6 @@ static int xsk_create(struct net *net, struct socket *sock, int protocol,
sk->sk_family = PF_XDP;
- sk->sk_destruct = xsk_destruct;
- sk_refcnt_debug_inc(sk);
sock_set_flag(sk, SOCK_RCU_FREE);
xs = xdp_sk(sk);