From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E02A0C282C3 for ; Thu, 24 Jan 2019 19:00:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE23E218A2 for ; Thu, 24 Jan 2019 19:00:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nenS64Uo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728751AbfAXTAY (ORCPT ); Thu, 24 Jan 2019 14:00:24 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:35589 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725913AbfAXTAY (ORCPT ); Thu, 24 Jan 2019 14:00:24 -0500 Received: by mail-pg1-f195.google.com with SMTP id s198so3062679pgs.2 for ; Thu, 24 Jan 2019 11:00:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5XAwWZ5CrpeiYWc0LszOySV/fE8d0J8DapWrgIHjrIY=; b=nenS64Uo2UVwzw8WAAvmubKpimV7emAn1Nnt34IMTHvCR/lu/TQHSf2oZSQDdUxjjc ZD/oD1eGh5coul8vWv3pRRARxm1guuC/evRKfR29GC0GFtLoVGcmtvG1LHwJag0EZa5T 2RsuytaBzaabXr+ensbjz8r2fRhKEu8jFo2mH8JoqJmFZctSUYvz0yrLznemV9E3eCyr nve9pSyQwbtEgiRx1QUCQCWksFt6RPEBOfbhbPvA+w2AHBHt4gunF9q8ywaF2xiPwh1J zN03ffOYzKdS9AJfRiC3N+aX+0O7NWGQMbcAwTRk/2M3FDw9mPSwKX8JAPSVbD/68Nmw cBWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5XAwWZ5CrpeiYWc0LszOySV/fE8d0J8DapWrgIHjrIY=; b=UUDUJ5fQ/aGpXgDTHy8Z8jk5ezE87yDsYNEkz4PyYFpMVi/JeJ/avg6g69eoTZrLQ8 hUXDKtOk6Ki2qZNCOEs+oL8xvuBY45KhXOZBYfBefl3JmrqwvF1gxudGWQLahnE1murb Uf2PvkmUpTHg5hBx+oJA0bcHGfZmnSN39jl+Vw9bxB2oL72UHAjGuVQyHdEUZWIJuHLD uAiNCzxDFqPHhtMLjTa1JkBzV580rLRAsqleZwlkzBw2hzlOIBOfZPb7LLPgOQ/nXhsn 3sjofQZpnpFkeD6DJpcpUavEDR8Ew8qmTsxXGJFSainjx0jvyeTNZ09PHl+hpmR1m5pO PqnQ== X-Gm-Message-State: AJcUukd42/fi2RP6bzAunGd6akkqFEve9z1VY/8bLKU8MdUC5isojmQV iKgGZuwbZbHoY+k6DXH/7VM= X-Google-Smtp-Source: ALg8bN46NtW0Um4OuDni4az5ml0AjKezn4dr7g6pnc3QoM9WGypbyqqA7TW4aZYPgea8R/emzAKQIw== X-Received: by 2002:a62:8a51:: with SMTP id y78mr7622451pfd.35.1548356423502; Thu, 24 Jan 2019 11:00:23 -0800 (PST) Received: from btopel-mobl.ger.intel.com ([134.134.139.82]) by smtp.gmail.com with ESMTPSA id t90sm31594415pfj.23.2019.01.24.11.00.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jan 2019 11:00:22 -0800 (PST) From: bjorn.topel@gmail.com To: ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org Cc: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , magnus.karlsson@intel.com, magnus.karlsson@gmail.com Subject: [PATCH bpf-next v2 1/3] net: xsk: track AF_XDP sockets on a per-netns list Date: Thu, 24 Jan 2019 19:59:37 +0100 Message-Id: <20190124185939.23628-2-bjorn.topel@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190124185939.23628-1-bjorn.topel@gmail.com> References: <20190124185939.23628-1-bjorn.topel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Björn Töpel Track each AF_XDP socket in a per-netns list. This will be used later by the sock_diag interface for querying sockets from userspace. Signed-off-by: Björn Töpel --- include/net/net_namespace.h | 4 ++++ include/net/netns/xdp.h | 13 +++++++++++++ net/xdp/xsk.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 include/net/netns/xdp.h diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 99d4148e0f90..a68ced28d8f4 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -160,6 +161,9 @@ struct net { #endif #if IS_ENABLED(CONFIG_CAN) struct netns_can can; +#endif +#ifdef CONFIG_XDP_SOCKETS + struct netns_xdp xdp; #endif struct sock *diag_nlsk; atomic_t fnhe_genid; diff --git a/include/net/netns/xdp.h b/include/net/netns/xdp.h new file mode 100644 index 000000000000..e5734261ba0a --- /dev/null +++ b/include/net/netns/xdp.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __NETNS_XDP_H__ +#define __NETNS_XDP_H__ + +#include +#include + +struct netns_xdp { + struct mutex lock; + struct hlist_head list; +}; + +#endif /* __NETNS_XDP_H__ */ diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index a03268454a27..80ca48cefc42 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -350,6 +350,10 @@ static int xsk_release(struct socket *sock) net = sock_net(sk); + mutex_lock(&net->xdp.lock); + sk_del_node_init_rcu(sk); + mutex_unlock(&net->xdp.lock); + local_bh_disable(); sock_prot_inuse_add(net, sk->sk_prot, -1); local_bh_enable(); @@ -746,6 +750,10 @@ static int xsk_create(struct net *net, struct socket *sock, int protocol, mutex_init(&xs->mutex); spin_lock_init(&xs->tx_completion_lock); + mutex_lock(&net->xdp.lock); + sk_add_node_rcu(sk, &net->xdp.list); + mutex_unlock(&net->xdp.lock); + local_bh_disable(); sock_prot_inuse_add(net, &xsk_proto, 1); local_bh_enable(); @@ -759,6 +767,23 @@ static const struct net_proto_family xsk_family_ops = { .owner = THIS_MODULE, }; +static int __net_init xsk_net_init(struct net *net) +{ + mutex_init(&net->xdp.lock); + INIT_HLIST_HEAD(&net->xdp.list); + return 0; +} + +static void __net_exit xsk_net_exit(struct net *net) +{ + WARN_ON_ONCE(!hlist_empty(&net->xdp.list)); +} + +static struct pernet_operations xsk_net_ops = { + .init = xsk_net_init, + .exit = xsk_net_exit, +}; + static int __init xsk_init(void) { int err; @@ -771,8 +796,13 @@ static int __init xsk_init(void) if (err) goto out_proto; + err = register_pernet_subsys(&xsk_net_ops); + if (err) + goto out_sk; return 0; +out_sk: + sock_unregister(PF_XDP); out_proto: proto_unregister(&xsk_proto); out: -- 2.19.1