diff mbox series

[v2,2/2] app/testpmd: add symmetric toeplitz hash support

Message ID 1564102511-99609-3-git-send-email-simei.su@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers show
Series add symmetric toeplitz hash support | expand

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Simei Su July 26, 2019, 12:55 a.m. UTC
From: Simei Su <simei.su@intel.com>

This patch adds command line support for Symmetric Toeplitz
hash configuration.

Signed-off-by: Simei Su <simei.su@intel.com>
---
 app/test-pmd/cmdline.c                      | 12 +++++++++---
 app/test-pmd/cmdline_flow.c                 | 12 +++++++++++-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

Comments

Ori Kam Sept. 28, 2019, 6:39 p.m. UTC | #1
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of simei
> Sent: Friday, July 26, 2019 3:55 AM
> To: qi.z.zhang@intel.com; jingjing.wu@intel.com; Adrien Mazarguil
> <adrien.mazarguil@6wind.com>
> Cc: dev@dpdk.org; simei.su@intel.com
> Subject: [dpdk-dev] [PATCH v2 2/2] app/testpmd: add symmetric toeplitz hash
> support
> 
> From: Simei Su <simei.su@intel.com>
> 
> This patch adds command line support for Symmetric Toeplitz
> hash configuration.
> 
> Signed-off-by: Simei Su <simei.su@intel.com>
> ---


Acked-by: Ori Kam <orika@mellanox.com>
Thanks,
Ori Kam

