patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] test-pmd: removed references to crc_strip
@ 2019-06-18 10:59 Andrius Sirvys
  2019-06-18 11:09 ` David Marchand
  0 siblings, 1 reply; 5+ messages in thread
From: Andrius Sirvys @ 2019-06-18 10:59 UTC (permalink / raw)
  To: stable, Wenzhuo Lu, Jingjing Wu, Bernard Iremonger
  Cc: Andrius Sirvys, ferruh.yigit

crc_strip was removed from lib/librte_ethdev/rte_ethdev.c as the
NICs carry out this operation themselves. However once removed,
the references to it we're forgotten to be taken out in test-pmd.

Fixes: 323e7b667f18 ("ethdev: make default behavior CRC strip on Rx")
Cc: ferruh.yigit@intel.com

Signed-off-by: Andrius Sirvys <andrius.sirvys@intel.com>
---
 app/test-pmd/cmdline.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index d1e0d4402..cd3f33add 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -878,7 +878,7 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"port config <port_id> rx_offload vlan_strip|"
 			"ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
 			"outer_ipv4_cksum|macsec_strip|header_split|"
-			"vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
+			"vlan_filter|vlan_extend|jumbo_frame|"
 			"scatter|timestamp|security|keep_crc on|off\n"
 			"     Enable or disable a per port Rx offloading"
 			" on all Rx queues of a port\n\n"
@@ -886,7 +886,7 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"port (port_id) rxq (queue_id) rx_offload vlan_strip|"
 			"ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
 			"outer_ipv4_cksum|macsec_strip|header_split|"
-			"vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
+			"vlan_filter|vlan_extend|jumbo_frame|"
 			"scatter|timestamp|security|keep_crc on|off\n"
 			"    Enable or disable a per queue Rx offloading"
 			" only on a specific Rx queue\n\n"
@@ -17991,7 +17991,7 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_offload =
 		 offload, "vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
 			   "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");
 cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_port_rx_offload_result,
@@ -18067,7 +18067,7 @@ cmdline_parse_inst_t cmd_config_per_port_rx_offload = {
 	.help_str = "port config <port_id> rx_offload vlan_strip|ipv4_cksum|"
 		    "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
 		    "macsec_strip|header_split|vlan_filter|vlan_extend|"
-		    "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
+		    "jumbo_frame|scatter|timestamp|security|keep_crc "
 		    "on|off",
 	.tokens = {
 		(void *)&cmd_config_per_port_rx_offload_result_port,
@@ -18117,7 +18117,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_offload =
 		 offload, "vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
 			   "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");
 cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
@@ -18169,7 +18169,7 @@ cmdline_parse_inst_t cmd_config_per_queue_rx_offload = {
 		    "vlan_strip|ipv4_cksum|"
 		    "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
 		    "macsec_strip|header_split|vlan_filter|vlan_extend|"
-		    "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
+		    "jumbo_frame|scatter|timestamp|security|keep_crc "
 		    "on|off",
 	.tokens = {
 		(void *)&cmd_config_per_queue_rx_offload_result_port,
-- 
2.17.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [dpdk-stable] [PATCH] test-pmd: removed references to crc_strip
  2019-06-18 10:59 [dpdk-stable] [PATCH] test-pmd: removed references to crc_strip Andrius Sirvys
@ 2019-06-18 11:09 ` David Marchand
  2019-06-19 14:13   ` Sirvys, Andrius
  0 siblings, 1 reply; 5+ messages in thread
From: David Marchand @ 2019-06-18 11:09 UTC (permalink / raw)
  To: Andrius Sirvys
  Cc: dpdk stable, Wenzhuo Lu, Jingjing Wu, Bernard Iremonger, Yigit,
	Ferruh, dev

On Tue, Jun 18, 2019 at 12:59 PM Andrius Sirvys <andrius.sirvys@intel.com>
wrote:

> crc_strip was removed from lib/librte_ethdev/rte_ethdev.c as the
> NICs carry out this operation themselves. However once removed,
> the references to it we're forgotten to be taken out in test-pmd.
>
> Fixes: 323e7b667f18 ("ethdev: make default behavior CRC strip on Rx")
> Cc: ferruh.yigit@intel.com
>
> Signed-off-by: Andrius Sirvys <andrius.sirvys@intel.com>
> ---
>  app/test-pmd/cmdline.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index d1e0d4402..cd3f33add 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -878,7 +878,7 @@ static void cmd_help_long_parsed(void *parsed_result,
>                         "port config <port_id> rx_offload vlan_strip|"
>
> "ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
>                         "outer_ipv4_cksum|macsec_strip|header_split|"
> -                       "vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
> +                       "vlan_filter|vlan_extend|jumbo_frame|"
>                         "scatter|timestamp|security|keep_crc on|off\n"
>                         "     Enable or disable a per port Rx offloading"
>                         " on all Rx queues of a port\n\n"
> @@ -886,7 +886,7 @@ static void cmd_help_long_parsed(void *parsed_result,
>                         "port (port_id) rxq (queue_id) rx_offload
> vlan_strip|"
>
> "ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
>                         "outer_ipv4_cksum|macsec_strip|header_split|"
> -                       "vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
> +                       "vlan_filter|vlan_extend|jumbo_frame|"
>                         "scatter|timestamp|security|keep_crc on|off\n"
>                         "    Enable or disable a per queue Rx offloading"
>                         " only on a specific Rx queue\n\n"
> @@ -17991,7 +17991,7 @@ cmdline_parse_token_string_t
> cmd_config_per_port_rx_offload_result_offload =
>                  offload,
> "vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
>                            "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");
>  cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_on_off
> =
>         TOKEN_STRING_INITIALIZER
>                 (struct cmd_config_per_port_rx_offload_result,
> @@ -18067,7 +18067,7 @@ cmdline_parse_inst_t
> cmd_config_per_port_rx_offload = {
>         .help_str = "port config <port_id> rx_offload
> vlan_strip|ipv4_cksum|"
>
> "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
>                     "macsec_strip|header_split|vlan_filter|vlan_extend|"
> -
>  "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
> +                   "jumbo_frame|scatter|timestamp|security|keep_crc "
>                     "on|off",
>         .tokens = {
>                 (void *)&cmd_config_per_port_rx_offload_result_port,
> @@ -18117,7 +18117,7 @@ cmdline_parse_token_string_t
> cmd_config_per_queue_rx_offload_result_offload =
>                  offload,
> "vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
>                            "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");
>  cmdline_parse_token_string_t
> cmd_config_per_queue_rx_offload_result_on_off =
>         TOKEN_STRING_INITIALIZER
>                 (struct cmd_config_per_queue_rx_offload_result,
> @@ -18169,7 +18169,7 @@ cmdline_parse_inst_t
> cmd_config_per_queue_rx_offload = {
>                     "vlan_strip|ipv4_cksum|"
>
> "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
>                     "macsec_strip|header_split|vlan_filter|vlan_extend|"
> -
>  "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
> +                   "jumbo_frame|scatter|timestamp|security|keep_crc "
>                     "on|off",
>         .tokens = {
>                 (void *)&cmd_config_per_queue_rx_offload_result_port,
> --
> 2.17.1
>

Rather than fix this list in all those places, is it possible to use
rte_rx_offload_names[] in a little wrapper in testpmd?
The same would have to be done with the tx flags after this.


-- 
David Marchand

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [dpdk-stable] [PATCH] test-pmd: removed references to crc_strip
  2019-06-18 11:09 ` David Marchand
