app/testpmd: add FEC command
This commit adds testpmd capability to query and config FEC function of device. This includes: - show FEC capabilities, example: testpmd> show port 0 fec capabilities - show FEC mode, example: testpmd> show port 0 fec_mode - config FEC mode, example: testpmd> set port <port_id> fec_mode auto|off|rs|baser where: auto|off|rs|baser are four kinds of FEC mode which dev support according to MAC link speed. Signed-off-by: Min Hu (Connor) <humin29@huawei.com> Reviewed-by: Wei Hu (Xavier) <xavier.huwei@huawei.com> Reviewed-by: Chengwen Feng <fengchengwen@huawei.com> Reviewed-by: Chengchang Tang <tangchengchang@huawei.com>
This commit is contained in:
Min Hu (Connor)
Ferruh Yigit
parent
9bf2ea8dbc
commit
b19da32e31
@ -248,6 +248,12 @@ static void cmd_help_long_parsed(void *parsed_result,
|
||||
|
||||
"show port (port_id) macs|mcast_macs"
|
||||
" Display list of mac addresses added to port.\n\n"
|
||||
|
||||
"show port (port_id) fec capabilities"
|
||||
" Show fec capabilities of a port.\n\n"
|
||||
|
||||
"show port (port_id) fec_mode"
|
||||
" Show fec mode of a port.\n\n"
|
||||
);
|
||||
}
|
||||
|
||||
@ -751,6 +757,9 @@ static void cmd_help_long_parsed(void *parsed_result,
|
||||
"show port (port_id) queue-region\n"
|
||||
" show all queue region related configuration info\n\n"
|
||||
|
||||
"set port (port_id) fec_mode auto|off|rs|baser\n"
|
||||
" set fec mode for a specific port\n\n"
|
||||
|
||||
, list_pkt_forwarding_modes()
|
||||
);
|
||||
}
|
||||
@ -19218,6 +19227,226 @@ cmdline_parse_inst_t cmd_show_tx_metadata = {
|
||||
},
|
||||
};
|
||||
|
||||
/* *** show fec capability per port configuration *** */
|
||||
struct cmd_show_fec_capability_result {
|
||||
cmdline_fixed_string_t cmd_show;
|
||||
cmdline_fixed_string_t cmd_port;
|
||||
cmdline_fixed_string_t cmd_fec;
|
||||
cmdline_fixed_string_t cmd_keyword;
|
||||
portid_t cmd_pid;
|
||||
};
|
||||
|
||||
static void
|
||||
cmd_show_fec_capability_parsed(void *parsed_result,
|
||||
__rte_unused struct cmdline *cl,
|
||||
__rte_unused void *data)
|
||||
{
|
||||
#define FEC_CAP_NUM 2
|
||||
struct cmd_show_fec_capability_result *res = parsed_result;
|
||||
struct rte_eth_fec_capa speed_fec_capa[FEC_CAP_NUM];
|
||||
unsigned int num = FEC_CAP_NUM;
|
||||
unsigned int ret_num;
|
||||
int ret;
|
||||
|
||||
if (!rte_eth_dev_is_valid_port(res->cmd_pid)) {
|
||||
printf("Invalid port id %u\n", res->cmd_pid);
|
||||
return;
|
||||
}
|
||||
|
||||
ret = rte_eth_fec_get_capability(res->cmd_pid, speed_fec_capa, num);
|
||||
if (ret == -ENOTSUP) {
|
||||
printf("Function not implemented\n");
|
||||
return;
|
||||
} else if (ret < 0) {
|
||||
printf("Get FEC capability failed\n");
|
||||
return;
|
||||
}
|
||||
|
||||
ret_num = (unsigned int)ret;
|
||||
show_fec_capability(ret_num, speed_fec_capa);
|
||||
}
|
||||
|
||||
cmdline_parse_token_string_t cmd_show_fec_capability_show =
|
||||
TOKEN_STRING_INITIALIZER(struct cmd_show_fec_capability_result,
|
||||
cmd_show, "show");
|
||||
cmdline_parse_token_string_t cmd_show_fec_capability_port =
|
||||
TOKEN_STRING_INITIALIZER(struct cmd_show_fec_capability_result,
|
||||
cmd_port, "port");
|
||||
cmdline_parse_token_num_t cmd_show_fec_capability_pid =
|
||||
TOKEN_NUM_INITIALIZER(struct cmd_show_fec_capability_result,
|
||||
cmd_pid, UINT16);
|
||||
cmdline_parse_token_string_t cmd_show_fec_capability_fec =
|
||||
TOKEN_STRING_INITIALIZER(struct cmd_show_fec_capability_result,
|
||||
cmd_fec, "fec");
|
||||
cmdline_parse_token_string_t cmd_show_fec_capability_keyword =
|
||||
TOKEN_STRING_INITIALIZER(struct cmd_show_fec_capability_result,
|
||||
cmd_keyword, "capabilities");
|
||||
|
||||
cmdline_parse_inst_t cmd_show_capability = {
|
||||
.f = cmd_show_fec_capability_parsed,
|
||||
.data = NULL,
|
||||
.help_str = "show port <port_id> fec capabilities",
|
||||
.tokens = {
|
||||
(void *)&cmd_show_fec_capability_show,
|
||||
(void *)&cmd_show_fec_capability_port,
|
||||
(void *)&cmd_show_fec_capability_pid,
|
||||
(void *)&cmd_show_fec_capability_fec,
|
||||
(void *)&cmd_show_fec_capability_keyword,
|
||||
NULL,
|
||||
},
|
||||
};
|
||||
|
||||
/* *** show fec mode per port configuration *** */
|
||||
struct cmd_show_fec_metadata_result {
|
||||
cmdline_fixed_string_t cmd_show;
|
||||
cmdline_fixed_string_t cmd_port;
|
||||
cmdline_fixed_string_t cmd_keyword;
|
||||
portid_t cmd_pid;
|
||||
};
|
||||
|
||||
static void
|
||||
cmd_show_fec_mode_parsed(void *parsed_result,
|
||||
__rte_unused struct cmdline *cl,
|
||||
__rte_unused void *data)
|
||||
{
|
||||
#define FEC_NAME_SIZE 16
|
||||
struct cmd_show_fec_metadata_result *res = parsed_result;
|
||||
uint32_t mode;
|
||||
char buf[FEC_NAME_SIZE];
|
||||
int ret;
|
||||
|
||||
if (!rte_eth_dev_is_valid_port(res->cmd_pid)) {
|
||||
printf("Invalid port id %u\n", res->cmd_pid);
|
||||
return;
|
||||
}
|
||||
ret = rte_eth_fec_get(res->cmd_pid, &mode);
|
||||
if (ret == -ENOTSUP) {
|
||||
printf("Function not implemented\n");
|
||||
return;
|
||||
} else if (ret < 0) {
|
||||
printf("Get FEC mode failed\n");
|
||||
return;
|
||||
}
|
||||
|
||||
switch (mode) {
|
||||
case RTE_ETH_FEC_MODE_CAPA_MASK(NOFEC):
|
||||
strlcpy(buf, "off", sizeof(buf));
|
||||
break;
|
||||
case RTE_ETH_FEC_MODE_CAPA_MASK(AUTO):
|
||||
strlcpy(buf, "auto", sizeof(buf));
|
||||
break;
|
||||
case RTE_ETH_FEC_MODE_CAPA_MASK(BASER):
|
||||
strlcpy(buf, "baser", sizeof(buf));
|
||||
break;
|
||||
case RTE_ETH_FEC_MODE_CAPA_MASK(RS):
|
||||
strlcpy(buf, "rs", sizeof(buf));
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
printf("%s\n", buf);
|
||||
}
|
||||
|
||||
cmdline_parse_token_string_t cmd_show_fec_mode_show =
|
||||
TOKEN_STRING_INITIALIZER(struct cmd_show_fec_metadata_result,
|
||||
cmd_show, "show");
|
||||
cmdline_parse_token_string_t cmd_show_fec_mode_port =
|
||||
TOKEN_STRING_INITIALIZER(struct cmd_show_fec_metadata_result,
|
||||
cmd_port, "port");
|
||||
cmdline_parse_token_num_t cmd_show_fec_mode_pid =
|
||||
TOKEN_NUM_INITIALIZER(struct cmd_show_fec_metadata_result,
|
||||
cmd_pid, UINT16);
|
||||
cmdline_parse_token_string_t cmd_show_fec_mode_keyword =
|
||||
TOKEN_STRING_INITIALIZER(struct cmd_show_fec_metadata_result,
|
||||
cmd_keyword, "fec_mode");
|
||||
|
||||
cmdline_parse_inst_t cmd_show_fec_mode = {
|
||||
.f = cmd_show_fec_mode_parsed,
|
||||
.data = NULL,
|
||||
.help_str = "show port <port_id> fec_mode",
|
||||
.tokens = {
|
||||
(void *)&cmd_show_fec_mode_show,
|
||||
(void *)&cmd_show_fec_mode_port,
|
||||
(void *)&cmd_show_fec_mode_pid,
|
||||
(void *)&cmd_show_fec_mode_keyword,
|
||||
NULL,
|
||||
},
|
||||
};
|
||||
|
||||
/* *** set fec mode per port configuration *** */
|
||||
struct cmd_set_port_fec_mode {
|
||||
cmdline_fixed_string_t set;
|
||||
cmdline_fixed_string_t port;
|
||||
portid_t port_id;
|
||||
cmdline_fixed_string_t fec_mode;
|
||||
cmdline_fixed_string_t fec_value;
|
||||
};
|
||||
|
||||
/* Common CLI fields for set fec mode */
|
||||
cmdline_parse_token_string_t cmd_set_port_fec_mode_set =
|
||||
TOKEN_STRING_INITIALIZER
|
||||
(struct cmd_set_port_fec_mode,
|
||||
set, "set");
|
||||
cmdline_parse_token_string_t cmd_set_port_fec_mode_port =
|
||||
TOKEN_STRING_INITIALIZER
|
||||
(struct cmd_set_port_fec_mode,
|
||||
port, "port");
|
||||
cmdline_parse_token_num_t cmd_set_port_fec_mode_port_id =
|
||||
TOKEN_NUM_INITIALIZER
|
||||
(struct cmd_set_port_fec_mode,
|
||||
port_id, UINT16);
|
||||
cmdline_parse_token_string_t cmd_set_port_fec_mode_str =
|
||||
TOKEN_STRING_INITIALIZER
|
||||
(struct cmd_set_port_fec_mode,
|
||||
fec_mode, "fec_mode");
|
||||
cmdline_parse_token_string_t cmd_set_port_fec_mode_value =
|
||||
TOKEN_STRING_INITIALIZER
|
||||
(struct cmd_set_port_fec_mode,
|
||||
fec_value, NULL);
|
||||
|
||||
static void
|
||||
cmd_set_port_fec_mode_parsed(
|
||||
void *parsed_result,
|
||||
__rte_unused struct cmdline *cl,
|
||||
__rte_unused void *data)
|
||||
{
|
||||
struct cmd_set_port_fec_mode *res = parsed_result;
|
||||
uint16_t port_id = res->port_id;
|
||||
uint32_t mode;
|
||||
int ret;
|
||||
|
||||
ret = parse_fec_mode(res->fec_value, &mode);
|
||||
if (ret < 0) {
|
||||
printf("Unknown fec mode: %s for Port %d\n", res->fec_value,
|
||||
port_id);
|
||||
return;
|
||||
}
|
||||
|
||||
ret = rte_eth_fec_set(port_id, mode);
|
||||
if (ret == -ENOTSUP) {
|
||||
printf("Function not implemented\n");
|
||||
return;
|
||||
} else if (ret < 0) {
|
||||
printf("Set FEC mode failed\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
cmdline_parse_inst_t cmd_set_fec_mode = {
|
||||
.f = cmd_set_port_fec_mode_parsed,
|
||||
.data = NULL,
|
||||
.help_str = "set port <port_id> fec_mode auto|off|rs|baser",
|
||||
.tokens = {
|
||||
(void *)&cmd_set_port_fec_mode_set,
|
||||
(void *)&cmd_set_port_fec_mode_port,
|
||||
(void *)&cmd_set_port_fec_mode_port_id,
|
||||
(void *)&cmd_set_port_fec_mode_str,
|
||||
(void *)&cmd_set_port_fec_mode_value,
|
||||
NULL,
|
||||
},
|
||||
};
|
||||
|
||||
/* show port supported ptypes */
|
||||
|
||||
/* Common result structure for show port ptypes */
|
||||
@ -19853,6 +20082,9 @@ cmdline_parse_ctx_t main_ctx[] = {
|
||||
(cmdline_parse_inst_t *)&cmd_show_set_raw,
|
||||
(cmdline_parse_inst_t *)&cmd_show_set_raw_all,
|
||||
(cmdline_parse_inst_t *)&cmd_config_tx_dynf_specific,
|
||||
(cmdline_parse_inst_t *)&cmd_show_fec_mode,
|
||||
(cmdline_parse_inst_t *)&cmd_set_fec_mode,
|
||||
(cmdline_parse_inst_t *)&cmd_show_capability,
|
||||
NULL,
|
||||
};
|
||||
|
||||
|
||||
@ -139,6 +139,28 @@ const struct rss_type_info rss_type_table[] = {
|
||||
{ NULL, 0 },
|
||||
};
|
||||
|
||||
static const struct {
|
||||
enum rte_eth_fec_mode mode;
|
||||
const char *name;
|
||||
} fec_mode_name[] = {
|
||||
{
|
||||
.mode = RTE_ETH_FEC_NOFEC,
|
||||
.name = "off",
|
||||
},
|
||||
{
|
||||
.mode = RTE_ETH_FEC_AUTO,
|
||||
.name = "auto",
|
||||
},
|
||||
{
|
||||
.mode = RTE_ETH_FEC_BASER,
|
||||
.name = "baser",
|
||||
},
|
||||
{
|
||||
.mode = RTE_ETH_FEC_RS,
|
||||
.name = "rs",
|
||||
},
|
||||
};
|
||||
|
||||
static void
|
||||
print_ethaddr(const char *name, struct rte_ether_addr *eth_addr)
|
||||
{
|
||||
@ -3191,6 +3213,40 @@ set_tx_pkt_split(const char *name)
|
||||
printf("unknown value: \"%s\"\n", name);
|
||||
}
|
||||
|
||||
int
|
||||
parse_fec_mode(const char *name, uint32_t *mode)
|
||||
{
|
||||
uint8_t i;
|
||||
|
||||
for (i = 0; i < RTE_DIM(fec_mode_name); i++) {
|
||||
if (strcmp(fec_mode_name[i].name, name) == 0) {
|
||||
*mode = RTE_ETH_FEC_MODE_TO_CAPA(fec_mode_name[i].mode);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
void
|
||||
show_fec_capability(unsigned int num, struct rte_eth_fec_capa *speed_fec_capa)
|
||||
{
|
||||
unsigned int i, j;
|
||||
|
||||
printf("FEC capabilities:\n");
|
||||
|
||||
for (i = 0; i < num; i++) {
|
||||
printf("%s : ",
|
||||
rte_eth_link_speed_to_str(speed_fec_capa[i].speed));
|
||||
|
||||
for (j = RTE_ETH_FEC_AUTO; j < RTE_DIM(fec_mode_name); j++) {
|
||||
if (RTE_ETH_FEC_MODE_TO_CAPA(j) &
|
||||
speed_fec_capa[i].capa)
|
||||
printf("%s ", fec_mode_name[j].name);
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
show_tx_pkt_segments(void)
|
||||
{
|
||||
|
||||
@ -806,6 +806,8 @@ void show_tx_pkt_segments(void);
|
||||
void set_tx_pkt_times(unsigned int *tx_times);
|
||||
void show_tx_pkt_times(void);
|
||||
void set_tx_pkt_split(const char *name);
|
||||
int parse_fec_mode(const char *name, enum rte_eth_fec_mode *mode);
|
||||
void show_fec_capability(uint32_t num, struct rte_eth_fec_capa *speed_fec_capa);
|
||||
void set_nb_pkt_per_burst(uint16_t pkt_burst);
|
||||
char *list_pkt_forwarding_modes(void);
|
||||
char *list_pkt_forwarding_retry_modes(void);
|
||||
|
||||
@ -619,6 +619,20 @@ For example::
|
||||
00000020: 03 06 00 00 00 FA 00 00 00 00 08 00 00 00 00 00 | ................
|
||||
00000030: 06 00 | ..
|
||||
|
||||
show fec capabilities
|
||||
~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Show fec capabilities of a port::
|
||||
|
||||
testpmd> show port (port_id) fec capabilities
|
||||
|
||||
show fec mode
|
||||
~~~~~~~~~~~~~
|
||||
|
||||
Show fec mode of a port::
|
||||
|
||||
testpmd> show port (port_id) fec_mode
|
||||
|
||||
|
||||
Configuration Functions
|
||||
-----------------------
|
||||
@ -2012,6 +2026,14 @@ during the flow rule creation::
|
||||
|
||||
Otherwise the default index ``0`` is used.
|
||||
|
||||
Set fec mode
|
||||
~~~~~~~~~~~~
|
||||
|
||||
Set fec mode for a specific port::
|
||||
|
||||
testpmd> set port (port_id) fec_mode auto|off|rs|baser
|
||||
|
||||
|
||||
Port Functions
|
||||
--------------
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user