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 2A110A057F for ; Tue, 28 Jun 2022 17:20:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2665940042; Tue, 28 Jun 2022 17:20:17 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9D57240042 for ; Tue, 28 Jun 2022 17:20:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656429615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z7C4XvrqeEXK4o5adAAUtFaJup84tVVevY7pRsZEbY4=; b=AFxrE3CcxhTCBxCZdL/e3Siv6MlZi76vAPrY7qfBzWS9PWpfXIhFQ5pwBLeQpoVxjQXXbB n1P8v/Sdo0G1uqCRc85AlpXqWbfwuZ2uZ3OERBtQjY0NYhmQd02VMLCogJIbj46Q0zZ8+h cn2N+vWdBuy3TE67cTEEdxPGl4O5F+0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-623-etzdq7nUPPud348D6Y_bGQ-1; Tue, 28 Jun 2022 11:20:12 -0400 X-MC-Unique: etzdq7nUPPud348D6Y_bGQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4670229DD9A2; Tue, 28 Jun 2022 15:20:12 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 264AC1415108; Tue, 28 Jun 2022 15:20:11 +0000 (UTC) From: Kevin Traynor To: Ajit Khaparde Cc: Somnath Kotur , Kalesh AP , Andy Gospodarek , dpdk stable Subject: patch 'net/bnxt: fix switch domain allocation' has been queued to stable release 21.11.2 Date: Tue, 28 Jun 2022 16:19:33 +0100 Message-Id: <20220628151938.2278711-21-ktraynor@redhat.com> In-Reply-To: <20220628151938.2278711-1-ktraynor@redhat.com> References: <20220628151938.2278711-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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/30/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/7991efd0ba3f4dd49e1c501b323215e5b1c65e58 Thanks. Kevin --- >From 7991efd0ba3f4dd49e1c501b323215e5b1c65e58 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Wed, 15 Jun 2022 20:26:57 +0530 Subject: [PATCH] net/bnxt: fix switch domain allocation [ upstream commit aef3baca157d8202c26c5e034a9ab920da60d414 ] Allocate switch domain after the trusted VF capability is queried from the FW. Currently we are calling the function earlier. Since the switch domain is allocated only for PFs or trusted VF, the current location of code fails to allocate the domain during init. But during cleanup we try to free the domain incorrectly. Fix the behavior by changing the sequence of function calls. Fixes: 3127f99274b67 ("net/bnxt: refactor init/uninit") Signed-off-by: Ajit Khaparde Reviewed-by: Somnath Kotur Reviewed-by: Kalesh AP Reviewed-by: Andy Gospodarek --- drivers/net/bnxt/bnxt_ethdev.c | 45 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 68e28f95f6..1d1f0f93ad 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -5287,4 +5287,23 @@ bnxt_init_locks(struct bnxt *bp) } +/* This should be called after we have queried trusted VF cap */ +static int bnxt_alloc_switch_domain(struct bnxt *bp) +{ + int rc = 0; + + if (BNXT_PF(bp) || BNXT_VF_IS_TRUSTED(bp)) { + rc = rte_eth_switch_domain_alloc(&bp->switch_domain_id); + if (rc) + PMD_DRV_LOG(ERR, + "Failed to alloc switch domain: %d\n", rc); + else + PMD_DRV_LOG(INFO, + "Switch domain allocated %d\n", + bp->switch_domain_id); + } + + return rc; +} + static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev) { @@ -5295,4 +5314,8 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev) return rc; + rc = bnxt_alloc_switch_domain(bp); + if (rc) + return rc; + if (!reconfig_dev) { rc = bnxt_setup_mac_addr(bp->eth_dev); @@ -5734,22 +5757,4 @@ err: } -static int bnxt_alloc_switch_domain(struct bnxt *bp) -{ - int rc = 0; - - if (BNXT_PF(bp) || BNXT_VF_IS_TRUSTED(bp)) { - rc = rte_eth_switch_domain_alloc(&bp->switch_domain_id); - if (rc) - PMD_DRV_LOG(ERR, - "Failed to alloc switch domain: %d\n", rc); - else - PMD_DRV_LOG(INFO, - "Switch domain allocated %d\n", - bp->switch_domain_id); - } - - return rc; -} - /* Allocate and initialize various fields in bnxt struct that * need to be allocated/destroyed only once in the lifetime of the driver @@ -5828,8 +5833,4 @@ static int bnxt_drv_init(struct rte_eth_dev *eth_dev) return rc; - rc = bnxt_alloc_switch_domain(bp); - if (rc) - return rc; - return rc; } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-28 16:18:04.534815587 +0100 +++ 0021-net-bnxt-fix-switch-domain-allocation.patch 2022-06-28 16:18:04.050387175 +0100 @@ -1 +1 @@ -From aef3baca157d8202c26c5e034a9ab920da60d414 Mon Sep 17 00:00:00 2001 +From 7991efd0ba3f4dd49e1c501b323215e5b1c65e58 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit aef3baca157d8202c26c5e034a9ab920da60d414 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 0f0f40b95b..34f21496a4 100644 +index 68e28f95f6..1d1f0f93ad 100644 @@ -28 +29 @@ -@@ -5288,4 +5288,23 @@ bnxt_init_locks(struct bnxt *bp) +@@ -5287,4 +5287,23 @@ bnxt_init_locks(struct bnxt *bp) @@ -52 +53 @@ -@@ -5296,4 +5315,8 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev) +@@ -5295,4 +5314,8 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev) @@ -61 +62 @@ -@@ -5735,22 +5758,4 @@ err: +@@ -5734,22 +5757,4 @@ err: @@ -84 +85 @@ -@@ -5829,8 +5834,4 @@ static int bnxt_drv_init(struct rte_eth_dev *eth_dev) +@@ -5828,8 +5833,4 @@ static int bnxt_drv_init(struct rte_eth_dev *eth_dev)