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 1C940433C8 for ; Tue, 5 Mar 2024 16:36:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0B26042E87; Tue, 5 Mar 2024 16:36:22 +0100 (CET) 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 5833542E69 for ; Tue, 5 Mar 2024 16:36:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652979; 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=Om0jvXMQmvY6tFmyQIw2aUCV13oruMMui+gLj9xDn3U=; b=KEc2yVCvMH1iVtmCaRBowUlq2cikLZ0J5cc/roNX465HmW8yhDbQZBv7f6/EBP6uxZcQy6 K4hltMJb+nMbRNF6QRqWHg9Tde/AtYG1O6ZIHAuvq4H0pPosp0y8o4ITyag+pTvAcG0zby j5b6acXCsPcOR2ov3Y5Do2bO2dmsA2w= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-671-iAqAZVOXOvOu8-ZjvANAgA-1; Tue, 05 Mar 2024 10:36:18 -0500 X-MC-Unique: iAqAZVOXOvOu8-ZjvANAgA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CE56B8007A1; Tue, 5 Mar 2024 15:36:17 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33B75200AFA5; Tue, 5 Mar 2024 15:36:17 +0000 (UTC) From: Kevin Traynor To: Kiran Kumar K Cc: Satheesh Paul , dpdk stable Subject: patch 'net/cnxk: fix flow RSS configuration' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:37 +0000 Message-ID: <20240305153449.263666-64-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/24. 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/5a59e070c092f555366aa7b3f401acd79692e71d Thanks. Kevin --- >From 5a59e070c092f555366aa7b3f401acd79692e71d Mon Sep 17 00:00:00 2001 From: Kiran Kumar K Date: Fri, 15 Dec 2023 12:15:43 +0530 Subject: [PATCH] net/cnxk: fix flow RSS configuration [ upstream commit 752ce2f3e5bf7bd8add8dc9629f3b824886c641e ] While creating a RSS rule, if no RSS types are specified, use RSS types from dev config. Fixes: bc778a17fa46 ("net/cnxk: support flow RSS") Signed-off-by: Kiran Kumar K Reviewed-by: Satheesh Paul --- drivers/net/cnxk/cnxk_rte_flow.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/net/cnxk/cnxk_rte_flow.c b/drivers/net/cnxk/cnxk_rte_flow.c index 0410f2d82e..bdff3c0fc9 100644 --- a/drivers/net/cnxk/cnxk_rte_flow.c +++ b/drivers/net/cnxk/cnxk_rte_flow.c @@ -94,13 +94,17 @@ npc_rss_action_validate(struct rte_eth_dev *eth_dev, static void -npc_rss_flowkey_get(struct cnxk_eth_dev *eth_dev, - const struct roc_npc_action *rss_action, - uint32_t *flowkey_cfg) +npc_rss_flowkey_get(struct cnxk_eth_dev *eth_dev, const struct roc_npc_action *rss_action, + uint32_t *flowkey_cfg, uint64_t default_rss_types) { const struct roc_npc_action_rss *rss; + uint64_t rss_types; rss = (const struct roc_npc_action_rss *)rss_action->conf; + rss_types = rss->types; + /* If no RSS types are specified, use default one */ + if (rss_types == 0) + rss_types = default_rss_types; - *flowkey_cfg = cnxk_rss_ethdev_to_nix(eth_dev, rss->types, rss->level); + *flowkey_cfg = cnxk_rss_ethdev_to_nix(eth_dev, rss_types, rss->level); } @@ -197,5 +201,6 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, in_actions[i].type = ROC_NPC_ACTION_TYPE_RSS; in_actions[i].conf = actions->conf; - npc_rss_flowkey_get(dev, &in_actions[i], flowkey_cfg); + npc_rss_flowkey_get(dev, &in_actions[i], flowkey_cfg, + eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf); break; -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:56.166683282 +0000 +++ 0064-net-cnxk-fix-flow-RSS-configuration.patch 2024-03-05 14:08:54.725520964 +0000 @@ -1 +1 @@ -From 752ce2f3e5bf7bd8add8dc9629f3b824886c641e Mon Sep 17 00:00:00 2001 +From 5a59e070c092f555366aa7b3f401acd79692e71d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 752ce2f3e5bf7bd8add8dc9629f3b824886c641e ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - drivers/net/cnxk/cnxk_flow.c | 15 ++++++++++----- + drivers/net/cnxk/cnxk_rte_flow.c | 15 ++++++++++----- @@ -18,5 +19,5 @@ -diff --git a/drivers/net/cnxk/cnxk_flow.c b/drivers/net/cnxk/cnxk_flow.c -index 11670d37e0..a92b61c332 100644 ---- a/drivers/net/cnxk/cnxk_flow.c -+++ b/drivers/net/cnxk/cnxk_flow.c -@@ -104,13 +104,17 @@ npc_rss_action_validate(struct rte_eth_dev *eth_dev, const struct rte_flow_attr +diff --git a/drivers/net/cnxk/cnxk_rte_flow.c b/drivers/net/cnxk/cnxk_rte_flow.c +index 0410f2d82e..bdff3c0fc9 100644 +--- a/drivers/net/cnxk/cnxk_rte_flow.c ++++ b/drivers/net/cnxk/cnxk_rte_flow.c +@@ -94,13 +94,17 @@ npc_rss_action_validate(struct rte_eth_dev *eth_dev, @@ -44 +45 @@ -@@ -294,5 +298,6 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, +@@ -197,5 +201,6 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,