From patchwork Tue Aug 2 11:13:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias May X-Patchwork-Id: 12934559 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 CAE50C00140 for ; Tue, 2 Aug 2022 11:46:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233939AbiHBLqZ (ORCPT ); Tue, 2 Aug 2022 07:46:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235854AbiHBLqY (ORCPT ); Tue, 2 Aug 2022 07:46:24 -0400 Received: from mx07-0057a101.pphosted.com (mx07-0057a101.pphosted.com [205.220.184.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CADC718E09; Tue, 2 Aug 2022 04:46:23 -0700 (PDT) Received: from pps.filterd (m0214197.ppops.net [127.0.0.1]) by mx07-0057a101.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 272AlwUb013562; Tue, 2 Aug 2022 13:13:40 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=westermo.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=12052020; bh=Qj7f8eQ7QpQGORu5fbsYBALfepwxw72bHVigT/CTuh8=; b=ovFEtCvwcc1Cm1Q7IEiNe7zNPKHs8UH8iOg0whwREFRugNEXD1/NiE4sfxXbkB1N7ZBs wh7N5FFBq9YJ3QRIkaQOcb3YD9LWhPd1NQ88gpbxwTJZhHyvot/PCExef1NOKSIld3hl UFFyCIdp+zBkPxQ+YqoSrbSv8SHmKfmMVUxHN3xnU4NpIgmi75UcDgQR4a5KNcImINqA 7Nurz5mSMwlAOH6HrijkLbTKkwtBrIuSspGBWYzjvFuUNEYR5x31WfmSFlW59QQ7T2mq CmRZgYYfjdvwnTdiKqzVF0PyVJMiOnX+2EfP+BW+Scky6K4VT3VIyD3ZoM3UY9CGlE7u PQ== Received: from mail.beijerelectronics.com ([195.67.87.131]) by mx07-0057a101.pphosted.com (PPS) with ESMTPS id 3hms0c2v0k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 02 Aug 2022 13:13:40 +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 13:13:34 +0200 From: Matthias May To: CC: , , , , , , , , , , , , , , , , , , , , , , Matthias May Subject: [PATCH net 1/4] geneve: do not use RT_TOS for IPv6 flowlabel Date: Tue, 2 Aug 2022 13:13:05 +0200 Message-ID: <20220802111308.1359887-2-matthias.may@westermo.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220802111308.1359887-1-matthias.may@westermo.com> References: <20220802111308.1359887-1-matthias.may@westermo.com> MIME-Version: 1.0 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: nYwn2O9PudBvjx2F12Bg24sjXxd-g5e0 X-Proofpoint-ORIG-GUID: nYwn2O9PudBvjx2F12Bg24sjXxd-g5e0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org According to Guillaume Nault RT_TOS should never be used for IPv6. Fixes: 3a56f86f1be6a ("geneve: handle ipv6 priority like ipv4 tos") Signed-off-by: Matthias May --- drivers/net/geneve.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 4c380c06f178..e1a4480e6f17 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -877,8 +877,7 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb, use_cache = false; } - fl6->flowlabel = ip6_make_flowinfo(RT_TOS(prio), - info->key.label); + fl6->flowlabel = ip6_make_flowinfo(prio, info->key.label); dst_cache = (struct dst_cache *)&info->dst_cache; if (use_cache) { dst = dst_cache_get_ip6(dst_cache, &fl6->saddr); From patchwork Tue Aug 2 11:13:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias May X-Patchwork-Id: 12934558 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 D326BC00140 for ; Tue, 2 Aug 2022 11:44:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233232AbiHBLoZ (ORCPT ); Tue, 2 Aug 2022 07:44:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232724AbiHBLoY (ORCPT ); Tue, 2 Aug 2022 07:44:24 -0400 X-Greylist: delayed 1805 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 02 Aug 2022 04:44:23 PDT Received: from mx07-0057a101.pphosted.com (mx07-0057a101.pphosted.com [205.220.184.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1E8C2C11C; Tue, 2 Aug 2022 04:44:23 -0700 (PDT) Received: from pps.filterd (m0214197.ppops.net [127.0.0.1]) by mx07-0057a101.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 272AlwUc013562; Tue, 2 Aug 2022 13:13:40 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=westermo.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=12052020; bh=jmv1RXgcifzo+iYBEh6qxatR0GrNbICobm5w+o7vL+I=; b=y8LztleUh2HsQZUt1GNGiCaZhK+g+KC+Vp/9gfNsaAV/nc3tYV113FPpMTolpf1/dsM1 FBJ+KFLBrLy1RbDiicTusoJ7cRIJEhnIypBehFPmMojdHLm9JiatgJZzx0SAroGIgdex ckzbS8iVQs/Z6f+XIuWX3/IJBly4L1ILVvLwnFxksW0pgR55z17/FyfX9AMWLWTohtJm AtihTR06lu8vHq00x6Fw5M5B8HJSQByUKs7k2NHQoJvK2kndZX2tfi9xS6YPqId1Sl++ I7LKTiLi/Y1j5eldZo9SAf+xx/5T+xBYRvtC1j22evT28duTGqIXcVcroNoFdq6F25ei Uw== Received: from mail.beijerelectronics.com ([195.67.87.131]) by mx07-0057a101.pphosted.com (PPS) with ESMTPS id 3hms0c2v0k-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 02 Aug 2022 13:13:40 +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 13:13:37 +0200 From: Matthias May To: CC: , , , , , , , , , , , , , , , , , , , , , , Matthias May Subject: [PATCH net 2/4] vxlan: do not use RT_TOS for IPv6 flowlabel Date: Tue, 2 Aug 2022 13:13:06 +0200 Message-ID: <20220802111308.1359887-3-matthias.may@westermo.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220802111308.1359887-1-matthias.may@westermo.com> References: <20220802111308.1359887-1-matthias.may@westermo.com> MIME-Version: 1.0 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: CXfJo1MVuPQQyt3vNwhvrwcn2nwt3EVC X-Proofpoint-ORIG-GUID: CXfJo1MVuPQQyt3vNwhvrwcn2nwt3EVC Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org According to Guillaume Nault RT_TOS should never be used for IPv6. Fixes: 1400615d64cf ("vxlan: allow setting ipv6 traffic class") Signed-off-by: Matthias May --- drivers/net/vxlan/vxlan_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index 265d4a0245e7..797585fbb004 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -2320,7 +2320,7 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan, fl6.flowi6_oif = oif; fl6.daddr = *daddr; fl6.saddr = *saddr; - fl6.flowlabel = ip6_make_flowinfo(RT_TOS(tos), label); + fl6.flowlabel = ip6_make_flowinfo(tos, label); fl6.flowi6_mark = skb->mark; fl6.flowi6_proto = IPPROTO_UDP; fl6.fl6_dport = dport; From patchwork Tue Aug 2 11:13:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias May X-Patchwork-Id: 12934557 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 6444FC19F2D for ; Tue, 2 Aug 2022 11:42:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236193AbiHBLm1 (ORCPT ); Tue, 2 Aug 2022 07:42:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233384AbiHBLmZ (ORCPT ); Tue, 2 Aug 2022 07:42:25 -0400 X-Greylist: delayed 1695 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 02 Aug 2022 04:42:24 PDT Received: from mx08-0057a101.pphosted.com (mx08-0057a101.pphosted.com [185.183.31.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 916A32127E; Tue, 2 Aug 2022 04:42:24 -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 272AqotW029528; Tue, 2 Aug 2022 13:13:42 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=westermo.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=12052020; bh=qzoiygoNP3aKHBU59YwFwlDaf3F38U+FwxB7grTnLfg=; b=RI6w56erWjaWVrwEz/AujQ1SNFoXRSblYjthE9nzGQ/D1wkSTacmTDR4jil83+xVtQCy 29Cu//n2F0THt/01/+axhTNGYIEyv4MbZCN3MJQSQQwHJEb6M5OXDewyjZrauTk0JWVY nfCJJr72FH4OzYBbON0kcfCGml7V5SsK6AwXLS3Xgd9xk7cPkB+IDQ31DSHnIR65oeh5 /04yqkamwwsxa5dKpa2TwyRv63BE2ix3lP0lB/H/TIq2pR+We622hv6I2/CMrOS9CIcX 7DKpIBj+Dae9VBouF2EWkUP6F3N8olYWgRWm6gLOdSoAMNnTcaYd3NeJR6giYJCkgSqx /w== Received: from mail.beijerelectronics.com ([195.67.87.131]) by mx07-0057a101.pphosted.com (PPS) with ESMTPS id 3hmrn42u0q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 02 Aug 2022 13:13: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 13:13:39 +0200 From: Matthias May To: CC: , , , , , , , , , , , , , , , , , , , , , , Matthias May Subject: [PATCH net 3/4] mlx5: do not use RT_TOS for IPv6 flowlabel Date: Tue, 2 Aug 2022 13:13:07 +0200 Message-ID: <20220802111308.1359887-4-matthias.may@westermo.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220802111308.1359887-1-matthias.may@westermo.com> References: <20220802111308.1359887-1-matthias.may@westermo.com> MIME-Version: 1.0 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: 4kZqUP7mwkKp_nVO2BtZHMDBUjOJGro6 X-Proofpoint-ORIG-GUID: 4kZqUP7mwkKp_nVO2BtZHMDBUjOJGro6 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org According to Guillaume Nault RT_TOS should never be used for IPv6. Fixes: ce99f6b97fcd ("net/mlx5e: Support SRIOV TC encapsulation offloads for IPv6 tunnels") Signed-off-by: Matthias May --- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c index d87bbb0be7c8..e6f64d890fb3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c @@ -506,7 +506,7 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, int err; attr.ttl = tun_key->ttl; - attr.fl.fl6.flowlabel = ip6_make_flowinfo(RT_TOS(tun_key->tos), tun_key->label); + attr.fl.fl6.flowlabel = ip6_make_flowinfo(tun_key->tos, tun_key->label); attr.fl.fl6.daddr = tun_key->u.ipv6.dst; attr.fl.fl6.saddr = tun_key->u.ipv6.src; @@ -620,7 +620,7 @@ int mlx5e_tc_tun_update_header_ipv6(struct mlx5e_priv *priv, attr.ttl = tun_key->ttl; - attr.fl.fl6.flowlabel = ip6_make_flowinfo(RT_TOS(tun_key->tos), tun_key->label); + attr.fl.fl6.flowlabel = ip6_make_flowinfo(tun_key->tos, tun_key->label); attr.fl.fl6.daddr = tun_key->u.ipv6.dst; attr.fl.fl6.saddr = tun_key->u.ipv6.src; From patchwork Tue Aug 2 11:13:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias May X-Patchwork-Id: 12934560 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 5420BC19F2B for ; Tue, 2 Aug 2022 11:46:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235854AbiHBLq0 (ORCPT ); Tue, 2 Aug 2022 07:46:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236557AbiHBLqZ (ORCPT ); Tue, 2 Aug 2022 07:46:25 -0400 Received: from mx07-0057a101.pphosted.com (mx07-0057a101.pphosted.com [205.220.184.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD08F1C100; Tue, 2 Aug 2022 04:46:23 -0700 (PDT) Received: from pps.filterd (m0214197.ppops.net [127.0.0.1]) by mx07-0057a101.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 27275Q7L026303; Tue, 2 Aug 2022 13:13:44 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=westermo.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=12052020; bh=s0sAH8Va4oVwM9bds8xjXKdGoYvKULeCnqytXxV4qlc=; b=2C9dKWqOfJyjZErAq5w2BIdsx6gbaRvgJ1S6g9qaYiN+C0qXm3O6ik1RtyQynJEF+2+T QTQMsqjAzGVSGp0dEaCoSQKtI4MNJdT93PsXMgqecDByUL4IXJge7MidjM8GPPehEqE2 CBQYwOEBv33BXffQxIsOWy4HAT3U6WblyY+NxzSh/DCkNUvjoI9gXzrn1J4+v7eOKwh8 YnIaJ8MBQ32nKgVU+ZJQJ3bXro9huFWxILyacJV2iYoctlxRmK2ukcLUPDRT2NnWAUSh r1qMowoYCbIA+zflmU5tmR3kvrgGj9Ylzg7j9uIwJ6uXlf/CLkn6+jCRzAhDNzGOEswN +A== Received: from mail.beijerelectronics.com ([195.67.87.131]) by mx07-0057a101.pphosted.com (PPS) with ESMTPS id 3hms0c2v0p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 02 Aug 2022 13:13:44 +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 13:13:42 +0200 From: Matthias May To: CC: , , , , , , , , , , , , , , , , , , , , , , Matthias May Subject: [PATCH net 4/4] ipv6: do not use RT_TOS for IPv6 flowlabel Date: Tue, 2 Aug 2022 13:13:08 +0200 Message-ID: <20220802111308.1359887-5-matthias.may@westermo.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220802111308.1359887-1-matthias.may@westermo.com> References: <20220802111308.1359887-1-matthias.may@westermo.com> MIME-Version: 1.0 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: FkHXf2mzz-Ak5yeVUdjlC1xlaQTArItR X-Proofpoint-ORIG-GUID: FkHXf2mzz-Ak5yeVUdjlC1xlaQTArItR Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org According to Guillaume Nault RT_TOS should never be used for IPv6. Fixes: 571912c69f0e ("net: UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc.") Signed-off-by: Matthias May --- net/ipv6/ip6_output.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 77e3f5970ce4..ec62f472aa1c 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1311,8 +1311,7 @@ struct dst_entry *ip6_dst_lookup_tunnel(struct sk_buff *skb, fl6.daddr = info->key.u.ipv6.dst; fl6.saddr = info->key.u.ipv6.src; prio = info->key.tos; - fl6.flowlabel = ip6_make_flowinfo(RT_TOS(prio), - info->key.label); + fl6.flowlabel = ip6_make_flowinfo(prio, info->key.label); dst = ipv6_stub->ipv6_dst_lookup_flow(net, sock->sk, &fl6, NULL);