From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (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 A8EAE4AC154 for ; Wed, 2 Sep 2026 20:37:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.72 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788381470; cv=none; b=lb1ht1iVuHJol9ypaSk46BFGfFotYD/wNIqt2Q14SAciuRGgH9Nq4xQU/8brHk53MBcEATKkWICg36/ZZmTXmYKpm+JPhA4iO0spNw5i3KHAQa6iHwuyAxyky2Nq2rzJ8+wEVNEvp4q773zbSLjs6ygGHlWEXUCqxeuE0C+Aiqw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788381470; c=relaxed/simple; bh=bZ91AQrlklRHXjgRjul+y6r/y3olcO4xmkIcmzGZ3oE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fVpfKlmO0RsnyQ0Z7Q8qUYgpCfd70zAEurBJVqd2NLoINS1OhdmNRLos4RikYC2kEiJopjq0NaOrpaMuD451zZzKeG/ppwlqfCxfp1+rPHh/1TAazHiKLYHwGmHJgyaDCJB16SqDEvCpIqMkyRuFzdiagHKTt2x19Wc/7Lk8S/w= 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=J/fvBbUz; arc=none smtp.client-ip=209.85.216.72 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="J/fvBbUz" Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-398e1f7d1a5so2431524a91.0 for ; Wed, 02 Sep 2026 13:37:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788381468; x=1788986268; 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=9/CkC4vf8NaX/aVUOd6WHsBHSmTu3pCWHf3y/lGhgn0=; b=J/fvBbUzP44Cd7LlMUL4PO59ujHUvYEeOIiRx/VdWSW5X3LmvvPYCfhskRenZvehwg 6GD0heqGz0cLeS6GC2yztIrCmDtZ/i8iE90lXwfKdswgW9dRAY2rLWJaOXTyf2LoS0au NAzSopM1Fe/KSTffmKZGtcW+K0XQ0MQWsMqv7u7UlVtSqYQeukCKIHRrRL3a70XDgQOl ENbxEOIJ7PaFTP3dsqgflOBYWySaf0cXY4cVrIH5SF3KcYKR3iddBLS2CfK7rNzYo5/1 P/BOShkfFc/VV6MkSRsge/iRTbiZFQwU4RH33FbTBXHBL8IBgmhG2UvJB5E27RRAW3hQ 6aQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788381468; x=1788986268; 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=9/CkC4vf8NaX/aVUOd6WHsBHSmTu3pCWHf3y/lGhgn0=; b=XC/jd13WcOr3Klm6nI+SVEThniaWcG0rrglROvW3lqFYfjIPX8+WmikKPXt/ImN1S+ V22r8gpesdSUJwT/D8Vwbc6ERM4douZI/JfU358PcHk5oP13i4Morq59Ys0CXF0f4og9 wQ0hEFaIH3RtfZ88xMLIKJ6EV9bjaBr8ndcwXpTmqSiHRl0IafEDUMSmARD3k4w1w4d6 F7qegP0pw8nuzhRLMHN48kpWb4HAxsY9PWgBAnTWjBOGdgm1XJ0kDqBvCZkb2lD6YZcJ qbAwBmHF0glG+0kELW+M/gotgV0GgQHJGHd4bbR6rh3Feu6zFwU7ByU5nBAWGQuEL/6Y sbpw== X-Forwarded-Encrypted: i=1; AKwUvBwntWTit+8CEsq5GXcZdj8hE6hWO7EWL+/cnxUeZMNp/+4K8AXvdhBhprNWW30Y1js9Z1xKSos=@vger.kernel.org X-Gm-Message-State: AFuF++kLR3KVZnV032K4nisn+BD5g+JdfWzBnPS/cKt5r57bSOPfm2jf 6AJrcCuhe81vEFW5psAIo4sMbliK9KIoQUC5iIxy4XLtUIfiU44JanvgVMFOVgqkibtD7EZDARG rIINgmg== X-Received: from pjqo10.prod.google.com ([2002:a17:90a:ac0a:b0:396:1f9d:c3c7]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:dfcd:b0:398:ba0e:96f6 with SMTP id 98e67ed59e1d1-39aee1ad8edmr11950743a91.23.1788381467843; Wed, 02 Sep 2026 13:37:47 -0700 (PDT) Date: Wed, 2 Sep 2026 20:36:48 +0000 In-Reply-To: <20260902203722.926528-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260902203722.926528-1-kuniyu@google.com> X-Mailer: git-send-email 2.55.0.970.g62bdec98f9-goog Message-ID: <20260902203722.926528-8-kuniyu@google.com> Subject: [PATCH v6 net-next 07/15] neighbour: Remove 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, Nikolay Aleksandrov Content-Type: text/plain; charset="UTF-8" Now, &arp_tbl and &nd_tbl are stored in net->neigh_tables[]. Let's use net->neigh_tables[] in neighbour.c and remove the global neigh_tables[]. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Nikolay Aleksandrov --- include/net/neighbour.h | 4 ++-- net/core/neighbour.c | 34 +++++++++++++++------------------- net/ipv4/arp.c | 2 +- net/ipv6/ndisc.c | 4 ++-- 4 files changed, 20 insertions(+), 24 deletions(-) diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 700d62605fab..3e31eebf8663 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -341,8 +341,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); +void neigh_table_init(struct neigh_table *tbl); +int neigh_table_clear(struct neigh_table *tbl); struct neighbour *neigh_lookup(struct neigh_table *tbl, const void *pkey, struct net_device *dev); struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey, diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 286acb7cd504..34da4cdc813d 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1807,9 +1807,7 @@ void neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *parms) static struct lock_class_key neigh_table_proxy_queue_class; -static struct neigh_table *neigh_tables[NEIGH_NR_TABLES] __read_mostly; - -void neigh_table_init(int index, struct neigh_table *tbl) +void neigh_table_init(struct neigh_table *tbl) { unsigned long now = jiffies; unsigned long phsize; @@ -1863,18 +1861,14 @@ void neigh_table_init(int index, struct neigh_table *tbl) tbl->last_flush = now; tbl->last_rand = now + tbl->parms.reachable_time * 20; - - neigh_tables[index] = tbl; } /* * Only called from ndisc_cleanup(), which means this is dead code * because we no longer can unload IPv6 module. */ -int neigh_table_clear(int index, struct neigh_table *tbl) +int neigh_table_clear(struct neigh_table *tbl) { - neigh_tables[index] = NULL; - /* It is not clean... Fix it to unload IPv6 module safely */ cancel_delayed_work_sync(&tbl->managed_work); cancel_delayed_work_sync(&tbl->gc_work); @@ -1911,16 +1905,16 @@ void neigh_table_unregister(struct net *net, int index) net->neigh_tables[index] = NULL; } -static struct neigh_table *neigh_find_table(int family) +static struct neigh_table *neigh_find_table(struct net *net, int family) { struct neigh_table *tbl = NULL; switch (family) { case AF_INET: - tbl = neigh_tables[NEIGH_ARP_TABLE]; + tbl = net->neigh_tables[NEIGH_ARP_TABLE]; break; case AF_INET6: - tbl = neigh_tables[NEIGH_ND_TABLE]; + tbl = net->neigh_tables[NEIGH_ND_TABLE]; break; } @@ -1974,7 +1968,7 @@ static int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh, } } - tbl = neigh_find_table(ndm->ndm_family); + tbl = neigh_find_table(net, ndm->ndm_family); if (tbl == NULL) return -EAFNOSUPPORT; @@ -2060,7 +2054,7 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh, } } - tbl = neigh_find_table(ndm->ndm_family); + tbl = neigh_find_table(net, ndm->ndm_family); if (tbl == NULL) return -EAFNOSUPPORT; @@ -2403,7 +2397,7 @@ static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh, ndtmsg = nlmsg_data(nlh); for (tidx = 0; tidx < NEIGH_NR_TABLES; tidx++) { - tbl = neigh_tables[tidx]; + tbl = net->neigh_tables[tidx]; if (!tbl) continue; @@ -2596,7 +2590,7 @@ static int neightbl_dump_info(struct sk_buff *skb, struct netlink_callback *cb) for (tidx = 0; tidx < NEIGH_NR_TABLES; tidx++) { struct neigh_parms *p; - tbl = neigh_tables[tidx]; + tbl = net->neigh_tables[tidx]; if (!tbl) continue; @@ -2933,6 +2927,7 @@ static int neigh_dump_info(struct sk_buff *skb, struct netlink_callback *cb) { const struct nlmsghdr *nlh = cb->nlh; struct neigh_dump_filter filter = {}; + struct net *net = sock_net(skb->sk); struct neigh_table *tbl; int t, family, s_t; int proxy = 0; @@ -2956,8 +2951,7 @@ static int neigh_dump_info(struct sk_buff *skb, struct netlink_callback *cb) rcu_read_lock(); for (t = 0; t < NEIGH_NR_TABLES; t++) { - tbl = neigh_tables[t]; - + tbl = net->neigh_tables[t]; if (!tbl) continue; if (t < s_t || (family && tbl->family != family)) @@ -3079,7 +3073,7 @@ static int neigh_get(struct sk_buff *in_skb, struct nlmsghdr *nlh, rcu_read_lock(); - tbl = neigh_find_table(ndm->ndm_family); + tbl = neigh_find_table(net, ndm->ndm_family); if (!tbl) { NL_SET_ERR_MSG(extack, "Unsupported family in header for neighbor get request"); err = -EAFNOSUPPORT; @@ -3167,9 +3161,11 @@ int neigh_xmit(int index, struct net_device *dev, if (likely(index < NEIGH_NR_TABLES)) { struct neigh_table *tbl; struct neighbour *neigh; + struct net *net; rcu_read_lock(); - tbl = neigh_tables[index]; + net = dev_net_rcu(dev); + tbl = net->neigh_tables[index]; if (!tbl) { rcu_read_unlock(); goto out_kfree_skb; diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index bad17d5aeafc..824c65c70408 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -1532,7 +1532,7 @@ static struct pernet_operations arp_net_ops = { void __init arp_init(void) { - neigh_table_init(NEIGH_ARP_TABLE, &arp_tbl); + neigh_table_init(&arp_tbl); dev_add_pack(&arp_packet_type); register_pernet_subsys(&arp_net_ops); diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index dc4c083fe27a..ed07cf78d223 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -2022,7 +2022,7 @@ int __init ndisc_init(void) /* * Initialize the neighbour table */ - neigh_table_init(NEIGH_ND_TABLE, &nd_tbl); + neigh_table_init(&nd_tbl); #ifdef CONFIG_SYSCTL err = neigh_sysctl_register(NULL, &nd_tbl.parms, @@ -2055,6 +2055,6 @@ void ndisc_cleanup(void) #ifdef CONFIG_SYSCTL neigh_sysctl_unregister(&nd_tbl.parms); #endif - neigh_table_clear(NEIGH_ND_TABLE, &nd_tbl); + neigh_table_clear(&nd_tbl); unregister_pernet_subsys(&ndisc_net_ops); } -- 2.55.0.970.g62bdec98f9-goog