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 C74C3A0A02 for ; Mon, 17 May 2021 18:21:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5AA7840041; Mon, 17 May 2021 18:21:32 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 19CAD40041 for ; Mon, 17 May 2021 18:21:31 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifzm-0000Nq-Ru; Mon, 17 May 2021 16:21:30 +0000 From: Christian Ehrhardt To: Somnath Kotur Cc: Ajit Khaparde , dpdk stable Date: Mon, 17 May 2021 18:21:07 +0200 Message-Id: <20210517162125.3178901-3-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517162125.3178901-1-christian.ehrhardt@canonical.com> References: <20210517162125.3178901-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: refactor multi-queue Rx configuration' has been queued to stable release 19.11.9 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 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/1a03f070178a1b75ea0724fc6613e8a7eec00ba0 Thanks. Christian Ehrhardt --- >From 1a03f070178a1b75ea0724fc6613e8a7eec00ba0 Mon Sep 17 00:00:00 2001 From: Somnath Kotur Date: Mon, 26 Apr 2021 11:37:54 +0530 Subject: [PATCH] net/bnxt: refactor multi-queue Rx configuration [ upstream commit 21b1677d87a23a9695be0cbcbdf38607a2d58f84 ] Eliminate separate codepath/handling for single queue as the multiqueue code path takes care of it as well. The only difference being the end_grp_id being 1 now instead of 0 for single queue, but that does not matter for single queue and does not alter any functionality. Fixes: 6133f207970c ("net/bnxt: add Rx queue create/destroy") Signed-off-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxq.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index 084f7ecf8f..376a7135a4 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -40,35 +40,6 @@ int bnxt_mq_rx_configure(struct bnxt *bp) bp->nr_vnics = 0; - /* Single queue mode */ - if (bp->rx_cp_nr_rings < 2) { - vnic = &bp->vnic_info[0]; - if (!vnic) { - PMD_DRV_LOG(ERR, "VNIC alloc failed\n"); - rc = -ENOMEM; - goto err_out; - } - vnic->flags |= BNXT_VNIC_INFO_BCAST; - bp->nr_vnics++; - - rxq = bp->eth_dev->data->rx_queues[0]; - rxq->vnic = vnic; - - vnic->func_default = true; - vnic->start_grp_id = 0; - vnic->end_grp_id = vnic->start_grp_id; - filter = bnxt_alloc_filter(bp); - if (!filter) { - PMD_DRV_LOG(ERR, "L2 filter alloc failed\n"); - rc = -ENOMEM; - goto err_out; - } - filter->mac_index = 0; - filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_OUTERMOST; - STAILQ_INSERT_TAIL(&vnic->filter, filter, next); - goto out; - } - /* Multi-queue mode */ if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_VMDQ_DCB_RSS) { /* VMDq ONLY, VMDq+RSS, VMDq+DCB, VMDq+DCB+RSS */ @@ -163,7 +134,6 @@ skip_filter_allocation: end_grp_id += nb_q_per_grp; } -out: bp->rx_num_qs_per_vnic = nb_q_per_grp; if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) { -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:36.907424151 +0200 +++ 0192-net-bnxt-refactor-multi-queue-Rx-configuration.patch 2021-05-17 17:40:29.551812470 +0200 @@ -1 +1 @@ -From 21b1677d87a23a9695be0cbcbdf38607a2d58f84 Mon Sep 17 00:00:00 2001 +From 1a03f070178a1b75ea0724fc6613e8a7eec00ba0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 21b1677d87a23a9695be0cbcbdf38607a2d58f84 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 2b0d3d4ac7..45e0c3d01c 100644 +index 084f7ecf8f..376a7135a4 100644