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

net/mvpp2: detach Tx QoS from Rx cls/QoS config

Browse Source 
Functional change:
Open receive cls/qos related features, only if the
config file contains an rx_related configuration entry.
This allows to configure tx_related entries, w/o unintentionally
opening rx cls/qos.

Code:
'use_global_defaults' is by default set to '1'.
Only if an rx_related entry was configured, it is updated to '0'.
rx cls/qos is performed only if 'use_global_defaults' is '0'.
Default TC configuration is now only mandatory when
'use_global_defaults' is '0'.

Signed-off-by: Yuval Caduri <cyuval@marvell.com>
Reviewed-by: Natalie Samsonov <nsamsono@marvell.com>
Tested-by: Natalie Samsonov <nsamsono@marvell.com>
This commit is contained in:
Yuval Caduri 2018-09-25 09:05:03 +02:00 committed by Ferruh Yigit
parent 429c394417
commit 406aeb1524
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/mvpp2/mrvl_ethdev.c
View File

@ -593,7 +593,8 @@ mrvl_dev_start(struct rte_eth_dev *dev)
}
/* For default QoS config, don't start classifier. */
if (mrvl_qos_cfg) {
if (mrvl_qos_cfg &&
mrvl_qos_cfg->port[dev->data->port_id].use_global_defaults == 0) {
ret = mrvl_start_qos_mapping(priv);
if (ret) {
MRVL_LOG(ERR, "Failed to setup QoS mapping");

41
drivers/net/mvpp2/mrvl_qos.c
View File

@ -324,6 +324,7 @@ parse_tc_cfg(struct rte_cfgfile *file, int port, int tc,
if (rte_cfgfile_num_sections(file, sec_name, strlen(sec_name)) <= 0)
return 0;
cfg->port[port].use_global_defaults = 0;
entry = rte_cfgfile_get_entry(file, sec_name, MRVL_TOK_RXQ);
if (entry) {
n = get_entry_values(entry,
@ -421,7 +422,7 @@ parse_policer(struct rte_cfgfile *file, int port, const char *sec_name,
cfg->port[port].policer_params.token_unit =
PP2_CLS_PLCR_PACKETS_TOKEN_UNIT;
} else {
RTE_LOG(ERR, PMD, "Unknown token: %s\n", entry);
MRVL_LOG(ERR, "Unknown token: %s", entry);
return -1;
}
}
@ -438,7 +439,7 @@ parse_policer(struct rte_cfgfile *file, int port, const char *sec_name,
cfg->port[port].policer_params.color_mode =
PP2_CLS_PLCR_COLOR_AWARE_MODE;
} else {
RTE_LOG(ERR, PMD, "Error in parsing: %s\n", entry);
MRVL_LOG(ERR, "Error in parsing: %s", entry);
return -1;
}
}
@ -518,28 +519,15 @@ mrvl_get_qoscfg(const char *key __rte_unused, const char *path,
snprintf(sec_name, sizeof(sec_name), "%s %d %s",
MRVL_TOK_PORT, n, MRVL_TOK_DEFAULT);
/* Use global defaults, unless an override occurs */
(*cfg)->port[n].use_global_defaults = 1;
/* Skip ports non-existing in configuration. */
if (rte_cfgfile_num_sections(file, sec_name,
strlen(sec_name)) <= 0) {
(*cfg)->port[n].use_global_defaults = 1;
(*cfg)->port[n].mapping_priority =
PP2_CLS_QOS_TBL_VLAN_IP_PRI;
continue;
}
entry = rte_cfgfile_get_entry(file, sec_name,
MRVL_TOK_DEFAULT_TC);
if (entry) {
if (get_val_securely(entry, &val) < 0 ||
val > USHRT_MAX)
return -1;
(*cfg)->port[n].default_tc = (uint8_t)val;
} else {
MRVL_LOG(ERR,
"Default Traffic Class required in custom configuration!");
return -1;
}
/*
* Read per-port rate limiting. Setting that will
* disable per-queue rate limiting.
@ -573,6 +561,7 @@ mrvl_get_qoscfg(const char *key __rte_unused, const char *path,
entry = rte_cfgfile_get_entry(file, sec_name,
MRVL_TOK_MAPPING_PRIORITY);
if (entry) {
(*cfg)->port[n].use_global_defaults = 0;
if (!strncmp(entry, MRVL_TOK_VLAN_IP,
sizeof(MRVL_TOK_VLAN_IP)))
(*cfg)->port[n].mapping_priority =
@ -602,6 +591,7 @@ mrvl_get_qoscfg(const char *key __rte_unused, const char *path,
entry = rte_cfgfile_get_entry(file, sec_name,
MRVL_TOK_PLCR_DEFAULT);
if (entry) {
(*cfg)->port[n].use_global_defaults = 0;
if (get_val_securely(entry, &val) < 0)
return -1;
@ -627,6 +617,21 @@ mrvl_get_qoscfg(const char *key __rte_unused, const char *path,
"Error %d parsing port %d tc %d!\n",
ret, n, i);
}
entry = rte_cfgfile_get_entry(file, sec_name,
MRVL_TOK_DEFAULT_TC);
if (entry) {
if (get_val_securely(entry, &val) < 0 ||
val > USHRT_MAX)
return -1;
(*cfg)->port[n].default_tc = (uint8_t)val;
} else {
if ((*cfg)->port[n].use_global_defaults == 0) {
MRVL_LOG(ERR,
"Default Traffic Class required in custom configuration!");
return -1;
}
}
}
return 0;