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 552D5A0A0E for ; Mon, 10 May 2021 18:06:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4FD9440140; Mon, 10 May 2021 18:06:29 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2054.outbound.protection.outlook.com [40.107.212.54]) by mails.dpdk.org (Postfix) with ESMTP id 2DD1840140 for ; Mon, 10 May 2021 18:06:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aSebFrB024W/D9KFaUhXUICGU66riPnX2jHFiLawajlu4IWlBYpoM1OMbM4GYJ7jdFLwlctqoE18TLNhmFxeyERNaIX7dQWROkK3IE7+5zZvf5/pYm+k+1oTATSvJV+RJfgAc6wd75JR4wsTT0ktoTuS7O/dWODLhwp5j4vu2TXAzK0UVCgan1xgtHBujAOzOlTRdbfZ/j05RFJvELiT7/ETlU2Iuf4OgYUVDWAhfEkQKxlI5mPkHtPUVTG0v7KaMufy0y9ZylejWHryPH3ivo2K9tQIzODp8I7xe2+CCXkF0pP1CvsrmaCeFQHQRg48rRpH+q5CcD4WroNqS7OQnQ== 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=zgtxvoqouGhZDqzF0Oez25e2J2RJuprhmEBomv7rYno=; b=A4lWqF6zG5KbWDZsLIDb0UG5fuK6eljj3O0HMqqmYxbM+1yrVa25p3YPadPocxAPTkB3cA7NZ8AK+ddL78CejbP2rn3EYqD0Y2f0MR3NrxqZHn6PUx9/8ZpylB7XCzjjeAfP0mERVGf9FLpYpgwkpt8AsjiF6ix4tEqYYZXpdkJSMaBIpePP7cnlWwSD+okuByAGDy/LTMfSMqUhETnRvSCIVfSngvJb+w0CxYDv1E/BeMEVkjlaDUzbcvd+zFvOPLCtljOV0BphGZTNTquhO+Ag8yDj8cw94srrmdCMcBoZOg1n5I8t0Fs822+0jAjue91coYeKsC2MeVsV9A29UQ== 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=zgtxvoqouGhZDqzF0Oez25e2J2RJuprhmEBomv7rYno=; b=C04sFtmGETsLWrcI7npNx4E2/r9CIgglyXllJkAPtgD2dogtFyz3n+Zuxfw5Imic9s2tXiZEWEReRaVjVlIsq/Ol+cA2H9+vOdcbSMCbvtN94iEKtnb2AjGgf/xBAZuNuCLffZWRuREALw3tJa1YJtf1VztWyfFFbYhlXXWempYaPVQqxdftJBhbky0+1bVmJSxqhOlQCflNbfcZflw3j308I7Jlqd8p4H3x03U5pB72/DHvML5s1JyodI+snhwaFFbasF4/ZuRAD+6WESFmiE/itUUkStL6IkxYDNUBgkxfoaqtFFEZJ9cZJC7R0kbwvJmc24Yfy7K2G3HkFZRYuA== Received: from BN9PR03CA0899.namprd03.prod.outlook.com (2603:10b6:408:13c::34) by MN2PR12MB3406.namprd12.prod.outlook.com (2603:10b6:208:c9::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.27; Mon, 10 May 2021 16:06:26 +0000 Received: from BN8NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13c:cafe::69) by BN9PR03CA0899.outlook.office365.com (2603:10b6:408:13c::34) 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:06:26 +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 BN8NAM11FT022.mail.protection.outlook.com (10.13.176.112) 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:06:26 +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:06:21 +0000 From: Xueming Li To: Jiawen Wu CC: Luca Boccassi , dpdk stable Date: Mon, 10 May 2021 23:59:41 +0800 Message-ID: <20210510160258.30982-32-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: 6fba5506-4d37-4c9b-486b-08d913cd90bb X-MS-TrafficTypeDiagnostic: MN2PR12MB3406: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vihz9lkIoUjvC45k5J1IE6bZcj5uRD9x1hnOC6h+ZHO74ys4cEffz4QEpOBBq5UFhSj8aHzVT/yLd7ozNhXe+q6fK69waQi32UkvE1SOBmIIOfF/GH3zuhqh/Tx/m/OhebChH+awkbb6EtyDx6WkPjdpMT0iIrwzlSOwVKMOTWEp9gk1biYLzaNNmGNd0RVH71w+xoozoh7j4F6mkGoG/RLNQ//o9NvQS772s0mf9OpGIHP+ubny6xUK7PBMFX/7npIfXmzqWx2sB6QF7X2zgMlIXH/wbAgUUCzHw8Go07U9EEhujZ/vjejKPVfJ5iWsFSbdKmd/qhN7BBorGFCJ872AnC7wjo83xy25Pc1xBBm1eQ4swNeZmuL3SrTyi09OJWeBkuFfDKQKJqoXz2LpraylnAM3Qj+eYAaKbpwI8Tjt8b2Fyiz+DOUTQ9gg+ZDUcNPFZCx+KtdLAVdPOgOewFKO83Jr52m1uArUIR+RMkcgwzX+Uo5pcH/PXzdkoxmF5PTa3wSBVFEiBa9iLeCWj7d4h66/DpKdGR6iNtNoISfkuvJSFcuojLJF5JVKwNN0Crfx+UjCMLLzfO2JUHdZcjq8pOS62CB67SZaYoK65SNVe3yY7YA2UhJ8oUxCVx9Mzh/SH72bBMog0GSHxVts8kNZpv5JhlAayvDALoANla30iK6CiVFXb479hi8BQsbsdxYcJEBlf/RmYTovtM/d7srCIQKpNoexko5MAQEYP5GxN7UOZDlzoVbzm2Sgks0MhIhZVR8CZL2+lun6zOPg9g== 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)(39860400002)(346002)(136003)(376002)(396003)(46966006)(36840700001)(36860700001)(6666004)(70586007)(8936002)(5660300002)(6286002)(82310400003)(2906002)(186003)(53546011)(16526019)(70206006)(4326008)(6916009)(47076005)(54906003)(82740400003)(478600001)(7696005)(316002)(86362001)(8676002)(15650500001)(36756003)(36906005)(356005)(7636003)(966005)(83380400001)(426003)(336012)(1076003)(55016002)(2616005)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:06:26.5323 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6fba5506-4d37-4c9b-486b-08d913cd90bb 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: BN8NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3406 Subject: [dpdk-stable] patch 'net/txgbe: update packet type' 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/58fc7f65f2ce721e274f74709d0be7623de5244e Thanks. Xueming Li --- >From 58fc7f65f2ce721e274f74709d0be7623de5244e Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 5 Mar 2021 10:14:37 +0800 Subject: [PATCH] net/txgbe: update packet type Cc: Luca Boccassi [ upstream commit 893b78035463f9d2eb35ea02ad7049312e2f855e ] Update the packet type lookup table according to the HW design. Fix the bug that inner L3 and L4 type can not be parsed when QINQ insert in tunnel packet. Fixes: 9e30b88f60b2 ("net/txgbe: support packet type") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ptypes.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/txgbe/txgbe_ptypes.c b/drivers/net/txgbe/txgbe_ptypes.c index cd160ebbaf..7009f20821 100644 --- a/drivers/net/txgbe/txgbe_ptypes.c +++ b/drivers/net/txgbe/txgbe_ptypes.c @@ -50,6 +50,7 @@ static u32 txgbe_ptype_lookup[TXGBE_PTID_MAX] __rte_cache_aligned = { /* L2:0-3 L3:4-7 L4:8-11 TUN:12-15 EL2:16-19 EL3:20-23 EL2:24-27 */ /* L2: ETH */ + TPTE(0x10, ETHER, NONE, NONE, NONE, NONE, NONE, NONE), TPTE(0x11, ETHER, NONE, NONE, NONE, NONE, NONE, NONE), TPTE(0x12, ETHER_TIMESYNC, NONE, NONE, NONE, NONE, NONE, NONE), TPTE(0x13, ETHER_FIP, NONE, NONE, NONE, NONE, NONE, NONE), @@ -67,6 +68,7 @@ static u32 txgbe_ptype_lookup[TXGBE_PTID_MAX] __rte_cache_aligned = { TPTE(0x1E, ETHER_FILTER, NONE, NONE, NONE, NONE, NONE, NONE), TPTE(0x1F, ETHER_FILTER, NONE, NONE, NONE, NONE, NONE, NONE), /* L3: IP */ + TPTE(0x20, ETHER, IPV4, NONFRAG, NONE, NONE, NONE, NONE), TPTE(0x21, ETHER, IPV4, FRAG, NONE, NONE, NONE, NONE), TPTE(0x22, ETHER, IPV4, NONFRAG, NONE, NONE, NONE, NONE), TPTE(0x23, ETHER, IPV4, UDP, NONE, NONE, NONE, NONE), @@ -339,7 +341,7 @@ txgbe_encode_ptype_tunnel(u32 ptype) break; case RTE_PTYPE_INNER_L2_ETHER_QINQ: ptid |= TXGBE_PTID_TUN_EIGMV; - return ptid; + break; default: break; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.528868400 +0800 +++ 0033-net-txgbe-update-packet-type.patch 2021-05-10 23:59:26.360000000 +0800 @@ -1 +1 @@ -From 893b78035463f9d2eb35ea02ad7049312e2f855e Mon Sep 17 00:00:00 2001 +From 58fc7f65f2ce721e274f74709d0be7623de5244e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 893b78035463f9d2eb35ea02ad7049312e2f855e ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org