d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/dpaa2: support flow API FS miss action configuration

Browse Source 
1) dpni_set_rx_hash_dist and dpni_set_rx_fs_dist used for TC
   configuration instead of dpni_set_rx_tc_dist. Otherwise,
   re-configuration of default TC of QoS fails.

2) Default miss action is to drop.  "export
   DPAA2_FLOW_CONTROL_MISS_FLOW=flow_id" is used receive the missed
   packets from flow with flow ID specified.

Signed-off-by: Jun Yang <jun.yang@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Jun Yang 2020-07-07 14:52:42 +05:30 committed by Ferruh Yigit
parent 59303cdf2e
commit 40f8402531
2 changed files with 61 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/net/dpaa2/base/dpaa2_hw_dpni.c
View File

@ -85,7 +85,7 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
{
struct dpaa2_dev_priv *priv = eth_dev->data->dev_private;
struct fsl_mc_io *dpni = priv->hw;
struct dpni_rx_tc_dist_cfg tc_cfg;
struct dpni_rx_dist_cfg tc_cfg;
struct dpkg_profile_cfg kg_cfg;
void *p_params;
int ret;
@ -96,8 +96,9 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
DPAA2_PMD_ERR("Unable to allocate flow-dist parameters");
return -ENOMEM;
}
memset(p_params, 0, DIST_PARAM_IOVA_SIZE);
memset(&tc_cfg, 0, sizeof(struct dpni_rx_tc_dist_cfg));
memset(&tc_cfg, 0, sizeof(struct dpni_rx_dist_cfg));
ret = dpaa2_distset_to_dpkg_profile_cfg(req_dist_set, &kg_cfg);
if (ret) {
@ -106,9 +107,11 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
rte_free(p_params);
return ret;
}
tc_cfg.key_cfg_iova = (uint64_t)(DPAA2_VADDR_TO_IOVA(p_params));
tc_cfg.dist_size = priv->dist_queues;
tc_cfg.dist_mode = DPNI_DIST_MODE_HASH;
tc_cfg.enable = true;
tc_cfg.tc = tc_index;
ret = dpkg_prepare_key_cfg(&kg_cfg, p_params);
if (ret) {
@ -117,8 +120,7 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
return ret;
}
ret = dpni_set_rx_tc_dist(dpni, CMD_PRI_LOW, priv->token, tc_index,
&tc_cfg);
ret = dpni_set_rx_hash_dist(dpni, CMD_PRI_LOW, priv->token, &tc_cfg);
rte_free(p_params);
if (ret) {
DPAA2_PMD_ERR(
@ -136,7 +138,7 @@ int dpaa2_remove_flow_dist(
{
struct dpaa2_dev_priv *priv = eth_dev->data->dev_private;
struct fsl_mc_io *dpni = priv->hw;
struct dpni_rx_tc_dist_cfg tc_cfg;
struct dpni_rx_dist_cfg tc_cfg;
struct dpkg_profile_cfg kg_cfg;
void *p_params;
int ret;
@ -147,13 +149,15 @@ int dpaa2_remove_flow_dist(
DPAA2_PMD_ERR("Unable to allocate flow-dist parameters");
return -ENOMEM;
}
memset(p_params, 0, DIST_PARAM_IOVA_SIZE);
memset(&tc_cfg, 0, sizeof(struct dpni_rx_tc_dist_cfg));
kg_cfg.num_extracts = 0;
tc_cfg.key_cfg_iova = (uint64_t)(DPAA2_VADDR_TO_IOVA(p_params));
tc_cfg.dist_size = 0;
tc_cfg.dist_mode = DPNI_DIST_MODE_NONE;
memset(&tc_cfg, 0, sizeof(struct dpni_rx_dist_cfg));
tc_cfg.dist_size = 0;
tc_cfg.key_cfg_iova = (uint64_t)(DPAA2_VADDR_TO_IOVA(p_params));
tc_cfg.enable = true;
tc_cfg.tc = tc_index;
memset(p_params, 0, DIST_PARAM_IOVA_SIZE);
kg_cfg.num_extracts = 0;
ret = dpkg_prepare_key_cfg(&kg_cfg, p_params);
if (ret) {
DPAA2_PMD_ERR("Unable to prepare extract parameters");
@ -161,8 +165,8 @@ int dpaa2_remove_flow_dist(
return ret;
}
ret = dpni_set_rx_tc_dist(dpni, CMD_PRI_LOW, priv->token, tc_index,
&tc_cfg);
ret = dpni_set_rx_hash_dist(dpni, CMD_PRI_LOW, priv->token,
&tc_cfg);
rte_free(p_params);
if (ret)
DPAA2_PMD_ERR(

62
drivers/net/dpaa2/dpaa2_flow.c
View File

@ -30,6 +30,8 @@
int mc_l4_port_identification;
static char *dpaa2_flow_control_log;
static int dpaa2_flow_miss_flow_id =
DPNI_FS_MISS_DROP;
#define FIXED_ENTRY_SIZE 54
@ -3201,7 +3203,7 @@ dpaa2_generic_flow_set(struct rte_flow *flow,
const struct rte_flow_action_rss *rss_conf;
int is_keycfg_configured = 0, end_of_list = 0;
int ret = 0, i = 0, j = 0;
struct dpni_rx_tc_dist_cfg tc_cfg;
struct dpni_rx_dist_cfg tc_cfg;
struct dpni_qos_tbl_cfg qos_cfg;
struct dpni_fs_action_cfg action;
struct dpaa2_dev_priv *priv = dev->data->dev_private;
@ -3330,20 +3332,30 @@ dpaa2_generic_flow_set(struct rte_flow *flow,
return -1;
}
memset(&tc_cfg, 0, sizeof(struct dpni_rx_tc_dist_cfg));
memset(&tc_cfg, 0,
sizeof(struct dpni_rx_dist_cfg));
tc_cfg.dist_size = priv->nb_rx_queues / priv->num_rx_tc;
tc_cfg.dist_mode = DPNI_DIST_MODE_FS;
tc_cfg.key_cfg_iova =
(uint64_t)priv->extract.tc_extract_param[flow->tc_id];
tc_cfg.fs_cfg.miss_action = DPNI_FS_MISS_DROP;
tc_cfg.fs_cfg.keep_entries = true;
ret = dpni_set_rx_tc_dist(dpni, CMD_PRI_LOW,
priv->token,
flow->tc_id, &tc_cfg);
tc_cfg.tc = flow->tc_id;
tc_cfg.enable = false;
ret = dpni_set_rx_hash_dist(dpni, CMD_PRI_LOW,
priv->token, &tc_cfg);
if (ret < 0) {
DPAA2_PMD_ERR(
"Distribution cannot be configured.(%d)"
, ret);
"TC hash cannot be disabled.(%d)",
ret);
return -1;
}
tc_cfg.enable = true;
tc_cfg.fs_miss_flow_id =
dpaa2_flow_miss_flow_id;
ret = dpni_set_rx_fs_dist(dpni, CMD_PRI_LOW,
priv->token, &tc_cfg);
if (ret < 0) {
DPAA2_PMD_ERR(
"TC distribution cannot be configured.(%d)",
ret);
return -1;
}
}
@ -3508,18 +3520,16 @@ dpaa2_generic_flow_set(struct rte_flow *flow,
return -1;
}
memset(&tc_cfg, 0, sizeof(struct dpni_rx_tc_dist_cfg));
memset(&tc_cfg, 0, sizeof(struct dpni_rx_dist_cfg));
tc_cfg.dist_size = rss_conf->queue_num;
tc_cfg.dist_mode = DPNI_DIST_MODE_HASH;
tc_cfg.key_cfg_iova = (size_t)param;
tc_cfg.fs_cfg.miss_action = DPNI_FS_MISS_DROP;
ret = dpni_set_rx_tc_dist(dpni, CMD_PRI_LOW,
priv->token, flow->tc_id,
&tc_cfg);
tc_cfg.enable = true;
tc_cfg.tc = flow->tc_id;
ret = dpni_set_rx_hash_dist(dpni, CMD_PRI_LOW,
priv->token, &tc_cfg);
if (ret < 0) {
DPAA2_PMD_ERR(
"RSS FS table cannot be configured: %d\n",
"RSS TC table cannot be configured: %d\n",
ret);
rte_free((void *)param);
return -1;
@ -3544,7 +3554,7 @@ dpaa2_generic_flow_set(struct rte_flow *flow,
priv->token, &qos_cfg);
if (ret < 0) {
DPAA2_PMD_ERR(
"Distribution can't be configured %d\n",
"RSS QoS dist can't be configured-%d\n",
ret);
return -1;
}
@ -3761,6 +3771,20 @@ struct rte_flow *dpaa2_flow_create(struct rte_eth_dev *dev,
dpaa2_flow_control_log =
getenv("DPAA2_FLOW_CONTROL_LOG");
if (getenv("DPAA2_FLOW_CONTROL_MISS_FLOW")) {
struct dpaa2_dev_priv *priv = dev->data->dev_private;
dpaa2_flow_miss_flow_id =
atoi(getenv("DPAA2_FLOW_CONTROL_MISS_FLOW"));
if (dpaa2_flow_miss_flow_id >= priv->dist_queues) {
DPAA2_PMD_ERR(
"The missed flow ID %d exceeds the max flow ID %d",
dpaa2_flow_miss_flow_id,
priv->dist_queues - 1);
return NULL;
}
}
flow = rte_zmalloc(NULL, sizeof(struct rte_flow), RTE_CACHE_LINE_SIZE);
if (!flow) {
DPAA2_PMD_ERR("Failure to allocate memory for flow");