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 11CD7A0555 for ; Wed, 25 May 2022 18:30:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0BE7A400EF; Wed, 25 May 2022 18:30:05 +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 C32E242B6C for ; Wed, 25 May 2022 18:30:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496202; 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=566EUKwyBGVdx6w4RtBvmdxghMdOOpe3aHZVTiS8AlA=; b=Xhf6InIQ7uhssiExq/jklRH1+rLprADhU9P0yY5jHggJZWuI8wDxzF3fmDuyIKHhgd9mum MQX4AS1g+z+AFtNQYECrv9eQU2kLlJbjWX6Qy1yBftiRZGj+pQbWsHv97mF9nPpXXfahY1 lKpUg2XXqhOaZuI5Uj7+AqZ0rJXg560= 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-290-0T3ZWGghNfeSEuugBmrnDA-1; Wed, 25 May 2022 12:29:59 -0400 X-MC-Unique: 0T3ZWGghNfeSEuugBmrnDA-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 823BC833977; Wed, 25 May 2022 16:29:58 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 658682026D07; Wed, 25 May 2022 16:29:56 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: check duplicate queue IDs' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:34 +0100 Message-Id: <20220525162847.711753-42-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/c25b1d545ecb8b349565980185acd2c3f891ea73 Thanks. Kevin --- >From c25b1d545ecb8b349565980185acd2c3f891ea73 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 27 Apr 2022 20:28:13 +0530 Subject: [PATCH] net/bnxt: check duplicate queue IDs [ upstream commit 447a0721ff9acfc14f5c64c031be7da956e9344a ] Currently driver does not have a check for duplicate queue ids. User must either specify all Rx queues created or no queues in the flow create command. Repeating the queue index is invalid. Also, moved the check for invalid queue to the beginning of the function. Fixes: 239695f754cb ("net/bnxt: enhance RSS action support") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_flow.c | 49 +++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c index 11dca5dc7e..2bb56692a5 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; + unsigned int rss_idx, i, j; uint16_t hash_type; uint64_t types; @@ -1134,4 +1134,35 @@ bnxt_vnic_rss_cfg_update(struct bnxt *bp, } + /* Validate Rx queues */ + for (i = 0; i < rss->queue_num; i++) { + PMD_DRV_LOG(DEBUG, "RSS action Queue %d\n", rss->queue[i]); + + if (rss->queue[i] >= bp->rx_nr_rings || + !bp->rx_queues[rss->queue[i]]) { + rte_flow_error_set(error, + EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, + act, + "Invalid queue ID for RSS"); + rc = -rte_errno; + goto ret; + } + } + + /* Duplicate queue ids are not supported. */ + for (i = 0; i < rss->queue_num; i++) { + for (j = i + 1; j < rss->queue_num; j++) { + if (rss->queue[i] == rss->queue[j]) { + rte_flow_error_set(error, + EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, + act, + "Duplicate queue ID for RSS"); + rc = -rte_errno; + goto ret; + } + } + } + /* Currently only Toeplitz hash is supported. */ if (rss->func != RTE_ETH_HASH_FUNCTION_DEFAULT && @@ -1201,20 +1232,4 @@ bnxt_vnic_rss_cfg_update(struct bnxt *bp, goto skip_rss_table; - /* Validate Rx queues */ - for (i = 0; i < rss->queue_num; i++) { - PMD_DRV_LOG(DEBUG, "RSS action Queue %d\n", rss->queue[i]); - - if (rss->queue[i] >= bp->rx_nr_rings || - !bp->rx_queues[rss->queue[i]]) { - rte_flow_error_set(error, - EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, - act, - "Invalid queue ID for RSS"); - rc = -rte_errno; - goto ret; - } - } - /* Prepare the indirection table */ for (rss_idx = 0; rss_idx < HW_HASH_INDEX_SIZE; rss_idx++) { -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:59.563661406 +0100 +++ 0042-net-bnxt-check-duplicate-queue-IDs.patch 2022-05-25 17:26:58.628828421 +0100 @@ -1 +1 @@ -From 447a0721ff9acfc14f5c64c031be7da956e9344a Mon Sep 17 00:00:00 2001 +From c25b1d545ecb8b349565980185acd2c3f891ea73 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 447a0721ff9acfc14f5c64c031be7da956e9344a ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index bd96bbaf4c..fc5bacf82c 100644 +index 11dca5dc7e..2bb56692a5 100644