From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6A08142D46 for ; Sun, 25 Jun 2023 08:41:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6111D40ED8; Sun, 25 Jun 2023 08:41:38 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id D422E40A7F for ; Sun, 25 Jun 2023 08:41:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J/B5o37zN3NGl9RRXD4nlAIXUraR5ILDMU/R7/nInBpP2TGX/WgH7aGIhaZV1uREq9nVwOKRFrXtrQc86rL2zKYSp+61Of3RDEJfYVnxDzLrJ6c3uMyOS30aVDo74vMNYfODpZs/8nacluMDh7QvgXrx9S2shsVF8T6q6CTLO6XuepNOmLZ2Gb47Bw8l6XHUhKZmpXzhN5O2SXsc6pMCS3vkqpgqqVV7X0MLxvjq9IgO10A5ULSajPXNQu7ZtXQ0hf51dFzzIkTIfQpL+srxmUle0HtMyOJWW540TpEF3V0Ou7uFAX7Ey3W6ypEItd2Cs52N9LcfxhNDV/Y5zZIaGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SmjYRk4fx6IuS9ZGf9vHsP3JD+sDCUDQm6hmApGfQns=; b=YAQxbfgU8krrvpQ68UZsZ6bDYSGAv9RWurgxaDkBG7RSsKL+BmiOkce7iasZnMRQHkdeJCNvfToun4+0TNJdDhdTwl2Sw1yFuRWpErWWx1b9sGe1dU0BNjXArJAvieSZZ8nrOneIF+Md21moyN6Nuwz8xFJjvYC5bO7wWINMP54PuzQRBDcgeJF/y657nyrhdcd8qs6u6kCYyHQzkTM73dsq4WKdqIYAijULVdTtoxuamJ51m+J71vBj3mVfnanuKoMJaR+Ak5ju8dy8x4OEgPh3hNEdZfH5diNgkJ7cvNFHhUAtpisNrBMoJEcrm9NqloGF1NqpI7GCcPAUKl3qeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SmjYRk4fx6IuS9ZGf9vHsP3JD+sDCUDQm6hmApGfQns=; b=Kw6Jv4Dur47eE4kn8vqUUKeTsJuCQbR8Q02tmoYMVS/slJ9pZ+eSpgHDiFut72heto11sEieoxYTCA0p8z59d0wMo7Uyi/yrEjg0y2xkgosBzSv4ehNrQxCZazx69ps6n8zA1bCq8TWv1yV0wbrbooZOFLpJDJ1yCQAAdPoqahMJHQr5BokBJg9aYbZN5HVpKNeKVw6zLHFZvKLyMzJaYSlAdpOBWsaqFFVw/mGeQ+mMvB2JchJPt91Zmgf+64ZPGa4nqzweazpIKaTvmyz7q+A4JnupHUK8LCwRlImk+ktcM/1qFk89ebR2yIkGG1iBMgBZe/MCu96PjDEiwbnpPw== Received: from SJ0PR03CA0189.namprd03.prod.outlook.com (2603:10b6:a03:2ef::14) by SN7PR12MB7785.namprd12.prod.outlook.com (2603:10b6:806:346::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:41:34 +0000 Received: from CO1NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:a03:2ef:cafe::fe) by SJ0PR03CA0189.outlook.office365.com (2603:10b6:a03:2ef::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.31 via Frontend Transport; Sun, 25 Jun 2023 06:41:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT022.mail.protection.outlook.com (10.13.175.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:41:33 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:41:18 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sat, 24 Jun 2023 23:41:16 -0700 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix TOS of IPv6 VXLAN encap flow action' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:40 +0800 Message-ID: <20230625063544.11183-63-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT022:EE_|SN7PR12MB7785:EE_ X-MS-Office365-Filtering-Correlation-Id: d2bb70b2-b94d-46b4-d126-08db754737b8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kuvLxVlvOg6u+yL3O3k6j9idmnGVHiKCAZIXgRl81uIpNuyUbQ+DzMP+8KeneIwspndPQPPNgxgUy98VOoKHwZleBhUnM1FkDulL9HXLkW50O2fo2YoARWtQDQHo1yAx4ZxORcFQSwaaDnHGyAaukp/r6A68yISyY8HS3Slb+35G++sJcVK4+Hkd0SOnbr8n62KTIw9qbOk1sajnGFRAHiMuGQ+8VZ3HePrS4KbonGV2XDQ0a9kha1hY66VhfgWzIVEMyRgdRJ7PQOdwN4RQZ7thSRCIX36a9qtG39s9SK1k9wckcveRf6iA+cXr55AeBxhgM/C8mAaleQTc65974kzSuqMRpTOExzVnC98FXxJKUm7DeVNE7e7v+uOUJ6zuRHL9QbiBvYbtl2wfO08EznsnqXRWiaTNyfNruHoAO7J/r1/Qp8LKEX5Sy9Wr7Q1Y2/zD74oHIHUcSCyz1HL+awLprcYdiMIBJJeoP1vtJpHhZVMjCUl8ul5TLdmRoD86ZBCd7SDpX6+8CTvhwTWDiSsuOSH/vvbDxu3tp1qNK3UFr3FZGBLN29NrM2tRLOCq7zba9FeNlZzRVS7P4q1/o2N2PbMLosS2f30x2ghimVqPyEkZ7olpp+tUZIwOioc4dr5aZMBl12/ijD8iMSvhRITqERO0dX3ELdvGe0nATRBb4AKdR4S1XaxmV7XraN6YqSFH+gv71v3+U1NuE3zKPix8ZKo97d+RSC/8mAxjO9FYC4kLgGKAjPAPs837VEFy2GNZ9Ndh947//St/QuCTLQ== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(376002)(346002)(396003)(136003)(451199021)(46966006)(36840700001)(40470700004)(40460700003)(2906002)(7696005)(82310400005)(82740400003)(6666004)(356005)(7636003)(2616005)(83380400001)(47076005)(336012)(426003)(66574015)(1076003)(26005)(186003)(6286002)(16526019)(53546011)(966005)(36860700001)(55016003)(40480700001)(41300700001)(54906003)(86362001)(478600001)(316002)(36756003)(70586007)(70206006)(4326008)(6916009)(5660300002)(8676002)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:41:33.9950 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d2bb70b2-b94d-46b4-d126-08db754737b8 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7785 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=c81816d07fae7a2d1eb041633ed48e7e062a5398 Thanks. Xueming Li --- >From c81816d07fae7a2d1eb041633ed48e7e062a5398 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Thu, 8 Jun 2023 11:19:54 +0800 Subject: [PATCH] net/nfp: fix TOS of IPv6 VXLAN encap flow action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 99a4b8589276402b8da491c86590fc8ca26498ce ] The former logic directly do shift operation on big endian data, fix it by convert the big endian data into CPU endian firstly. Fixes: c3b7254093c2 ("net/nfp: support IPv6 VXLAN encap flow action") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 3aefccc069..4dcd304bd2 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2736,6 +2736,7 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower, struct nfp_fl_rule_metadata *nfp_flow_meta, struct nfp_fl_tun *tun) { + uint8_t tos; uint64_t tun_id; struct nfp_fl_act_pre_tun *pre_tun; struct nfp_fl_act_set_tun *set_tun; @@ -2756,9 +2757,9 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower, set_tun = (struct nfp_fl_act_set_tun *)(act_data + act_pre_size); memset(set_tun, 0, act_set_size); tun_id = rte_be_to_cpu_32(vxlan->hdr.vx_vni); + tos = rte_be_to_cpu_32(ipv6->hdr.vtc_flow) >> RTE_IPV6_HDR_TC_SHIFT; nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_VXLAN, tun_id, - ipv6->hdr.hop_limits, - (ipv6->hdr.vtc_flow >> RTE_IPV6_HDR_TC_SHIFT) & 0xff); + ipv6->hdr.hop_limits, tos); set_tun->tun_flags = vxlan->hdr.vx_flags; /* Send the tunnel neighbor cmsg to fw */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.179177900 +0800 +++ 0062-net-nfp-fix-TOS-of-IPv6-VXLAN-encap-flow-action.patch 2023-06-25 14:31:58.415773900 +0800 @@ -1 +1 @@ -From 99a4b8589276402b8da491c86590fc8ca26498ce Mon Sep 17 00:00:00 2001 +From c81816d07fae7a2d1eb041633ed48e7e062a5398 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 99a4b8589276402b8da491c86590fc8ca26498ce ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 68e8654bf9..445e9a117c 100644 +index 3aefccc069..4dcd304bd2 100644 @@ -25 +27 @@ -@@ -2743,6 +2743,7 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower, +@@ -2736,6 +2736,7 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower, @@ -33 +35 @@ -@@ -2763,9 +2764,9 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower, +@@ -2756,9 +2757,9 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower,