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 2D2BFA0555 for ; Wed, 25 May 2022 18:30:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 28C234281C; Wed, 25 May 2022 18:30:08 +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 4BB9042B75 for ; Wed, 25 May 2022 18:30:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496205; 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=b8usoc7WxZaqppukPZRIR6dFcTMAMWNNpAAuh/XWu3Y=; b=KTzEl1XOOtOVszWzR0Vd/UYT0bIgTABG6hzhe4lTKsteRea1fczcjli0td+1fvESTaKpy8 9PUcs0QUgUY06Cmgns/nXvOzcJJkKfwa82iXTMy2dRVEKe4VnrV087w6cT2lhLvbfpDnyY 6ROTdVoMEunpN31G4Cbhv1mDwoiQkEU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-460-yZTnSv1hPw2zWAv7ts9olA-1; Wed, 25 May 2022 12:30:02 -0400 X-MC-Unique: yZTnSv1hPw2zWAv7ts9olA-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 88EDB80418B; Wed, 25 May 2022 16:30:00 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B89C2026D64; Wed, 25 May 2022 16:29:58 +0000 (UTC) From: Kevin Traynor To: Somnath Kotur Cc: Ajit Khaparde , Kalesh AP , dpdk stable Subject: patch 'net/bnxt: handle queue stop during RSS flow create' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:35 +0100 Message-Id: <20220525162847.711753-43-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/8c464cf6185a3fd42b7d3e504489248b03a4e3a2 Thanks. Kevin --- >From 8c464cf6185a3fd42b7d3e504489248b03a4e3a2 Mon Sep 17 00:00:00 2001 From: Somnath Kotur Date: Wed, 27 Apr 2022 20:28:14 +0530 Subject: [PATCH] net/bnxt: handle queue stop during RSS flow create [ upstream commit 962a521291e303e54a3b9a766ec43a30e23c2083 ] The programming of the RSS table was not taking into account if any of the queues in the set were stopped prior to the flow creation, hence leading to a vnic RSS config cmd failure thrown by the FW. Fix by programming only the active queues in the RSS action queue set. Fixes: 239695f754cb ("net/bnxt: enhance RSS action support") Signed-off-by: Somnath Kotur Reviewed-by: Ajit Khaparde Reviewed-by: Kalesh AP --- drivers/net/bnxt/bnxt_flow.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c index 2bb56692a5..8bdf2405f0 100644 --- a/drivers/net/bnxt/bnxt_flow.c +++ b/drivers/net/bnxt/bnxt_flow.c @@ -1116,5 +1116,5 @@ bnxt_vnic_rss_cfg_update(struct bnxt *bp, { const struct rte_flow_action_rss *rss; - unsigned int rss_idx, i, j; + unsigned int rss_idx, i, j, fw_idx; uint16_t hash_type; uint64_t types; @@ -1233,9 +1233,19 @@ bnxt_vnic_rss_cfg_update(struct bnxt *bp, /* Prepare the indirection table */ - for (rss_idx = 0; rss_idx < HW_HASH_INDEX_SIZE; rss_idx++) { + for (rss_idx = 0, fw_idx = 0; rss_idx < HW_HASH_INDEX_SIZE; + rss_idx++, fw_idx++) { + uint8_t *rxq_state = bp->eth_dev->data->rx_queue_state; struct bnxt_rx_queue *rxq; uint32_t idx; - idx = rss->queue[rss_idx % rss->queue_num]; + for (i = 0; i < bp->rx_cp_nr_rings; i++) { + idx = rss->queue[fw_idx % rss->queue_num]; + if (rxq_state[idx] != RTE_ETH_QUEUE_STATE_STOPPED) + break; + fw_idx++; + } + + if (i == bp->rx_cp_nr_rings) + return 0; if (BNXT_CHIP_P5(bp)) { -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:59.583611510 +0100 +++ 0043-net-bnxt-handle-queue-stop-during-RSS-flow-create.patch 2022-05-25 17:26:58.630828424 +0100 @@ -1 +1 @@ -From 962a521291e303e54a3b9a766ec43a30e23c2083 Mon Sep 17 00:00:00 2001 +From 8c464cf6185a3fd42b7d3e504489248b03a4e3a2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 962a521291e303e54a3b9a766ec43a30e23c2083 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index fc5bacf82c..f8e10968e3 100644 +index 2bb56692a5..8bdf2405f0 100644