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=1795386447; b=dFNQhpvULrlGcH8SUH0pgQqVVCW+RaHEebQ/k01kzuEsNzmQ6O0Q1QeQSmGUiLe2+Uh1 jmq4QoSuAOc8BQ0CXCAoqwLoPxyKCT6i/wARRgM+3Xu60zASNsTFLtUmZQqCVMAGIC9Yv 3lAbzN7QO98Hnr8oJxu7b4bhjd5kN4+XlXmfe10lDQVO6tXMR/nQGRGdftXkzWwvl4Rfa chuNXrAdvZNV0bkUCKg7zrrBCsSTUivQCO9TA5VP0A7IayMOPAETt1U5/9yFtxHS7CDax 4XyC+QeVW2hYudgXf1jvCGzOHYshnRQ+kHXdJSu9WNjRpa9DjXbtM+kGjBZYWg3eYfA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795386447; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Type: Content-Transfer-Encoding; bh=SQGxreFvwYENeUZGV06pLRCy1qyVwBxoDVTj9ix/ieQ=; b=s9/yqb1ezE4vvO0BVXVeKVmj4N/OxPoOly3hyT+/6C3npWCU2uTfeU2BeGmFseOPRnjR 5PDDPrq+wxuCOzpJN2bUqqECVGynYQLsvq0ayMR41Ni37Aq0jtlDPreEjf5PHGFcHK0uu h+Ym1MlgBVPyJHgTALcumHo+892BpqOEYc+O7Was677ri/NcZi96eRwU47l8TMS/kvV+4 Zd5KCiEQKhQaLgFVK3E/g2SdgleRe3ovug+O3qn/nDFkraMD4taY8GAy3x3v842+WeY2b Q+KaTW19FCppRIDeAYZbhBFnjyZjBhfNd4d8OlK+pVC6XfjkBTiUpoY4VLjTySWuBiA== 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=o2EN7JlE; 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 0479A606A32C for ; Sun, 22 Nov 2026 22:27:27 +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=o2EN7JlE Received: by smtp.kernel.org (Postfix) with ESMTPSA id 326971F000C0; Sun, 22 Nov 2026 22:27:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795386446; bh=SQGxreFvwYENeUZGV06pLRCy1qyVwBxoDVTj9ix/ieQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=o2EN7JlE0M7ZKSZn+uAM3uIMYZ9hBC6R7NHzZa8y74hAqFGZ0AM01W93KCEtgjEEM Sd3o6Gs8YE9m3MB7w9p5v6ARWlJTL8De2+iNouAZCrPBcNZf/gSUj7YURuMkT4N21v 2p/cf0AhLKm9/q0WcULsAg2vPjQFYevJuYT90ECPkPmzpn4rVCzMT0FgmMaDjcKhfV IkTp6AKf7a8/k1ncOwm2fHd8ts7ffn7o+xG92k5qz3Zlhn8fS+wGhFrSo++mHJuAXo 1axAQVXhyqWDfTOFTBLM8cBP9F1mgZZ7Tv8XtmLEqeGwOXhg7DpYyOm0j4BSqDuaH0 fEUxKrAaFc1Kw== 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 4/6] nexthop: bump the IPv6 route generation on group changes Date: Sun, 22 Nov 2026 15:27:02 -0700 Message-ID: <20261122222717.126333-6-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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: David Ahern IPv6 dsts are invalidated by bumping the netns route generation, but two nexthop object changes did not do so: - Replacing a nexthop that is a member of a group only bumped if the member itself had IPv6 routes, not when routes used a group containing it. - Removing a member from a group republishes the group array without any bump, so dsts built from the old group stayed valid. Bump in both cases when IPv6 routes use the nexthop, directly or through a group. Co-Authored-By: Claude Sonnet 5.5 Signed-off-by: David Ahern --- net/ipv4/nexthop.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c index 53431fe7d328..7cf496589f4f 100644 --- a/net/ipv4/nexthop.c +++ b/net/ipv4/nexthop.c @@ -2120,6 +2120,21 @@ static bool nh_has_f6i(struct nexthop *nh) return have_f6i; } +/* true if IPv6 routes use @nh directly or through a group containing it */ +static bool nh_used_by_f6i(struct nexthop *nh) +{ + struct nh_grp_entry *nhge; + + if (nh_has_f6i(nh)) + return true; + + list_for_each_entry(nhge, &nh->grp_list, nh_list) + if (nh_has_f6i(nhge->nh_parent)) + return true; + + return false; +} + static bool __must_check remove_nexthop_from_groups(struct net *net, struct nexthop *nh, struct nl_info *nlinfo) @@ -2127,6 +2142,7 @@ remove_nexthop_from_groups(struct net *net, struct nexthop *nh, struct nh_grp_entry *nhge, *tmp; LIST_HEAD(deferred_free); bool need_flush = false; + bool have_f6i = false; /* If there is nothing to do, let's avoid the costly call to * synchronize_net() @@ -2134,13 +2150,19 @@ remove_nexthop_from_groups(struct net *net, struct nexthop *nh, if (list_empty(&nh->grp_list)) return false; - list_for_each_entry_safe(nhge, tmp, &nh->grp_list, nh_list) + list_for_each_entry_safe(nhge, tmp, &nh->grp_list, nh_list) { + have_f6i |= nh_has_f6i(nhge->nh_parent); need_flush |= remove_nh_grp_entry(net, nhge, nlinfo, &deferred_free); + } /* make sure all see the newly published array before releasing rtnl */ synchronize_net(); + /* a group lost a member: dsts built from the old group are stale */ + if (have_f6i) + rt_genid_bump_ipv6(net); + /* Now safe to free percpu stats — all RCU readers have finished */ list_for_each_entry_safe(nhge, tmp, &deferred_free, nh_list) { list_del(&nhge->nh_list); @@ -2264,7 +2286,8 @@ static void nh_rt_cache_flush(struct net *net, struct nexthop *nh, if (!list_empty(&nh->fi_list)) rt_cache_flush(net); - if (nh_has_f6i(nh)) + /* dsts are validated against the netns route generation */ + if (nh_used_by_f6i(nh)) rt_genid_bump_ipv6(net); /* if an IPv6 group was replaced, we have to release all old -- 2.43.0