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 4BC78A0548 for ; Sun, 28 Nov 2021 15:56:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 43DF14068A; Sun, 28 Nov 2021 15:56:31 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2062.outbound.protection.outlook.com [40.107.94.62]) by mails.dpdk.org (Postfix) with ESMTP id CCB2D4068A for ; Sun, 28 Nov 2021 15:56:29 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n4ZGwADx41wRUOcJJxhCRZnPBvbsz9AhS/xE8uOk+tIZnzNRb8iBvy+r2csjk2z2NS2z+km8x2kxRSDcI8Dsx21qhbPO78zmxBTK7vOkoaXBAPyZQxQkIkWjQesMEUI/Xdi6dzDon/P5V8rf/wWw3GdVqmG/Y4h2fZ9pGDZg7zEQgvJsp0BWXvcNKbuPigRvTBwjuQfVCCJLiiA47t6InEdbo9oawojTBQN5HpMNikHxFrXs3J4r0+4F6Mo/l5kdrf21Zud8xGVYAza8pzzvG8Bvd1PbuY7htsBWw+d9R9OswnFg/N0cX/Nv0rM7xWtPaFwyYMzpawYWXLrchsw0xg== 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=CwBxvN4FBbNyo0I1M0J/fgSQBPhz4X13Iiu/S0MZDVM=; b=Rj7JaooG7N7/5+YBRhP386V1B4386Ijz4K44Ef0lh88AARq09Z5MRyzK5G87njzmxGlCmIZLn8gjT9E+G52j9ZiRT4ti1WlakMbUDmFYyt4pyJm2v/B5XuUslCyCcVOM+YNy1eR183y5N+/zkEn2apWrzMoGnF0YxTSyLi4tQTBHWsibe5w/x9cXd5DDEt1eulwWtWm1NiZYFPchx9/8Fc6l1+Mwj/oeYmB+H+EzjIrn7vPBb+jK9ZpwINr9bTHiu6uLaPpdlbV36rQwPe3EcnkMt4U+xmdSmjPIUEOU9siiA6bSUpC66mZwI2B5+RC5I4mLNdP3GohdGnExb8+35g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=CwBxvN4FBbNyo0I1M0J/fgSQBPhz4X13Iiu/S0MZDVM=; b=Vi6Z69+XnucdEsvJhyLay0vTMHyYARejte2Ees6j7UeHZZoCQSldw2aDySoT3pa/LbqgAWNHvJ/R0EovxfoPkL8dx9TXqz+SLBnaX2JQzsTnPXFddGA06idvbtJVDIM+qz8n5gBNG3cWUKWe01/AxWBKpu/zUd1J/LVrKQ/1AupmajpLhWkNBQkzxU3iJ8o34/aczkXFFalXX0ksicx/6i/IYC1ArWZYZhQUf1Uj6uPo3DXfBljEWPuic2KpNIqw1Y8AXWvGVR+EB2ZZFmd5cpdT5en0RSgzU9d4nAyhV0MDcLJbiQMe2Ch+VOsrSELqhpTs84Ds62ZSr00TyDyWHA== Received: from DM6PR10CA0018.namprd10.prod.outlook.com (2603:10b6:5:60::31) by CH2PR12MB4839.namprd12.prod.outlook.com (2603:10b6:610:b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Sun, 28 Nov 2021 14:56:28 +0000 Received: from DM6NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:5:60:cafe::c9) by DM6PR10CA0018.outlook.office365.com (2603:10b6:5:60::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.21 via Frontend Transport; Sun, 28 Nov 2021 14:56:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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.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 DM6NAM11FT025.mail.protection.outlook.com (10.13.172.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 14:56:27 +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.18; Sun, 28 Nov 2021 14:56:26 +0000 From: Xueming Li To: Jie Wang CC: Luca Boccassi , Aman Singh , dpdk stable Subject: patch 'app/testpmd: fix DCB in VT configuration' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:53:19 +0800 Message-ID: <20211128145423.3974892-16-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-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: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2beb311-6194-4517-2b3a-08d9b27f417d X-MS-TrafficTypeDiagnostic: CH2PR12MB4839: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I67k/RVzEw2gAg7ogVDl6uqjPAxF/W6v1b3+VfffhejzWj+yDkmE6X0IYk1wsBZNmyPTrKHgiqyBN4/EeGDep2sF4FAMVNkOroVuHet2DVYeKj+8tbwB6cy/Uf61+aqvg+Kn3f6WDvc7AwNOwj4ou74cLzEuk4rUi0dHCoJqDZp3NMSzaCWN1hrZRbFZtZ6rTtN1WBOC17tySGBcb7dJ7z/t4POm5eZDVHzKGE11cln6VoMgz6QB/kCr7LFMV/JJMiOf2P/MSovkxL7zqPc2yuYFU5VRcgNqikaQgPffeCgADF0Wh5FbBcXp1K0pvtuXLE6vUiFgLnGcYnLxp5lPUcPtLG5TuiYtOBMrjguDD9uHo77XrG6hXnd6mOYY8m4zezYoECo3RI1ih4Y4B2esSFYikrD+IK4pZjPqOc7GiEYfffEq/ve/3O+CrWpK7pk7vY24vSiXK9H1duEuZ9+3OK9q2XAUozrOyxw4MLoTlhOqFynLv4AirFNLteQvPgtLZSUSN2WKM0dvTBc8phnG7OD/DCLcQ5VZRvyLkfS3s04IGlQmvmpdMPr9gCiY/7eTwEZQgq6nVAfFxRRG86djY661fQmzAlmua0nbKKCMZqC/eBb7K4MYAt3vePqLJCTNDbW4u2JvGUbb7KdrOOrwpTnk+96Sh96DqtS1ExK/iqg0U5Sd6K2VXQ+by5BtPBQ0FsNU4SwVdcn0u2159L1s9icHrgO2SbyXyORkNEqzzuV8/+bKGNVy3nNdHi3oEIZB2jfltG4PNwzrQY0NKI/KZjJ6P/JJnGRfZgk1PjII8wydiB3T8mA5JuYjFXSl5aun7p8b9R0xyYS8FoJvujociw== 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)(36840700001)(46966006)(356005)(4326008)(4001150100001)(19627235002)(6286002)(508600001)(2906002)(7636003)(966005)(55016003)(36756003)(82310400004)(36860700001)(86362001)(7696005)(53546011)(2616005)(54906003)(8936002)(316002)(70586007)(8676002)(70206006)(5660300002)(1076003)(6916009)(16526019)(47076005)(6666004)(426003)(186003)(26005)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 14:56:27.7849 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2beb311-6194-4517-2b3a-08d9b27f417d 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: DM6NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4839 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 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/30/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/5d3a7aab1960e4216e97dca86a24cebcd22685f7 Thanks. Xueming Li --- >From 5d3a7aab1960e4216e97dca86a24cebcd22685f7 Mon Sep 17 00:00:00 2001 From: Jie Wang Date: Mon, 15 Nov 2021 11:29:58 +0800 Subject: [PATCH] app/testpmd: fix DCB in VT configuration Cc: Xueming Li [ upstream commit cbe70fded831acac4ccbde8e11ba33ce8c24227c ] When set port DCB in VT mode enabled, it should remove RSS HASH offload before reconfiguring the device and queues. Because port multi-queue mode is changed from RSS to DCB in VT. Fixes: 2a977b891f99 ("app/testpmd: fix DCB configuration") Signed-off-by: Jie Wang Acked-by: Aman Singh --- app/test-pmd/testpmd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 35a48e39cc..5af7dea3fe 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -3582,6 +3582,13 @@ init_port_dcb_config(portid_t pid, if (retval < 0) return retval; port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_VLAN_FILTER; + /* remove RSS HASH offload for DCB in vt mode */ + if (port_conf.rxmode.mq_mode == ETH_MQ_RX_VMDQ_DCB) { + port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_RSS_HASH; + for (i = 0; i < nb_rxq; i++) + rte_port->rx_conf[i].offloads &= + ~DEV_RX_OFFLOAD_RSS_HASH; + } /* re-configure the device . */ retval = rte_eth_dev_configure(pid, nb_rxq, nb_rxq, &port_conf); -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:04.297779601 +0800 +++ 0015-app-testpmd-fix-DCB-in-VT-configuration.patch 2021-11-28 22:41:03.223542730 +0800 @@ -1 +1 @@ -From cbe70fded831acac4ccbde8e11ba33ce8c24227c Mon Sep 17 00:00:00 2001 +From 5d3a7aab1960e4216e97dca86a24cebcd22685f7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit cbe70fded831acac4ccbde8e11ba33ce8c24227c ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index a66dfb297c..c18942279a 100644 +index 35a48e39cc..5af7dea3fe 100644 @@ -24 +26 @@ -@@ -3948,6 +3948,13 @@ init_port_dcb_config(portid_t pid, +@@ -3582,6 +3582,13 @@ init_port_dcb_config(portid_t pid, @@ -27 +29 @@ - port_conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_VLAN_FILTER; + port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_VLAN_FILTER; @@ -29,2 +31,2 @@ -+ if (port_conf.rxmode.mq_mode == RTE_ETH_MQ_RX_VMDQ_DCB) { -+ port_conf.rxmode.offloads &= ~RTE_ETH_RX_OFFLOAD_RSS_HASH; ++ if (port_conf.rxmode.mq_mode == ETH_MQ_RX_VMDQ_DCB) { ++ port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_RSS_HASH; @@ -33 +35 @@ -+ ~RTE_ETH_RX_OFFLOAD_RSS_HASH; ++ ~DEV_RX_OFFLOAD_RSS_HASH;