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 8FF69A0524 for ; Thu, 4 Feb 2021 12:37:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 88D7C24077B; Thu, 4 Feb 2021 12:37:36 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id BDF5D240750 for ; Thu, 4 Feb 2021 12:37:34 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cx4-0005fz-II; Thu, 04 Feb 2021 11:37:34 +0000 From: Christian Ehrhardt To: Alvin Zhang Cc: Jun W Zhou , Ferruh Yigit , dpdk stable Date: Thu, 4 Feb 2021 12:29:19 +0100 Message-Id: <20210204112954.2488123-104-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix key for RSS flow rule' has been queued to stable release 19.11.7 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 02/06/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/b93fbadbe60f768ac812e04603a6166732f53326 Thanks. Christian Ehrhardt --- >From b93fbadbe60f768ac812e04603a6166732f53326 Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Thu, 21 Jan 2021 17:41:54 +0800 Subject: [PATCH] app/testpmd: fix key for RSS flow rule [ upstream commit b57927702a58685e46d87960aba25a7b1fa0279e ] 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") Signed-off-by: Alvin Zhang Tested-by: Jun W Zhou Reviewed-by: Ferruh Yigit --- 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 be39f4b746..da3533c557 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -2768,7 +2768,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.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:32.311366666 +0100 +++ 0104-app-testpmd-fix-key-for-RSS-flow-rule.patch 2021-02-04 12:04:28.122789817 +0100 @@ -1 +1 @@ -From b57927702a58685e46d87960aba25a7b1fa0279e Mon Sep 17 00:00:00 2001 +From b93fbadbe60f768ac812e04603a6166732f53326 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b57927702a58685e46d87960aba25a7b1fa0279e ] + @@ -28 +29,0 @@ -Cc: stable@dpdk.org @@ -38 +39 @@ -index 0618611ab1..067e120743 100644 +index be39f4b746..da3533c557 100644 @@ -41 +42 @@ -@@ -3541,7 +3541,10 @@ static const struct token token_list[] = { +@@ -2768,7 +2768,10 @@ static const struct token token_list[] = {