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 68E0DA0C3F for ; Sat, 12 Jun 2021 01:16:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6229B4003F; Sat, 12 Jun 2021 01:16:32 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2044.outbound.protection.outlook.com [40.107.236.44]) by mails.dpdk.org (Postfix) with ESMTP id 457D24003F for ; Sat, 12 Jun 2021 01:16:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JDKxZTsFTY7dbMz2htbiBjCSmPmT/eVY2dOBf2jAn+Ims3KdZx8+o3357Dkzn8mi5TTxEFIVuUhN6XyPlGsWloJuPk4u5Gz3TFeAei6PhUp9Msk2qPDKbGGi8nlQzOf27ChZjDny9z20v3O6UdFzRHgn2u+UM1a11DE714aovONNp5PZGNn+gHgHvRsODKs5hx9afT6oQH/EYaq/h2YQpo/NC3Cb2S6nZVYN3R/waEJrrIPgBofc1h9hmPVu98VZhu2CzCdHgPqQUn6/amXp0SX/0ZQSrZF1bSdVwxNoPAQAijFg9eDEv4OaWjh5778tb9Pc0lPIXwsqn+MepSZw3g== 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=w2E+seTQJNC67aTOxZMVe/olCISVTs4r11Me+RGgL6w=; b=XIDY9Bw7Yt5to0HZT9AENO48ZrRIDxvLXr8wx7WpCkiy+5fKl+i0vh3bSgH3caHnoCf8aiEA7GrxVrJ3xGjWMgjQlkC0PAqK8rBoHOOe0q4VzLbo6yYF78ctK6S65OIQdiPS2OQhBmobGKvJ0rWgf5v4D+Tw0+RDWevhRI4GsmV2ZzSkFlgkna0iBhJ6lJKFiNg50X4CvsFkY77BOwfbnLudLWejvEWCz9xSbSi6jj3wRax3t15CNq4L4Z9UCelB5eoyBLUK1otiPcghxFygQeJt3USTEFFbA3hyg4k6rFJZeY1gLpgmZ54SCyU74d/q3BDNfbXtOGq0Y7TuTnXzDA== 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=w2E+seTQJNC67aTOxZMVe/olCISVTs4r11Me+RGgL6w=; b=ZegLVmCgjVUUAVJoobF+KKM/dlFX84D+zhUcNxBzCF6HXWx8yURYZ0+0T1CU7fPQfie1GAhw+QSd0UCY7GVGVaqpNJySsMEy0rEo1ykLWWL4mc4JZPqQ2AAdnBcmIpWpsHJkO6JGmB5VbOtNQvUiiCccMlZzMODk75jliPU32D1EMCjlqvOTQ8fISR6oYETDvZ0shTqc+48t6TIvlam2g7HjK4e84Yifqy3G76AV6XMNfoTSkNublXetiLLOxm3GhlHXXcit6wktomqyBKkL+4BLNgrVD3fjUte3iMa14xPP2PEONjZ1gOz9kdafFJfb44mGfhyFG1ij1qSqDIhv4A== Received: from BN9PR03CA0782.namprd03.prod.outlook.com (2603:10b6:408:13f::7) by BY5PR12MB3777.namprd12.prod.outlook.com (2603:10b6:a03:1a9::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Fri, 11 Jun 2021 23:16:29 +0000 Received: from BN8NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13f:cafe::58) by BN9PR03CA0782.outlook.office365.com (2603:10b6:408:13f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:16:29 +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 BN8NAM11FT005.mail.protection.outlook.com (10.13.176.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:16:29 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:16:27 +0000 From: Xueming Li To: Jiawen Wu CC: Luca Boccassi , dpdk stable Date: Sat, 12 Jun 2021 07:03:37 +0800 Message-ID: <20210611230433.8208-123-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6b5738d0-4bbd-47e3-6102-08d92d2ef1b1 X-MS-TrafficTypeDiagnostic: BY5PR12MB3777: 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: 1tDpfeaU4wGhqqWZ0u4BMa7HzaMd1jU6goxjx1/2tqTs7sU4DyuNsIk6CxzWQ7CJDdPi0i8n+ncy+UXHarbDpj2kQwXilrxhFTrOHP9kovMRkSraOT0c3BGH14PSlj6q/C7w1m5mW5MsSV4x8YXBogYiFchYjNkcXp6oRxW1+jnyxKzLnGO2posHtRanU/JJNs+V+IN2nyL8UvcVWDVnZch4pb5CL/ptJ0dP7WOOGOczhVw5wBrHCutz+pFcGHORKtpbsB3VdlsI7Pexa1asd3vMB91GRmQ+oWpic2axhiKRAmgR5wy7wyVBQ87AHbcFlP3+G+DHpVdI3y1Edfeesj1yCf5fVG/3sADQ0iOTL8PK+mSJBPPYP3vdBwYBs1V6XpZf9xXrY9d8Z674i5l/TSqNvug3nPzv07Wah1+4qieaQTx45tYIoOk42amjyksVIuUcnumTBZg4xkf7WXCNeF2J1q0Z2J8k8T8qb8EdQ0C3Xc746X9cbFV1Qpm4lK2tzSezh1oW8tjteCQMAvI0ZmmKVhakvwYeNXE/kUx1IeVVpWuZfCAMyjK3N8zeX5uIVbOyow8YFmf+V3DdMKVhTLQ8nLZWezIyzuDL4f9I+oS5CGtYf1zwsXYgBAqKidbLbKQx7hiNhPlsqhVWY3kVHDqOdrqrObuoritjYxyX6Mjg/AwpWpCG+VKyYhkCj4hEA7Guj/peOcCdLcioczE9cazKfnDgePq2xfnUZ5kEwxfX/3lX+CEte9/fjvmT2JxPDkyoRqTSTY3L431DM6tCXt/IeBWT4XdGWRR4anzvsE8XZuyxpoIcY9obGeC8/Kr2 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)(376002)(136003)(39860400002)(346002)(46966006)(36840700001)(356005)(478600001)(8936002)(6286002)(966005)(54906003)(6666004)(8676002)(53546011)(6916009)(316002)(86362001)(36860700001)(7636003)(19627235002)(83380400001)(4326008)(82740400003)(5660300002)(36756003)(36906005)(2616005)(186003)(47076005)(26005)(336012)(82310400003)(16526019)(1076003)(70586007)(55016002)(2906002)(7696005)(426003)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:16:29.4596 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6b5738d0-4bbd-47e3-6102-08d92d2ef1b1 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: BN8NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3777 Subject: [dpdk-stable] patch 'net/txgbe: fix QinQ strip' 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 06/14/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/ec14e372203b24f7077c43cf664841b36fc30ec5 Thanks. Xueming Li --- >From ec14e372203b24f7077c43cf664841b36fc30ec5 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Sat, 8 May 2021 14:35:26 +0800 Subject: [PATCH] net/txgbe: fix QinQ strip Cc: Luca Boccassi [ upstream commit 15f0573e9254763c3680bfbfa4bfab8599e5ab84 ] Support to enable and disable QINQ hardware strip, when configure VLAN offload with QINQ strip mask. If there are packets have QINQ tag to RSS, users should enable QINQ strip before configuring the RSS. Fixes: 220b0e49bc47 ("net/txgbe: support VLAN") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev.c | 39 +++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 2e539ca02e..d9cc7d236a 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -977,7 +977,6 @@ txgbe_vlan_hw_extend_disable(struct rte_eth_dev *dev) ctrl = rd32(hw, TXGBE_PORTCTL); ctrl &= ~TXGBE_PORTCTL_VLANEXT; - ctrl &= ~TXGBE_PORTCTL_QINQ; wr32(hw, TXGBE_PORTCTL, ctrl); } @@ -985,17 +984,38 @@ static void txgbe_vlan_hw_extend_enable(struct rte_eth_dev *dev) { struct txgbe_hw *hw = TXGBE_DEV_HW(dev); - struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode; - struct rte_eth_txmode *txmode = &dev->data->dev_conf.txmode; uint32_t ctrl; PMD_INIT_FUNC_TRACE(); ctrl = rd32(hw, TXGBE_PORTCTL); ctrl |= TXGBE_PORTCTL_VLANEXT; - if (rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP || - txmode->offloads & DEV_TX_OFFLOAD_QINQ_INSERT) - ctrl |= TXGBE_PORTCTL_QINQ; + wr32(hw, TXGBE_PORTCTL, ctrl); +} + +static void +txgbe_qinq_hw_strip_disable(struct rte_eth_dev *dev) +{ + struct txgbe_hw *hw = TXGBE_DEV_HW(dev); + uint32_t ctrl; + + PMD_INIT_FUNC_TRACE(); + + ctrl = rd32(hw, TXGBE_PORTCTL); + ctrl &= ~TXGBE_PORTCTL_QINQ; + wr32(hw, TXGBE_PORTCTL, ctrl); +} + +static void +txgbe_qinq_hw_strip_enable(struct rte_eth_dev *dev) +{ + struct txgbe_hw *hw = TXGBE_DEV_HW(dev); + uint32_t ctrl; + + PMD_INIT_FUNC_TRACE(); + + ctrl = rd32(hw, TXGBE_PORTCTL); + ctrl |= TXGBE_PORTCTL_QINQ | TXGBE_PORTCTL_VLANEXT; wr32(hw, TXGBE_PORTCTL, ctrl); } @@ -1062,6 +1082,13 @@ txgbe_vlan_offload_config(struct rte_eth_dev *dev, int mask) txgbe_vlan_hw_extend_disable(dev); } + if (mask & ETH_QINQ_STRIP_MASK) { + if (rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP) + txgbe_qinq_hw_strip_enable(dev); + else + txgbe_qinq_hw_strip_disable(dev); + } + return 0; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:59.743893100 +0800 +++ 0123-net-txgbe-fix-QinQ-strip.patch 2021-06-12 06:53:56.520000000 +0800 @@ -1 +1 @@ -From 15f0573e9254763c3680bfbfa4bfab8599e5ab84 Mon Sep 17 00:00:00 2001 +From ec14e372203b24f7077c43cf664841b36fc30ec5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 15f0573e9254763c3680bfbfa4bfab8599e5ab84 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 46d6f541b5..e62675520a 100644 +index 2e539ca02e..d9cc7d236a 100644 @@ -22 +24 @@ -@@ -1186,7 +1186,6 @@ txgbe_vlan_hw_extend_disable(struct rte_eth_dev *dev) +@@ -977,7 +977,6 @@ txgbe_vlan_hw_extend_disable(struct rte_eth_dev *dev) @@ -30 +32 @@ -@@ -1194,17 +1193,38 @@ static void +@@ -985,17 +984,38 @@ static void @@ -74 +76 @@ -@@ -1271,6 +1291,13 @@ txgbe_vlan_offload_config(struct rte_eth_dev *dev, int mask) +@@ -1062,6 +1082,13 @@ txgbe_vlan_offload_config(struct rte_eth_dev *dev, int mask)