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 27F81A034F for ; Wed, 10 Nov 2021 07:35:58 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A86D40142; Wed, 10 Nov 2021 07:35:58 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2055.outbound.protection.outlook.com [40.107.236.55]) by mails.dpdk.org (Postfix) with ESMTP id BD70440142 for ; Wed, 10 Nov 2021 07:35:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZurAzelroScJxzZ28y66OS/jHcf1nJwA3O5+S9eNL+l6Mc2wmNdqteo0/LtcSdWhU892p/oVqjxiHoyisGGMD9URhXBv8ERBC+W+zT1ABevNDev4vxaMKf68TRI5mwhxglp01k7CtBeynCgoRmz6y7yfEqLF1iLLj6JlRJHqKRQ3xaVYKjdOcIzpK6f9j+fZRIvsjeKxjC0Bx4FQ+N1RO/TDEZAajQy1+yVb0yzlntJpAvu1zpEf8tNaAMpVB2HF2xTNL28wF0O/brfby6+oXZ7oLBOuD/qssAa9G85vwLNw4elzSVDbIHWWop+Bljot/dDrMNgeLZPsSiCFQ/xA5A== 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=G9q6+MuClSAVpddYAZdb43eZxb/PMO9mJxhvWrorqpY=; b=iIZpeiyDm2xAystMDIV+mVI5i2dUnnmSkbJmJF4tYp0OiPz7SFNLvLuPbW4qTnUUex1C5PDVf7ui591cC2WAmsWkVveZQMds+sFvMRU1PIQHCO6wVL/4pS40P7nIoLJBa2YE7tEJSr+cgwxHAeT14kZ7bj9t2ZgqKabWr8LiZMzCmoidgXI1dqSnkeWlPQ/WoWyl1stEkNO63wfwWlxODU4HgIxFIAccJDPYVDV9akjHXpXPlnlAJmZbI6O25e3aonweTqwXA/NN20q4RwqCE+mw2uuDYbgAVH2kkPZuIgq+/NDXymDvt7LWAsKIIctoxwTT7uhfBFlPPfyG6WsFDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=broadcom.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=G9q6+MuClSAVpddYAZdb43eZxb/PMO9mJxhvWrorqpY=; b=Si9UVzNzzsHR2bbUD/Xy/RPcK2eKIIulB6Vf4KdcDnVjDBRbumYYjf/ulGm9O4d/25b8tWtkAc3BLxe8upkTHl1cGryUsg2xkKrj31CSl/QJY3S+1kKYv/UVB53gFKtY7K6qIGhEskfx8LZpIocrE22W++VggsVv5yWcmNKfD+PfxeEFbHm3IbYhlVjBhS000eEx4ugkuHiA4BHhQFzTdLBHe1WRT3RpDqVMCcqlbzFQtch6FFH0dh4Wj1OJzMQfWXe6a015xn0VdY8kw4wyi/cchpLTMPp0AINPvZMZYO0FWUfLAkg8YCp+7BKKGTLZ++wEN4282+a9A7P60J9qFw== Received: from DS7PR03CA0352.namprd03.prod.outlook.com (2603:10b6:8:55::32) by BY5PR12MB4226.namprd12.prod.outlook.com (2603:10b6:a03:203::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.16; Wed, 10 Nov 2021 06:35:53 +0000 Received: from DM6NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:8:55:cafe::86) by DS7PR03CA0352.outlook.office365.com (2603:10b6:8:55::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:35:53 +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 DM6NAM11FT005.mail.protection.outlook.com (10.13.172.238) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:35:53 +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; Wed, 10 Nov 2021 06:35:51 +0000 From: Xueming Li To: Kalesh AP CC: Luca Boccassi , Ajit Khaparde , Lance Richardson , dpdk stable Date: Wed, 10 Nov 2021 14:28:34 +0800 Message-ID: <20211110063216.2744012-31-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-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: df8db7e5-6526-431b-f25d-08d9a4145849 X-MS-TrafficTypeDiagnostic: BY5PR12MB4226: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uD6y19rGC6zEC2R6cpJ6qLJbI9xLwexqwfniJ5LsdjqZZaxz+O7e6M2Z0PuFHi1R2XBDTopTV9kHjBpVaHAgRMWc4np7rDZOnKc8sW7dsLK+i886wmuwWsKSRywnzWlh9KaDzgWCU9pdf1mhfLv8GRU7EcJ1UG0R1SGAp867DwZ8mGAyK5A2m5+y5S6mwQ1L0ghC92KJst6rk5VTJm6GPwR9kDoV0THDVxqdaSHhKUs7psOl/JNu765dOLd8eBn8IaPNt9V8gkzGLZm0SfdCcyZsQX2P+gpEvwZjifn07DU8xfYxDC4N1gV9tEK98SLBMJBKMCFs9oqMhaJLxeneOYVmlXUoKP/mBStBeyztn7oLkRaU32INmvFpVW403gOboZAm+ZHxTO1eOq+Jf+ZA1oWNCwrSpAgKMOJvTFi9/MpO/7USuelzJ7m6Lzxm0KROv3ZQXKOGE5gtwj4AXZyGrt+O54HcuAdPWqQu5AZu4pdhDopwrBn1ICk+tP4OdloqTh0b0dEiTL3NTEkXQ/3oYFmj20GM2wXXIkcjS5mPiuqo17Kr6Z1+YkHyW3rtybfghpI9QgGu8Q37SEiO2NCbH/lRUtUj2ybvoih8NwbFOLBDAOBJS6LI8piodRxL/9cquhRSVnno9/AKhwbWC9VJmOjuQpCpeLZRuh8eQPe+fkJu9uGZ077krOblV6zZM8zp9Ywl7AT/eHUF8DoWoK9FCrzumOYiNvgY8KnQDESiUBlE+8twuGnJaagbtojHJhglnohhL951IX7CRQx2WvL21/wWcUMwyQIrAbqPnC3UGwCNMiz8/VKJrbfdRyqydgymGT3OcrcaGxvI96IwRRUPcg== 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)(46966006)(36840700001)(36860700001)(2906002)(86362001)(36756003)(4326008)(5660300002)(47076005)(356005)(55016002)(36906005)(6286002)(7636003)(4001150100001)(966005)(426003)(54906003)(8676002)(316002)(6916009)(508600001)(83380400001)(16526019)(336012)(1076003)(8936002)(186003)(26005)(82310400003)(70206006)(53546011)(7696005)(70586007)(6666004)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:35:53.5908 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: df8db7e5-6526-431b-f25d-08d9a4145849 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: DM6NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4226 Subject: [dpdk-stable] patch 'net/bnxt: fix double allocation of ring groups' has been queued to stable release 20.11.4 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.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/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/fc300c1c4a2ec069fac7cc94f0960fe6c8174375 Thanks. Xueming Li --- >From fc300c1c4a2ec069fac7cc94f0960fe6c8174375 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 1 Sep 2021 09:30:01 +0530 Subject: [PATCH] net/bnxt: fix double allocation of ring groups Cc: Xueming Li [ upstream commit 36a97cd23fc916ac475a0b827074b5645fff0cfe ] After commit "d68249f88266", driver allocates ring groups in bnxt_alloc_hwrm_rx_ring(). But during port start, driver invokes bnxt_alloc_hwrm_rx_ring() followed by bnxt_alloc_all_hwrm_ring_grps(). This will cause the FW command failure in bnxt_alloc_all_hwrm_ring_grps() To fix this, just don't create the ring group if it is already created. Fixes: 9b63c6fd70e3 ("net/bnxt: support Rx/Tx queue start/stop") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Lance Richardson --- drivers/net/bnxt/bnxt_hwrm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index d8ff3c7920..50b41d82d3 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1737,6 +1737,10 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int idx) struct hwrm_ring_grp_alloc_input req = {.req_type = 0 }; struct hwrm_ring_grp_alloc_output *resp = bp->hwrm_cmd_resp_addr; + /* Don't attempt to re-create the ring group if it is already created */ + if (bp->grp_info[idx].fw_grp_id != INVALID_HW_RING_ID) + return 0; + HWRM_PREP(&req, HWRM_RING_GRP_ALLOC, BNXT_USE_CHIMP_MB); req.cr = rte_cpu_to_le_16(bp->grp_info[idx].cp_fw_ring_id); -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:03.464856411 +0800 +++ 0030-net-bnxt-fix-double-allocation-of-ring-groups.patch 2021-11-10 14:17:01.777413521 +0800 @@ -1 +1 @@ -From 36a97cd23fc916ac475a0b827074b5645fff0cfe Mon Sep 17 00:00:00 2001 +From fc300c1c4a2ec069fac7cc94f0960fe6c8174375 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 36a97cd23fc916ac475a0b827074b5645fff0cfe ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 0e0e266589..585cdeded8 100644 +index d8ff3c7920..50b41d82d3 100644 @@ -27 +29 @@ -@@ -1873,6 +1873,10 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int idx) +@@ -1737,6 +1737,10 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int idx)