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 2C1E8A0A0E for ; Mon, 10 May 2021 18:11:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 20D2240140; Mon, 10 May 2021 18:11:59 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2043.outbound.protection.outlook.com [40.107.237.43]) by mails.dpdk.org (Postfix) with ESMTP id 9A13640140 for ; Mon, 10 May 2021 18:11:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CoZRouCUcjdaOmNGnfOE1Jc15QnWiFWK+i7zBCLRNZDDP+foXNqhMLUzLDvazsJ6Dye9FuozXEbETWVGwOcv5wgHnam/rGuE8jhfjPiNynNw8/Dto43WVTBSl+fBDTq79LhsxQ06cqMYRR0s6Z1+UvPO1xgFzFz1uU2I/9K7Zz+XlcGQYBuLDO/fv93wn3RC4j1eCaEA9f+zzVqOZSmcTOCl275IoikV+dwnOxYEWpl8fcAdEIbLr36vtx3maHlBtrwrfznQ9qqESfaEjzbwFu/pUq9xzM87gVetZdl8W5Gajigdu9uu6HiDurbEg4yuqnXYyAqAdZogvoDYw64tTg== 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-SenderADCheck; bh=nDeQv7huX4H6ipYocvwiNHJ8JwjMOqE+PvxFgPDz138=; b=Dfj/uBR/yp67YMd0W/Jx7k2g8XUyDuUzWWgQmujTd4fRI/DMkeBHeVhpXsIEizKHbI8JGW64y35unxTr/pAaiMbAwN7x4Ff1JSwsSc9g+msbZoQ2NjIGUZR3YgLFkxuWpx/Ew0BasF0cdXazBngNMHUZsW1a6ev73P7YQrVDy7Zf9bO8GzcIZkCBId0HTS+wmHetHCTno75de1Oa7t07aaHH9fNgef9r5LRxGbnzDvV8R+ctmtZzGKXPlPTuMnxzlKFXJtqB81dyPEtDMDtsu1J1T9Uq1bYxqifLPa8+TJXdIFxUvmsEHTsjCzv7ba9Ppw+YagEPfLnrV1QMdbhWAA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=nDeQv7huX4H6ipYocvwiNHJ8JwjMOqE+PvxFgPDz138=; b=DnZyfQqcfNCaoNpjK5JmMhb7C+3GPrCn7W71KXB6b59bqF2qwxvrfbnS1JUlfkLZUUWfgUVK/5X0il+thOnzsQzh6CEwcW5AFYUuYWQVV13/WeYVVzvUqpYTTQb6y2R/OZg+IwhR5fyVn2jZuRx9o8884Iam0I5s8b7b7FZUtDjR2qNLD8pSEWNWw3v16qBOgYC6xqCmlyGv835V531b59nZOftGvbKutbJRPD6DQcXjFoYVGJUAbwAEve1GhYWhecEAcWPzaZB7NsfTFdK8Elc5Bw1xSxTPH9lmuScNQK0bWgbosuOQiuBipsVLJK+Q4z/cwpMH8iPl/hzRVnqiew== Received: from MW4PR03CA0053.namprd03.prod.outlook.com (2603:10b6:303:8e::28) by MN2PR12MB4094.namprd12.prod.outlook.com (2603:10b6:208:15f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24; Mon, 10 May 2021 16:11:56 +0000 Received: from CO1NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8e:cafe::69) by MW4PR03CA0053.outlook.office365.com (2603:10b6:303:8e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:11:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT059.mail.protection.outlook.com (10.13.174.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:11:56 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:11:48 +0000 From: Xueming Li To: Jiawei Wang CC: Luca Boccassi , Ori Kam , dpdk stable Date: Tue, 11 May 2021 00:00:35 +0800 Message-ID: <20210510160258.30982-86-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a8ad9b3c-5730-4857-1e26-08d913ce5520 X-MS-TrafficTypeDiagnostic: MN2PR12MB4094: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9I30Ugs9l/+UJdxZZ/m6zEE5sO527hBJwJTyeIRsrFmbpvOTzsrBolMKNINmKW7Lj4tQAfztsDDymtR17xSfuaDxeQc/B3psxBu85cH5Q9EdCy8/nE98s2YIOq2KWwfGClzNaG0mWQtrQixqgY0CteZLvAvX1tax1LEIUV4hXVhF0nVYaz6Sh9FUZwPF9ENi9wFvpZg3BL6p6bRWmKEywv5oZWPvxREGzN/ufdTeXrVTCG89xGY/unIYcjR10h6BPxN+h62dke1aD40/aM/u9qjBMU5yWb0uncE2BPcezMFqxdZspx35woz6oOkiIGeTxzXcC9WTiGezQTsnQ2tx3x0Lb6c//QEKKapAHs0tO7qsrsu9MORMSDNWgMK9uWmR/PNPmKwH4LXJzVirRxPON9K8llaWwnLAHMCE1dJ+HSVPeAGTJPPxtn7N8ZaMaFq8vWPDnyYDSlRazFlV59aq26k7NMP5EHZv2c9EyNoMuYeJPKBQxllu54KijbzINhWZaZ56zmS4ZMjgG/ebCke1hh4idpoet2UscilULR5tSyBdLRfBw8Iv4aO7oXeEmBp0zcq/FawfeOAuWec+EQ6cy6rFQT1bKPMxrnfGwUVnGBsJujFqYRN+5BccAYhWmXVCk+E2RrXl5HPNyv8QzBvxXoVhO6XNZJOsq/JVADGtLZKYIr13KB0maIxDNyt80QR9cYNVmT0xHfIhaT7GEduGlRszJ0SbR9fY8S+tc+T0RTh/7Vv7mx8kvS2quSdKIupwV6HBohOezdHw7IIeJkAOFg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(136003)(346002)(376002)(39860400002)(46966006)(36840700001)(8676002)(7696005)(426003)(53546011)(2616005)(47076005)(8936002)(966005)(36860700001)(6862004)(4326008)(336012)(36906005)(7636003)(6666004)(86362001)(356005)(82310400003)(186003)(1076003)(37006003)(54906003)(316002)(2906002)(478600001)(83380400001)(6636002)(82740400003)(55016002)(36756003)(6286002)(70586007)(5660300002)(26005)(16526019)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:11:56.0875 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a8ad9b3c-5730-4857-1e26-08d913ce5520 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4094 Subject: [dpdk-stable] patch 'app/testpmd: fix NVGRE encap configuration' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/763cb5c708a1ccbae67442ddb6b18e3768204947 Thanks. Xueming Li --- >From 763cb5c708a1ccbae67442ddb6b18e3768204947 Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Tue, 16 Mar 2021 06:18:27 +0200 Subject: [PATCH] app/testpmd: fix NVGRE encap configuration Cc: Luca Boccassi [ upstream commit 9b0da816bdec98c0d6c5d17ccdd337bdbafc3f75 ] For NVGRE protocol, the default value of 'c_k_s_rsvd0_ver' must be 0x2000, and protocol type must be 0x6558 in the NVGRE header. This patch updates these two configurations while parsing the nvgre encap. Fixes: dcd962fc6b4e ("app/testpmd: add NVGRE encap/decap") Signed-off-by: Jiawei Wang Acked-by: Ori Kam --- app/test-pmd/cmdline_flow.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index de80924e7c..c67ac71505 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -5203,6 +5203,8 @@ parse_vc_action_nvgre_encap(struct context *ctx, const struct token *token, .src_addr = nvgre_encap_conf.ipv4_src, .dst_addr = nvgre_encap_conf.ipv4_dst, }, + .item_nvgre.c_k_s_rsvd0_ver = RTE_BE16(0x2000), + .item_nvgre.protocol = RTE_BE16(RTE_ETHER_TYPE_TEB), .item_nvgre.flow_id = 0, }; memcpy(action_nvgre_encap_data->item_eth.dst.addr_bytes, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:28.846247000 +0800 +++ 0087-app-testpmd-fix-NVGRE-encap-configuration.patch 2021-05-10 23:59:26.450000000 +0800 @@ -1 +1 @@ -From 9b0da816bdec98c0d6c5d17ccdd337bdbafc3f75 Mon Sep 17 00:00:00 2001 +From 763cb5c708a1ccbae67442ddb6b18e3768204947 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 9b0da816bdec98c0d6c5d17ccdd337bdbafc3f75 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 49d9f9c043..2c40c6996e 100644 +index de80924e7c..c67ac71505 100644 @@ -26 +28 @@ -@@ -5439,6 +5439,8 @@ parse_vc_action_nvgre_encap(struct context *ctx, const struct token *token, +@@ -5203,6 +5203,8 @@ parse_vc_action_nvgre_encap(struct context *ctx, const struct token *token,