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 53565A04F0 for ; Tue, 10 Dec 2019 15:59:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2A66A1B13C; Tue, 10 Dec 2019 15:59:56 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id C2C501B13C for ; Tue, 10 Dec 2019 15:59:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575989993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k00bKHkrGH9zyMSeimoDR7l8RDmrot0C2zt5uBjTUdc=; b=ejMreFt5NaLfQG57V0i0pGum/KlU5mq2+uA/qVWONO5ZRQW4jv8u2z8H6oMdnVOnFYZsE8 s2LoXPALDRqPiHucyXRh5eD91NMl4jDZ5l32I2ABEG3/oeg2NLOEqEL8SwocSRLcgofzt/ vYkywDsJvliw0JPEBEUbPMCDNZkdQ0g= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-86-4Lq05KJnOpu7s_IpUR6A1g-1; Tue, 10 Dec 2019 09:59:51 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 747A51800D45; Tue, 10 Dec 2019 14:59:50 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A0A75DE52; Tue, 10 Dec 2019 14:59:49 +0000 (UTC) From: Kevin Traynor To: Ting Xu Cc: Bernard Iremonger , dpdk stable Date: Tue, 10 Dec 2019 14:58:35 +0000 Message-Id: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 4Lq05KJnOpu7s_IpUR6A1g-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'app/testpmd: fix CRC strip command' has been queued to LTS release 18.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/16/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 rebasi= ng (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/0a72a7de14dcccbf0e= c925d5744e43fdbae20c5a Thanks. Kevin. --- >From 0a72a7de14dcccbf0ec925d5744e43fdbae20c5a Mon Sep 17 00:00:00 2001 From: Ting Xu Date: Tue, 15 Oct 2019 09:14:20 +0000 Subject: [PATCH] app/testpmd: fix CRC strip command [ upstream commit 5e913bdb4f4d05f90ca99467444f11633c78749a ] This patch fixed the bug that a failure appeared when config rx_offload crc_strip using command "port config all crc-strip on|off". The reason is that this command was removed in Commit e5db17a1e54e. The current command is "port config rx_offload keep_crc on|off" instead. In this patch, some codes left over about 'crc_strip' are removed to make the current command clearer. Fixes: e5db17a1e54e ("app/testpmd: remove duplicated Rx offload commands") Signed-off-by: Ting Xu Acked-by: Bernard Iremonger --- app/test-pmd/cmdline.c | 12 ++++++------ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 7f13309ad..7c90457cd 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -875,5 +875,5 @@ static void cmd_help_long_parsed(void *parsed_result, =09=09=09"ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|" =09=09=09"outer_ipv4_cksum|macsec_strip|header_split|" -=09=09=09"vlan_filter|vlan_extend|jumbo_frame|crc_strip|" +=09=09=09"vlan_filter|vlan_extend|jumbo_frame|" =09=09=09"scatter|timestamp|security|keep_crc on|off\n" =09=09=09" Enable or disable a per port Rx offloading" @@ -883,5 +883,5 @@ static void cmd_help_long_parsed(void *parsed_result, =09=09=09"ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|" =09=09=09"outer_ipv4_cksum|macsec_strip|header_split|" -=09=09=09"vlan_filter|vlan_extend|jumbo_frame|crc_strip|" +=09=09=09"vlan_filter|vlan_extend|jumbo_frame|" =09=09=09"scatter|timestamp|security|keep_crc on|off\n" =09=09=09" Enable or disable a per queue Rx offloading" @@ -17809,5 +17809,5 @@ cmdline_parse_token_string_t cmd_config_per_port_rx= _offload_result_offload =3D =09=09=09 "qinq_strip#outer_ipv4_cksum#macsec_strip#" =09=09=09 "header_split#vlan_filter#vlan_extend#jumbo_frame#" -=09=09=09 "crc_strip#scatter#timestamp#security#keep_crc"); +=09=09=09 "scatter#timestamp#security#keep_crc"); cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_on_off = =3D =09TOKEN_STRING_INITIALIZER @@ -17885,5 +17885,5 @@ cmdline_parse_inst_t cmd_config_per_port_rx_offload= =3D { =09=09 "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|" =09=09 "macsec_strip|header_split|vlan_filter|vlan_extend|" -=09=09 "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc " +=09=09 "jumbo_frame|scatter|timestamp|security|keep_crc " =09=09 "on|off", =09.tokens =3D { @@ -17935,5 +17935,5 @@ cmdline_parse_token_string_t cmd_config_per_queue_r= x_offload_result_offload =3D =09=09=09 "qinq_strip#outer_ipv4_cksum#macsec_strip#" =09=09=09 "header_split#vlan_filter#vlan_extend#jumbo_frame#" -=09=09=09 "crc_strip#scatter#timestamp#security#keep_crc"); +=09=09=09 "scatter#timestamp#security#keep_crc"); cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_on_off= =3D =09TOKEN_STRING_INITIALIZER @@ -17987,5 +17987,5 @@ cmdline_parse_inst_t cmd_config_per_queue_rx_offloa= d =3D { =09=09 "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|" =09=09 "macsec_strip|header_split|vlan_filter|vlan_extend|" -=09=09 "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc " +=09=09 "jumbo_frame|scatter|timestamp|security|keep_crc " =09=09 "on|off", =09.tokens =3D { diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testp= md_app_ug/testpmd_funcs.rst index 3db8c4882..37d5d876b 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -1602,5 +1602,5 @@ Enable or disable a per port Rx offloading on all Rx = queues of a port:: qinq_strip, outer_ipv4_cksum, macsec_strip, header_split, vlan_filter, vlan_extend, jumbo_frame, - crc_strip, scatter, timestamp, security, keep_crc + scatter, timestamp, security, keep_crc =20 This command should be run when the port is stopped, or else it will fail. @@ -1617,5 +1617,5 @@ Enable or disable a per queue Rx offloading only on a= specific Rx queue:: qinq_strip, outer_ipv4_cksum, macsec_strip, header_split, vlan_filter, vlan_extend, jumbo_frame, - crc_strip, scatter, timestamp, security, keep_crc + scatter, timestamp, security, keep_crc =20 This command should be run when the port is stopped, or else it will fail. --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:39.157144981 +0000 +++ 0001-app-testpmd-fix-CRC-strip-command.patch=092019-12-10 14:49:38.9754= 59203 +0000 @@ -1 +1 @@ -From 5e913bdb4f4d05f90ca99467444f11633c78749a Mon Sep 17 00:00:00 2001 +From 0a72a7de14dcccbf0ec925d5744e43fdbae20c5a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5e913bdb4f4d05f90ca99467444f11633c78749a ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 514372932..a18402de5 100644 +index 7f13309ad..7c90457cd 100644 @@ -29 +30 @@ -@@ -850,5 +850,5 @@ static void cmd_help_long_parsed(void *parsed_result, +@@ -875,5 +875,5 @@ static void cmd_help_long_parsed(void *parsed_result, @@ -36 +37 @@ -@@ -858,5 +858,5 @@ static void cmd_help_long_parsed(void *parsed_result, +@@ -883,5 +883,5 @@ static void cmd_help_long_parsed(void *parsed_result, @@ -43 +44 @@ -@@ -18072,5 +18072,5 @@ cmdline_parse_token_string_t cmd_config_per_port_r= x_offload_result_offload =3D +@@ -17809,5 +17809,5 @@ cmdline_parse_token_string_t cmd_config_per_port_r= x_offload_result_offload =3D @@ -50 +51 @@ -@@ -18152,5 +18152,5 @@ cmdline_parse_inst_t cmd_config_per_port_rx_offloa= d =3D { +@@ -17885,5 +17885,5 @@ cmdline_parse_inst_t cmd_config_per_port_rx_offloa= d =3D { @@ -57 +58 @@ -@@ -18202,5 +18202,5 @@ cmdline_parse_token_string_t cmd_config_per_queue_= rx_offload_result_offload =3D +@@ -17935,5 +17935,5 @@ cmdline_parse_token_string_t cmd_config_per_queue_= rx_offload_result_offload =3D @@ -64 +65 @@ -@@ -18258,5 +18258,5 @@ cmdline_parse_inst_t cmd_config_per_queue_rx_offlo= ad =3D { +@@ -17987,5 +17987,5 @@ cmdline_parse_inst_t cmd_config_per_queue_rx_offlo= ad =3D { @@ -72 +73 @@ -index 28b47e6cb..1da60faff 100644 +index 3db8c4882..37d5d876b 100644 @@ -75 +76 @@ -@@ -1654,5 +1654,5 @@ Enable or disable a per port Rx offloading on all Rx= queues of a port:: +@@ -1602,5 +1602,5 @@ Enable or disable a per port Rx offloading on all Rx= queues of a port:: @@ -82 +83 @@ -@@ -1669,5 +1669,5 @@ Enable or disable a per queue Rx offloading only on = a specific Rx queue:: +@@ -1617,5 +1617,5 @@ Enable or disable a per queue Rx offloading only on = a specific Rx queue::