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 840F3A0543 for ; Tue, 21 Jun 2022 10:07:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F22F40151; Tue, 21 Jun 2022 10:07:18 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2067.outbound.protection.outlook.com [40.107.243.67]) by mails.dpdk.org (Postfix) with ESMTP id A44C84282D for ; Tue, 21 Jun 2022 10:07:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=icGH+34QkANTSqAyz0fCLIr88Jwn6TV/7DcYXk8swXtZti/sCasa28W3TZsyPxVNo2xC0XHgAkeH/Eg8DqRPPGnrFlLzA0NfTlfwcWSjx1XmdmlyuX3eDRtq1/KsgliJ3hsB/574eb+T1spsMVZ6knX+R0EKXrI0bRIPRLrD+33lmt+S8SXcrnJ8SpdBWhBoQP2WvWTKJ5HKVZSo//yTivqWqH9JCKXYgNArwpDtpkRgQ5Kw/iWNZt8UTgAm/DZmbpsjoHXiKULfZ8si39w8iW457YQQNf5K7NZ/ZJmRJHquf7OCpadJTw07ekHDs9mbRr39xVvBlup/GsifXr8s7w== 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=4LjYantXhfvbN0rsjGcyzvkMDNhyaqK0kOfzKYFWhsg=; b=RTm1x0TspdUgCeIPfjK2sVXCDFsjhxVdOFU9SDGaJr5lNyQSUrk69r2yWgMR4aI4VCxQuyACDASiyhWJT5gSiCKRrJJDuB/rBy6z1PKSMXfDFEwaSyb1O+QhD/eUEkXMPvO5OG6/PP6Mp11K6c2AnapKpPzijJazm2bkCbRu3zwEGbsTYLEzWYjumfG9bhxICYCJQbbQqj0Aw7o5vR7ZZNSG0j01cbbSMB/7MzsfszhlTbZhPwzup3XtMn2wdBjxLnFQBbH2Q3MARG2PQVO+vyZ+l9BOiZ+4rDHK2wukbf9KYd45cY+yW0KOiSEVpI5EHsp4Gx4JSTQ0AGXj8czBCw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) smtp.rcpttodomain=broadcom.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=4LjYantXhfvbN0rsjGcyzvkMDNhyaqK0kOfzKYFWhsg=; b=jOzeaCdtanx9QzCgVC20szTmtRMPErG4ZcJInLRWFGlIeUKBSwkN79PKywGDZYBoIpl8V/4alCk3qO6r/A0RUBPHhQGB13vec+mMS5J8PUrBnonmQpuTvhNdb0p/HFKA30lXUlK0Ik5Hmzw5s3OX7ae346iXiHA3UnRDvt2uji6f5OHlu31OkjfDoIHoJSQ+pAcpTYdK6vghAZzrI6Xuedp/KViJ9Vdpd6kV6zNnSJiafJXqT8bLS5UP+EnxhVeu5K0mmIjL7rr67vcK6G8oiMx+UBsZapvqQhsC61BLC+H8BDQZoqGytlbEXDbHYlU+lGUaCfqSfn7Ugw7YYayjMA== Received: from BN6PR12CA0025.namprd12.prod.outlook.com (2603:10b6:405:70::11) by BYAPR12MB3607.namprd12.prod.outlook.com (2603:10b6:a03:dd::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Tue, 21 Jun 2022 08:07:14 +0000 Received: from BN8NAM11FT004.eop-nam11.prod.protection.outlook.com (2603:10b6:405:70:cafe::7) by BN6PR12CA0025.outlook.office365.com (2603:10b6:405:70::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:07:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.234) 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 12.22.5.234 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.234; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.234) by BN8NAM11FT004.mail.protection.outlook.com (10.13.176.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:07:14 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:07:13 +0000 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.22; Tue, 21 Jun 2022 01:07:11 -0700 From: Xueming Li To: Somnath Kotur CC: Ajit Khaparde , Kalesh AP , dpdk stable Subject: patch 'net/bnxt: fix ring group on Rx restart' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:52 +0300 Message-ID: <20220621080301.2315720-47-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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-Office365-Filtering-Correlation-Id: 79d5bbed-87c2-45f4-dbd1-08da535d0d42 X-MS-TrafficTypeDiagnostic: BYAPR12MB3607:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DfdoBIKEHnRsyct0fNaPsAES6BgYUnXqhiKTDIQQGyN8i8KxQ/3ZOSf9Hq1ibaI+JiATyUXBTbDo8cFxjLHeSST+C5zCZqPzFcP0BEq3pdY4CwXthEBasrkDOURkV3aGC39LBTegsBIlVd8f4h7/McKyMDTrwTzMtrHzQHxH0Slvlbdv3GVE2zPizxgjmpmxvM6ZgJbcHjHsVVySoQ4LRSHFhr0OxjUt4T49XkbAI0O9WG0KAaxeb/n7bsjqBz3sDYiY9OslL0ooXs4BQfyH02q0snXn5a3HZjOPwsuujsxoTCa9WHoYM5WB4LxdCZ14rDzSz7N1VLzn8vj3WwB3joAP5v91c39mHGqkCTW6a87HZoCckQHMx7Bhwt1NUdJOwXNWTxPYyVv08sjSR2H9POGg1l2j+92uLov/dbnkw4ew1V1gQgvgb2AHAfG4m3uKqjmAPg5M3C39PNlZ+bE+LtCn30TjL4LzAwCsyGU7oCqr1aTZ3wZUirNpZKp4ywpSZbpR4e6Kv1yF/loVE2s9VqrRzHoDn68nD1iYdo57Ojv+JDivKDvKLwX7H2Ut3EPDbtH1UcyVmyhji9NJhSZtgnt+dK2Wb7hWqEi+k7d0jgl1+I2wgjUQvOy04NeYvlHcxDfn38thHNNNuGIKhuH3e+UhaKCnshhQil22Hz76wOJzjdb7PiCZUhG9vaF8M+WD8LZa9QPQ8h4LpRWWNXCjQhLmCAkVFiE4jllDrujJcL8UkVIfAeWDD00oDCuq9vD/UQFipBGNPritx/c5OoGlblo7of1F7dxy75BgYYMPd0XO5/6h2fOU0QDFqZ3gNZXeuSx5j1fN5iVAe61aKac58kNP68AqQ4UL88WAk7Xgljs= X-Forefront-Antispam-Report: CIP:12.22.5.234; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(376002)(136003)(346002)(39860400002)(396003)(36840700001)(46966006)(40470700004)(966005)(8676002)(4326008)(6666004)(478600001)(70206006)(54906003)(70586007)(2616005)(1076003)(36756003)(186003)(16526019)(41300700001)(6916009)(426003)(83380400001)(55016003)(8936002)(47076005)(336012)(316002)(6286002)(356005)(40460700003)(86362001)(2906002)(40480700001)(5660300002)(82740400003)(26005)(7696005)(53546011)(82310400005)(81166007)(36860700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:07:14.4333 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 79d5bbed-87c2-45f4-dbd1-08da535d0d42 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.234]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT004.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3607 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.6 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/23/22. 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/167d0cbbfd534297c41dc07d25d09608cadcf0d0 Thanks. Xueming Li --- >From 167d0cbbfd534297c41dc07d25d09608cadcf0d0 Mon Sep 17 00:00:00 2001 From: Somnath Kotur Date: Wed, 27 Apr 2022 20:28:12 +0530 Subject: [PATCH] net/bnxt: fix ring group on Rx restart Cc: Xueming Li [ upstream commit 1b27f8245eee1209d9ee27304fae3515e93ef5b0 ] When an Rx queue is stopped and restarted, as part of that workflow, for cards that have ring groups, we free and reallocate the ring group. This new ring group is not communicated to the VNIC though via HWRM_VNIC_CFG cmd. Fix to issue HWRM_VNIC_CFG cmd on all adapters now in this scenario. Fixes: ed0ae3502fc9 ("net/bnxt: update ring group after ring stop start") Signed-off-by: Somnath Kotur Reviewed-by: Ajit Khaparde Reviewed-by: Kalesh AP --- drivers/net/bnxt/bnxt_rxq.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index 8145264950..7959d48f47 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -457,10 +457,11 @@ int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id) if (rc) return rc; - if (BNXT_CHIP_THOR(bp)) { - /* Reconfigure default receive ring and MRU. */ - bnxt_hwrm_vnic_cfg(bp, rxq->vnic); - } + if (BNXT_HAS_RING_GRPS(bp)) + rxq->vnic->dflt_ring_grp = bp->grp_info[rx_queue_id].fw_grp_id; + /* Reconfigure default receive ring and MRU. */ + bnxt_hwrm_vnic_cfg(bp, rxq->vnic); + PMD_DRV_LOG(INFO, "Rx queue started %d\n", rx_queue_id); if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) { -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:51.413173827 +0800 +++ 0046-net-bnxt-fix-ring-group-on-Rx-restart.patch 2022-06-21 15:37:49.054451311 +0800 @@ -1 +1 @@ -From 1b27f8245eee1209d9ee27304fae3515e93ef5b0 Mon Sep 17 00:00:00 2001 +From 167d0cbbfd534297c41dc07d25d09608cadcf0d0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1b27f8245eee1209d9ee27304fae3515e93ef5b0 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 8147404d9c..9b5ff4ce2d 100644 +index 8145264950..7959d48f47 100644 @@ -26 +28 @@ -@@ -488,10 +488,11 @@ int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id) +@@ -457,10 +457,11 @@ int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id) @@ -30 +32 @@ -- if (BNXT_CHIP_P5(bp)) { +- if (BNXT_CHIP_THOR(bp)) { @@ -41 +43 @@ - if (dev_conf->rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) { + if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {