From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 85AC37F99 for ; Wed, 19 Nov 2014 15:48:06 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 19 Nov 2014 06:58:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,417,1413270000"; d="scan'208";a="610472218" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga001.jf.intel.com with ESMTP; 19 Nov 2014 06:58:30 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id sAJEwSUM032277; Wed, 19 Nov 2014 22:58:28 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id sAJEwQMH001396; Wed, 19 Nov 2014 22:58:28 +0800 Received: (from hzhan75@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id sAJEwQlQ001392; Wed, 19 Nov 2014 22:58:26 +0800 From: Helin Zhang To: dev@dpdk.org Date: Wed, 19 Nov 2014 22:58:16 +0800 Message-Id: <1416409096-1340-4-git-send-email-helin.zhang@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1416409096-1340-1-git-send-email-helin.zhang@intel.com> References: <1413861289-26662-1-git-send-email-helin.zhang@intel.com> <1416409096-1340-1-git-send-email-helin.zhang@intel.com> Subject: [dpdk-dev] [PATCH v6 3/3] app/testpmd: add commands to support hash functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 14:48:11 -0000 To demonstrate the hash filter control, commands are added. They are, - get_sym_hash_ena_per_port - set_sym_hash_ena_per_port - get_sym_hash_ena_per_pctype - set_sym_hash_ena_per_pctype - get_filter_swap - set_filter_swap - get_hash_function - set_hash_function Signed-off-by: Helin Zhang --- app/test-pmd/cmdline.c | 628 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 628 insertions(+) v6 changes: * Flow type strings are used to replace Packet Classification Types, to isolate hardware specific things. diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 4c3fc76..ce1547d 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -74,6 +74,7 @@ #include #include #include +#include #include #include @@ -683,6 +684,44 @@ static void cmd_help_long_parsed(void *parsed_result, "get_flex_filter (port_id) index (idx)\n" " get info of a flex filter.\n\n" + + "get_sym_hash_ena_per_port (port_id)\n" + " get symmetric hash enable configuration per port.\n\n" + + "set_sym_hash_ena_per_port (port_id)" + " (enable|disable)\n" + " set symmetric hash enable configuration per port" + " to enable or disable.\n\n" + + "get_sym_hash_ena_per_flow_type (port_id) (ipv4-udp|" + "ipv4-tcp|ipv4-sctp|ipv4-other|ipv4-frag|ipv6-udp|" + "ipv6-tcp|ipv6-sctp|ipv6-other|ipv6-frag|l2_payload)\n" + " get symmetric hash enable configuration per flow type.\n\n" + + "set_sym_hash_ena_per_flow_type (port_id) (ipv4-udp|" + "ipv4-tcp|ipv4-sctp|ipv4-other|ipv4-frag|ipv6-udp|" + "ipv6-tcp|ipv6-sctp|ipv6-other|ipv6-frag|l2_payload) " + "(enable|disable)\n" + " set symmetric hash enable configuration per" + " flow type to enable or disable.\n\n" + + "get_filter_swap (port_id) (ipv4-udp|ipv4-tcp|" + "ipv4-sctp|ipv4-other|ipv4-frag|ipv6-udp|ipv6-tcp|" + "ipv6-sctp|ipv6-other|ipv6-frag|l2_payload)\n" + " get filter swap configurations.\n\n" + + "set_filter_swap (port_id) (ipv4-udp|ipv4-tcp|" + "ipv4-sctp|ipv4-other|ipv4-frag|ipv6-udp|ipv6-tcp|" + "ipv6-sctp|ipv6-other|ipv6-frag|l2_payload) " + "(off0_src0) (off0_src1) (len0) (off1_src0) " + "(off1_src1) (len1)\n" + " set filter swap configurations.\n\n" + + "get_hash_function (port_id)\n" + " get hash function of Toeplitz or Simple XOR.\n\n" + + "set_hash_function (port_id) (toeplitz|simple_xor)\n" + " set the hash function to Toeplitz or Simple XOR.\n\n" ); } } @@ -7745,6 +7784,587 @@ cmdline_parse_inst_t cmd_get_flex_filter = { }, }; +/* *** Classification Filters Control *** */ +static uint8_t +parse_flow_type(const char *str) +{ + struct flow_type_pair { + char str[STR_TOKEN_SIZE]; + uint8_t flow_type; + }; + uint32_t i; + static const struct flow_type_pair ftype[] = { + {"ipv4-udp", ETH_RSS_NONF_IPV4_UDP_SHIFT}, + {"ipv4-tcp", ETH_RSS_NONF_IPV4_TCP_SHIFT}, + {"ipv4-sctp", ETH_RSS_NONF_IPV4_SCTP_SHIFT}, + {"ipv4-other", ETH_RSS_NONF_IPV4_OTHER_SHIFT}, + {"ipv4-frag", ETH_RSS_FRAG_IPV4_SHIFT}, + {"ipv6-udp", ETH_RSS_NONF_IPV6_UDP_SHIFT}, + {"ipv6-tcp", ETH_RSS_NONF_IPV6_TCP_SHIFT}, + {"ipv6-sctp", ETH_RSS_NONF_IPV6_SCTP_SHIFT}, + {"ipv6-other", ETH_RSS_NONF_IPV6_OTHER_SHIFT}, + {"ipv6-frag", ETH_RSS_FRAG_IPV6_SHIFT}, + {"l2_payload", ETH_RSS_L2_PAYLOAD_SHIFT}, + }; + + if (!str) + return 0xFF; + + for (i = 0; i < RTE_DIM(ftype); i++) { + if (!strcmp(ftype[i].str, str)) + return ftype[i].flow_type; + } + + return 0xFF; +} + +/* *** Get symmetric hash enable per port *** */ +struct cmd_get_sym_hash_ena_per_port_result { + cmdline_fixed_string_t get_sym_hash_ena_per_port; + uint8_t port_id; +}; + +static void +cmd_get_sym_hash_per_port_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_get_sym_hash_ena_per_port_result *res = parsed_result; + struct rte_eth_hash_filter_info info; + int ret; + + if (rte_eth_dev_filter_supported(res->port_id, + RTE_ETH_FILTER_HASH) < 0) { + printf("RTE_ETH_FILTER_HASH not supported on port: %d\n", + res->port_id); + return; + } + + memset(&info, 0, sizeof(info)); + info.info_type = RTE_ETH_HASH_FILTER_SYM_HASH_ENA_PER_PORT; + ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH, + RTE_ETH_FILTER_GET, &info); + if (ret < 0) { + printf("Cannot get symmetric hash enable per port " + "on port %u\n", res->port_id); + return; + } + + printf("Symmetric hash is %s on port %u\n", info.info.enable ? + "enabled" : "disabled", res->port_id); +} + +cmdline_parse_token_string_t cmd_get_sym_hash_ena_per_port_all = + TOKEN_STRING_INITIALIZER(struct cmd_get_sym_hash_ena_per_port_result, + get_sym_hash_ena_per_port, "get_sym_hash_ena_per_port"); +cmdline_parse_token_num_t cmd_get_sym_hash_ena_per_port_port_id = + TOKEN_NUM_INITIALIZER(struct cmd_get_sym_hash_ena_per_port_result, + port_id, UINT8); + +cmdline_parse_inst_t cmd_get_sym_hash_ena_per_port = { + .f = cmd_get_sym_hash_per_port_parsed, + .data = NULL, + .help_str = "get_sym_hash_ena_per_port port_id", + .tokens = { + (void *)&cmd_get_sym_hash_ena_per_port_all, + (void *)&cmd_get_sym_hash_ena_per_port_port_id, + NULL, + }, +}; + +/* *** Set symmetric hash enable per port *** */ +struct cmd_set_sym_hash_ena_per_port_result { + cmdline_fixed_string_t set_sym_hash_ena_per_port; + cmdline_fixed_string_t enable; + uint8_t port_id; +}; + +static void +cmd_set_sym_hash_per_port_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_set_sym_hash_ena_per_port_result *res = parsed_result; + struct rte_eth_hash_filter_info info; + int ret; + + if (rte_eth_dev_filter_supported(res->port_id, + RTE_ETH_FILTER_HASH) < 0) { + printf("RTE_ETH_FILTER_HASH not supported on port: %d\n", + res->port_id); + return; + } + + memset(&info, 0, sizeof(info)); + info.info_type = RTE_ETH_HASH_FILTER_SYM_HASH_ENA_PER_PORT; + if (!strcmp(res->enable, "enable")) + info.info.enable = 1; + ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH, + RTE_ETH_FILTER_SET, &info); + if (ret < 0) { + printf("Cannot set symmetric hash enable per port on " + "port %u\n", res->port_id); + return; + } + + printf("Symmetric hash has been set to %s on port %u\n", + res->enable, res->port_id); +} + +cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_all = + TOKEN_STRING_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result, + set_sym_hash_ena_per_port, "set_sym_hash_ena_per_port"); +cmdline_parse_token_num_t cmd_set_sym_hash_ena_per_port_port_id = + TOKEN_NUM_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result, + port_id, UINT8); +cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_enable = + TOKEN_STRING_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result, + enable, "enable#disable"); + +cmdline_parse_inst_t cmd_set_sym_hash_ena_per_port = { + .f = cmd_set_sym_hash_per_port_parsed, + .data = NULL, + .help_str = "set_sym_hash_ena_per_port port_id enable|disable", + .tokens = { + (void *)&cmd_set_sym_hash_ena_per_port_all, + (void *)&cmd_set_sym_hash_ena_per_port_port_id, + (void *)&cmd_set_sym_hash_ena_per_port_enable, + NULL, + }, +}; + +/* *** Get symmetric hash enable per flow_type *** */ +struct cmd_get_sym_hash_ena_per_flow_type_result { + cmdline_fixed_string_t get_sym_hash_ena_per_flow_type; + uint8_t port_id; + cmdline_fixed_string_t flow_type; +}; + +static void +cmd_get_sym_hash_per_flow_type_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_get_sym_hash_ena_per_flow_type_result *res = parsed_result; + struct rte_eth_hash_filter_info info; + int ret; + + if (rte_eth_dev_filter_supported(res->port_id, + RTE_ETH_FILTER_HASH) < 0) { + printf("RTE_ETH_FILTER_HASH not supported on port: %d\n", + res->port_id); + return; + } + + memset(&info, 0, sizeof(info)); + info.info_type = + RTE_ETH_HASH_FILTER_SYM_HASH_ENA_PER_FLOW_TYPE; + info.info.sym_hash_ena.flow_type = parse_flow_type(res->flow_type); + ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH, + RTE_ETH_FILTER_GET, &info); + if (ret < 0) { + printf("Cannot get symmetric hash enable per flow_type on " + "port %u, flow_type %s\n", + res->port_id, res->flow_type); + return; + } + printf("Symmetric hash is %s on port %u, flow_type %s\n", + info.info.sym_hash_ena.enable ? "enabled" : + "disabled", res->port_id, res->flow_type); +} + +cmdline_parse_token_string_t cmd_get_sym_hash_ena_per_flow_type_all = + TOKEN_STRING_INITIALIZER( + struct cmd_get_sym_hash_ena_per_flow_type_result, + get_sym_hash_ena_per_flow_type, + "get_sym_hash_ena_per_flow_type"); +cmdline_parse_token_num_t cmd_get_sym_hash_ena_per_flow_type_port_id = + TOKEN_NUM_INITIALIZER(struct cmd_get_sym_hash_ena_per_flow_type_result, + port_id, UINT8); +cmdline_parse_token_string_t cmd_get_sym_hash_ena_per_flow_type_flow_type = + TOKEN_STRING_INITIALIZER( + struct cmd_get_sym_hash_ena_per_flow_type_result, flow_type, + "ipv4-udp#ipv4-tcp#ipv4-sctp#ipv4-other#ipv4-frag#ipv6-udp#" + "ipv6-tcp#ipv6-sctp#ipv6-other#ipv6-frag#l2_payload"); + +cmdline_parse_inst_t cmd_get_sym_hash_ena_per_flow_type = { + .f = cmd_get_sym_hash_per_flow_type_parsed, + .data = NULL, + .help_str = "get_sym_hash_ena_per_flow_type port_id ipv4-udp|ipv4-tcp|" + "ipv4-sctp|ipv4-other|ipv4-frag|ipv6-udp|ipv6-tcp|ipv6-sctp|" + "ipv6-other|ipv6-frag|l2_payload", + .tokens = { + (void *)&cmd_get_sym_hash_ena_per_flow_type_all, + (void *)&cmd_get_sym_hash_ena_per_flow_type_port_id, + (void *)&cmd_get_sym_hash_ena_per_flow_type_flow_type, + NULL, + }, +}; + +/* *** Set symmetric hash enable per flow_type *** */ +struct cmd_set_sym_hash_ena_per_flow_type_result { + cmdline_fixed_string_t set_sym_hash_ena_per_flow_type; + cmdline_fixed_string_t enable; + uint8_t port_id; + cmdline_fixed_string_t flow_type; +}; + +static void +cmd_set_sym_hash_per_flow_type_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_set_sym_hash_ena_per_flow_type_result *res = parsed_result; + struct rte_eth_hash_filter_info info; + int ret; + + if (rte_eth_dev_filter_supported(res->port_id, + RTE_ETH_FILTER_HASH) < 0) { + printf("RTE_ETH_FILTER_HASH not supported on port: %d\n", + res->port_id); + return; + } + + memset(&info, 0, sizeof(info)); + info.info_type = + RTE_ETH_HASH_FILTER_SYM_HASH_ENA_PER_FLOW_TYPE; + info.info.sym_hash_ena.flow_type = parse_flow_type(res->flow_type); + if (!strcmp(res->enable, "enable")) + info.info.sym_hash_ena.enable = 1; + ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH, + RTE_ETH_FILTER_SET, &info); + if (ret < 0) { + printf("Cannot set symmetric hash enable per flow_type to %s " + "on port %u, flow_type %s\n", res->enable ? "enabled" : + "disabled", res->port_id, res->flow_type); + return; + } + printf("Symmetic hash has been set to %s on port %u, flow_type %s\n", + res->enable, res->port_id, res->flow_type); +} + +cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_flow_type_all = + TOKEN_STRING_INITIALIZER( + struct cmd_set_sym_hash_ena_per_flow_type_result, + set_sym_hash_ena_per_flow_type, + "set_sym_hash_ena_per_flow_type"); +cmdline_parse_token_num_t cmd_set_sym_hash_ena_per_flow_type_port_id = + TOKEN_NUM_INITIALIZER(struct cmd_set_sym_hash_ena_per_flow_type_result, + port_id, UINT8); +cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_flow_type_flow_type = + TOKEN_STRING_INITIALIZER( + struct cmd_set_sym_hash_ena_per_flow_type_result, flow_type, + "ipv4-udp#ipv4-tcp#ipv4-sctp#ipv4-other#ipv4-frag#ipv6-udp#" + "ipv6-tcp#ipv6-sctp#ipv6-other#ipv6-frag#l2_payload"); +cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_flow_type_enable = + TOKEN_STRING_INITIALIZER( + struct cmd_set_sym_hash_ena_per_flow_type_result, + enable, "enable#disable"); + +cmdline_parse_inst_t cmd_set_sym_hash_ena_per_flow_type = { + .f = cmd_set_sym_hash_per_flow_type_parsed, + .data = NULL, + .help_str = "set_sym_hash_ena_per_flow_type pord_id ipv4-udp|ipv4-tcp|" + "ipv4-sctp|ipv4-other|ipv4-frag|ipv6-udp|ipv6-tcp|ipv6-sctp|" + "ipv6-other|ipv6-frag|l2_payload enable|disable", + .tokens = { + (void *)&cmd_set_sym_hash_ena_per_flow_type_all, + (void *)&cmd_set_sym_hash_ena_per_flow_type_port_id, + (void *)&cmd_set_sym_hash_ena_per_flow_type_flow_type, + (void *)&cmd_set_sym_hash_ena_per_flow_type_enable, + NULL, + }, +}; + +/* *** Get filter swap *** */ +struct cmd_get_filter_swap_result { + cmdline_fixed_string_t get_filter_swap; + uint8_t port_id; + cmdline_fixed_string_t flow_type; +}; + +static void +cmd_get_filter_swap_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_get_filter_swap_result *res = parsed_result; + struct rte_eth_hash_filter_info info; + int ret; + + if (rte_eth_dev_filter_supported(res->port_id, + RTE_ETH_FILTER_HASH) < 0) { + printf("RTE_ETH_FILTER_HASH not supported on port: %d\n", + res->port_id); + return; + } + + memset(&info, 0, sizeof(info)); + info.info_type = RTE_ETH_HASH_FILTER_SWAP; + info.info.filter_swap.flow_type = parse_flow_type(res->flow_type); + ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH, + RTE_ETH_FILTER_GET, &info); + if (ret < 0) { + printf("Cannot get filter swap on port %u, flow_type %s\n", + res->port_id, res->flow_type); + return; + } + printf("Filter swap of port %u, flow_type %s is configured as:\n" + "off0_src0: 0x%02x, off0_src1: 0x%02x, len0: 0x%02x\n" + "off1_src0: 0x%02x, off1_src1: 0x%02x, len1: 0x%02x\n", + res->port_id, res->flow_type, info.info.filter_swap.off0_src0, + info.info.filter_swap.off0_src1, info.info.filter_swap.len0, + info.info.filter_swap.off1_src0, + info.info.filter_swap.off1_src1, info.info.filter_swap.len1); +} + +cmdline_parse_token_string_t cmd_get_filter_swap_all = + TOKEN_STRING_INITIALIZER(struct cmd_get_filter_swap_result, + get_filter_swap, "get_filter_swap"); +cmdline_parse_token_num_t cmd_get_filter_swap_port_id = + TOKEN_NUM_INITIALIZER(struct cmd_get_filter_swap_result, + port_id, UINT8); +cmdline_parse_token_string_t cmd_get_filter_swap_flow_type = + TOKEN_STRING_INITIALIZER(struct cmd_get_filter_swap_result, flow_type, + "ipv4-udp#ipv4-tcp#ipv4-sctp#ipv4-other#ipv4-frag#ipv6-udp#" + "ipv6-tcp#ipv6-sctp#ipv6-other#ipv6-frag#l2_payload"); + +cmdline_parse_inst_t cmd_get_filter_swap = { + .f = cmd_get_filter_swap_parsed, + .data = NULL, + .help_str = "get_filter_swap port_id ipv4-udp|ipv4-tcp|ipv4-sctp|" + "ipv4-other|ipv4-frag|ipv6-udp|ipv6-tcp|ipv6-sctp|ipv6-other|" + "ipv6-frag|l2_payload", + .tokens = { + (void *)&cmd_get_filter_swap_all, + (void *)&cmd_get_filter_swap_port_id, + (void *)&cmd_get_filter_swap_flow_type, + NULL, + }, +}; + +/* *** Set filter swap *** */ +struct cmd_set_filter_swap_result { + cmdline_fixed_string_t set_filter_swap; + uint8_t port_id; + cmdline_fixed_string_t flow_type; + uint8_t off0_src0; + uint8_t off0_src1; + uint8_t len0; + uint8_t off1_src0; + uint8_t off1_src1; + uint8_t len1; +}; + +static void +cmd_set_filter_swap_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_set_filter_swap_result *res = parsed_result; + struct rte_eth_hash_filter_info info; + int ret; + + if (rte_eth_dev_filter_supported(res->port_id, + RTE_ETH_FILTER_HASH) < 0) { + printf("RTE_ETH_FILTER_HASH not supported on port: %d\n", + res->port_id); + return; + } + + memset(&info, 0, sizeof(info)); + info.info_type = RTE_ETH_HASH_FILTER_SWAP; + info.info.filter_swap.flow_type = parse_flow_type(res->flow_type); + info.info.filter_swap.off0_src0 = res->off0_src0; + info.info.filter_swap.off0_src1 = res->off0_src1; + info.info.filter_swap.len0 = res->len0; + info.info.filter_swap.off1_src0 = res->off1_src0; + info.info.filter_swap.off1_src1 = res->off1_src1; + info.info.filter_swap.len1 = res->len1; + ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH, + RTE_ETH_FILTER_SET, &info); + if (ret < 0) { + printf("Cannot set filter swap on port %u, flow_type %s\n", + res->port_id, res->flow_type); + return; + } + printf("Filter swap of port %u, flow_type %s has been set as:\n" + "off0_src0: 0x%02x, off0_src1: 0x%02x, len0: 0x%02x\n" + "off1_src0: 0x%02x, off1_src1: 0x%02x, len1: 0x%02x\n", + res->port_id, res->flow_type, info.info.filter_swap.off0_src0, + info.info.filter_swap.off0_src1, info.info.filter_swap.len0, + info.info.filter_swap.off1_src0, + info.info.filter_swap.off1_src1, info.info.filter_swap.len1); +} + +cmdline_parse_token_string_t cmd_set_filter_swap_all = + TOKEN_STRING_INITIALIZER(struct cmd_set_filter_swap_result, + set_filter_swap, "set_filter_swap"); +cmdline_parse_token_num_t cmd_set_filter_swap_port_id = + TOKEN_NUM_INITIALIZER(struct cmd_set_filter_swap_result, + port_id, UINT8); +cmdline_parse_token_string_t cmd_set_filter_swap_flow_type = + TOKEN_STRING_INITIALIZER(struct cmd_set_filter_swap_result, flow_type, + "ipv4-udp#ipv4-tcp#ipv4-sctp#ipv4-other#ipv4-frag#ipv6-udp#" + "ipv6-tcp#ipv6-sctp#ipv6-other#ipv6-frag#l2_payload"); +cmdline_parse_token_num_t cmd_set_filter_swap_off0_src0 = + TOKEN_NUM_INITIALIZER(struct cmd_set_filter_swap_result, + off0_src0, UINT8); +cmdline_parse_token_num_t cmd_set_filter_swap_off0_src1 = + TOKEN_NUM_INITIALIZER(struct cmd_set_filter_swap_result, + off0_src1, UINT8); +cmdline_parse_token_num_t cmd_set_filter_swap_len0 = + TOKEN_NUM_INITIALIZER(struct cmd_set_filter_swap_result, + len0, UINT8); +cmdline_parse_token_num_t cmd_set_filter_swap_off1_src0 = + TOKEN_NUM_INITIALIZER(struct cmd_set_filter_swap_result, + off1_src0, UINT8); +cmdline_parse_token_num_t cmd_set_filter_swap_off1_src1 = + TOKEN_NUM_INITIALIZER(struct cmd_set_filter_swap_result, + off1_src1, UINT8); +cmdline_parse_token_num_t cmd_set_filter_swap_len1 = + TOKEN_NUM_INITIALIZER(struct cmd_set_filter_swap_result, + len1, UINT8); + +cmdline_parse_inst_t cmd_set_filter_swap = { + .f = cmd_set_filter_swap_parsed, + .data = NULL, + .help_str = "set_filter_swap port_id ipv4-udp|ipv4-tcp|ipv4-sctp|" + "ipv4-other|ipv4-frag|ipv6-udp|ipv6-tcp|ipv6-sctp|ipv6-other|" + "ipv6-frag|l2_payload off0_src0 off0_src1 len0 off1_src0 " + "off1_src1 len1", + .tokens = { + (void *)&cmd_set_filter_swap_all, + (void *)&cmd_set_filter_swap_port_id, + (void *)&cmd_set_filter_swap_flow_type, + (void *)&cmd_set_filter_swap_off0_src0, + (void *)&cmd_set_filter_swap_off0_src1, + (void *)&cmd_set_filter_swap_len0, + (void *)&cmd_set_filter_swap_off1_src0, + (void *)&cmd_set_filter_swap_off1_src1, + (void *)&cmd_set_filter_swap_len1, + NULL, + }, +}; + +/* Get hash function */ +struct cmd_get_hash_function_result { + cmdline_fixed_string_t get_hash_function; + uint8_t port_id; +}; + +static void +cmd_get_hash_function_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_get_hash_function_result *res = parsed_result; + struct rte_eth_hash_filter_info info; + int ret; + + if (rte_eth_dev_filter_supported(res->port_id, + RTE_ETH_FILTER_HASH) < 0) { + printf("RTE_ETH_FILTER_HASH not supported on port %d\n", + res->port_id); + return; + } + + memset(&info, 0, sizeof(info)); + info.info_type = RTE_ETH_HASH_FILTER_HASH_FUNCTION; + ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH, + RTE_ETH_FILTER_GET, &info); + if (ret < 0) { + printf("Cannot get hash function on port %d\n", res->port_id); + return; + } + printf("Hash function is %s\n", info.info.hash_function == + RTE_ETH_HASH_FUNCTION_TOEPLITZ ? "Toeplitz" : "Simple XOR"); +} + +cmdline_parse_token_string_t cmd_get_hash_function_all = + TOKEN_STRING_INITIALIZER(struct cmd_get_hash_function_result, + get_hash_function, "get_hash_function"); +cmdline_parse_token_num_t cmd_get_hash_function_port_id = + TOKEN_NUM_INITIALIZER(struct cmd_get_hash_function_result, + port_id, UINT8); + +cmdline_parse_inst_t cmd_get_hash_function = { + .f = cmd_get_hash_function_parsed, + .data = NULL, + .help_str = "get_hash_function port_id", + .tokens = { + (void *)&cmd_get_hash_function_all, + (void *)&cmd_get_hash_function_port_id, + NULL, + }, +}; + +/* Set hash function of Hoeplitz or Simple XOR */ +struct cmd_set_hash_function_result { + cmdline_fixed_string_t set_hash_function; + uint8_t port_id; + cmdline_fixed_string_t hash_function; +}; + +static void +cmd_set_hash_function_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_set_hash_function_result *res = parsed_result; + struct rte_eth_hash_filter_info info; + int ret; + + if (rte_eth_dev_filter_supported(res->port_id, + RTE_ETH_FILTER_HASH) < 0) { + printf("RTE_ETH_FILTER_HASH not supported on port %d\n", + res->port_id); + return; + } + + memset(&info, 0, sizeof(info)); + info.info_type = RTE_ETH_HASH_FILTER_HASH_FUNCTION; + if (!strcmp(res->hash_function, "toeplitz")) + info.info.hash_function = RTE_ETH_HASH_FUNCTION_TOEPLITZ; + else if (!strcmp(res->hash_function, "simple_xor")) + info.info.hash_function = RTE_ETH_HASH_FUNCTION_SIMPLE_XOR; + else { + printf("Unsupported hash function %s\n", res->hash_function); + return; + } + ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH, + RTE_ETH_FILTER_SET, &info); + if (ret < 0) { + printf("Cannot set hash function to %s on port %d\n", + res->hash_function, res->port_id); + return; + } + printf("Hash function has been successfully set to %s on port %d\n", + res->hash_function, res->port_id); +} + +cmdline_parse_token_string_t cmd_set_hash_function_all = + TOKEN_STRING_INITIALIZER(struct cmd_set_hash_function_result, + set_hash_function, "set_hash_function"); +cmdline_parse_token_num_t cmd_set_hash_function_port_id = + TOKEN_NUM_INITIALIZER(struct cmd_set_hash_function_result, + port_id, UINT8); +cmdline_parse_token_string_t cmd_set_hash_function_hash_function = + TOKEN_STRING_INITIALIZER(struct cmd_set_hash_function_result, + hash_function, "toeplitz#simple_xor"); + +cmdline_parse_inst_t cmd_set_hash_function = { + .f = cmd_set_hash_function_parsed, + .data = NULL, + .help_str = "set_hash_function port_id toeplitz|simple_xor", + .tokens = { + (void *)&cmd_set_hash_function_all, + (void *)&cmd_set_hash_function_port_id, + (void *)&cmd_set_hash_function_hash_function, + NULL, + }, +}; + /* ******************************************************************************** */ /* list of instructions */ @@ -7874,6 +8494,14 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_add_flex_filter, (cmdline_parse_inst_t *)&cmd_remove_flex_filter, (cmdline_parse_inst_t *)&cmd_get_flex_filter, + (cmdline_parse_inst_t *)&cmd_get_sym_hash_ena_per_port, + (cmdline_parse_inst_t *)&cmd_set_sym_hash_ena_per_port, + (cmdline_parse_inst_t *)&cmd_get_sym_hash_ena_per_flow_type, + (cmdline_parse_inst_t *)&cmd_set_sym_hash_ena_per_flow_type, + (cmdline_parse_inst_t *)&cmd_get_filter_swap, + (cmdline_parse_inst_t *)&cmd_set_filter_swap, + (cmdline_parse_inst_t *)&cmd_set_hash_function, + (cmdline_parse_inst_t *)&cmd_get_hash_function, NULL, }; -- 1.8.1.4