ethdev: remove legacy global filter configuration support
Global filter configuration request was supported by net/i40e driver only to configure GRE key length. Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
parent
f0872e8754
commit
0cd2ff37c3
@ -9295,62 +9295,6 @@ cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
/* *** GLOBAL CONFIG *** */
|
|
||||||
struct cmd_global_config_result {
|
|
||||||
cmdline_fixed_string_t cmd;
|
|
||||||
portid_t port_id;
|
|
||||||
cmdline_fixed_string_t cfg_type;
|
|
||||||
uint8_t len;
|
|
||||||
};
|
|
||||||
|
|
||||||
static void
|
|
||||||
cmd_global_config_parsed(void *parsed_result,
|
|
||||||
__rte_unused struct cmdline *cl,
|
|
||||||
__rte_unused void *data)
|
|
||||||
{
|
|
||||||
struct cmd_global_config_result *res = parsed_result;
|
|
||||||
struct rte_eth_global_cfg conf;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
memset(&conf, 0, sizeof(conf));
|
|
||||||
conf.cfg_type = RTE_ETH_GLOBAL_CFG_TYPE_GRE_KEY_LEN;
|
|
||||||
conf.cfg.gre_key_len = res->len;
|
|
||||||
ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_NONE,
|
|
||||||
RTE_ETH_FILTER_SET, &conf);
|
|
||||||
#ifdef RTE_NET_I40E
|
|
||||||
if (ret == -ENOTSUP)
|
|
||||||
ret = rte_pmd_i40e_set_gre_key_len(res->port_id, res->len);
|
|
||||||
#endif
|
|
||||||
if (ret != 0)
|
|
||||||
printf("Global config error\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
cmdline_parse_token_string_t cmd_global_config_cmd =
|
|
||||||
TOKEN_STRING_INITIALIZER(struct cmd_global_config_result, cmd,
|
|
||||||
"global_config");
|
|
||||||
cmdline_parse_token_num_t cmd_global_config_port_id =
|
|
||||||
TOKEN_NUM_INITIALIZER(struct cmd_global_config_result, port_id,
|
|
||||||
UINT16);
|
|
||||||
cmdline_parse_token_string_t cmd_global_config_type =
|
|
||||||
TOKEN_STRING_INITIALIZER(struct cmd_global_config_result,
|
|
||||||
cfg_type, "gre-key-len");
|
|
||||||
cmdline_parse_token_num_t cmd_global_config_gre_key_len =
|
|
||||||
TOKEN_NUM_INITIALIZER(struct cmd_global_config_result,
|
|
||||||
len, UINT8);
|
|
||||||
|
|
||||||
cmdline_parse_inst_t cmd_global_config = {
|
|
||||||
.f = cmd_global_config_parsed,
|
|
||||||
.data = (void *)NULL,
|
|
||||||
.help_str = "global_config <port_id> gre-key-len <key_len>",
|
|
||||||
.tokens = {
|
|
||||||
(void *)&cmd_global_config_cmd,
|
|
||||||
(void *)&cmd_global_config_port_id,
|
|
||||||
(void *)&cmd_global_config_type,
|
|
||||||
(void *)&cmd_global_config_gre_key_len,
|
|
||||||
NULL,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
/* *** CONFIGURE VM MIRROR VLAN/POOL RULE *** */
|
/* *** CONFIGURE VM MIRROR VLAN/POOL RULE *** */
|
||||||
struct cmd_set_mirror_mask_result {
|
struct cmd_set_mirror_mask_result {
|
||||||
cmdline_fixed_string_t set;
|
cmdline_fixed_string_t set;
|
||||||
@ -18454,7 +18398,6 @@ cmdline_parse_ctx_t main_ctx[] = {
|
|||||||
(cmdline_parse_inst_t *)&cmd_vf_mac_addr_filter,
|
(cmdline_parse_inst_t *)&cmd_vf_mac_addr_filter,
|
||||||
(cmdline_parse_inst_t *)&cmd_queue_rate_limit,
|
(cmdline_parse_inst_t *)&cmd_queue_rate_limit,
|
||||||
(cmdline_parse_inst_t *)&cmd_tunnel_udp_config,
|
(cmdline_parse_inst_t *)&cmd_tunnel_udp_config,
|
||||||
(cmdline_parse_inst_t *)&cmd_global_config,
|
|
||||||
(cmdline_parse_inst_t *)&cmd_set_mirror_mask,
|
(cmdline_parse_inst_t *)&cmd_set_mirror_mask,
|
||||||
(cmdline_parse_inst_t *)&cmd_set_mirror_link,
|
(cmdline_parse_inst_t *)&cmd_set_mirror_link,
|
||||||
(cmdline_parse_inst_t *)&cmd_reset_mirror_rule,
|
(cmdline_parse_inst_t *)&cmd_reset_mirror_rule,
|
||||||
|
@ -3399,17 +3399,6 @@ For example to add source IP to FD input set for flow type of ipv4-udp on port 0
|
|||||||
|
|
||||||
testpmd> set_fdir_input_set 0 ipv4-udp src-ipv4 add
|
testpmd> set_fdir_input_set 0 ipv4-udp src-ipv4 add
|
||||||
|
|
||||||
global_config
|
|
||||||
~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
Set different GRE key length for input set::
|
|
||||||
|
|
||||||
global_config (port_id) gre-key-len (number in bytes)
|
|
||||||
|
|
||||||
For example to set GRE key length for input set to 4 bytes on port 0::
|
|
||||||
|
|
||||||
testpmd> global_config 0 gre-key-len 4
|
|
||||||
|
|
||||||
|
|
||||||
.. _testpmd_rte_flow:
|
.. _testpmd_rte_flow:
|
||||||
|
|
||||||
|
@ -8909,47 +8909,6 @@ i40e_dev_set_gre_key_len(struct i40e_hw *hw, uint8_t len)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
|
||||||
i40e_dev_global_config_set(struct i40e_hw *hw, struct rte_eth_global_cfg *cfg)
|
|
||||||
{
|
|
||||||
int ret = -EINVAL;
|
|
||||||
|
|
||||||
if (!hw || !cfg)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
switch (cfg->cfg_type) {
|
|
||||||
case RTE_ETH_GLOBAL_CFG_TYPE_GRE_KEY_LEN:
|
|
||||||
ret = i40e_dev_set_gre_key_len(hw, cfg->cfg.gre_key_len);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
PMD_DRV_LOG(ERR, "Unknown config type %u", cfg->cfg_type);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
i40e_filter_ctrl_global_config(struct rte_eth_dev *dev,
|
|
||||||
enum rte_filter_op filter_op,
|
|
||||||
void *arg)
|
|
||||||
{
|
|
||||||
struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
|
|
||||||
int ret = I40E_ERR_PARAM;
|
|
||||||
|
|
||||||
switch (filter_op) {
|
|
||||||
case RTE_ETH_FILTER_SET:
|
|
||||||
ret = i40e_dev_global_config_set(hw,
|
|
||||||
(struct rte_eth_global_cfg *)arg);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
PMD_DRV_LOG(ERR, "unknown operation %u", filter_op);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Set the symmetric hash enable configurations per port */
|
/* Set the symmetric hash enable configurations per port */
|
||||||
static void
|
static void
|
||||||
i40e_set_symmetric_hash_enable_per_port(struct i40e_hw *hw, uint8_t enable)
|
i40e_set_symmetric_hash_enable_per_port(struct i40e_hw *hw, uint8_t enable)
|
||||||
@ -9986,10 +9945,6 @@ i40e_dev_filter_ctrl(struct rte_eth_dev *dev,
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
switch (filter_type) {
|
switch (filter_type) {
|
||||||
case RTE_ETH_FILTER_NONE:
|
|
||||||
/* For global configuration */
|
|
||||||
ret = i40e_filter_ctrl_global_config(dev, filter_op, arg);
|
|
||||||
break;
|
|
||||||
case RTE_ETH_FILTER_FDIR:
|
case RTE_ETH_FILTER_FDIR:
|
||||||
ret = i40e_fdir_ctrl_func(dev, filter_op, arg);
|
ret = i40e_fdir_ctrl_func(dev, filter_op, arg);
|
||||||
break;
|
break;
|
||||||
|
@ -1752,9 +1752,6 @@ sfc_dev_filter_ctrl(struct rte_eth_dev *dev, enum rte_filter_type filter_type,
|
|||||||
sfc_log_init(sa, "entry");
|
sfc_log_init(sa, "entry");
|
||||||
|
|
||||||
switch (filter_type) {
|
switch (filter_type) {
|
||||||
case RTE_ETH_FILTER_NONE:
|
|
||||||
sfc_err(sa, "Global filters configuration not supported");
|
|
||||||
break;
|
|
||||||
case RTE_ETH_FILTER_FDIR:
|
case RTE_ETH_FILTER_FDIR:
|
||||||
sfc_err(sa, "Flow Director filters not supported");
|
sfc_err(sa, "Flow Director filters not supported");
|
||||||
break;
|
break;
|
||||||
|
@ -105,26 +105,6 @@ struct rte_eth_ntuple_filter {
|
|||||||
uint16_t queue; /**< Queue assigned to when match*/
|
uint16_t queue; /**< Queue assigned to when match*/
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Global eth device configuration type.
|
|
||||||
*/
|
|
||||||
enum rte_eth_global_cfg_type {
|
|
||||||
RTE_ETH_GLOBAL_CFG_TYPE_UNKNOWN = 0,
|
|
||||||
RTE_ETH_GLOBAL_CFG_TYPE_GRE_KEY_LEN,
|
|
||||||
RTE_ETH_GLOBAL_CFG_TYPE_MAX,
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Global eth device configuration.
|
|
||||||
*/
|
|
||||||
struct rte_eth_global_cfg {
|
|
||||||
enum rte_eth_global_cfg_type cfg_type; /**< Global config type. */
|
|
||||||
union {
|
|
||||||
uint8_t gre_key_len; /**< Valid GRE key length in byte. */
|
|
||||||
uint64_t reserved; /**< Reserve space for future use. */
|
|
||||||
} cfg;
|
|
||||||
};
|
|
||||||
|
|
||||||
#define RTE_ETH_FDIR_MAX_FLEXLEN 16 /**< Max length of flexbytes. */
|
#define RTE_ETH_FDIR_MAX_FLEXLEN 16 /**< Max length of flexbytes. */
|
||||||
#define RTE_ETH_INSET_SIZE_MAX 128 /**< Max length of input set. */
|
#define RTE_ETH_INSET_SIZE_MAX 128 /**< Max length of input set. */
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user