sync patches ranges from versoin 9 t0 17 from master branch Signed-off-by: speech_white <humin29@huawei.com>
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From b57927702a58685e46d87960aba25a7b1fa0279e Mon Sep 17 00:00:00 2001
|
|
From: Alvin Zhang <alvinx.zhang@intel.com>
|
|
Date: Thu, 21 Jan 2021 17:41:54 +0800
|
|
Subject: [PATCH] app/testpmd: fix key for RSS flow rule
|
|
|
|
Since the patch '1848b117' has initialized the variable 'key' in
|
|
'struct rte_flow_action_rss' with 'NULL', the PMD cannot get the
|
|
RSS key now. Details as bellow:
|
|
|
|
testpmd> flow create 0 ingress pattern eth / ipv4 / end actions
|
|
rss types ipv4-other end key
|
|
1234567890123456789012345678901234567890FFFFFFFFFFFF123
|
|
4567890123456789012345678901234567890FFFFFFFFFFFF
|
|
queues end / end
|
|
Flow rule #1 created
|
|
testpmd> show port 0 rss-hash key
|
|
RSS functions:
|
|
all ipv4-other ip
|
|
RSS key:
|
|
4439796BB54C5023B675EA5B124F9F30B8A2C03DDFDC4D02A08C9B3
|
|
34AF64A4C05C6FA343958D8557D99583AE138C92E81150366
|
|
|
|
This patch sets offset and size of the 'key' variable as the first
|
|
parameter of the token 'key'. Later, the address of the RSS key will
|
|
be copied to 'key' variable.
|
|
|
|
Fixes: 1848b117cca1 ("app/testpmd: fix RSS key for flow API RSS rule")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
|
|
Tested-by: Jun W Zhou <junx.w.zhou@intel.com>
|
|
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
|
|
---
|
|
app/test-pmd/cmdline_flow.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
|
|
index 0618611ab1..067e120743 100644
|
|
--- a/app/test-pmd/cmdline_flow.c
|
|
+++ b/app/test-pmd/cmdline_flow.c
|
|
@@ -3541,7 +3541,10 @@ static const struct token token_list[] = {
|
|
.name = "key",
|
|
.help = "RSS hash key",
|
|
.next = NEXT(action_rss, NEXT_ENTRY(HEX)),
|
|
- .args = ARGS(ARGS_ENTRY_ARB(0, 0),
|
|
+ .args = ARGS(ARGS_ENTRY_ARB
|
|
+ (offsetof(struct action_rss_data, conf) +
|
|
+ offsetof(struct rte_flow_action_rss, key),
|
|
+ sizeof(((struct rte_flow_action_rss *)0)->key)),
|
|
ARGS_ENTRY_ARB
|
|
(offsetof(struct action_rss_data, conf) +
|
|
offsetof(struct rte_flow_action_rss, key_len),
|
|
--
|
|
2.33.0
|
|
|