From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F3DFF412BF1 for ; Fri, 7 Aug 2026 23:29:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786145380; cv=none; b=rMMmThWTisPmMZhlxmUI6JMc7ZjUBT6o5sbAuywEuXth9Qt6xhm+o97Wij2E7tL5TCkLO5g4DIMFgKdhgHKrAa+Eg5wLLYHuLMGbgMC/c/CUE2jz1cKimJpW7zxUSjOhMnfbI/XuUE4Z4wrWAGkVHWg3C2/5G2klZvI8hGDc/pA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786145380; c=relaxed/simple; bh=HuvcK2ZQRfWBvhTLwlkMWMegVH+Jtz8iW1wWzgmPJBI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YIGIaRjihl1niafXB40nhJ+1iiwXFRfCb8zz3ogZ6kEJyCWU7XFbZMeysLMJPERa9kUmQpnJRjhC6LyeafonB27gwMp/l9TeNmIax92aBoK6qqNZFOEbSps/6Cif98FwB9/aOwB6uCQDwwsNrY9LIbTDgzTJvc9Hnx24QrymGDQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=eEaoPSnh; arc=none smtp.client-ip=209.85.210.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="eEaoPSnh" Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-84e375d9736so86056b3a.2 for ; Fri, 07 Aug 2026 16:29:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786145378; x=1786750178; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=xooLlvy4kkl0e8VxchM15X6w2WCP935IVgl6a5R8YOw=; b=eEaoPSnhJlCsXJUQkkSI5Lj+5YAY2VVFA4X7sevM/WO2sUUEM2BUjwpNiW/4W91D0V g9bdpxT5Vpb6HYIg02D04PZL7ie+U9SiZPjc0WnzRWUhxuVKDSCU+HFsYOk9oNY6CRsI 5PeRdpQ/HIqbLau83pju13biiiKVyi5yhVUBNb/B/DIYFrG9+lFJHI0iJp5PXqfCya9B 3YX1bdAdB56C2llJ7iTp8dKz8v2ASLrYT30GxTk3PVy5s0Yz47ZhDy7Mrvr7iaxwpDuu ZdkT6jcKPv3znrqJmxxthgGHFuzvpdXstu8OpMwVZSihJrCpWPi1rt3Xydd5uzeQcW2Q EAoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786145378; x=1786750178; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=xooLlvy4kkl0e8VxchM15X6w2WCP935IVgl6a5R8YOw=; b=j4u/drcOQZkF4Nl9UfLpihII/km5sB2+fMwQhT46Ac56jjjcB7qGIL5eQuejMkyVBh y3bhVw/F5OAz6IrNd3I7mVcdOBsgScZlnEDJXjJnsdgERdI6Vvn6kBSz3+rSdzl1sPYk UlwL7xOamCW2PR5f755+TbixSaLyOVztLYzJvNcLlR/HyP28dRZYsqmcUZo/XMxlrvHU wi0qYJ7SwsN09rmeZQy5PzTRFWREPaaPAu5ELeP+FNCcClidG0NbDNFgtRInN8dm8+sN PRsCveAR4I0Yl0B7hqQILrYO6mP3WUJZnEzr4c2g/VomhibvKlYbLS17o8UJ7x8wbq5h Rvrg== X-Forwarded-Encrypted: i=1; AHgh+RqNUl2NY+iJF7RD/5oFTyyzflZXZzQ0Z1wXg4SAAFnaEPEII3ok/Sq2HD5PcIi3oidd/KDjd3k=@vger.kernel.org X-Gm-Message-State: AOJu0YyF46yMjNPib2uCMepIAYmBipFuBL1TVjUjy43/U83CwC502g97 leMRP6d837ksmFQs3wYiCHD/5f+w6F1AQJIi+Xm1DPgcffWJ9nPl2gOf+XC5ImqvMEuu4ptxta5 1DXRs+g== X-Received: from pfblb1.prod.google.com ([2002:a05:6a00:4f01:b0:84b:ff7b:d4d]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:909e:b0:845:e8f3:bdd0 with SMTP id d2e1a72fcca58-84f2e0ed609mr32638462b3a.33.1786145378082; Fri, 07 Aug 2026 16:29:38 -0700 (PDT) Date: Fri, 7 Aug 2026 23:28:43 +0000 In-Reply-To: <20260807232932.3986667-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260807232932.3986667-1-kuniyu@google.com> X-Mailer: git-send-email 2.55.0.679.g6767b8d81c-goog Message-ID: <20260807232932.3986667-6-kuniyu@google.com> Subject: [PATCH v2 net-next 05/13] neighbour: Store arp_tbl and nd_tbl in net->neigh_tables[]. From: Kuniyuki Iwashima To: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , David Ahern , Ido Schimmel Cc: Simon Horman , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org Content-Type: text/plain; charset="UTF-8" We will remove RTNL for neigh_add() and neigh_delete(), but they are still serialised by per-protocol neigh_table.lock. We can avoid contention by converting neigh_tables[] to per-netns, but arp_tbl and nd_tbl are directly used in many places. As a prep, let's store &arp_tbl and &nd_tbl in net->neigh_tables[]. We will replace such users with arp_table(net) and nd_table(net) and then allocate per-netns neigh_table. Note that nd_table() still returns &nd_tbl in case disable_ipv6_mod is 1 because some buggy drivers use nd_tbl without checking it. Signed-off-by: Kuniyuki Iwashima --- include/net/arp.h | 6 +++++- include/net/ndisc.h | 9 +++++++++ include/net/neighbour.h | 2 ++ include/net/net_namespace.h | 4 ++++ net/core/neighbour.c | 12 ++++++++++++ net/ipv4/arp.c | 23 +++++++++++++++++++++-- net/ipv6/ndisc.c | 12 +++++++++++- 7 files changed, 64 insertions(+), 4 deletions(-) diff --git a/include/net/arp.h b/include/net/arp.h index e8747e0713c7..f8d18b1f8b28 100644 --- a/include/net/arp.h +++ b/include/net/arp.h @@ -7,9 +7,13 @@ #include #include - extern struct neigh_table arp_tbl; +static inline struct neigh_table *arp_table(struct net *net) +{ + return net->neigh_tables[NEIGH_ARP_TABLE]; +} + static inline u32 arp_hashfn(const void *pkey, const struct net_device *dev, u32 *hash_rnd) { u32 key = *(const u32 *)pkey; diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 3da1a6f8d3f9..84dba1376f98 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -67,6 +67,15 @@ struct prefix_info; extern struct neigh_table nd_tbl; +static inline struct neigh_table *nd_table(struct net *net) +{ +#if IS_ENABLED(CONFIG_IPV6) + if (disable_ipv6_mod) + return &nd_tbl; +#endif + return net->neigh_tables[NEIGH_ND_TABLE]; +} + struct nd_msg { struct icmp6hdr icmph; struct in6_addr target; diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 7847c29496ae..700d62605fab 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -339,6 +339,8 @@ static inline void neigh_confirm(struct neighbour *n) } } +int neigh_table_register(struct net *net, struct neigh_table *tbl, int index); +void neigh_table_unregister(struct net *net, int index); void neigh_table_init(int index, struct neigh_table *tbl); int neigh_table_clear(int index, struct neigh_table *tbl); struct neighbour *neigh_lookup(struct neigh_table *tbl, const void *pkey, diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 501af1999fe8..f96a390ae536 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -47,6 +48,7 @@ struct user_namespace; struct proc_dir_entry; +struct neigh_table; struct net_device; struct sock; struct ctl_table_header; @@ -103,6 +105,8 @@ struct net { struct proc_dir_entry *proc_net; struct proc_dir_entry *proc_net_stat; + struct neigh_table *neigh_tables[NEIGH_NR_TABLES]; + #ifdef CONFIG_SYSCTL struct ctl_table_set sysctls; #endif diff --git a/net/core/neighbour.c b/net/core/neighbour.c index caa52bf64a2d..286acb7cd504 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1899,6 +1899,18 @@ int neigh_table_clear(int index, struct neigh_table *tbl) return 0; } +int neigh_table_register(struct net *net, struct neigh_table *tbl, int index) +{ + net->neigh_tables[index] = tbl; + + return 0; +} + +void neigh_table_unregister(struct net *net, int index) +{ + net->neigh_tables[index] = NULL; +} + static struct neigh_table *neigh_find_table(int family) { struct neigh_table *tbl = NULL; diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index d409f606aec0..bad17d5aeafc 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -1495,15 +1495,34 @@ static const struct seq_operations arp_seq_ops = { static int __net_init arp_net_init(struct net *net) { + int err; + + err = neigh_table_register(net, &arp_tbl, NEIGH_ARP_TABLE); + if (err) + goto err; + +#ifdef CONFIG_PROC_FS if (!proc_create_net("arp", 0444, net->proc_net, &arp_seq_ops, - sizeof(struct neigh_seq_state))) - return -ENOMEM; + sizeof(struct neigh_seq_state))) { + err = -ENOMEM; + goto err_proc_create; + } +#endif + return 0; + +#ifdef CONFIG_PROC_FS +err_proc_create: + neigh_table_unregister(net, NEIGH_ARP_TABLE); +#endif +err: + return err; } static void __net_exit arp_net_exit(struct net *net) { remove_proc_entry("arp", net->proc_net); + neigh_table_unregister(net, NEIGH_ARP_TABLE); } static struct pernet_operations arp_net_ops = { diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index fe36b3f51285..951c0f484ae7 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1971,12 +1971,16 @@ static int __net_init ndisc_net_init(struct net *net) struct sock *sk; int err; + err = neigh_table_register(net, &nd_tbl, NEIGH_ND_TABLE); + if (err) + goto err; + err = inet_ctl_sock_create(&sk, PF_INET6, SOCK_RAW, IPPROTO_ICMPV6, net); if (err < 0) { net_err_ratelimited("NDISC: Failed to initialize the control socket (err %d)\n", err); - return err; + goto err_sock_create; } net->ipv6.ndisc_sk = sk; @@ -1987,11 +1991,17 @@ static int __net_init ndisc_net_init(struct net *net) inet6_clear_bit(MC6_LOOP, sk); return 0; + +err_sock_create: + neigh_table_unregister(net, NEIGH_ND_TABLE); +err: + return err; } static void __net_exit ndisc_net_exit(struct net *net) { inet_ctl_sock_destroy(net->ipv6.ndisc_sk); + neigh_table_unregister(net, NEIGH_ND_TABLE); } static struct pernet_operations ndisc_net_ops = { -- 2.55.0.679.g6767b8d81c-goog