From nobody Sun Apr 12 02:48:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D15BC19F2C for ; Tue, 2 Aug 2022 12:23:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237066AbiHBMXH (ORCPT ); Tue, 2 Aug 2022 08:23:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237060AbiHBMXC (ORCPT ); Tue, 2 Aug 2022 08:23:02 -0400 Received: from mx08-0057a101.pphosted.com (mx08-0057a101.pphosted.com [185.183.31.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 020685073C; Tue, 2 Aug 2022 05:22:59 -0700 (PDT) Received: from pps.filterd (m0214196.ppops.net [127.0.0.1]) by mx07-0057a101.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 272AeB8x001989; Tue, 2 Aug 2022 14:20:41 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=westermo.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=12052020; bh=3sjdGficD/AKSRbBF8kWwqIQiYuXVjB6Pg42n4U43Gc=; b=tIHhJxIMwhsB1E3FZQtU9YaAmRd+1qKssOYCvv7StilLul03cawZswESA+NRmZJtawyh 4YxJG+wnalkxjTXb3T3Nw3JR65wDDIpz184zZ0YafQb+UnSIZ9a4aPVqO2YdqZ8nneSg TW8EnSPG1IaeJRGHYxprXZ+3qwqTTbV4hSio5XabcIQCQiSD62m/rSY0D1lvIgo7noZ2 ieoSGY9vbw58XUPTHpp3nLZ88b3H8MxTj2lNujiwRUkRYQ0Mh7/FPm4O16MsSeuyAcmr ssRqj4aUZOCCv2oGgAtUXXekdiM0lcE7x0EpPCNztbgFXpn4VA7UDjAnb1+va4Kfv6gF kw== Received: from mail.beijerelectronics.com ([195.67.87.131]) by mx07-0057a101.pphosted.com (PPS) with ESMTPS id 3hmrn42vps-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 02 Aug 2022 14:20:41 +0200 Received: from Orpheus.westermo.com (172.29.101.13) by EX01GLOBAL.beijerelectronics.com (10.101.10.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.2375.17; Tue, 2 Aug 2022 14:20:39 +0200 From: Matthias May To: CC: , , , , , , , , , , , , Matthias May Subject: [PATCH v3 net] geneve: fix TOS inheriting for ipv4 Date: Tue, 2 Aug 2022 14:20:25 +0200 Message-ID: <20220802122025.1364123-1-matthias.may@westermo.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.29.101.13] X-ClientProxiedBy: wsevst-s0023.westermo.com (192.168.130.120) To EX01GLOBAL.beijerelectronics.com (10.101.10.25) X-Proofpoint-GUID: BL6xwU_P0y675RcCKEw2jdbyIL2nK4qC X-Proofpoint-ORIG-GUID: BL6xwU_P0y675RcCKEw2jdbyIL2nK4qC Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The current code retrieves the TOS field after the lookup on the ipv4 routing table. The routing process currently only allows routing based on the original 3 TOS bits, and not on the full 6 DSCP bits. As a result the retrieved TOS is cut to the 3 bits. However for inheriting purposes the full 6 bits should be used. Extract the full 6 bits before the route lookup and use that instead of the cut off 3 TOS bits. This patch is the functional equivalent for IPv4 to the patch "geneve: do not use RT_TOS for IPv6 flowlabel" Fixes: e305ac6cf5a1 ("geneve: Add support to collect tunnel metadata.") Signed-off-by: Matthias May Acked-by: Guillaume Nault --- v1 -> v2: - Fix typo in "Fixes" tag v2 -> v3: - Add missing CCs --- drivers/net/geneve.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 2495a5719e1c..4c380c06f178 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -797,7 +797,8 @@ static struct rtable *geneve_get_v4_rt(struct sk_buff *= skb, struct geneve_sock *gs4, struct flowi4 *fl4, const struct ip_tunnel_info *info, - __be16 dport, __be16 sport) + __be16 dport, __be16 sport, + __u8 *full_tos) { bool use_cache =3D ip_tunnel_dst_cache_usable(skb, info); struct geneve_dev *geneve =3D netdev_priv(dev); @@ -822,6 +823,7 @@ static struct rtable *geneve_get_v4_rt(struct sk_buff *= skb, use_cache =3D false; } fl4->flowi4_tos =3D RT_TOS(tos); + *full_tos =3D tos; =20 dst_cache =3D (struct dst_cache *)&info->dst_cache; if (use_cache) { @@ -910,6 +912,7 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct = net_device *dev, const struct ip_tunnel_key *key =3D &info->key; struct rtable *rt; struct flowi4 fl4; + __u8 full_tos; __u8 tos, ttl; __be16 df =3D 0; __be16 sport; @@ -920,7 +923,7 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct = net_device *dev, =20 sport =3D udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true); rt =3D geneve_get_v4_rt(skb, dev, gs4, &fl4, info, - geneve->cfg.info.key.tp_dst, sport); + geneve->cfg.info.key.tp_dst, sport, &full_tos); if (IS_ERR(rt)) return PTR_ERR(rt); =20 @@ -964,7 +967,7 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct = net_device *dev, =20 df =3D key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0; } else { - tos =3D ip_tunnel_ecn_encap(fl4.flowi4_tos, ip_hdr(skb), skb); + tos =3D ip_tunnel_ecn_encap(full_tos, ip_hdr(skb), skb); if (geneve->cfg.ttl_inherit) ttl =3D ip_tunnel_get_ttl(ip_hdr(skb), skb); else @@ -1137,6 +1140,7 @@ static int geneve_fill_metadata_dst(struct net_device= *dev, struct sk_buff *skb) { struct ip_tunnel_info *info =3D skb_tunnel_info(skb); struct geneve_dev *geneve =3D netdev_priv(dev); + __u8 full_tos; __be16 sport; =20 if (ip_tunnel_info_af(info) =3D=3D AF_INET) { @@ -1148,7 +1152,8 @@ static int geneve_fill_metadata_dst(struct net_device= *dev, struct sk_buff *skb) 1, USHRT_MAX, true); =20 rt =3D geneve_get_v4_rt(skb, dev, gs4, &fl4, info, - geneve->cfg.info.key.tp_dst, sport); + geneve->cfg.info.key.tp_dst, sport, + &full_tos); if (IS_ERR(rt)) return PTR_ERR(rt); =20 --=20 2.35.1