@ 2019-06-19 14:13   ` Sirvys, Andrius
  2019-06-19 14:23     ` David Marchand
  0 siblings, 1 reply; 5+ messages in thread
From: Sirvys, Andrius @ 2019-06-19 14:13 UTC (permalink / raw)
  To: David Marchand
  Cc: dpdk stable, Lu, Wenzhuo, Wu,  Jingjing, Iremonger, Bernard,
	Yigit, Ferruh, dev

That sounds like a good idea. Do you have any examples by chance of something like this or any advice how to implement.
The string needs to be generated beforehand so where would we be able to put the code in for that.

From: David Marchand [mailto:david.marchand@redhat.com]
Sent: Tuesday, June 18, 2019 12:09 PM
To: Sirvys, Andrius <andrius.sirvys@intel.com>
Cc: dpdk stable <stable@dpdk.org>; Lu, Wenzhuo <wenzhuo.lu@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Iremonger, Bernard <bernard.iremonger@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>; dev <dev@dpdk.org>
Subject: Re: [dpdk-stable] [PATCH] test-pmd: removed references to crc_strip



On Tue, Jun 18, 2019 at 12:59 PM Andrius Sirvys <andrius.sirvys@intel.com<mailto:andrius.sirvys@intel.com>> wrote:
crc_strip was removed from lib/librte_ethdev/rte_ethdev.c as the
NICs carry out this operation themselves. However once removed,
the references to it we're forgotten to be taken out in test-pmd.

Fixes: 323e7b667f18 ("ethdev: make default behavior CRC strip on Rx")
Cc: ferruh.yigit@intel.com<mailto:ferruh.yigit@intel.com>

Signed-off-by: Andrius Sirvys <andrius.sirvys@intel.com<mailto:andrius.sirvys@intel.com>>
---
 app/test-pmd/cmdline.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index d1e0d4402..cd3f33add 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -878,7 +878,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "port config <port_id> rx_offload vlan_strip|"
                        "ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
                        "outer_ipv4_cksum|macsec_strip|header_split|"
-                       "vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
+                       "vlan_filter|vlan_extend|jumbo_frame|"
                        "scatter|timestamp|security|keep_crc on|off\n"
                        "     Enable or disable a per port Rx offloading"
                        " on all Rx queues of a port\n\n"
