From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795386449; b=KZzbUY/csdmmx3FVJYZRhgZ6IPY6v/uRypnCRI8z5M+CUlDFLkPA7IjU/w8N9xHvsmbx q07aD1XEwzghUXxbXfvqBXGEXTrv/KSa11Zb423S9B2ggvNOJDlfMti5gGcPb1luilaTS +OtmBYuTDKr0cOj4EgWRYMWzymtoWGRmqqGCfRvC00EePYZXafoATu6oLIQuTKxQyGEV/ ciFxO2jmUag/CffqXsoO0B8O+Wpjwba3arhRlruK81/YdgGSpjv3X0H8hllqbPw/pLwNC NhufWsX9v2huP9o8TIt6yuVX9y6z7pJqQqltE63jyD2UuE+vCXjPFNEXt04NzLoA+Ug== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795386449; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=YgGR5xN3PuGX76DiuCcrLV3TFndk8klvDQxD4hL4lN0=; b=muT57PZdvO6JSMGrJGlrnQ5Tox4VePiplorMzSWqGU3GAbhATsu8BNwaqjoLURiYdy0t nf6N9w/evyTewMknM4Utvk0ZAgmIpwKMD18demyyALUMHDazdctx1+JPkv96oWxhWSVgh x6pZ1QpqJ01+eeg8SO6q9K+T3dlDMg3Q7lsFIjZdtjzPpqKjG+vio5gzg0A9wM3A3+hgP 9Wl0ftNn/MsXdtGRgl7Lpa2aes1fCpGFhKB0PPkoLfy2I7dUAPrf1cm/zJvhNIkw2Bf5T GY+jDA4J6SvoI6hqL3DoSs0HURHCQTl18xREyNoibouI7S2WOPsHkX67JM4nAg/iymw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=hJhJWgxg; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 326F3606A33D for ; Sun, 22 Nov 2026 22:27:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=hJhJWgxg Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FBF51F000EF; Sun, 22 Nov 2026 22:27:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795386448; bh=YgGR5xN3PuGX76DiuCcrLV3TFndk8klvDQxD4hL4lN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hJhJWgxgwcJCXQJjr8dZ+NHhM8NGN3HrX0pYNSMdau4DiBEIcdzkCP+QxGhCl5UZk cK3nsnedY71FuroCgTgEjDwz7IBL9j7p2i5C/ttyGY1pE9jNmZ45FIwB0/nCZZCHnM FX5udptuuW8r6YH54tRSg4Ij5sO4eu1QRQPQIrzp0ah5F4RdHV1ZEQv4cwrF4bC1NR heB+GrD3hf0QBxbCrF/8gK4JG1go/obBM36wbxRevQTfBzgC9GW/3AkBivWl6KKWNH Hq/PnAdgDWJeMFgNrhX4p0Ufud3lOlNKHHVu8J/X5yIcgrAK6KFEizxwA+BZfeCFpu taj9MHi00jZPg== From: David Ahern To: netdev@vger.kernel.org Cc: ralf@mandelbit.com, David Ahern , David Ahern , Ido Schimmel , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , "Claude Sonnet 5 . 5" Subject: [RFC net-next 6/6] ipv6: make rt_genid_bump_ipv6() a plain counter increment Date: Sun, 22 Nov 2026 15:27:04 -0700 Message-ID: <20261122222717.126333-8-dsahern@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261122222717.126333-1-dsahern@kernel.org> References: <20261122222717.126333-1-dsahern@kernel.org> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: David Ahern rt_genid_bump_ipv6() called fib6_flush_trees() through a function pointer. That walked every node of every table to write a new fn_sernum, so that cookies derived from fn_sernum would mismatch. Cached dsts are now validated against net->ipv6.fib6_sernum itself, so the walk no longer invalidates anything. Do what rt_genid_bump_ipv4() does and increment the counter, keeping fib6_new_sernum()'s wrap to 1 so the value is never 0. This makes nexthop, address and FIB rule changes cheap, and stops them from touching fn_sernum, which route dumps use to detect that a tree changed: a dump is no longer restarted by events that do not change the tree. With the walk gone, drop the __fib6_flush_trees pointer and its export, fib6_new_sernum() in favour of the new helper, and the sernum handling in fib6_cleaner that only the walk used. Co-Authored-By: Claude Sonnet 5.5 Signed-off-by: David Ahern --- include/net/net_namespace.h | 26 ++++++++++++++----- net/ipv6/addrconf_core.c | 7 ----- net/ipv6/ip6_fib.c | 51 ++++++------------------------------- 3 files changed, 27 insertions(+), 57 deletions(-) diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 4a4d72080acd..f39baf51bcc5 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -556,18 +556,30 @@ static inline int rt_genid_ipv6(const struct net *net) { return atomic_read(&net->ipv6.fib6_sernum); } -#endif -static inline void rt_genid_bump_ipv4(struct net *net) +/* Invalidate every cached IPv6 dst in @net. Returns the new generation, + * which is never 0. + */ +static inline int rt_genid_bump_ipv6(struct net *net) { - atomic_inc(&net->ipv4.rt_genid); + int new, old = atomic_read(&net->ipv6.fib6_sernum); + + do { + new = old < INT_MAX ? old + 1 : 1; + } while (!atomic_try_cmpxchg(&net->ipv6.fib6_sernum, &old, new)); + + return new; } +#else +static inline int rt_genid_bump_ipv6(struct net *net) +{ + return 0; +} +#endif -extern void (*__fib6_flush_trees)(struct net *net); -static inline void rt_genid_bump_ipv6(struct net *net) +static inline void rt_genid_bump_ipv4(struct net *net) { - if (__fib6_flush_trees) - __fib6_flush_trees(net); + atomic_inc(&net->ipv4.rt_genid); } #if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN) diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c index 29095c90aa16..e7ee5f98327d 100644 --- a/net/ipv6/addrconf_core.c +++ b/net/ipv6/addrconf_core.c @@ -9,13 +9,6 @@ #include #include -/* if ipv6 module registers this function is used by xfrm to force all - * sockets to relookup their nodes - this is fairly expensive, be - * careful - */ -void (*__fib6_flush_trees)(struct net *); -EXPORT_SYMBOL(__fib6_flush_trees); - #define IPV6_ADDR_SCOPE_TYPE(scope) ((scope) << 16) static inline unsigned int ipv6_addr_scope2type(unsigned int scope) diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 266370e15774..75512fbcb945 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -43,7 +43,6 @@ struct fib6_cleaner { struct fib6_walker w; struct net *net; int (*func)(struct fib6_info *, void *arg); - int sernum; void *arg; bool skip_notify; }; @@ -123,21 +122,6 @@ static void fib6_walkers_skip_rt(struct net *net, struct fib6_info *rt) fib6_walkers_replace_leaf(net, rt, next); } -static int fib6_new_sernum(struct net *net) -{ - int new, old = atomic_read(&net->ipv6.fib6_sernum); - - do { - new = old < INT_MAX ? old + 1 : 1; - } while (!atomic_try_cmpxchg(&net->ipv6.fib6_sernum, &old, new)); - - return new; -} - -enum { - FIB6_NO_SERNUM_CHANGE = 0, -}; - void fib6_update_sernum(struct net *net, struct fib6_info *f6i) { struct fib6_node *fn; @@ -145,7 +129,7 @@ void fib6_update_sernum(struct net *net, struct fib6_info *f6i) fn = rcu_dereference_protected(f6i->fib6_node, lockdep_is_held(&f6i->fib6_table->tb6_lock)); if (fn) - WRITE_ONCE(fn->fn_sernum, fib6_new_sernum(net)); + WRITE_ONCE(fn->fn_sernum, rt_genid_bump_ipv6(net)); } /* Tell route dumps that an exception was added under @f6i without @@ -1464,7 +1448,7 @@ static void __fib6_update_sernum_upto_root(struct fib6_info *rt, void fib6_update_sernum_upto_root(struct net *net, struct fib6_info *rt) { - __fib6_update_sernum_upto_root(rt, fib6_new_sernum(net)); + __fib6_update_sernum_upto_root(rt, rt_genid_bump_ipv6(net)); } /* @@ -1595,7 +1579,7 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt, fib6_info_release(iter); } - __fib6_update_sernum_upto_root(rt, fib6_new_sernum(info->nl_net)); + __fib6_update_sernum_upto_root(rt, rt_genid_bump_ipv6(info->nl_net)); if (rt->fib6_flags & RTF_EXPIRES) fib6_add_gc_list(rt); @@ -2282,16 +2266,6 @@ static int fib6_clean_node(struct fib6_walker *w) .skip_notify = c->skip_notify, }; - if (c->sernum != FIB6_NO_SERNUM_CHANGE && - READ_ONCE(w->node->fn_sernum) != c->sernum) - WRITE_ONCE(w->node->fn_sernum, c->sernum); - - if (!c->func) { - WARN_ON_ONCE(c->sernum == FIB6_NO_SERNUM_CHANGE); - w->leaf = NULL; - return 0; - } - for_each_fib6_walker_rt(w) { res = c->func(rt, c->arg); if (res == -1) { @@ -2331,7 +2305,7 @@ static int fib6_clean_node(struct fib6_walker *w) static void fib6_clean_tree(struct net *net, struct fib6_node *root, int (*func)(struct fib6_info *, void *arg), - int sernum, void *arg, bool skip_notify) + void *arg, bool skip_notify) { struct fib6_cleaner c; @@ -2341,7 +2315,6 @@ static void fib6_clean_tree(struct net *net, struct fib6_node *root, c.w.skip = 0; c.w.skip_in_node = 0; c.func = func; - c.sernum = sernum; c.arg = arg; c.net = net; c.skip_notify = skip_notify; @@ -2351,7 +2324,7 @@ static void fib6_clean_tree(struct net *net, struct fib6_node *root, static void __fib6_clean_all(struct net *net, int (*func)(struct fib6_info *, void *), - int sernum, void *arg, bool skip_notify) + void *arg, bool skip_notify) { struct fib6_table *table; struct hlist_head *head; @@ -2363,7 +2336,7 @@ static void __fib6_clean_all(struct net *net, hlist_for_each_entry_rcu(table, head, tb6_hlist) { spin_lock_bh(&table->tb6_lock); fib6_clean_tree(net, &table->tb6_root, - func, sernum, arg, skip_notify); + func, arg, skip_notify); spin_unlock_bh(&table->tb6_lock); } } @@ -2373,21 +2346,14 @@ static void __fib6_clean_all(struct net *net, void fib6_clean_all(struct net *net, int (*func)(struct fib6_info *, void *), void *arg) { - __fib6_clean_all(net, func, FIB6_NO_SERNUM_CHANGE, arg, false); + __fib6_clean_all(net, func, arg, false); } void fib6_clean_all_skip_notify(struct net *net, int (*func)(struct fib6_info *, void *), void *arg) { - __fib6_clean_all(net, func, FIB6_NO_SERNUM_CHANGE, arg, true); -} - -static void fib6_flush_trees(struct net *net) -{ - int new_sernum = fib6_new_sernum(net); - - __fib6_clean_all(net, NULL, new_sernum, NULL, false); + __fib6_clean_all(net, func, arg, true); } /* @@ -2624,7 +2590,6 @@ int __init fib6_init(void) if (ret) goto out_unregister_subsys; - __fib6_flush_trees = fib6_flush_trees; out: return ret; -- 2.43.0