>  app/test-pmd/cmdline.c                      | 12 +++++++++---
>  app/test-pmd/cmdline_flow.c                 | 12 +++++++++++-
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  2 +-
>  3 files changed, 21 insertions(+), 5 deletions(-)
> 
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index a28362d..60c159f 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -1055,7 +1055,7 @@ static void cmd_help_long_parsed(void
> *parsed_result,
>  			"get_hash_global_config (port_id)\n"
>  			"    Get the global configurations of hash filters.\n\n"
> 
> -			"set_hash_global_config (port_id)
> (toeplitz|simple_xor|default)"
> +			"set_hash_global_config (port_id)
> (toeplitz|simple_xor|symmetric_toeplitz|default)"
>  			" (ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-
> other|ipv6|"
>  			"ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-
> other|l2_payload)"
>  			" (enable|disable)\n"
> @@ -12258,6 +12258,9 @@ struct cmd_get_hash_global_config_result {
>  	case RTE_ETH_HASH_FUNCTION_SIMPLE_XOR:
>  		printf("Hash function is Simple XOR\n");
>  		break;
> +	case RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ:
> +		printf("Hash function is Symmetric Toeplitz\n");
> +		break;
>  	default:
>  		printf("Unknown hash function\n");
>  		break;
> @@ -12331,6 +12334,9 @@ struct cmd_set_hash_global_config_result {
>  	else if (!strcmp(res->hash_func, "simple_xor"))
>  		info.info.global_conf.hash_func =
>  			RTE_ETH_HASH_FUNCTION_SIMPLE_XOR;
> +	else if	(!strcmp(res->hash_func, "symmetric_toeplitz"))
> +		info.info.global_conf.hash_func =
> +			RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ;
>  	else if (!strcmp(res->hash_func, "default"))
>  		info.info.global_conf.hash_func =
>  			RTE_ETH_HASH_FUNCTION_DEFAULT;
> @@ -12360,7 +12366,7 @@ struct cmd_set_hash_global_config_result {
>  		port_id, UINT16);
>  cmdline_parse_token_string_t cmd_set_hash_global_config_hash_func =
>  	TOKEN_STRING_INITIALIZER(struct
> cmd_set_hash_global_config_result,
> -		hash_func, "toeplitz#simple_xor#default");
> +		hash_func, "toeplitz#simple_xor#symmetric_toeplitz#default");
>  cmdline_parse_token_string_t cmd_set_hash_global_config_flow_type =
>  	TOKEN_STRING_INITIALIZER(struct
> cmd_set_hash_global_config_result,
>  		flow_type,
> @@ -12374,7 +12380,7 @@ struct cmd_set_hash_global_config_result {
>  	.f = cmd_set_hash_global_config_parsed,
>  	.data = NULL,
>  	.help_str = "set_hash_global_config <port_id> "
> -		"toeplitz|simple_xor|default "
> +		"toeplitz|simple_xor|symmetric_toeplitz|default "
>  		"ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|"
>  		"ipv6|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|"
>  		"l2_payload enable|disable",
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index 4958713..4968df9 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -220,6 +220,7 @@ enum index {
>  	ACTION_RSS_FUNC_DEFAULT,
>  	ACTION_RSS_FUNC_TOEPLITZ,
>  	ACTION_RSS_FUNC_SIMPLE_XOR,
> +	ACTION_RSS_FUNC_SYMMETRIC_TOEPLITZ,
>  	ACTION_RSS_TYPES,
>  	ACTION_RSS_TYPE,
>  	ACTION_RSS_KEY,
> @@ -2457,7 +2458,8 @@ static int comp_vc_action_rss_queue(struct context
> *, const struct token *,
>  		.next = NEXT(action_rss,
>  			     NEXT_ENTRY(ACTION_RSS_FUNC_DEFAULT,
>  					ACTION_RSS_FUNC_TOEPLITZ,
> -					ACTION_RSS_FUNC_SIMPLE_XOR)),
> +					ACTION_RSS_FUNC_SIMPLE_XOR,
> +
> 	ACTION_RSS_FUNC_SYMMETRIC_TOEPLITZ)),
>  	},
>  	[ACTION_RSS_FUNC_DEFAULT] = {
>  		.name = "default",
> @@ -2474,6 +2476,11 @@ static int comp_vc_action_rss_queue(struct context
> *, const struct token *,
>  		.help = "simple XOR hash function",
>  		.call = parse_vc_action_rss_func,
>  	},
> +	[ACTION_RSS_FUNC_SYMMETRIC_TOEPLITZ] = {
> +		.name = "symmetric_toeplitz",
> +		.help = "Symmetric Toeplitz hash function",
> +		.call = parse_vc_action_rss_func,
> +	},
>  	[ACTION_RSS_LEVEL] = {
>  		.name = "level",
>  		.help = "encapsulation level for \"types\"",
> @@ -3588,6 +3595,9 @@ static int comp_vc_action_rss_queue(struct context
> *, const struct token *,
>  	case ACTION_RSS_FUNC_SIMPLE_XOR:
>  		func = RTE_ETH_HASH_FUNCTION_SIMPLE_XOR;
>  		break;
> +	case ACTION_RSS_FUNC_SYMMETRIC_TOEPLITZ:
> +		func = RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ;
> +		break;
>  	default:
>  		return -1;
>  	}
> diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> index 313e070..6343638 100644
> --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> @@ -3471,7 +3471,7 @@ set_hash_global_config
> 
>  Set the global configurations of hash filters::
> 
> -   set_hash_global_config (port_id) (toeplitz|simple_xor|default) \
> +   set_hash_global_config (port_id)
> (toeplitz|simple_xor|symmetric_toeplitz|default) \
>     (ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|ipv6|ipv6-frag| \
>     ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|l2_payload|<flow_id>) \
>     (enable|disable)
> --
> 1.8.3.1
diff mbox series

Patch

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index a28362d..60c159f 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1055,7 +1055,7 @@  static void cmd_help_long_parsed(void *parsed_result,
 			"get_hash_global_config (port_id)\n"
 			"    Get the global configurations of hash filters.\n\n"
 
-			"set_hash_global_config (port_id) (toeplitz|simple_xor|default)"
+			"set_hash_global_config (port_id) (toeplitz|simple_xor|symmetric_toeplitz|default)"
 			" (ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|ipv6|"
 			"ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|l2_payload)"
 			" (enable|disable)\n"
@@ -12258,6 +12258,9 @@  struct cmd_get_hash_global_config_result {
 	case RTE_ETH_HASH_FUNCTION_SIMPLE_XOR:
 		printf("Hash function is Simple XOR\n");
 		break;
+	case RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ:
+		printf("Hash function is Symmetric Toeplitz\n");
+		break;
 	default:
 		printf("Unknown hash function\n");
 		break;
@@ -12331,6 +12334,9 @@  struct cmd_set_hash_global_config_result {
 	else if (!strcmp(res->hash_func, "simple_xor"))
 		info.info.global_conf.hash_func =
 			RTE_ETH_HASH_FUNCTION_SIMPLE_XOR;
+	else if	(!strcmp(res->hash_func, "symmetric_toeplitz"))
+		info.info.global_conf.hash_func =
+			RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ;
 	else if (!strcmp(res->hash_func, "default"))
 		info.info.global_conf.hash_func =
 			RTE_ETH_HASH_FUNCTION_DEFAULT;
@@ -12360,7 +12366,7 @@  struct cmd_set_hash_global_config_result {
 		port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_hash_global_config_hash_func =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_hash_global_config_result,
-		hash_func, "toeplitz#simple_xor#default");
+		hash_func, "toeplitz#simple_xor#symmetric_toeplitz#default");
 cmdline_parse_token_string_t cmd_set_hash_global_config_flow_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_hash_global_config_result,
 		flow_type,
@@ -12374,7 +12380,7 @@  struct cmd_set_hash_global_config_result {
 	.f = cmd_set_hash_global_config_parsed,
 	.data = NULL,
 	.help_str = "set_hash_global_config <port_id> "
-		"toeplitz|simple_xor|default "
+		"toeplitz|simple_xor|symmetric_toeplitz|default "
 		"ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|"
 		"ipv6|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|"
 		"l2_payload enable|disable",
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 4958713..4968df9 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -220,6 +220,7 @@  enum index {
 	ACTION_RSS_FUNC_DEFAULT,
 	ACTION_RSS_FUNC_TOEPLITZ,
 	ACTION_RSS_FUNC_SIMPLE_XOR,
+	ACTION_RSS_FUNC_SYMMETRIC_TOEPLITZ,
 	ACTION_RSS_TYPES,
 	ACTION_RSS_TYPE,
 	ACTION_RSS_KEY,
@@ -2457,7 +2458,8 @@  static int comp_vc_action_rss_queue(struct context *, const struct token *,
 		.next = NEXT(action_rss,
 			     NEXT_ENTRY(ACTION_RSS_FUNC_DEFAULT,
 					ACTION_RSS_FUNC_TOEPLITZ,
-					ACTION_RSS_FUNC_SIMPLE_XOR)),
+					ACTION_RSS_FUNC_SIMPLE_XOR,
+					ACTION_RSS_FUNC_SYMMETRIC_TOEPLITZ)),
 	},
 	[ACTION_RSS_FUNC_DEFAULT] = {
 		.name = "default",
@@ -2474,6 +2476,11 @@  static int comp_vc_action_rss_queue(struct context *, const struct token *,
 		.help = "simple XOR hash function",
 		.call = parse_vc_action_rss_func,
 	},
+	[ACTION_RSS_FUNC_SYMMETRIC_TOEPLITZ] = {
+		.name = "symmetric_toeplitz",
+		.help = "Symmetric Toeplitz hash function",
+		.call = parse_vc_action_rss_func,
+	},
 	[ACTION_RSS_LEVEL] = {
 		.name = "level",
 		.help = "encapsulation level for \"types\"",
@@ -3588,6 +3595,9 @@  static int comp_vc_action_rss_queue(struct context *, const struct token *,
 	case ACTION_RSS_FUNC_SIMPLE_XOR:
 		func = RTE_ETH_HASH_FUNCTION_SIMPLE_XOR;
 		break;
+	case ACTION_RSS_FUNC_SYMMETRIC_TOEPLITZ:
+		func = RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ;
+		break;
 	default:
 		return -1;
 	}
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 313e070..6343638 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -3471,7 +3471,7 @@  set_hash_global_config
 
 Set the global configurations of hash filters::
 
-   set_hash_global_config (port_id) (toeplitz|simple_xor|default) \
+   set_hash_global_config (port_id) (toeplitz|simple_xor|symmetric_toeplitz|default) \
    (ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|ipv6|ipv6-frag| \
    ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|l2_payload|<flow_id>) \
    (enable|disable)