@@ -886,7 +886,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "port (port_id) rxq (queue_id) rx_offload vlan_strip|"
                        "ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
                        "outer_ipv4_cksum|macsec_strip|header_split|"
-                       "vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
+                       "vlan_filter|vlan_extend|jumbo_frame|"
                        "scatter|timestamp|security|keep_crc on|off\n"
                        "    Enable or disable a per queue Rx offloading"
                        " only on a specific Rx queue\n\n"
@@ -17991,7 +17991,7 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_offload =
                 offload, "vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
                           "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");
 cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_config_per_port_rx_offload_result,
@@ -18067,7 +18067,7 @@ cmdline_parse_inst_t cmd_config_per_port_rx_offload = {
        .help_str = "port config <port_id> rx_offload vlan_strip|ipv4_cksum|"
                    "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
                    "macsec_strip|header_split|vlan_filter|vlan_extend|"
-                   "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
+                   "jumbo_frame|scatter|timestamp|security|keep_crc "
                    "on|off",
        .tokens = {
                (void *)&cmd_config_per_port_rx_offload_result_port,
@@ -18117,7 +18117,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_offload =
                 offload, "vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
                           "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");
 cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_config_per_queue_rx_offload_result,
@@ -18169,7 +18169,7 @@ cmdline_parse_inst_t cmd_config_per_queue_rx_offload = {
                    "vlan_strip|ipv4_cksum|"
                    "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
                    "macsec_strip|header_split|vlan_filter|vlan_extend|"
-                   "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
+                   "jumbo_frame|scatter|timestamp|security|keep_crc "
                    "on|off",
        .tokens = {
                (void *)&cmd_config_per_queue_rx_offload_result_port,
--
2.17.1

Rather than fix this list in all those places, is it possible to use rte_rx_offload_names[] in a little wrapper in testpmd?
The same would have to be done with the tx flags after this.


--
David Marchand

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [dpdk-stable] [PATCH] test-pmd: removed references to crc_strip
  2019-06-19 14:13   ` Sirvys, Andrius
@ 2019-06-19 14:23     ` David Marchand
  2019-06-19 14:30       ` David Marchand
  0 siblings, 1 reply; 5+ messages in thread
From: David Marchand @ 2019-06-19 14:23 UTC (permalink / raw)
  To: Sirvys, Andrius
  Cc: dpdk stable, Lu, Wenzhuo, Wu, Jingjing, Iremonger, Bernard,
	Yigit, Ferruh, dev

On Wed, Jun 19, 2019 at 4:13 PM Sirvys, Andrius <andrius.sirvys@intel.com>
wrote:

> That sounds like a good idea. Do you have any examples by chance of
> something like this or any advice how to implement.
>
> The string needs to be generated beforehand so where would we be able to
> put the code in for that.
>

For the usage strings, you only need to call a wrapper that dynamically
outputs the list separated by |.
For the
cmd_config_per_port_rx_offload/cmd_config_per_port_rx_offload_result_offload
tokens init, you have an example with cmd_set_fwd_retry_mode_init() which
updates cmd_set_fwd_retry_mode/cmd_setfwd_retry_mode tokens.


-- 
David Marchand

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [dpdk-stable] [PATCH] test-pmd: removed references to crc_strip
  2019-06-19 14:23     ` David Marchand
@ 2019-06-19 14:30       ` David Marchand
  0 siblings, 0 replies; 5+ messages in thread
From: David Marchand @ 2019-06-19 14:30 UTC (permalink / raw)
  To: Sirvys, Andrius
  Cc: dpdk stable, Lu, Wenzhuo, Wu, Jingjing, Iremonger, Bernard,
	Yigit, Ferruh, dev

On Wed, Jun 19, 2019 at 4:23 PM David Marchand <david.marchand@redhat.com>
wrote:

>
> On Wed, Jun 19, 2019 at 4:13 PM Sirvys, Andrius <andrius.sirvys@intel.com>
> wrote:
>
>> That sounds like a good idea. Do you have any examples by chance of
>> something like this or any advice how to implement.
>>
>> The string needs to be generated beforehand so where would we be able to
>> put the code in for that.
>>
>
> For the usage strings, you only need to call a wrapper that dynamically
> outputs the list separated by |.
> For the
> cmd_config_per_port_rx_offload/cmd_config_per_port_rx_offload_result_offload
> tokens init, you have an example with cmd_set_fwd_retry_mode_init() which
> updates cmd_set_fwd_retry_mode/cmd_setfwd_retry_mode tokens.
>

See: https://git.dpdk.org/dpdk/commit/?id=769ce6b17835


-- 
David Marchand

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-06-19 14:30 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-18 10:59 [dpdk-stable] [PATCH] test-pmd: removed references to crc_strip Andrius Sirvys
2019-06-18 11:09 ` David Marchand
2019-06-19 14:13   ` Sirvys, Andrius
2019-06-19 14:23     ` David Marchand
2019-06-19 14:30       ` David Marchand

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).