From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 14E3DA0613 for ; Tue, 27 Aug 2019 11:31:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0CC691BFE1; Tue, 27 Aug 2019 11:31:04 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D46861C07F for ; Tue, 27 Aug 2019 11:31:02 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E7F58BA2DA; Tue, 27 Aug 2019 09:31:02 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FB195C1B2; Tue, 27 Aug 2019 09:31:00 +0000 (UTC) From: Kevin Traynor To: Haiyue Wang Cc: Xiaolong Ye , Bernard Iremonger , dpdk stable Date: Tue, 27 Aug 2019 10:29:51 +0100 Message-Id: <20190827093032.20423-14-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Tue, 27 Aug 2019 09:31:02 +0000 (UTC) Subject: [dpdk-stable] patch 'app/testpmd: fix parsing RSS queue rule' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/03/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/fdedb6180886c2326db6d7b19b3db0d8c9397055 Thanks. Kevin Traynor --- >From fdedb6180886c2326db6d7b19b3db0d8c9397055 Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Tue, 25 Jun 2019 18:38:03 +0800 Subject: [PATCH] app/testpmd: fix parsing RSS queue rule [ upstream commit 9a45c4981c351bdef78a69d1f7b7788f2614913f ] Declare a local variable 'arg' to hold the pointer to ARGS_ENTRY_ARB, otherwise, the pop 'arg' in 'parse_int' holds wrong data like 'arg-> offset = 5912737, arg->size = 0', this caused the parse failure. If calling like 'push_args(ctx, ARGS_ENTRY_ARB..)', the below code for assigning 'offset & size' will be missed for some gcc optimization. parse_vc_action_rss_queue 29c5: c5 f9 ef c0 vpxor %xmm0,%xmm0,%xmm0 29c9: 43 8d 44 24 68 lea 0x68(%r12,%r12,1),%eax 29ce: 48 c7 44 24 20 00 00 movq $0x0,0x20(%rsp) 29d5: 00 00 29d7: c5 f8 29 44 24 10 vmovaps %xmm0,0x10(%rsp) 29dd: 89 44 24 18 mov %eax,0x18(%rsp) 29e1: 48 63 83 0c 01 00 00 movslq 0x10c(%rbx),%rax 29e8: c7 44 24 1c 02 00 00 movl $0x2,0x1c(%rsp) 29ef: 00 29f0: c5 f8 29 04 24 vmovaps %xmm0,(%rsp) The above assembly code is from this modification with: gcc version 9.1.1 20190503 (Red Hat 9.1.1-1) (GCC) Fedora release 30 (Thirty) 5.1.11-300.fc30.x86_64 Fixes: d0ad8648b1c5 ("app/testpmd: fix RSS flow action configuration") Signed-off-by: Haiyue Wang Reviewed-by: Xiaolong Ye Acked-by: Bernard Iremonger --- app/test-pmd/cmdline_flow.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index fe5bda9dc..d1fd27327 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -3379,4 +3379,5 @@ parse_vc_action_rss_queue(struct context *ctx, const struct token *token, static const enum index next[] = NEXT_ENTRY(ACTION_RSS_QUEUE); struct action_rss_data *action_rss_data; + const struct arg *arg; int ret; int i; @@ -3394,8 +3395,8 @@ parse_vc_action_rss_queue(struct context *ctx, const struct token *token, if (i >= ACTION_RSS_QUEUE_NUM) return -1; - if (push_args(ctx, - ARGS_ENTRY_ARB(offsetof(struct action_rss_data, queue) + - i * sizeof(action_rss_data->queue[i]), - sizeof(action_rss_data->queue[i])))) + arg = ARGS_ENTRY_ARB(offsetof(struct action_rss_data, queue) + + i * sizeof(action_rss_data->queue[i]), + sizeof(action_rss_data->queue[i])); + if (push_args(ctx, arg)) return -1; ret = parse_int(ctx, token, str, len, NULL, 0); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:11.667680895 +0100 +++ 0014-app-testpmd-fix-parsing-RSS-queue-rule.patch 2019-08-27 09:40:10.872145553 +0100 @@ -1 +1 @@ -From 9a45c4981c351bdef78a69d1f7b7788f2614913f Mon Sep 17 00:00:00 2001 +From fdedb6180886c2326db6d7b19b3db0d8c9397055 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9a45c4981c351bdef78a69d1f7b7788f2614913f ] + @@ -31 +32,0 @@ -Cc: stable@dpdk.org @@ -41 +42 @@ -index 4e5fa7a2d..e3e8448c9 100644 +index fe5bda9dc..d1fd27327 100644 @@ -44 +45 @@ -@@ -3479,4 +3479,5 @@ parse_vc_action_rss_queue(struct context *ctx, const struct token *token, +@@ -3379,4 +3379,5 @@ parse_vc_action_rss_queue(struct context *ctx, const struct token *token, @@ -50 +51 @@ -@@ -3494,8 +3495,8 @@ parse_vc_action_rss_queue(struct context *ctx, const struct token *token, +@@ -3394,8 +3395,8 @@ parse_vc_action_rss_queue(struct context *ctx, const struct token *token,