From 94198f40f2bd150bc958d8bd2b5892c11f640f5d Mon Sep 17 00:00:00 2001 From: Kiran Kumar K Date: Thu, 17 Sep 2020 07:37:34 +0530 Subject: [PATCH] app/testpmd: support RSS level configuration Adding support to set RSS level from ethdev config. level-default will requests the default behavior. level-outer will requests RSS to be performed on the outermost packet encapsulation level. level-inner will request RSS to be performed on the specified inner packet encapsulation level, from outermost to innermost. Signed-off-by: Kiran Kumar K Reviewed-by: Ajit Khaparde --- app/test-pmd/cmdline.c | 17 ++++++++++++++--- app/test-pmd/parameters.c | 14 +++++++++++--- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 0f12d187ae..5f93409e31 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -800,7 +800,8 @@ 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|none|)\n" + "ether|port|vxlan|geneve|nvgre|vxlan-gpe|none|level-default|" + "level-outer|level-inner|)\n" " Set the RSS mode.\n\n" "port config port-id rss reta (hash,queue)[,(hash,queue)]\n" @@ -2346,7 +2347,16 @@ cmd_config_rss_parsed(void *parsed_result, rss_conf.rss_hf = ETH_RSS_GTPU; else if (!strcmp(res->value, "none")) rss_conf.rss_hf = 0; - else if (!strcmp(res->value, "default")) + else if (!strcmp(res->value, "level-default")) { + rss_hf &= (~ETH_RSS_LEVEL_MASK); + rss_conf.rss_hf = (rss_hf | ETH_RSS_LEVEL_PMD_DEFAULT); + } else if (!strcmp(res->value, "level-outer")) { + rss_hf &= (~ETH_RSS_LEVEL_MASK); + rss_conf.rss_hf = (rss_hf | ETH_RSS_LEVEL_OUTERMOST); + } else if (!strcmp(res->value, "level-inner")) { + rss_hf &= (~ETH_RSS_LEVEL_MASK); + rss_conf.rss_hf = (rss_hf | ETH_RSS_LEVEL_INNERMOST); + } else if (!strcmp(res->value, "default")) use_default = 1; else if (isdigit(res->value[0]) && atoi(res->value) > 0 && atoi(res->value) < 64) @@ -2405,7 +2415,8 @@ cmdline_parse_inst_t cmd_config_rss = { .data = NULL, .help_str = "port config all rss " "all|default|eth|vlan|ip|tcp|udp|sctp|ether|port|vxlan|geneve|" - "nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|none|", + "nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|none|level-default|" + "level-outer|level-inner|", .tokens = { (void *)&cmd_config_rss_port, (void *)&cmd_config_rss_keyword, diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 8c2aa13dd3..1ead59579b 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -66,9 +66,9 @@ usage(char* progname) "--tx-ip=SRC,DST | --tx-udp=PORT | " #endif "--pkt-filter-mode= |" - "--rss-ip | --rss-udp | " - "--rxpt= | --rxht= | --rxwt= | --rxfreet= | " - "--txpt= | --txht= | --txwt= | --txfreet= | " + "--rss-ip | --rss-udp | --rss-level-inner | --rss-level-outer |" + "--rxpt= | --rxht= | --rxwt= |" + " --rxfreet= | --txpt= | --txht= | --txwt= | --txfreet= | " "--txrst= | --tx-offloads= | | --rx-offloads= | " "--vxlan-gpe-port= | --record-core-cycles | " "--record-burst-stats]\n", @@ -152,6 +152,8 @@ usage(char* progname) "swap L2,L3,L4 for MAC, IPv4/IPv6 and TCP/UDP only.\n"); printf(" --rss-ip: set RSS functions to IPv4/IPv6 only .\n"); printf(" --rss-udp: set RSS functions to IPv4/IPv6 + UDP.\n"); + printf(" --rss-level-inner: set RSS hash level to innermost\n"); + printf(" --rss-level-outer: set RSS hash level to outermost\n"); printf(" --rxq=N: set the number of RX queues per port to N.\n"); printf(" --rxd=N: set the number of descriptors in RX rings to N.\n"); printf(" --txq=N: set the number of TX queues per port to N.\n"); @@ -635,6 +637,8 @@ launch_args_parse(int argc, char** argv) { "forward-mode", 1, 0, 0 }, { "rss-ip", 0, 0, 0 }, { "rss-udp", 0, 0, 0 }, + { "rss-level-outer", 0, 0, 0 }, + { "rss-level-inner", 0, 0, 0 }, { "rxq", 1, 0, 0 }, { "txq", 1, 0, 0 }, { "rxd", 1, 0, 0 }, @@ -1056,6 +1060,10 @@ launch_args_parse(int argc, char** argv) rss_hf = ETH_RSS_IP; if (!strcmp(lgopts[opt_idx].name, "rss-udp")) rss_hf = ETH_RSS_UDP; + if (!strcmp(lgopts[opt_idx].name, "rss-level-inner")) + rss_hf |= ETH_RSS_LEVEL_INNERMOST; + if (!strcmp(lgopts[opt_idx].name, "rss-level-outer")) + rss_hf |= ETH_RSS_LEVEL_OUTERMOST; if (!strcmp(lgopts[opt_idx].name, "rxq")) { n = atoi(optarg); if (n >= 0 && check_nb_rxq((queueid_t)n) == 0) -- 2.20.1