ip6_tunnel: Unmask upper DSCP bits in ip4ip6_err()

Unmask the upper DSCP bits when calling ip_route_output_ports() so that
in the future it could perform the FIB lookup according to the full DSCP
value.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Guillaume Nault <gnault@redhat.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/20240903135327.2810535-4-idosch@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index ec51ab5063e8746c48abae718a079d4de529d8d5..b60e13c42bcacd56c89db773dcd90480b4d892d8 100644 (file)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -53,6 +53,7 @@
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
 #include <net/dst_metadata.h>
+#include <net/inet_dscp.h>
 
 MODULE_AUTHOR("Ville Nuorvala");
 MODULE_DESCRIPTION("IPv6 tunneling device");
@@ -608,7 +609,8 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
        /* Try to guess incoming interface */
        rt = ip_route_output_ports(dev_net(skb->dev), &fl4, NULL, eiph->saddr,
-                                  0, 0, 0, IPPROTO_IPIP, RT_TOS(eiph->tos), 0);
+                                  0, 0, 0, IPPROTO_IPIP,
+                                  eiph->tos & INET_DSCP_MASK, 0);
        if (IS_ERR(rt))
                goto out;
 
@@ -619,7 +621,8 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        if (rt->rt_flags & RTCF_LOCAL) {
                rt = ip_route_output_ports(dev_net(skb->dev), &fl4, NULL,
                                           eiph->daddr, eiph->saddr, 0, 0,
-                                          IPPROTO_IPIP, RT_TOS(eiph->tos), 0);
+                                          IPPROTO_IPIP,
+                                          eiph->tos & INET_DSCP_MASK, 0);
                if (IS_ERR(rt) || rt->dst.dev->type != ARPHRD_TUNNEL6) {
                        if (!IS_ERR(rt))
                                ip_rt_put(rt);