app/testpmd: set default RSS key as null
diff mbox series

Message ID 1603274830-25490-1-git-send-email-oulijun@huawei.com
State Accepted, archived
Delegated to: Ferruh Yigit
Headers show
Series
  • app/testpmd: set default RSS key as null
Related show

Checks

Context Check Description
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/Intel-compilation success Compilation OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/checkpatch success coding style OK

Commit Message

Lijun Ou Oct. 21, 2020, 10:07 a.m. UTC
From: Ophir Munk <ophirmu@mellanox.com>

When creating an RSS rule without specifying a key (see [1]) it is
expected that the device will use the default key.
A NULL key is used to indicate to a PMD it should use
its default key, however testpmd assigns a non-NULL dummy key
(see [2]) instead.
This does not enable testing any PMD behavior when the RSS key is not
specified. This commit fixes this limitation by setting key to NULL.
Also, it fixes the Scenario [3] that enable default RSS action by
setting key=NULL and key_len!=0.
[1]
RSS rule example without specifying a key:
flow create 0 ingress <pattern> / end actions rss queues 0 1 end / end
[2]
Testpmd default key assignment:
.key= "testpmd's default RSS hash key, "
"override it for better balancing"
[3]
flow create 0 <pattern> actions rss queues 0 1 end key_len 40 / end

fixes refer to the link: https://patches.dpdk.org/patch/80898/

Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Signed-off-by: Lijun Ou <oulijun@huawei.com>
---
 app/test-pmd/cmdline_flow.c  | 19 ++-----------------
 lib/librte_ethdev/rte_flow.c |  2 +-
 2 files changed, 3 insertions(+), 18 deletions(-)

Comments

Ferruh Yigit Oct. 26, 2020, 10:36 a.m. UTC | #1
On 10/21/2020 11:07 AM, Lijun Ou wrote:
> From: Ophir Munk <ophirmu@mellanox.com>
> 
> When creating an RSS rule without specifying a key (see [1]) it is
> expected that the device will use the default key.
> A NULL key is used to indicate to a PMD it should use
> its default key, however testpmd assigns a non-NULL dummy key
> (see [2]) instead.
> This does not enable testing any PMD behavior when the RSS key is not
> specified. This commit fixes this limitation by setting key to NULL.
> Also, it fixes the Scenario [3] that enable default RSS action by
> setting key=NULL and key_len!=0.
> [1]
> RSS rule example without specifying a key:
> flow create 0 ingress <pattern> / end actions rss queues 0 1 end / end
> [2]
> Testpmd default key assignment:
> .key= "testpmd's default RSS hash key, "
> "override it for better balancing"
> [3]
> flow create 0 <pattern> actions rss queues 0 1 end key_len 40 / end
> 
> fixes refer to the link: https://patches.dpdk.org/patch/80898/
> 
> Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> Signed-off-by: Lijun Ou <oulijun@huawei.com>

Applied to dpdk-next-net/main, thanks.


Updated the commit log as below:

Author: Lijun Ou <oulijun@huawei.com>
Date:   Wed Oct 21 18:07:10 2020 +0800

     app/testpmd: fix RSS key for flow API RSS rule

     When a flow API RSS rule is issued in testpmd, device RSS key is changed
     unexpectedly, device RSS key is changed to the testpmd default RSS key.

     Consider the following usage with testpmd:
     1. first, startup testpmd:
      testpmd> show port 0 rss-hash key
      RSS functions: all ipv4-frag ipv4-other ipv6-frag ipv6-other ip
      RSS key: 6D5A56DA255B0EC24167253D43A38FB0D0CA2BCBAE7B30B477CB2DA38030F
               20C6A42B73BBEAC01FA
     2. create a rss rule
      testpmd> flow create 0 ingress pattern eth / ipv4 / udp / end \
               actions rss types ipv4-udp end queues end / end

     3. show rss-hash key
      testpmd> show port 0 rss-hash key
      RSS functions: all ipv4-udp udp
      RSS key: 74657374706D6427732064656661756C74205253532068617368206B65792
               C206F76657272696465

     This is because testpmd always sends a key with the RSS rule,
     if user provides a key as part of the rule that key is used, if user
     doesn't provide a key, testpmd default key is sent to the PMDs, which is
     causing device programmed RSS key to be changed.

     There was a previous attempt to fix the same issue [1], but it has been
     reverted back [2] because of the crash when 'key_len' is provided
     without 'key'.

     This patch follows the same approach with the initial fix [1] but also
     addresses the crash.

     After change, testpmd RSS key is 'NULL' by default, if user provides a
     key as part of rule it is used, if not no key is sent to the PMDs at all

     [1]
     Commit a4391f8bae85 ("app/testpmd: set default RSS key as null")

     [2]
     Commit f3698c3d09a6 ("app/testpmd: revert setting default RSS")

     Fixes: d0ad8648b1c5 ("app/testpmd: fix RSS flow action configuration")
     Cc: stable@dpdk.org

     Signed-off-by: Lijun Ou <oulijun@huawei.com>
     Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
     Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>

Patch
diff mbox series

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index cd35d5b..3d1dd05 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -4850,30 +4850,15 @@  parse_vc_action_rss(struct context *ctx, const struct token *token,
 			.func = RTE_ETH_HASH_FUNCTION_DEFAULT,
 			.level = 0,
 			.types = rss_hf,
-			.key_len = sizeof(action_rss_data->key),
+			.key_len = 0,
 			.queue_num = RTE_MIN(nb_rxq, ACTION_RSS_QUEUE_NUM),
-			.key = action_rss_data->key,
+			.key = NULL,
 			.queue = action_rss_data->queue,
 		},
-		.key = "testpmd's default RSS hash key, "
-			"override it for better balancing",
 		.queue = { 0 },
 	};
 	for (i = 0; i < action_rss_data->conf.queue_num; ++i)
 		action_rss_data->queue[i] = i;
-	if (!port_id_is_invalid(ctx->port, DISABLED_WARN) &&
-	    ctx->port != (portid_t)RTE_PORT_ALL) {
-		struct rte_eth_dev_info info;
-		int ret2;
-
-		ret2 = rte_eth_dev_info_get(ctx->port, &info);
-		if (ret2 != 0)
-			return ret2;
-
-		action_rss_data->conf.key_len =
-			RTE_MIN(sizeof(action_rss_data->key),
-				info.hash_key_size);
-	}
 	action->conf = &action_rss_data->conf;
 	return ret;
 }
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index d3e5cbc..a06f64c 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -577,7 +577,7 @@  rte_flow_conv_action_conf(void *buf, const size_t size,
 			   }),
 			   size > sizeof(*dst.rss) ? sizeof(*dst.rss) : size);
 		off = sizeof(*dst.rss);
-		if (src.rss->key_len) {
+		if (src.rss->key_len && src.rss->key) {
 			off = RTE_ALIGN_CEIL(off, sizeof(*dst.rss->key));
 			tmp = sizeof(*src.rss->key) * src.rss->key_len;
 			if (size >= off + tmp)