From b0f02d9a8256b36963c8aa5f14e426614cea3eb1 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 29 Jun 2022 16:34:45 +0800 Subject: [PATCH] app/testpmd: unify name of L2 payload offload Currently, the "port config all rss xx" command uses 'ether' name to match and to set 'RTE_ETH_RSS_L2_PAYLOAD' offload. However, others RSS command, such as, "port config rss-hash-key" and "show port rss-hash key", use 'l2-payload' to represent this offload. So this patch unifies the name of 'RTE_ETH_RSS_L2_PAYLOAD' offload. Signed-off-by: Huisong Li Acked-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 6 +++--- doc/guides/rel_notes/release_22_07.rst | 5 +++++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index ded7dfe656..0123f4a4e5 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -694,7 +694,7 @@ static void cmd_help_long_parsed(void *parsed_result, "receive buffers available.\n\n" "port config all rss (all|default|ip|tcp|udp|sctp|" - "ether|port|vxlan|geneve|nvgre|vxlan-gpe|ecpri|mpls|ipv4-chksum|l2tpv2|" + "l2-payload|port|vxlan|geneve|nvgre|vxlan-gpe|ecpri|mpls|ipv4-chksum|l2tpv2|" "none|level-default|level-outer|level-inner|)\n" " Set the RSS mode.\n\n" @@ -2080,7 +2080,7 @@ cmd_config_rss_parsed(void *parsed_result, rss_conf.rss_hf = RTE_ETH_RSS_TCP; else if (!strcmp(res->value, "sctp")) rss_conf.rss_hf = RTE_ETH_RSS_SCTP; - else if (!strcmp(res->value, "ether")) + else if (!strcmp(res->value, "l2_payload")) rss_conf.rss_hf = RTE_ETH_RSS_L2_PAYLOAD; else if (!strcmp(res->value, "port")) rss_conf.rss_hf = RTE_ETH_RSS_PORT; @@ -2203,7 +2203,7 @@ static cmdline_parse_inst_t cmd_config_rss = { .f = cmd_config_rss_parsed, .data = NULL, .help_str = "port config all rss " - "all|default|eth|vlan|ip|tcp|udp|sctp|ether|port|vxlan|geneve|" + "all|default|eth|vlan|ip|tcp|udp|sctp|l2-payload|port|vxlan|geneve|" "nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|mpls|ipv4-chksum|l2tpv2|" "none|level-default|level-outer|level-inner|", .tokens = { diff --git a/doc/guides/rel_notes/release_22_07.rst b/doc/guides/rel_notes/release_22_07.rst index 6365800313..b40d6f9d84 100644 --- a/doc/guides/rel_notes/release_22_07.rst +++ b/doc/guides/rel_notes/release_22_07.rst @@ -261,6 +261,11 @@ New Features Merged l3fwd-acl code into l3fwd as l3fwd-acl contains duplicate and common functions to l3fwd. +* **Renamed L2 payload RSS type in testpmd.** + + Renamed RSS type ``ether`` to ``l2-payload`` for ``port config all rss`` + command. + Removed Items ------------- diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index f716ea2797..9a79ffd03b 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -2144,7 +2144,7 @@ port config - RSS Set the RSS (Receive Side Scaling) mode on or off:: - testpmd> port config all rss (all|default|eth|vlan|ip|tcp|udp|sctp|ether|port|vxlan|geneve|nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|mpls|l2tpv2|none) + testpmd> port config all rss (all|default|eth|vlan|ip|tcp|udp|sctp|l2-payload|port|vxlan|geneve|nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|mpls|l2tpv2|none) RSS is on by default. -- 2.39.5