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 D9700A0A02 for ; Mon, 17 May 2021 18:11:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D17FF410F1; Mon, 17 May 2021 18:11:11 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 94AAA40041 for ; Mon, 17 May 2021 18:11:10 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifpm-0007Yl-Cb; Mon, 17 May 2021 16:11:10 +0000 From: Christian Ehrhardt To: Xiaoyun Li Cc: Ferruh Yigit , dpdk stable Date: Mon, 17 May 2021 18:07:22 +0200 Message-Id: <20210517161039.3132619-13-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: remove unnecessary UDP tunnel check' has been queued to stable release 19.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/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/540aba68adb2a66e8d415d09e5344f6a1745ad8b Thanks. Christian Ehrhardt --- >From 540aba68adb2a66e8d415d09e5344f6a1745ad8b Mon Sep 17 00:00:00 2001 From: Xiaoyun Li Date: Thu, 18 Feb 2021 11:06:10 +0800 Subject: [PATCH] app/testpmd: remove unnecessary UDP tunnel check [ upstream commit 9d32f448ea0096185d0bbc5582c8b57f090c88a6 ] cmd_tunnel_udp_config checked 'cmd' to set prot_type but this cmd is only for rx_vxlan_port. The unnecessary cmd check will cause uninit coverity issue. So remove it and rename 'cmd' to 'rx_vxlan_port'. Coverity issue: 366155 Fixes: bd948f20d609 ("app/testpmd: VXLAN packet identification") Signed-off-by: Xiaoyun Li Acked-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 9a9da744a1..cba219625f 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -9100,7 +9100,7 @@ cmdline_parse_inst_t cmd_tunnel_filter = { /* *** CONFIGURE TUNNEL UDP PORT *** */ struct cmd_tunnel_udp_config { - cmdline_fixed_string_t cmd; + cmdline_fixed_string_t rx_vxlan_port; cmdline_fixed_string_t what; uint16_t udp_port; portid_t port_id; @@ -9116,9 +9116,7 @@ cmd_tunnel_udp_config_parsed(void *parsed_result, int ret; tunnel_udp.udp_port = res->udp_port; - - if (!strcmp(res->cmd, "rx_vxlan_port")) - tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN; + tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN; if (!strcmp(res->what, "add")) ret = rte_eth_dev_udp_tunnel_port_add(res->port_id, @@ -9131,9 +9129,9 @@ cmd_tunnel_udp_config_parsed(void *parsed_result, printf("udp tunneling add error: (%s)\n", strerror(-ret)); } -cmdline_parse_token_string_t cmd_tunnel_udp_config_cmd = +cmdline_parse_token_string_t cmd_tunnel_udp_config_rx_vxlan_port = TOKEN_STRING_INITIALIZER(struct cmd_tunnel_udp_config, - cmd, "rx_vxlan_port"); + rx_vxlan_port, "rx_vxlan_port"); cmdline_parse_token_string_t cmd_tunnel_udp_config_what = TOKEN_STRING_INITIALIZER(struct cmd_tunnel_udp_config, what, "add#rm"); @@ -9150,7 +9148,7 @@ cmdline_parse_inst_t cmd_tunnel_udp_config = { .help_str = "rx_vxlan_port add|rm : " "Add/Remove a tunneling UDP port filter", .tokens = { - (void *)&cmd_tunnel_udp_config_cmd, + (void *)&cmd_tunnel_udp_config_rx_vxlan_port, (void *)&cmd_tunnel_udp_config_what, (void *)&cmd_tunnel_udp_config_udp_port, (void *)&cmd_tunnel_udp_config_port_id, -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:30.064313346 +0200 +++ 0013-app-testpmd-remove-unnecessary-UDP-tunnel-check.patch 2021-05-17 17:40:29.119809066 +0200 @@ -1 +1 @@ -From 9d32f448ea0096185d0bbc5582c8b57f090c88a6 Mon Sep 17 00:00:00 2001 +From 540aba68adb2a66e8d415d09e5344f6a1745ad8b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9d32f448ea0096185d0bbc5582c8b57f090c88a6 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 65d03b0ffb..14110eb2e4 100644 +index 9a9da744a1..cba219625f 100644 @@ -24 +25 @@ -@@ -9097,7 +9097,7 @@ cmdline_parse_inst_t cmd_vf_rate_limit = { +@@ -9100,7 +9100,7 @@ cmdline_parse_inst_t cmd_tunnel_filter = { @@ -33 +34 @@ -@@ -9113,9 +9113,7 @@ cmd_tunnel_udp_config_parsed(void *parsed_result, +@@ -9116,9 +9116,7 @@ cmd_tunnel_udp_config_parsed(void *parsed_result, @@ -44 +45 @@ -@@ -9128,9 +9126,9 @@ cmd_tunnel_udp_config_parsed(void *parsed_result, +@@ -9131,9 +9129,9 @@ cmd_tunnel_udp_config_parsed(void *parsed_result, @@ -56 +57 @@ -@@ -9147,7 +9145,7 @@ cmdline_parse_inst_t cmd_tunnel_udp_config = { +@@ -9150,7 +9148,7 @@ cmdline_parse_inst_t cmd_tunnel_udp_config = {