From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 820013D994 for ; Sun, 12 Apr 2026 20:02:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776024171; cv=none; b=MsbpMWixU3zYHsPL7T1JuPSq8FnKhycO2eozEMmvlz1YUeUtAHZZeeN5lliQ/cFY/D0vHPtNq7Up1+bdZU4FtAKALEERKbmG8Z6uPBaZN7HwxMNYTLN9YEBYyTEA1cVJI4RLbpkDqycl1qlJja8k4eKknOqVl+PIg6TzIbGpwE8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776024171; c=relaxed/simple; bh=l1KlPvbjV6Kf7otFy5PnxrB9calB5whgtwodZCuEnUY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ddrbs8wEPLcCcI/OgNqqOMvICYuO8sLBwWltLiGgqdc74yHUjgGkE0jSL8qKxx8fntGB8IIfauVSebjAY8+vFo/PDcxqEjNlnaLU9BjpL2JQ1PKXqIC/KZG4AIa2/MN6W8Bu7BuTD3RHDu7Yxv4CSe5FlaP4fLFKH2Qtv1mN2Yk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NFJAQGbL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NFJAQGbL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7270EC19424; Sun, 12 Apr 2026 20:02:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776024171; bh=l1KlPvbjV6Kf7otFy5PnxrB9calB5whgtwodZCuEnUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NFJAQGbLtJdXmCYbv2St9bLir8xD6YZsYTOgrTZS9vfsgOqPy+b4PaQyVls/SN6/w mLrZfPgVP7ZOECzC55LVQOeSaQSoitgW9Gz59j8O7YFNfSqxsxa7uZgfNoyYGe9/fw n1pYdawmzHvmvoKrl7foc6UYB42V+IPSeQCLyWYEgKS/2fbxWLO6/MibqcoLl+xTui fTtpelcw/GTxDzvExW3KDsOHER59nEI3MSTOGwb5l7FYY7j0Q6AU8iW6/3woWLHgHU 8tjx/vFSRxtecUcTVJ9AN4DHIgLOnr53jzhT6sIyNzjm/RtSXvOsXHFpnBntpQMVEk /UUNn70+bRdcQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Andrea Mayer , Nicolas Dichtel , Justin Iurman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] seg6: separate dst_cache for input and output paths in seg6 lwtunnel Date: Sun, 12 Apr 2026 16:02:48 -0400 Message-ID: <20260412200248.2405054-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026041204-extrovert-unashamed-ae30@gregkh> References: <2026041204-extrovert-unashamed-ae30@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Andrea Mayer [ Upstream commit c3812651b522fe8437ebb7063b75ddb95b571643 ] The seg6 lwtunnel uses a single dst_cache per encap route, shared between seg6_input_core() and seg6_output_core(). These two paths can perform the post-encap SID lookup in different routing contexts (e.g., ip rules matching on the ingress interface, or VRF table separation). Whichever path runs first populates the cache, and the other reuses it blindly, bypassing its own lookup. Fix this by splitting the cache into cache_input and cache_output, so each path maintains its own cached dst independently. Fixes: 6c8702c60b88 ("ipv6: sr: add support for SRH encapsulation and injection with lwtunnels") Cc: stable@vger.kernel.org Signed-off-by: Andrea Mayer Reviewed-by: Nicolas Dichtel Reviewed-by: Justin Iurman Link: https://patch.msgid.link/20260404004405.4057-2-andrea.mayer@uniroma2.it Signed-off-by: Jakub Kicinski [ added missing dst reference loop guard in seg6_output_core() ] Signed-off-by: Sasha Levin --- net/ipv6/seg6_iptunnel.c | 41 +++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c index b186d85ec5b3f..264a14aef4523 100644 --- a/net/ipv6/seg6_iptunnel.c +++ b/net/ipv6/seg6_iptunnel.c @@ -48,7 +48,8 @@ static size_t seg6_lwt_headroom(struct seg6_iptunnel_encap *tuninfo) } struct seg6_lwt { - struct dst_cache cache; + struct dst_cache cache_input; + struct dst_cache cache_output; struct seg6_iptunnel_encap tuninfo[]; }; @@ -486,7 +487,7 @@ static int seg6_input_core(struct net *net, struct sock *sk, slwt = seg6_lwt_lwtunnel(lwtst); local_bh_disable(); - dst = dst_cache_get(&slwt->cache); + dst = dst_cache_get(&slwt->cache_input); local_bh_enable(); err = seg6_do_srh(skb, dst); @@ -502,7 +503,7 @@ static int seg6_input_core(struct net *net, struct sock *sk, /* cache only if we don't create a dst reference loop */ if (!dst->error && lwtst != dst->lwtstate) { local_bh_disable(); - dst_cache_set_ip6(&slwt->cache, dst, + dst_cache_set_ip6(&slwt->cache_input, dst, &ipv6_hdr(skb)->saddr); local_bh_enable(); } @@ -561,7 +562,7 @@ static int seg6_output_core(struct net *net, struct sock *sk, slwt = seg6_lwt_lwtunnel(orig_dst->lwtstate); local_bh_disable(); - dst = dst_cache_get(&slwt->cache); + dst = dst_cache_get(&slwt->cache_output); local_bh_enable(); err = seg6_do_srh(skb, dst); @@ -586,9 +587,12 @@ static int seg6_output_core(struct net *net, struct sock *sk, goto drop; } - local_bh_disable(); - dst_cache_set_ip6(&slwt->cache, dst, &fl6.saddr); - local_bh_enable(); + /* cache only if we don't create a dst reference loop */ + if (orig_dst->lwtstate != dst->lwtstate) { + local_bh_disable(); + dst_cache_set_ip6(&slwt->cache_output, dst, &fl6.saddr); + local_bh_enable(); + } err = skb_cow_head(skb, LL_RESERVED_SPACE(dst->dev)); if (unlikely(err)) @@ -695,11 +699,13 @@ static int seg6_build_state(struct net *net, struct nlattr *nla, slwt = seg6_lwt_lwtunnel(newts); - err = dst_cache_init(&slwt->cache, GFP_ATOMIC); - if (err) { - kfree(newts); - return err; - } + err = dst_cache_init(&slwt->cache_input, GFP_ATOMIC); + if (err) + goto err_free_newts; + + err = dst_cache_init(&slwt->cache_output, GFP_ATOMIC); + if (err) + goto err_destroy_input; memcpy(&slwt->tuninfo, tuninfo, tuninfo_len); @@ -714,11 +720,20 @@ static int seg6_build_state(struct net *net, struct nlattr *nla, *ts = newts; return 0; + +err_destroy_input: + dst_cache_destroy(&slwt->cache_input); +err_free_newts: + kfree(newts); + return err; } static void seg6_destroy_state(struct lwtunnel_state *lwt) { - dst_cache_destroy(&seg6_lwt_lwtunnel(lwt)->cache); + struct seg6_lwt *slwt = seg6_lwt_lwtunnel(lwt); + + dst_cache_destroy(&slwt->cache_input); + dst_cache_destroy(&slwt->cache_output); } static int seg6_fill_encap_info(struct sk_buff *skb, -- 2.53.0