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 BC217A0555 for ; Wed, 25 May 2022 18:29:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9D3B3400EF; Wed, 25 May 2022 18:29:57 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id BB878400EF for ; Wed, 25 May 2022 18:29:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496196; 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=hrudSZZ1scuf2QTdJAroPMLwbMNlCPs84HpB+uIji+U=; b=Hzp4QFvTftGrXYG50GWtZCCyFizhQvL5Ri0ucIWN7AT/isUi3nn7IIN+x5oJSoLVpQR3JG 9DE8V6oh2BmNfZdogeLxQQ9JJxMxgFX+CZp/NLld71p3GfTmQT5vi6jcs3iHzRHSfxh0FY hev1kUQfVmQAmdLGGqnwx/+ikqrudnU= 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-332-tsYps4PJPlu_sjgkMna3Dg-1; Wed, 25 May 2022 12:29:53 -0400 X-MC-Unique: tsYps4PJPlu_sjgkMna3Dg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C0E9C3C0CD54; Wed, 25 May 2022 16:29:52 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDDA92026D64; Wed, 25 May 2022 16:29:51 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: fix Rx configuration' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:31 +0100 Message-Id: <20220525162847.711753-39-ktraynor@redhat.com> In-Reply-To: <20220525162847.711753-1-ktraynor@redhat.com> References: <20220525162847.711753-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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 05/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/3774986bddc587ba75036d6f897945f73ba5e0d3 Thanks. Kevin --- >From 3774986bddc587ba75036d6f897945f73ba5e0d3 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 27 Apr 2022 20:28:08 +0530 Subject: [PATCH] net/bnxt: fix Rx configuration [ upstream commit 0a90c56eacd5e345b42c7f152d33ca4c39343a52 ] We are currently not handling RX/RSS modes correctly. After launching testpmd with multiple RXQs, if the user tries to set the number of RXQs to 1, driver is not updating the "hash_type" and "hash_mode" values of the VNICs. As a result, driver issues bnxt_vnic_rss_configure() unnecessarily and the FW command fails. Fixed bnxt_mq_rx_configure() to update VNIC RSS fields unconditionally. Fixes: 4191bc8f79a8 ("net/bnxt: handle multi queue mode properly") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_rxq.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index 3c2283b8c6..8977138012 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -66,4 +66,5 @@ int bnxt_mq_rx_configure(struct bnxt *bp) { struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf; + struct rte_eth_rss_conf *rss = &bp->rss_conf; const struct rte_eth_vmdq_rx_conf *conf = &dev_conf->rx_adv_conf.vmdq_rx_conf; @@ -173,27 +174,17 @@ skip_filter_allocation: bp->rx_num_qs_per_vnic = nb_q_per_grp; - if (dev_conf->rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) { - struct rte_eth_rss_conf *rss = &bp->rss_conf; + for (i = 0; i < bp->nr_vnics; i++) { + uint32_t lvl = RTE_ETH_RSS_LEVEL(rss->rss_hf); - for (i = 0; i < bp->nr_vnics; i++) { - uint32_t lvl = RTE_ETH_RSS_LEVEL(rss->rss_hf); + vnic = &bp->vnic_info[i]; + vnic->hash_type = bnxt_rte_to_hwrm_hash_types(rss->rss_hf); + vnic->hash_mode = bnxt_rte_to_hwrm_hash_level(bp, rss->rss_hf, lvl); - vnic = &bp->vnic_info[i]; - vnic->hash_type = - bnxt_rte_to_hwrm_hash_types(rss->rss_hf); - vnic->hash_mode = - bnxt_rte_to_hwrm_hash_level(bp, - rss->rss_hf, - lvl); - - /* - * Use the supplied key if the key length is - * acceptable and the rss_key is not NULL - */ - if (rss->rss_key && - rss->rss_key_len <= HW_HASH_KEY_SIZE) - memcpy(vnic->rss_hash_key, - rss->rss_key, rss->rss_key_len); - } + /* + * Use the supplied key if the key length is + * acceptable and the rss_key is not NULL + */ + if (rss->rss_key && rss->rss_key_len <= HW_HASH_KEY_SIZE) + memcpy(vnic->rss_hash_key, rss->rss_key, rss->rss_key_len); } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:59.503609993 +0100 +++ 0039-net-bnxt-fix-Rx-configuration.patch 2022-05-25 17:26:58.625828417 +0100 @@ -1 +1 @@ -From 0a90c56eacd5e345b42c7f152d33ca4c39343a52 Mon Sep 17 00:00:00 2001 +From 3774986bddc587ba75036d6f897945f73ba5e0d3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0a90c56eacd5e345b42c7f152d33ca4c39343a52 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org