Move related specific testpmd commands into this driver directory.
While at it, fix checkpatch warnings.
The bypass code required some special init code before starting a port.
This is removed from testpmd itself and a new (*untested*) command is
added.
Note: bypass commands were not compiled since the switch to meson.
This change reinstates them, though I am really tempted to drop them
since we had no complaint for such a long time.
Signed-off-by: David Marchand <david.march...@redhat.com>
---
app/test-pmd/cmdline.c | 977 +-----------------------
app/test-pmd/testpmd.c | 14 -
app/test-pmd/testpmd.h | 5 +-
drivers/net/ixgbe/ixgbe_testpmd.c | 1147 +++++++++++++++++++++++++++++
drivers/net/ixgbe/meson.build | 2 +
5 files changed, 1151 insertions(+), 994 deletions(-)
create mode 100644 drivers/net/ixgbe/ixgbe_testpmd.c
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index fee05c1a0c..a5a5ef9588 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -69,8 +69,6 @@ static cmdline_parse_ctx_t *main_ctx;
static TAILQ_HEAD(, testpmd_cmdline_parser) cmdline_parsers =
TAILQ_HEAD_INITIALIZER(cmdline_parsers);
-static void cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue);
-
/* *** Help command with introduction. *** */
struct cmd_help_brief_result {
cmdline_fixed_string_t help;
@@ -344,24 +342,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"set all queues drop (port_id) (on|off)\n"
" Set drop enable bit for all queues.\n\n"
- "set vf split drop (port_id) (vf_id) (on|off)\n"
- " Set split drop enable bit for a VF from the
PF.\n\n"
-
"set vf mac antispoof (port_id) (vf_id) (on|off).\n"
" Set MAC antispoof for a VF from the PF.\n\n"
- "set macsec offload (port_id) on encrypt (on|off)
replay-protect (on|off)\n"
- " Enable MACsec offload.\n\n"
-
- "set macsec offload (port_id) off\n"
- " Disable MACsec offload.\n\n"
-
- "set macsec sc (tx|rx) (port_id) (mac) (pi)\n"
- " Configure MACsec secure connection (SC).\n\n"
-
- "set macsec sa (tx|rx) (port_id) (idx) (an) (pn)
(key)\n"
- " Configure MACsec secure association (SA).\n\n"
-
"set vf broadcast (port_id) (vf_id) (on|off)\n"
" Set VF broadcast for a VF from the PF.\n\n"
@@ -392,9 +375,6 @@ static void cmd_help_long_parsed(void *parsed_result,
"set tx strict-link-priority (port_id) (tc_bitmap)\n"
" Set some TCs' strict link priority mode on a
physical port.\n\n"
- "set tc tx min-bandwidth (port_id) (bw1, bw2, ...)\n"
- " Set all TCs' min bandwidth(%%) for all PF and
VFs.\n\n"
-
"vlan set (strip|filter|qinq_strip|extend) (on|off)
(port_id)\n"
" Set the VLAN strip or filter or qinq strip or
extend\n\n"
@@ -587,29 +567,6 @@ static void cmd_help_long_parsed(void *parsed_result,
" Flush (default) or don't flush RX streams before"
" forwarding. Mainly used with PCAP drivers.\n\n"
- "set bypass mode (normal|bypass|isolate) (port_id)\n"
- " Set the bypass mode for the lowest port on bypass
enabled"
- " NIC.\n\n"
-
- "set bypass event
(timeout|os_on|os_off|power_on|power_off) "
- "mode (normal|bypass|isolate) (port_id)\n"
- " Set the event required to initiate specified bypass
mode for"
- " the lowest port on a bypass enabled NIC where:\n"
- " timeout = enable bypass after watchdog
timeout.\n"
- " os_on = enable bypass when OS/board is
powered on.\n"
- " os_off = enable bypass when OS/board is
powered off.\n"
- " power_on = enable bypass when power supply is
turned on.\n"
- " power_off = enable bypass when power supply is
turned off."
- "\n\n"
-
- "set bypass timeout (0|1.5|2|3|4|8|16|32)\n"
- " Set the bypass watchdog timeout to 'n' seconds"
- " where 0 = instant.\n\n"
-
- "show bypass config (port_id)\n"
- " Show the bypass configuration for a bypass enabled
NIC"
- " using the lowest port on the NIC.\n\n"
-
"set link-up port (port_id)\n"
" Set link up for a port.\n\n"
@@ -5517,347 +5474,6 @@ cmdline_parse_inst_t cmd_set_link_check = {
},
};
-/* *** SET NIC BYPASS MODE *** */
-struct cmd_set_bypass_mode_result {
- cmdline_fixed_string_t set;
- cmdline_fixed_string_t bypass;
- cmdline_fixed_string_t mode;
- cmdline_fixed_string_t value;
- portid_t port_id;
-};
-
-static void
-cmd_set_bypass_mode_parsed(void *parsed_result,
- __rte_unused struct cmdline *cl,
- __rte_unused void *data)
-{
- struct cmd_set_bypass_mode_result *res = parsed_result;
- portid_t port_id = res->port_id;
- int32_t rc = -EINVAL;
-
-#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS
- uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
-
- if (!strcmp(res->value, "bypass"))
- bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_BYPASS;
- else if (!strcmp(res->value, "isolate"))
- bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_ISOLATE;
- else
- bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
-
- /* Set the bypass mode for the relevant port. */
- rc = rte_pmd_ixgbe_bypass_state_set(port_id, &bypass_mode);
-#endif
- if (rc != 0)
- fprintf(stderr, "\t Failed to set bypass mode for port = %d.\n",
- port_id);
-}
-
-cmdline_parse_token_string_t cmd_setbypass_mode_set =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_mode_result,
- set, "set");
-cmdline_parse_token_string_t cmd_setbypass_mode_bypass =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_mode_result,
- bypass, "bypass");
-cmdline_parse_token_string_t cmd_setbypass_mode_mode =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_mode_result,
- mode, "mode");
-cmdline_parse_token_string_t cmd_setbypass_mode_value =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_mode_result,
- value, "normal#bypass#isolate");
-cmdline_parse_token_num_t cmd_setbypass_mode_port =
- TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_mode_result,
- port_id, RTE_UINT16);
-
-cmdline_parse_inst_t cmd_set_bypass_mode = {
- .f = cmd_set_bypass_mode_parsed,
- .help_str = "set bypass mode normal|bypass|isolate <port_id>: "
- "Set the NIC bypass mode for port_id",
- .data = NULL,
- .tokens = {
- (void *)&cmd_setbypass_mode_set,
- (void *)&cmd_setbypass_mode_bypass,
- (void *)&cmd_setbypass_mode_mode,
- (void *)&cmd_setbypass_mode_value,
- (void *)&cmd_setbypass_mode_port,
- NULL,
- },
-};
-
-/* *** SET NIC BYPASS EVENT *** */
-struct cmd_set_bypass_event_result {
- cmdline_fixed_string_t set;
- cmdline_fixed_string_t bypass;
- cmdline_fixed_string_t event;
- cmdline_fixed_string_t event_value;
- cmdline_fixed_string_t mode;
- cmdline_fixed_string_t mode_value;
- portid_t port_id;
-};
-
-static void
-cmd_set_bypass_event_parsed(void *parsed_result,
- __rte_unused struct cmdline *cl,
- __rte_unused void *data)
-{
- int32_t rc = -EINVAL;
- struct cmd_set_bypass_event_result *res = parsed_result;
- portid_t port_id = res->port_id;
-
-#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS
- uint32_t bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_NONE;
- uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
-
- if (!strcmp(res->event_value, "timeout"))
- bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_TIMEOUT;
- else if (!strcmp(res->event_value, "os_on"))
- bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_OS_ON;
- else if (!strcmp(res->event_value, "os_off"))
- bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_OS_OFF;
- else if (!strcmp(res->event_value, "power_on"))
- bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_POWER_ON;
- else if (!strcmp(res->event_value, "power_off"))
- bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_POWER_OFF;
- else
- bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_NONE;
-
- if (!strcmp(res->mode_value, "bypass"))
- bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_BYPASS;
- else if (!strcmp(res->mode_value, "isolate"))
- bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_ISOLATE;
- else
- bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
-
- /* Set the watchdog timeout. */
- if (bypass_event == RTE_PMD_IXGBE_BYPASS_EVENT_TIMEOUT) {
-
- rc = -EINVAL;
- if (RTE_PMD_IXGBE_BYPASS_TMT_VALID(bypass_timeout)) {
- rc = rte_pmd_ixgbe_bypass_wd_timeout_store(port_id,
- bypass_timeout);
- }
- if (rc != 0) {
- fprintf(stderr,
- "Failed to set timeout value %u for port %d,
errto code: %d.\n",
- bypass_timeout, port_id, rc);
- }
- }
-
- /* Set the bypass event to transition to bypass mode. */
- rc = rte_pmd_ixgbe_bypass_event_store(port_id, bypass_event,
- bypass_mode);
-#endif
-
- if (rc != 0)
- fprintf(stderr, "\t Failed to set bypass event for port =
%d.\n",
- port_id);
-}
-
-cmdline_parse_token_string_t cmd_setbypass_event_set =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
- set, "set");
-cmdline_parse_token_string_t cmd_setbypass_event_bypass =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
- bypass, "bypass");
-cmdline_parse_token_string_t cmd_setbypass_event_event =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
- event, "event");
-cmdline_parse_token_string_t cmd_setbypass_event_event_value =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
- event_value,
"none#timeout#os_off#os_on#power_on#power_off");
-cmdline_parse_token_string_t cmd_setbypass_event_mode =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
- mode, "mode");
-cmdline_parse_token_string_t cmd_setbypass_event_mode_value =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
- mode_value, "normal#bypass#isolate");
-cmdline_parse_token_num_t cmd_setbypass_event_port =
- TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_event_result,
- port_id, RTE_UINT16);
-
-cmdline_parse_inst_t cmd_set_bypass_event = {
- .f = cmd_set_bypass_event_parsed,
- .help_str = "set bypass event none|timeout|os_on|os_off|power_on|"
- "power_off mode normal|bypass|isolate <port_id>: "
- "Set the NIC bypass event mode for port_id",
- .data = NULL,
- .tokens = {
- (void *)&cmd_setbypass_event_set,
- (void *)&cmd_setbypass_event_bypass,
- (void *)&cmd_setbypass_event_event,
- (void *)&cmd_setbypass_event_event_value,
- (void *)&cmd_setbypass_event_mode,
- (void *)&cmd_setbypass_event_mode_value,
- (void *)&cmd_setbypass_event_port,
- NULL,
- },
-};
-
-
-/* *** SET NIC BYPASS TIMEOUT *** */
-struct cmd_set_bypass_timeout_result {
- cmdline_fixed_string_t set;
- cmdline_fixed_string_t bypass;
- cmdline_fixed_string_t timeout;
- cmdline_fixed_string_t value;
-};
-
-static void
-cmd_set_bypass_timeout_parsed(void *parsed_result,
- __rte_unused struct cmdline *cl,
- __rte_unused void *data)
-{
- __rte_unused struct cmd_set_bypass_timeout_result *res = parsed_result;
-
-#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS
- if (!strcmp(res->value, "1.5"))
- bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_1_5_SEC;
- else if (!strcmp(res->value, "2"))
- bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_2_SEC;
- else if (!strcmp(res->value, "3"))
- bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_3_SEC;
- else if (!strcmp(res->value, "4"))
- bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_4_SEC;
- else if (!strcmp(res->value, "8"))
- bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_8_SEC;
- else if (!strcmp(res->value, "16"))
- bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_16_SEC;
- else if (!strcmp(res->value, "32"))
- bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_32_SEC;
- else
- bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF;
-#endif
-}
-
-cmdline_parse_token_string_t cmd_setbypass_timeout_set =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_timeout_result,
- set, "set");
-cmdline_parse_token_string_t cmd_setbypass_timeout_bypass =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_timeout_result,
- bypass, "bypass");
-cmdline_parse_token_string_t cmd_setbypass_timeout_timeout =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_timeout_result,
- timeout, "timeout");
-cmdline_parse_token_string_t cmd_setbypass_timeout_value =
- TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_timeout_result,
- value, "0#1.5#2#3#4#8#16#32");
-
-cmdline_parse_inst_t cmd_set_bypass_timeout = {
- .f = cmd_set_bypass_timeout_parsed,
- .help_str = "set bypass timeout 0|1.5|2|3|4|8|16|32: "
- "Set the NIC bypass watchdog timeout in seconds",
- .data = NULL,
- .tokens = {
- (void *)&cmd_setbypass_timeout_set,
- (void *)&cmd_setbypass_timeout_bypass,
- (void *)&cmd_setbypass_timeout_timeout,
- (void *)&cmd_setbypass_timeout_value,
- NULL,
- },
-};
-
-/* *** SHOW NIC BYPASS MODE *** */
-struct cmd_show_bypass_config_result {
- cmdline_fixed_string_t show;
- cmdline_fixed_string_t bypass;
- cmdline_fixed_string_t config;
- portid_t port_id;
-};
-
-static void
-cmd_show_bypass_config_parsed(void *parsed_result,
- __rte_unused struct cmdline *cl,
- __rte_unused void *data)
-{
- struct cmd_show_bypass_config_result *res = parsed_result;
- portid_t port_id = res->port_id;
- int rc = -EINVAL;
-#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS
- uint32_t event_mode;
- uint32_t bypass_mode;
- uint32_t timeout = bypass_timeout;
- unsigned int i;
-
- static const char * const timeouts[RTE_PMD_IXGBE_BYPASS_TMT_NUM] =
- {"off", "1.5", "2", "3", "4", "8", "16", "32"};
- static const char * const modes[RTE_PMD_IXGBE_BYPASS_MODE_NUM] =
- {"UNKNOWN", "normal", "bypass", "isolate"};
- static const char * const events[RTE_PMD_IXGBE_BYPASS_EVENT_NUM] = {
- "NONE",
- "OS/board on",
- "power supply on",
- "OS/board off",
- "power supply off",
- "timeout"};
-
- /* Display the bypass mode.*/
- if (rte_pmd_ixgbe_bypass_state_show(port_id, &bypass_mode) != 0) {
- fprintf(stderr, "\tFailed to get bypass mode for port = %d\n",
- port_id);
- return;
- }
- else {
- if (!RTE_PMD_IXGBE_BYPASS_MODE_VALID(bypass_mode))
- bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NONE;
-
- printf("\tbypass mode = %s\n", modes[bypass_mode]);
- }
-
- /* Display the bypass timeout.*/
- if (!RTE_PMD_IXGBE_BYPASS_TMT_VALID(timeout))
- timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF;
-
- printf("\tbypass timeout = %s\n", timeouts[timeout]);
-
- /* Display the bypass events and associated modes. */
- for (i = RTE_PMD_IXGBE_BYPASS_EVENT_START; i < RTE_DIM(events); i++) {
-
- if (rte_pmd_ixgbe_bypass_event_show(port_id, i, &event_mode)) {
- fprintf(stderr,
- "\tFailed to get bypass mode for event = %s\n",
- events[i]);
- } else {
- if (!RTE_PMD_IXGBE_BYPASS_MODE_VALID(event_mode))
- event_mode = RTE_PMD_IXGBE_BYPASS_MODE_NONE;
-
- printf("\tbypass event: %-16s = %s\n", events[i],
- modes[event_mode]);
- }
- }
-#endif
- if (rc != 0)
- fprintf(stderr,
- "\tFailed to get bypass configuration for port = %d\n",
- port_id);
-}
-
-cmdline_parse_token_string_t cmd_showbypass_config_show =
- TOKEN_STRING_INITIALIZER(struct cmd_show_bypass_config_result,
- show, "show");
-cmdline_parse_token_string_t cmd_showbypass_config_bypass =
- TOKEN_STRING_INITIALIZER(struct cmd_show_bypass_config_result,
- bypass, "bypass");
-cmdline_parse_token_string_t cmd_showbypass_config_config =
- TOKEN_STRING_INITIALIZER(struct cmd_show_bypass_config_result,
- config, "config");
-cmdline_parse_token_num_t cmd_showbypass_config_port =
- TOKEN_NUM_INITIALIZER(struct cmd_show_bypass_config_result,
- port_id, RTE_UINT16);
-
-cmdline_parse_inst_t cmd_show_bypass_config = {
- .f = cmd_show_bypass_config_parsed,
- .help_str = "show bypass config <port_id>: "
- "Show the NIC bypass config for port_id",
- .data = NULL,
- .tokens = {
- (void *)&cmd_showbypass_config_show,
- (void *)&cmd_showbypass_config_bypass,
- (void *)&cmd_showbypass_config_config,
- (void *)&cmd_showbypass_config_port,
- NULL,
- },
-};
-
/* *** SET FORWARDING MODE *** */
struct cmd_set_fwd_mode_result {
cmdline_fixed_string_t set;
@@ -10079,100 +9695,6 @@ cmdline_parse_inst_t cmd_set_all_queues_drop_en = {
},
};
-/* vf split drop enable configuration */
-
-/* Common result structure for vf split drop enable */
-struct cmd_vf_split_drop_en_result {
- cmdline_fixed_string_t set;
- cmdline_fixed_string_t vf;
- cmdline_fixed_string_t split;
- cmdline_fixed_string_t drop;
- portid_t port_id;
- uint16_t vf_id;
- cmdline_fixed_string_t on_off;
-};
-
-/* Common CLI fields for vf split drop enable disable */
-cmdline_parse_token_string_t cmd_vf_split_drop_en_set =
- TOKEN_STRING_INITIALIZER
- (struct cmd_vf_split_drop_en_result,
- set, "set");
-cmdline_parse_token_string_t cmd_vf_split_drop_en_vf =
- TOKEN_STRING_INITIALIZER
- (struct cmd_vf_split_drop_en_result,
- vf, "vf");
-cmdline_parse_token_string_t cmd_vf_split_drop_en_split =
- TOKEN_STRING_INITIALIZER
- (struct cmd_vf_split_drop_en_result,
- split, "split");
-cmdline_parse_token_string_t cmd_vf_split_drop_en_drop =
- TOKEN_STRING_INITIALIZER
- (struct cmd_vf_split_drop_en_result,
- drop, "drop");
-cmdline_parse_token_num_t cmd_vf_split_drop_en_port_id =
- TOKEN_NUM_INITIALIZER
- (struct cmd_vf_split_drop_en_result,
- port_id, RTE_UINT16);
-cmdline_parse_token_num_t cmd_vf_split_drop_en_vf_id =
- TOKEN_NUM_INITIALIZER
- (struct cmd_vf_split_drop_en_result,
- vf_id, RTE_UINT16);
-cmdline_parse_token_string_t cmd_vf_split_drop_en_on_off =
- TOKEN_STRING_INITIALIZER
- (struct cmd_vf_split_drop_en_result,
- on_off, "on#off");
-
-static void
-cmd_set_vf_split_drop_en_parsed(
- void *parsed_result,
- __rte_unused struct cmdline *cl,
- __rte_unused void *data)
-{
- struct cmd_vf_split_drop_en_result *res = parsed_result;
- int ret = -ENOTSUP;
- int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
-
- if (port_id_is_invalid(res->port_id, ENABLED_WARN))
- return;
-
-#ifdef RTE_NET_IXGBE
- ret = rte_pmd_ixgbe_set_vf_split_drop_en(res->port_id, res->vf_id,
- is_on);
-#endif
- switch (ret) {
- case 0:
- break;
- case -EINVAL:
- fprintf(stderr, "invalid vf_id %d or is_on %d\n",
- res->vf_id, is_on);
- break;
- case -ENODEV:
- fprintf(stderr, "invalid port_id %d\n", res->port_id);
- break;
- case -ENOTSUP:
- fprintf(stderr, "not supported on port %d\n", res->port_id);
- break;
- default:
- fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
- }
-}
-
-cmdline_parse_inst_t cmd_set_vf_split_drop_en = {
- .f = cmd_set_vf_split_drop_en_parsed,
- .data = NULL,
- .help_str = "set vf split drop <port_id> <vf_id> on|off",
- .tokens = {
- (void *)&cmd_vf_split_drop_en_set,
- (void *)&cmd_vf_split_drop_en_vf,
- (void *)&cmd_vf_split_drop_en_split,
- (void *)&cmd_vf_split_drop_en_drop,
- (void *)&cmd_vf_split_drop_en_port_id,
- (void *)&cmd_vf_split_drop_en_vf_id,
- (void *)&cmd_vf_split_drop_en_on_off,
- NULL,
- },
-};
-
/* vf mac address configuration */
/* Common result structure for vf mac address */
@@ -10277,431 +9799,6 @@ cmdline_parse_inst_t cmd_set_vf_mac_addr = {
},
};
-/* MACsec configuration */
-
-/* Common result structure for MACsec offload enable */
-struct cmd_macsec_offload_on_result {
- cmdline_fixed_string_t set;
- cmdline_fixed_string_t macsec;
- cmdline_fixed_string_t offload;
- portid_t port_id;
- cmdline_fixed_string_t on;
- cmdline_fixed_string_t encrypt;
- cmdline_fixed_string_t en_on_off;
- cmdline_fixed_string_t replay_protect;
- cmdline_fixed_string_t rp_on_off;
-};
-
-/* Common CLI fields for MACsec offload disable */
-cmdline_parse_token_string_t cmd_macsec_offload_on_set =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_offload_on_result,
- set, "set");
-cmdline_parse_token_string_t cmd_macsec_offload_on_macsec =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_offload_on_result,
- macsec, "macsec");
-cmdline_parse_token_string_t cmd_macsec_offload_on_offload =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_offload_on_result,
- offload, "offload");
-cmdline_parse_token_num_t cmd_macsec_offload_on_port_id =
- TOKEN_NUM_INITIALIZER
- (struct cmd_macsec_offload_on_result,
- port_id, RTE_UINT16);
-cmdline_parse_token_string_t cmd_macsec_offload_on_on =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_offload_on_result,
- on, "on");
-cmdline_parse_token_string_t cmd_macsec_offload_on_encrypt =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_offload_on_result,
- encrypt, "encrypt");
-cmdline_parse_token_string_t cmd_macsec_offload_on_en_on_off =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_offload_on_result,
- en_on_off, "on#off");
-cmdline_parse_token_string_t cmd_macsec_offload_on_replay_protect =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_offload_on_result,
- replay_protect, "replay-protect");
-cmdline_parse_token_string_t cmd_macsec_offload_on_rp_on_off =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_offload_on_result,
- rp_on_off, "on#off");
-
-static void
-cmd_set_macsec_offload_on_parsed(
- void *parsed_result,
- __rte_unused struct cmdline *cl,
- __rte_unused void *data)
-{
- struct cmd_macsec_offload_on_result *res = parsed_result;
- int ret = -ENOTSUP;
- portid_t port_id = res->port_id;
- int en = (strcmp(res->en_on_off, "on") == 0) ? 1 : 0;
- int rp = (strcmp(res->rp_on_off, "on") == 0) ? 1 : 0;
- struct rte_eth_dev_info dev_info;
-
- if (port_id_is_invalid(port_id, ENABLED_WARN))
- return;
- if (!port_is_stopped(port_id)) {
- fprintf(stderr, "Please stop port %d first\n", port_id);
- return;
- }
-
- ret = eth_dev_info_get_print_err(port_id, &dev_info);
- if (ret != 0)
- return;
-
- if (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_MACSEC_INSERT) {
-#ifdef RTE_NET_IXGBE
- ret = rte_pmd_ixgbe_macsec_enable(port_id, en, rp);
-#endif
- }
- RTE_SET_USED(en);
- RTE_SET_USED(rp);
-
- switch (ret) {
- case 0:
- ports[port_id].dev_conf.txmode.offloads |=
-
RTE_ETH_TX_OFFLOAD_MACSEC_INSERT;
- cmd_reconfig_device_queue(port_id, 1, 1);
- break;
- case -ENODEV:
- fprintf(stderr, "invalid port_id %d\n", port_id);
- break;
- case -ENOTSUP:
- fprintf(stderr, "not supported on port %d\n", port_id);
- break;
- default:
- fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
- }
-}
-
-cmdline_parse_inst_t cmd_set_macsec_offload_on = {
- .f = cmd_set_macsec_offload_on_parsed,
- .data = NULL,
- .help_str = "set macsec offload <port_id> on "
- "encrypt on|off replay-protect on|off",
- .tokens = {
- (void *)&cmd_macsec_offload_on_set,
- (void *)&cmd_macsec_offload_on_macsec,
- (void *)&cmd_macsec_offload_on_offload,
- (void *)&cmd_macsec_offload_on_port_id,
- (void *)&cmd_macsec_offload_on_on,
- (void *)&cmd_macsec_offload_on_encrypt,
- (void *)&cmd_macsec_offload_on_en_on_off,
- (void *)&cmd_macsec_offload_on_replay_protect,
- (void *)&cmd_macsec_offload_on_rp_on_off,
- NULL,
- },
-};
-
-/* Common result structure for MACsec offload disable */
-struct cmd_macsec_offload_off_result {
- cmdline_fixed_string_t set;
- cmdline_fixed_string_t macsec;
- cmdline_fixed_string_t offload;
- portid_t port_id;
- cmdline_fixed_string_t off;
-};
-
-/* Common CLI fields for MACsec offload disable */
-cmdline_parse_token_string_t cmd_macsec_offload_off_set =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_offload_off_result,
- set, "set");
-cmdline_parse_token_string_t cmd_macsec_offload_off_macsec =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_offload_off_result,
- macsec, "macsec");
-cmdline_parse_token_string_t cmd_macsec_offload_off_offload =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_offload_off_result,
- offload, "offload");
-cmdline_parse_token_num_t cmd_macsec_offload_off_port_id =
- TOKEN_NUM_INITIALIZER
- (struct cmd_macsec_offload_off_result,
- port_id, RTE_UINT16);
-cmdline_parse_token_string_t cmd_macsec_offload_off_off =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_offload_off_result,
- off, "off");
-
-static void
-cmd_set_macsec_offload_off_parsed(
- void *parsed_result,
- __rte_unused struct cmdline *cl,
- __rte_unused void *data)
-{
- struct cmd_macsec_offload_off_result *res = parsed_result;
- int ret = -ENOTSUP;
- struct rte_eth_dev_info dev_info;
- portid_t port_id = res->port_id;
-
- if (port_id_is_invalid(port_id, ENABLED_WARN))
- return;
- if (!port_is_stopped(port_id)) {
- fprintf(stderr, "Please stop port %d first\n", port_id);
- return;
- }
-
- ret = eth_dev_info_get_print_err(port_id, &dev_info);
- if (ret != 0)
- return;
-
- if (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_MACSEC_INSERT) {
-#ifdef RTE_NET_IXGBE
- ret = rte_pmd_ixgbe_macsec_disable(port_id);
-#endif
- }
- switch (ret) {
- case 0:
- ports[port_id].dev_conf.txmode.offloads &=
-
~RTE_ETH_TX_OFFLOAD_MACSEC_INSERT;
- cmd_reconfig_device_queue(port_id, 1, 1);
- break;
- case -ENODEV:
- fprintf(stderr, "invalid port_id %d\n", port_id);
- break;
- case -ENOTSUP:
- fprintf(stderr, "not supported on port %d\n", port_id);
- break;
- default:
- fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
- }
-}
-
-cmdline_parse_inst_t cmd_set_macsec_offload_off = {
- .f = cmd_set_macsec_offload_off_parsed,
- .data = NULL,
- .help_str = "set macsec offload <port_id> off",
- .tokens = {
- (void *)&cmd_macsec_offload_off_set,
- (void *)&cmd_macsec_offload_off_macsec,
- (void *)&cmd_macsec_offload_off_offload,
- (void *)&cmd_macsec_offload_off_port_id,
- (void *)&cmd_macsec_offload_off_off,
- NULL,
- },
-};
-
-/* Common result structure for MACsec secure connection configure */
-struct cmd_macsec_sc_result {
- cmdline_fixed_string_t set;
- cmdline_fixed_string_t macsec;
- cmdline_fixed_string_t sc;
- cmdline_fixed_string_t tx_rx;
- portid_t port_id;
- struct rte_ether_addr mac;
- uint16_t pi;
-};
-
-/* Common CLI fields for MACsec secure connection configure */
-cmdline_parse_token_string_t cmd_macsec_sc_set =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_sc_result,
- set, "set");
-cmdline_parse_token_string_t cmd_macsec_sc_macsec =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_sc_result,
- macsec, "macsec");
-cmdline_parse_token_string_t cmd_macsec_sc_sc =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_sc_result,
- sc, "sc");
-cmdline_parse_token_string_t cmd_macsec_sc_tx_rx =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_sc_result,
- tx_rx, "tx#rx");
-cmdline_parse_token_num_t cmd_macsec_sc_port_id =
- TOKEN_NUM_INITIALIZER
- (struct cmd_macsec_sc_result,
- port_id, RTE_UINT16);
-cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
- TOKEN_ETHERADDR_INITIALIZER
- (struct cmd_macsec_sc_result,
- mac);
-cmdline_parse_token_num_t cmd_macsec_sc_pi =
- TOKEN_NUM_INITIALIZER
- (struct cmd_macsec_sc_result,
- pi, RTE_UINT16);
-
-static void
-cmd_set_macsec_sc_parsed(
- void *parsed_result,
- __rte_unused struct cmdline *cl,
- __rte_unused void *data)
-{
- struct cmd_macsec_sc_result *res = parsed_result;
- int ret = -ENOTSUP;
- int is_tx = (strcmp(res->tx_rx, "tx") == 0) ? 1 : 0;
-
-#ifdef RTE_NET_IXGBE
- ret = is_tx ?
- rte_pmd_ixgbe_macsec_config_txsc(res->port_id,
- res->mac.addr_bytes) :
- rte_pmd_ixgbe_macsec_config_rxsc(res->port_id,
- res->mac.addr_bytes, res->pi);
-#endif
- RTE_SET_USED(is_tx);
-
- switch (ret) {
- case 0:
- break;
- case -ENODEV:
- fprintf(stderr, "invalid port_id %d\n", res->port_id);
- break;
- case -ENOTSUP:
- fprintf(stderr, "not supported on port %d\n", res->port_id);
- break;
- default:
- fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
- }
-}
-
-cmdline_parse_inst_t cmd_set_macsec_sc = {
- .f = cmd_set_macsec_sc_parsed,
- .data = NULL,
- .help_str = "set macsec sc tx|rx <port_id> <mac> <pi>",
- .tokens = {
- (void *)&cmd_macsec_sc_set,
- (void *)&cmd_macsec_sc_macsec,
- (void *)&cmd_macsec_sc_sc,
- (void *)&cmd_macsec_sc_tx_rx,
- (void *)&cmd_macsec_sc_port_id,
- (void *)&cmd_macsec_sc_mac,
- (void *)&cmd_macsec_sc_pi,
- NULL,
- },
-};
-
-/* Common result structure for MACsec secure connection configure */
-struct cmd_macsec_sa_result {
- cmdline_fixed_string_t set;
- cmdline_fixed_string_t macsec;
- cmdline_fixed_string_t sa;
- cmdline_fixed_string_t tx_rx;
- portid_t port_id;
- uint8_t idx;
- uint8_t an;
- uint32_t pn;
- cmdline_fixed_string_t key;
-};
-
-/* Common CLI fields for MACsec secure connection configure */
-cmdline_parse_token_string_t cmd_macsec_sa_set =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_sa_result,
- set, "set");
-cmdline_parse_token_string_t cmd_macsec_sa_macsec =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_sa_result,
- macsec, "macsec");
-cmdline_parse_token_string_t cmd_macsec_sa_sa =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_sa_result,
- sa, "sa");
-cmdline_parse_token_string_t cmd_macsec_sa_tx_rx =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_sa_result,
- tx_rx, "tx#rx");
-cmdline_parse_token_num_t cmd_macsec_sa_port_id =
- TOKEN_NUM_INITIALIZER
- (struct cmd_macsec_sa_result,
- port_id, RTE_UINT16);
-cmdline_parse_token_num_t cmd_macsec_sa_idx =
- TOKEN_NUM_INITIALIZER
- (struct cmd_macsec_sa_result,
- idx, RTE_UINT8);
-cmdline_parse_token_num_t cmd_macsec_sa_an =
- TOKEN_NUM_INITIALIZER
- (struct cmd_macsec_sa_result,
- an, RTE_UINT8);
-cmdline_parse_token_num_t cmd_macsec_sa_pn =
- TOKEN_NUM_INITIALIZER
- (struct cmd_macsec_sa_result,
- pn, RTE_UINT32);
-cmdline_parse_token_string_t cmd_macsec_sa_key =
- TOKEN_STRING_INITIALIZER
- (struct cmd_macsec_sa_result,
- key, NULL);
-
-static void
-cmd_set_macsec_sa_parsed(
- void *parsed_result,
- __rte_unused struct cmdline *cl,
- __rte_unused void *data)
-{
- struct cmd_macsec_sa_result *res = parsed_result;
- int ret = -ENOTSUP;
- int is_tx = (strcmp(res->tx_rx, "tx") == 0) ? 1 : 0;
- uint8_t key[16] = { 0 };
- uint8_t xdgt0;
- uint8_t xdgt1;
- int key_len;
- int i;
-
- key_len = strlen(res->key) / 2;
- if (key_len > 16)
- key_len = 16;
-
- for (i = 0; i < key_len; i++) {
- xdgt0 = parse_and_check_key_hexa_digit(res->key, (i * 2));
- if (xdgt0 == 0xFF)
- return;
- xdgt1 = parse_and_check_key_hexa_digit(res->key, (i * 2) + 1);
- if (xdgt1 == 0xFF)
- return;
- key[i] = (uint8_t) ((xdgt0 * 16) + xdgt1);
- }
-
-#ifdef RTE_NET_IXGBE
- ret = is_tx ?
- rte_pmd_ixgbe_macsec_select_txsa(res->port_id,
- res->idx, res->an, res->pn, key) :
- rte_pmd_ixgbe_macsec_select_rxsa(res->port_id,
- res->idx, res->an, res->pn, key);
-#endif
- RTE_SET_USED(is_tx);
- RTE_SET_USED(key);
-
- switch (ret) {
- case 0:
- break;
- case -EINVAL:
- fprintf(stderr, "invalid idx %d or an %d\n", res->idx, res->an);
- break;
- case -ENODEV:
- fprintf(stderr, "invalid port_id %d\n", res->port_id);
- break;
- case -ENOTSUP:
- fprintf(stderr, "not supported on port %d\n", res->port_id);
- break;
- default:
- fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
- }
-}
-
-cmdline_parse_inst_t cmd_set_macsec_sa = {
- .f = cmd_set_macsec_sa_parsed,
- .data = NULL,
- .help_str = "set macsec sa tx|rx <port_id> <idx> <an> <pn> <key>",
- .tokens = {
- (void *)&cmd_macsec_sa_set,
- (void *)&cmd_macsec_sa_macsec,
- (void *)&cmd_macsec_sa_sa,
- (void *)&cmd_macsec_sa_tx_rx,
- (void *)&cmd_macsec_sa_port_id,
- (void *)&cmd_macsec_sa_idx,
- (void *)&cmd_macsec_sa_an,
- (void *)&cmd_macsec_sa_pn,
- (void *)&cmd_macsec_sa_key,
- NULL,
- },
-};
-
/* VF unicast promiscuous mode configuration */
/* Common result structure for VF unicast promiscuous mode */
@@ -11294,68 +10391,6 @@ cmdline_parse_inst_t cmd_vf_tc_min_bw = {
},
};
-static void
-cmd_tc_min_bw_parsed(
- void *parsed_result,
- __rte_unused struct cmdline *cl,
- __rte_unused void *data)
-{
- struct cmd_vf_tc_bw_result *res = parsed_result;
- struct rte_port *port;
- uint8_t tc_num;
- uint8_t bw[16];
- int ret = -ENOTSUP;
-
- if (port_id_is_invalid(res->port_id, ENABLED_WARN))
- return;
-
- port = &ports[res->port_id];
- /** Check if the port is not started **/
- if (port->port_status != RTE_PORT_STOPPED) {
- fprintf(stderr, "Please stop port %d first\n", res->port_id);
- return;
- }
-
- ret = vf_tc_min_bw_parse_bw_list(bw, &tc_num, res->bw_list);
- if (ret)
- return;
-
-#ifdef RTE_NET_IXGBE
- ret = rte_pmd_ixgbe_set_tc_bw_alloc(res->port_id, tc_num, bw);
-#endif
-
- switch (ret) {
- case 0:
- break;
- case -EINVAL:
- fprintf(stderr, "invalid bandwidth\n");
- break;
- case -ENODEV:
- fprintf(stderr, "invalid port_id %d\n", res->port_id);
- break;
- case -ENOTSUP:
- fprintf(stderr, "function not implemented\n");
- break;
- default:
- fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
- }
-}
-
-cmdline_parse_inst_t cmd_tc_min_bw = {
- .f = cmd_tc_min_bw_parsed,
- .data = NULL,
- .help_str = "set tc tx min-bandwidth <port_id> <bw1, bw2, ...>",
- .tokens = {
- (void *)&cmd_vf_tc_bw_set,
- (void *)&cmd_vf_tc_bw_tc,
- (void *)&cmd_vf_tc_bw_tx,
- (void *)&cmd_vf_tc_bw_min_bw,
- (void *)&cmd_vf_tc_bw_port_id,
- (void *)&cmd_vf_tc_bw_bw_list,
- NULL,
- },
-};
-
/* TC max bandwidth setting */
static void
cmd_vf_tc_max_bw_parsed(
@@ -16188,10 +15223,6 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
(cmdline_parse_inst_t *)&cmd_set_allmulti_mode_all,
(cmdline_parse_inst_t *)&cmd_set_flush_rx,
(cmdline_parse_inst_t *)&cmd_set_link_check,
- (cmdline_parse_inst_t *)&cmd_set_bypass_mode,
- (cmdline_parse_inst_t *)&cmd_set_bypass_event,
- (cmdline_parse_inst_t *)&cmd_set_bypass_timeout,
- (cmdline_parse_inst_t *)&cmd_show_bypass_config,
(cmdline_parse_inst_t *)&cmd_vlan_offload,
(cmdline_parse_inst_t *)&cmd_vlan_tpid,
(cmdline_parse_inst_t *)&cmd_rx_vlan_filter_all,
@@ -16307,11 +15338,6 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
(cmdline_parse_inst_t *)&cmd_set_vf_vlan_insert,
(cmdline_parse_inst_t *)&cmd_set_tx_loopback,
(cmdline_parse_inst_t *)&cmd_set_all_queues_drop_en,
- (cmdline_parse_inst_t *)&cmd_set_vf_split_drop_en,
- (cmdline_parse_inst_t *)&cmd_set_macsec_offload_on,
- (cmdline_parse_inst_t *)&cmd_set_macsec_offload_off,
- (cmdline_parse_inst_t *)&cmd_set_macsec_sc,
- (cmdline_parse_inst_t *)&cmd_set_macsec_sa,
(cmdline_parse_inst_t *)&cmd_set_vf_traffic,
(cmdline_parse_inst_t *)&cmd_set_vf_rxmode,
(cmdline_parse_inst_t *)&cmd_vf_rate_limit,
@@ -16325,7 +15351,6 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
(cmdline_parse_inst_t *)&cmd_vf_tc_min_bw,
(cmdline_parse_inst_t *)&cmd_vf_tc_max_bw,
(cmdline_parse_inst_t *)&cmd_strict_link_prio,
- (cmdline_parse_inst_t *)&cmd_tc_min_bw,
(cmdline_parse_inst_t *)&cmd_set_vxlan,
(cmdline_parse_inst_t *)&cmd_set_vxlan_tos_ttl,
(cmdline_parse_inst_t *)&cmd_set_vxlan_with_vlan,
@@ -16518,7 +15543,7 @@ prompt_exit(void)
}
}
-static void
+void
cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue)
{
if (id == (portid_t)RTE_PORT_ALL) {
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 5bda46e32b..84e7996556 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -437,16 +437,6 @@ uint32_t event_print_mask = (UINT32_C(1) <<
RTE_ETH_EVENT_UNKNOWN) |
*/
int do_mlockall = 0;
-/*
- * NIC bypass mode configuration options.
- */
-
-#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS
-/* The NIC bypass watchdog timeout. */
-uint32_t bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF;
-#endif
-
-
#ifdef RTE_LIB_LATENCYSTATS
/*
@@ -3800,10 +3790,6 @@ init_port_config(void)
if (ret != 0)
return;
-#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS
- rte_pmd_ixgbe_bypass_init(pid);
-#endif
-
if (lsc_interrupt && (*port->dev_info.dev_flags &
RTE_ETH_DEV_INTR_LSC))
port->dev_conf.intr_conf.lsc = 1;
if (rmv_interrupt && (*port->dev_info.dev_flags &
RTE_ETH_DEV_INTR_RMV))
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 9058d21a07..48dff3b8a6 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -439,10 +439,6 @@ extern uint8_t hot_plug; /**< enable by "--hot-plug"
parameter */
extern int do_mlockall; /**< set by "--mlockall" or "--no-mlockall" parameter
*/
extern uint8_t clear_ptypes; /**< disabled by set ptype cmd */
-#ifdef RTE_LIBRTE_IXGBE_BYPASS
-extern uint32_t bypass_timeout; /**< Store the NIC bypass watchdog timeout */
-#endif
-
/*
* Store specified sockets on which memory pool to be used by ports
* is allocated.
@@ -871,6 +867,7 @@ unsigned int parse_item_list(const char *str, const char
*item_name,
unsigned int max_items,
unsigned int *parsed_items, int check_unique_values);
void launch_args_parse(int argc, char** argv);
+void cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue);
void cmdline_read_from_file(const char *filename);
int init_cmdline(void);
void prompt(void);
diff --git a/drivers/net/ixgbe/ixgbe_testpmd.c
b/drivers/net/ixgbe/ixgbe_testpmd.c
new file mode 100644
index 0000000000..1a4ffb69be
--- /dev/null
+++ b/drivers/net/ixgbe/ixgbe_testpmd.c
@@ -0,0 +1,1147 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation.
+ */
+
+#define RTE_LIBRTE_IXGBE_BYPASS
+
+#include <ethdev_driver.h>
+#include "ixgbe_ethdev.h"
+#include "rte_pmd_ixgbe.h"
+
+#include <cmdline_parse_etheraddr.h>
+#include <cmdline_parse_num.h>
+#include <cmdline_parse_string.h>
+
+#include "testpmd.h"
+
+static uint8_t
+hexa_digit_to_value(char hexa_digit)
+{
+ if ((hexa_digit >= '0') && (hexa_digit <= '9'))
+ return (uint8_t)(hexa_digit - '0');
+ if ((hexa_digit >= 'a') && (hexa_digit <= 'f'))
+ return (uint8_t)((hexa_digit - 'a') + 10);
+ if ((hexa_digit >= 'A') && (hexa_digit <= 'F'))
+ return (uint8_t)((hexa_digit - 'A') + 10);
+ /* Invalid hexa digit */
+ return 0xFF;
+}
+
+static uint8_t
+parse_and_check_key_hexa_digit(char *key, int idx)
+{
+ uint8_t hexa_v;
+
+ hexa_v = hexa_digit_to_value(key[idx]);
+ if (hexa_v == 0xFF)
+ fprintf(stderr,
+ "invalid key: character %c at position %d is not a
valid hexa digit\n",
+ key[idx], idx);
+ return hexa_v;
+}
+
+static int
+vf_tc_min_bw_parse_bw_list(uint8_t *bw_list,
+ uint8_t *tc_num,
+ char *str)
+{
+ uint32_t size;
+ const char *p, *p0 = str;
+ char s[256];
+ char *end;
+ char *str_fld[16];
+ uint16_t i;
+ int ret;
+
+ p = strchr(p0, '(');
+ if (p == NULL) {
+ fprintf(stderr,
+ "The bandwidth-list should be '(bw1, bw2, ...)'\n");
+ return -1;
+ }
+ p++;
+ p0 = strchr(p, ')');
+ if (p0 == NULL) {
+ fprintf(stderr,
+ "The bandwidth-list should be '(bw1, bw2, ...)'\n");
+ return -1;
+ }
+ size = p0 - p;
+ if (size >= sizeof(s)) {
+ fprintf(stderr,
+ "The string size exceeds the internal buffer size\n");
+ return -1;
+ }
+ snprintf(s, sizeof(s), "%.*s", size, p);
+ ret = rte_strsplit(s, sizeof(s), str_fld, 16, ',');
+ if (ret <= 0) {
+ fprintf(stderr, "Failed to get the bandwidth list.\n");
+ return -1;
+ }
+ *tc_num = ret;
+ for (i = 0; i < ret; i++)
+ bw_list[i] = (uint8_t)strtoul(str_fld[i], &end, 0);
+
+ return 0;
+}
+
+/* The NIC bypass watchdog timeout. */
+uint32_t bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF;
+
+static inline bool
+check_bypass_enabled(portid_t port_id)
+{
+ struct ixgbe_adapter *adapter;
+
+ adapter = rte_eth_devices[port_id].data->dev_private;
+ if (adapter->bps.ops.bypass_rw == NULL) {
+ fprintf(stderr, "Bypass is not enabled on this port.\n");
+ return false;
+ }
+
+ return true;
+}
+
+/* Enable bypass mode */
+struct cmd_config_bypass_result {
+ cmdline_fixed_string_t port;
+ cmdline_fixed_string_t config;
+ cmdline_fixed_string_t bypass;
+ portid_t port_id;
+ cmdline_fixed_string_t value;
+};
+
+static void
+cmd_config_bypass_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_config_bypass_result *res = parsed_result;
+ portid_t port_id = res->port_id;
+
+ if (ports[port_id].port_status == RTE_PORT_STARTED) {
+ fprintf(stderr, "Cannot change bypass configuration while port
is started, please stop it and retry\n");
+ return;
+ }
+
+ if (strcmp(res->value, "on") == 0)
+ rte_pmd_ixgbe_bypass_init(port_id);
+}
+
+static cmdline_parse_token_string_t cmd_config_bypass_port =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_bypass_result, port, "port");
+static cmdline_parse_token_string_t cmd_config_bypass_config =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_bypass_result, config,
"config");
+static cmdline_parse_token_string_t cmd_config_bypass_bypass =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_bypass_result, bypass,
"bypass");
+static cmdline_parse_token_num_t cmd_config_bypass_port_id =
+ TOKEN_NUM_INITIALIZER(struct cmd_config_bypass_result, port_id,
RTE_UINT16);
+static cmdline_parse_token_string_t cmd_config_bypass_value =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_bypass_result, value,
"on#off");
+
+static cmdline_parse_inst_t cmd_config_bypass = {
+ .f = cmd_config_bypass_parsed,
+ .data = NULL,
+ .help_str = "port config bypass <port_id> on|off",
+ .tokens = {
+ (void *)&cmd_config_bypass_port,
+ (void *)&cmd_config_bypass_config,
+ (void *)&cmd_config_bypass_bypass,
+ (void *)&cmd_config_bypass_port_id,
+ (void *)&cmd_config_bypass_value,
+ NULL,
+ },
+};
+
+/* *** SET NIC BYPASS MODE *** */
+struct cmd_set_bypass_mode_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t bypass;
+ cmdline_fixed_string_t mode;
+ cmdline_fixed_string_t value;
+ portid_t port_id;
+};
+
+static void
+cmd_set_bypass_mode_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_set_bypass_mode_result *res = parsed_result;
+ uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
+ portid_t port_id = res->port_id;
+ int32_t rc = -EINVAL;
+
+ if (!check_bypass_enabled(port_id))
+ return;
+
+ if (!strcmp(res->value, "bypass"))
+ bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_BYPASS;
+ else if (!strcmp(res->value, "isolate"))
+ bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_ISOLATE;
+ else
+ bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
+
+ /* Set the bypass mode for the relevant port. */
+ rc = rte_pmd_ixgbe_bypass_state_set(port_id, &bypass_mode);
+ if (rc != 0)
+ fprintf(stderr, "\t Failed to set bypass mode for port = %d.\n",
+ port_id);
+}
+
+static cmdline_parse_token_string_t cmd_setbypass_mode_set =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_mode_result,
+ set, "set");
+static cmdline_parse_token_string_t cmd_setbypass_mode_bypass =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_mode_result,
+ bypass, "bypass");
+static cmdline_parse_token_string_t cmd_setbypass_mode_mode =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_mode_result,
+ mode, "mode");
+static cmdline_parse_token_string_t cmd_setbypass_mode_value =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_mode_result,
+ value, "normal#bypass#isolate");
+static cmdline_parse_token_num_t cmd_setbypass_mode_port =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_mode_result,
+ port_id, RTE_UINT16);
+
+static cmdline_parse_inst_t cmd_set_bypass_mode = {
+ .f = cmd_set_bypass_mode_parsed,
+ .help_str = "set bypass mode normal|bypass|isolate <port_id>: "
+ "Set the NIC bypass mode for port_id",
+ .data = NULL,
+ .tokens = {
+ (void *)&cmd_setbypass_mode_set,
+ (void *)&cmd_setbypass_mode_bypass,
+ (void *)&cmd_setbypass_mode_mode,
+ (void *)&cmd_setbypass_mode_value,
+ (void *)&cmd_setbypass_mode_port,
+ NULL,
+ },
+};
+
+/* *** SET NIC BYPASS EVENT *** */
+struct cmd_set_bypass_event_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t bypass;
+ cmdline_fixed_string_t event;
+ cmdline_fixed_string_t event_value;
+ cmdline_fixed_string_t mode;
+ cmdline_fixed_string_t mode_value;
+ portid_t port_id;
+};
+
+static void
+cmd_set_bypass_event_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ int32_t rc = -EINVAL;
+ struct cmd_set_bypass_event_result *res = parsed_result;
+ portid_t port_id = res->port_id;
+ uint32_t bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_NONE;
+ uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
+
+ if (!check_bypass_enabled(port_id))
+ return;
+
+ if (!strcmp(res->event_value, "timeout"))
+ bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_TIMEOUT;
+ else if (!strcmp(res->event_value, "os_on"))
+ bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_OS_ON;
+ else if (!strcmp(res->event_value, "os_off"))
+ bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_OS_OFF;
+ else if (!strcmp(res->event_value, "power_on"))
+ bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_POWER_ON;
+ else if (!strcmp(res->event_value, "power_off"))
+ bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_POWER_OFF;
+ else
+ bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_NONE;
+
+ if (!strcmp(res->mode_value, "bypass"))
+ bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_BYPASS;
+ else if (!strcmp(res->mode_value, "isolate"))
+ bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_ISOLATE;
+ else
+ bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
+
+ /* Set the watchdog timeout. */
+ if (bypass_event == RTE_PMD_IXGBE_BYPASS_EVENT_TIMEOUT) {
+ rc = -EINVAL;
+ if (RTE_PMD_IXGBE_BYPASS_TMT_VALID(bypass_timeout)) {
+ rc = rte_pmd_ixgbe_bypass_wd_timeout_store(port_id,
+ bypass_timeout);
+ }
+ if (rc != 0) {
+ fprintf(stderr,
+ "Failed to set timeout value %u for port %d,
errto code: %d.\n",
+ bypass_timeout, port_id, rc);
+ }
+ }
+
+ /* Set the bypass event to transition to bypass mode. */
+ rc = rte_pmd_ixgbe_bypass_event_store(port_id, bypass_event,
+ bypass_mode);
+ if (rc != 0)
+ fprintf(stderr, "\t Failed to set bypass event for port =
%d.\n",
+ port_id);
+}
+
+static cmdline_parse_token_string_t cmd_setbypass_event_set =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
+ set, "set");
+static cmdline_parse_token_string_t cmd_setbypass_event_bypass =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
+ bypass, "bypass");
+static cmdline_parse_token_string_t cmd_setbypass_event_event =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
+ event, "event");
+static cmdline_parse_token_string_t cmd_setbypass_event_event_value =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
+ event_value,
"none#timeout#os_off#os_on#power_on#power_off");
+static cmdline_parse_token_string_t cmd_setbypass_event_mode =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
+ mode, "mode");
+static cmdline_parse_token_string_t cmd_setbypass_event_mode_value =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
+ mode_value, "normal#bypass#isolate");
+static cmdline_parse_token_num_t cmd_setbypass_event_port =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_event_result,
+ port_id, RTE_UINT16);
+
+static cmdline_parse_inst_t cmd_set_bypass_event = {
+ .f = cmd_set_bypass_event_parsed,
+ .help_str = "set bypass event none|timeout|os_on|os_off|power_on|"
+ "power_off mode normal|bypass|isolate <port_id>: "
+ "Set the NIC bypass event mode for port_id",
+ .data = NULL,
+ .tokens = {
+ (void *)&cmd_setbypass_event_set,
+ (void *)&cmd_setbypass_event_bypass,
+ (void *)&cmd_setbypass_event_event,
+ (void *)&cmd_setbypass_event_event_value,
+ (void *)&cmd_setbypass_event_mode,
+ (void *)&cmd_setbypass_event_mode_value,
+ (void *)&cmd_setbypass_event_port,
+ NULL,
+ },
+};
+
+
+/* *** SET NIC BYPASS TIMEOUT *** */
+struct cmd_set_bypass_timeout_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t bypass;
+ cmdline_fixed_string_t timeout;
+ cmdline_fixed_string_t value;
+};
+
+static void
+cmd_set_bypass_timeout_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_set_bypass_timeout_result *res = parsed_result;
+
+ if (!strcmp(res->value, "1.5"))
+ bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_1_5_SEC;
+ else if (!strcmp(res->value, "2"))
+ bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_2_SEC;
+ else if (!strcmp(res->value, "3"))
+ bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_3_SEC;
+ else if (!strcmp(res->value, "4"))
+ bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_4_SEC;
+ else if (!strcmp(res->value, "8"))
+ bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_8_SEC;
+ else if (!strcmp(res->value, "16"))
+ bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_16_SEC;
+ else if (!strcmp(res->value, "32"))
+ bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_32_SEC;
+ else
+ bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF;
+}
+
+static cmdline_parse_token_string_t cmd_setbypass_timeout_set =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_timeout_result,
+ set, "set");
+static cmdline_parse_token_string_t cmd_setbypass_timeout_bypass =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_timeout_result,
+ bypass, "bypass");
+static cmdline_parse_token_string_t cmd_setbypass_timeout_timeout =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_timeout_result,
+ timeout, "timeout");
+static cmdline_parse_token_string_t cmd_setbypass_timeout_value =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_timeout_result,
+ value, "0#1.5#2#3#4#8#16#32");
+
+static cmdline_parse_inst_t cmd_set_bypass_timeout = {
+ .f = cmd_set_bypass_timeout_parsed,
+ .help_str = "set bypass timeout 0|1.5|2|3|4|8|16|32: "
+ "Set the NIC bypass watchdog timeout in seconds",
+ .data = NULL,
+ .tokens = {
+ (void *)&cmd_setbypass_timeout_set,
+ (void *)&cmd_setbypass_timeout_bypass,
+ (void *)&cmd_setbypass_timeout_timeout,
+ (void *)&cmd_setbypass_timeout_value,
+ NULL,
+ },
+};
+
+/* *** SHOW NIC BYPASS MODE *** */
+struct cmd_show_bypass_config_result {
+ cmdline_fixed_string_t show;
+ cmdline_fixed_string_t bypass;
+ cmdline_fixed_string_t config;
+ portid_t port_id;
+};
+
+static void
+cmd_show_bypass_config_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_show_bypass_config_result *res = parsed_result;
+ portid_t port_id = res->port_id;
+ int rc = -EINVAL;
+ uint32_t event_mode;
+ uint32_t bypass_mode;
+ uint32_t timeout = bypass_timeout;
+ unsigned int i;
+
+ static const char * const timeouts[RTE_PMD_IXGBE_BYPASS_TMT_NUM] = {
+ "off", "1.5", "2", "3", "4", "8", "16", "32"
+ };
+ static const char * const modes[RTE_PMD_IXGBE_BYPASS_MODE_NUM] = {
+ "UNKNOWN", "normal", "bypass", "isolate"
+ };
+ static const char * const events[RTE_PMD_IXGBE_BYPASS_EVENT_NUM] = {
+ "NONE",
+ "OS/board on",
+ "power supply on",
+ "OS/board off",
+ "power supply off",
+ "timeout"};
+
+ if (!check_bypass_enabled(port_id))
+ return;
+
+ /* Display the bypass mode.*/
+ if (rte_pmd_ixgbe_bypass_state_show(port_id, &bypass_mode) != 0) {
+ fprintf(stderr, "\tFailed to get bypass mode for port = %d\n",
+ port_id);
+ return;
+ }
+ if (!RTE_PMD_IXGBE_BYPASS_MODE_VALID(bypass_mode))
+ bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NONE;
+
+ printf("\tbypass mode = %s\n", modes[bypass_mode]);
+
+ /* Display the bypass timeout.*/
+ if (!RTE_PMD_IXGBE_BYPASS_TMT_VALID(timeout))
+ timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF;
+
+ printf("\tbypass timeout = %s\n", timeouts[timeout]);
+
+ /* Display the bypass events and associated modes. */
+ for (i = RTE_PMD_IXGBE_BYPASS_EVENT_START; i < RTE_DIM(events); i++) {
+ if (rte_pmd_ixgbe_bypass_event_show(port_id, i, &event_mode)) {
+ fprintf(stderr,
+ "\tFailed to get bypass mode for event = %s\n",
+ events[i]);
+ } else {
+ if (!RTE_PMD_IXGBE_BYPASS_MODE_VALID(event_mode))
+ event_mode = RTE_PMD_IXGBE_BYPASS_MODE_NONE;
+
+ printf("\tbypass event: %-16s = %s\n", events[i],
+ modes[event_mode]);
+ }
+ }
+ if (rc != 0)
+ fprintf(stderr,
+ "\tFailed to get bypass configuration for port = %d\n",
+ port_id);
+}
+
+static cmdline_parse_token_string_t cmd_showbypass_config_show =
+ TOKEN_STRING_INITIALIZER(struct cmd_show_bypass_config_result,
+ show, "show");
+static cmdline_parse_token_string_t cmd_showbypass_config_bypass =
+ TOKEN_STRING_INITIALIZER(struct cmd_show_bypass_config_result,
+ bypass, "bypass");
+static cmdline_parse_token_string_t cmd_showbypass_config_config =
+ TOKEN_STRING_INITIALIZER(struct cmd_show_bypass_config_result,
+ config, "config");
+static cmdline_parse_token_num_t cmd_showbypass_config_port =
+ TOKEN_NUM_INITIALIZER(struct cmd_show_bypass_config_result,
+ port_id, RTE_UINT16);
+
+static cmdline_parse_inst_t cmd_show_bypass_config = {
+ .f = cmd_show_bypass_config_parsed,
+ .help_str = "show bypass config <port_id>: "
+ "Show the NIC bypass config for port_id",
+ .data = NULL,
+ .tokens = {
+ (void *)&cmd_showbypass_config_show,
+ (void *)&cmd_showbypass_config_bypass,
+ (void *)&cmd_showbypass_config_config,
+ (void *)&cmd_showbypass_config_port,
+ NULL,
+ },
+};
+
+/* Common result structure for vf split drop enable */
+struct cmd_vf_split_drop_en_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t vf;
+ cmdline_fixed_string_t split;
+ cmdline_fixed_string_t drop;
+ portid_t port_id;
+ uint16_t vf_id;
+ cmdline_fixed_string_t on_off;
+};
+
+/* Common CLI fields for vf split drop enable disable */
+static cmdline_parse_token_string_t cmd_vf_split_drop_en_set =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_vf_split_drop_en_result,
+ set, "set");
+static cmdline_parse_token_string_t cmd_vf_split_drop_en_vf =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_vf_split_drop_en_result,
+ vf, "vf");
+static cmdline_parse_token_string_t cmd_vf_split_drop_en_split =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_vf_split_drop_en_result,
+ split, "split");
+static cmdline_parse_token_string_t cmd_vf_split_drop_en_drop =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_vf_split_drop_en_result,
+ drop, "drop");
+static cmdline_parse_token_num_t cmd_vf_split_drop_en_port_id =
+ TOKEN_NUM_INITIALIZER
+ (struct cmd_vf_split_drop_en_result,
+ port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_vf_split_drop_en_vf_id =
+ TOKEN_NUM_INITIALIZER
+ (struct cmd_vf_split_drop_en_result,
+ vf_id, RTE_UINT16);
+static cmdline_parse_token_string_t cmd_vf_split_drop_en_on_off =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_vf_split_drop_en_result,
+ on_off, "on#off");
+
+static void
+cmd_set_vf_split_drop_en_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_vf_split_drop_en_result *res = parsed_result;
+ int ret = -ENOTSUP;
+ int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
+
+ if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+ return;
+
+ ret = rte_pmd_ixgbe_set_vf_split_drop_en(res->port_id, res->vf_id,
+ is_on);
+ switch (ret) {
+ case 0:
+ break;
+ case -EINVAL:
+ fprintf(stderr, "invalid vf_id %d or is_on %d\n",
+ res->vf_id, is_on);
+ break;
+ case -ENODEV:
+ fprintf(stderr, "invalid port_id %d\n", res->port_id);
+ break;
+ case -ENOTSUP:
+ fprintf(stderr, "not supported on port %d\n", res->port_id);
+ break;
+ default:
+ fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
+ }
+}
+
+static cmdline_parse_inst_t cmd_set_vf_split_drop_en = {
+ .f = cmd_set_vf_split_drop_en_parsed,
+ .data = NULL,
+ .help_str = "set vf split drop <port_id> <vf_id> on|off",
+ .tokens = {
+ (void *)&cmd_vf_split_drop_en_set,
+ (void *)&cmd_vf_split_drop_en_vf,
+ (void *)&cmd_vf_split_drop_en_split,
+ (void *)&cmd_vf_split_drop_en_drop,
+ (void *)&cmd_vf_split_drop_en_port_id,
+ (void *)&cmd_vf_split_drop_en_vf_id,
+ (void *)&cmd_vf_split_drop_en_on_off,
+ NULL,
+ },
+};
+
+/* MACsec configuration */
+
+/* Common result structure for MACsec offload enable */
+struct cmd_macsec_offload_on_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t macsec;
+ cmdline_fixed_string_t offload;
+ portid_t port_id;
+ cmdline_fixed_string_t on;
+ cmdline_fixed_string_t encrypt;
+ cmdline_fixed_string_t en_on_off;
+ cmdline_fixed_string_t replay_protect;
+ cmdline_fixed_string_t rp_on_off;
+};
+
+/* Common CLI fields for MACsec offload disable */
+static cmdline_parse_token_string_t cmd_macsec_offload_on_set =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_offload_on_result,
+ set, "set");
+static cmdline_parse_token_string_t cmd_macsec_offload_on_macsec =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_offload_on_result,
+ macsec, "macsec");
+static cmdline_parse_token_string_t cmd_macsec_offload_on_offload =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_offload_on_result,
+ offload, "offload");
+static cmdline_parse_token_num_t cmd_macsec_offload_on_port_id =
+ TOKEN_NUM_INITIALIZER
+ (struct cmd_macsec_offload_on_result,
+ port_id, RTE_UINT16);
+static cmdline_parse_token_string_t cmd_macsec_offload_on_on =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_offload_on_result,
+ on, "on");
+static cmdline_parse_token_string_t cmd_macsec_offload_on_encrypt =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_offload_on_result,
+ encrypt, "encrypt");
+static cmdline_parse_token_string_t cmd_macsec_offload_on_en_on_off =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_offload_on_result,
+ en_on_off, "on#off");
+static cmdline_parse_token_string_t cmd_macsec_offload_on_replay_protect =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_offload_on_result,
+ replay_protect, "replay-protect");
+static cmdline_parse_token_string_t cmd_macsec_offload_on_rp_on_off =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_offload_on_result,
+ rp_on_off, "on#off");
+
+static void
+cmd_set_macsec_offload_on_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_macsec_offload_on_result *res = parsed_result;
+ int ret = -ENOTSUP;
+ portid_t port_id = res->port_id;
+ int en = (strcmp(res->en_on_off, "on") == 0) ? 1 : 0;
+ int rp = (strcmp(res->rp_on_off, "on") == 0) ? 1 : 0;
+ struct rte_eth_dev_info dev_info;
+
+ if (port_id_is_invalid(port_id, ENABLED_WARN))
+ return;
+ if (!port_is_stopped(port_id)) {
+ fprintf(stderr, "Please stop port %d first\n", port_id);
+ return;
+ }
+
+ ret = eth_dev_info_get_print_err(port_id, &dev_info);
+ if (ret != 0)
+ return;
+
+ if (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_MACSEC_INSERT)
+ ret = rte_pmd_ixgbe_macsec_enable(port_id, en, rp);
+
+ switch (ret) {
+ case 0:
+ ports[port_id].dev_conf.txmode.offloads |=
+
RTE_ETH_TX_OFFLOAD_MACSEC_INSERT;
+ cmd_reconfig_device_queue(port_id, 1, 1);
+ break;
+ case -ENODEV:
+ fprintf(stderr, "invalid port_id %d\n", port_id);
+ break;
+ case -ENOTSUP:
+ fprintf(stderr, "not supported on port %d\n", port_id);
+ break;
+ default:
+ fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
+ }
+}
+
+static cmdline_parse_inst_t cmd_set_macsec_offload_on = {
+ .f = cmd_set_macsec_offload_on_parsed,
+ .data = NULL,
+ .help_str = "set macsec offload <port_id> on "
+ "encrypt on|off replay-protect on|off",
+ .tokens = {
+ (void *)&cmd_macsec_offload_on_set,
+ (void *)&cmd_macsec_offload_on_macsec,
+ (void *)&cmd_macsec_offload_on_offload,
+ (void *)&cmd_macsec_offload_on_port_id,
+ (void *)&cmd_macsec_offload_on_on,
+ (void *)&cmd_macsec_offload_on_encrypt,
+ (void *)&cmd_macsec_offload_on_en_on_off,
+ (void *)&cmd_macsec_offload_on_replay_protect,
+ (void *)&cmd_macsec_offload_on_rp_on_off,
+ NULL,
+ },
+};
+
+/* Common result structure for MACsec offload disable */
+struct cmd_macsec_offload_off_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t macsec;
+ cmdline_fixed_string_t offload;
+ portid_t port_id;
+ cmdline_fixed_string_t off;
+};
+
+/* Common CLI fields for MACsec offload disable */
+static cmdline_parse_token_string_t cmd_macsec_offload_off_set =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_offload_off_result,
+ set, "set");
+static cmdline_parse_token_string_t cmd_macsec_offload_off_macsec =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_offload_off_result,
+ macsec, "macsec");
+static cmdline_parse_token_string_t cmd_macsec_offload_off_offload =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_offload_off_result,
+ offload, "offload");
+static cmdline_parse_token_num_t cmd_macsec_offload_off_port_id =
+ TOKEN_NUM_INITIALIZER
+ (struct cmd_macsec_offload_off_result,
+ port_id, RTE_UINT16);
+static cmdline_parse_token_string_t cmd_macsec_offload_off_off =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_offload_off_result,
+ off, "off");
+
+static void
+cmd_set_macsec_offload_off_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_macsec_offload_off_result *res = parsed_result;
+ int ret = -ENOTSUP;
+ struct rte_eth_dev_info dev_info;
+ portid_t port_id = res->port_id;
+
+ if (port_id_is_invalid(port_id, ENABLED_WARN))
+ return;
+ if (!port_is_stopped(port_id)) {
+ fprintf(stderr, "Please stop port %d first\n", port_id);
+ return;
+ }
+
+ ret = eth_dev_info_get_print_err(port_id, &dev_info);
+ if (ret != 0)
+ return;
+
+ if (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_MACSEC_INSERT)
+ ret = rte_pmd_ixgbe_macsec_disable(port_id);
+ switch (ret) {
+ case 0:
+ ports[port_id].dev_conf.txmode.offloads &=
+
~RTE_ETH_TX_OFFLOAD_MACSEC_INSERT;
+ cmd_reconfig_device_queue(port_id, 1, 1);
+ break;
+ case -ENODEV:
+ fprintf(stderr, "invalid port_id %d\n", port_id);
+ break;
+ case -ENOTSUP:
+ fprintf(stderr, "not supported on port %d\n", port_id);
+ break;
+ default:
+ fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
+ }
+}
+
+static cmdline_parse_inst_t cmd_set_macsec_offload_off = {
+ .f = cmd_set_macsec_offload_off_parsed,
+ .data = NULL,
+ .help_str = "set macsec offload <port_id> off",
+ .tokens = {
+ (void *)&cmd_macsec_offload_off_set,
+ (void *)&cmd_macsec_offload_off_macsec,
+ (void *)&cmd_macsec_offload_off_offload,
+ (void *)&cmd_macsec_offload_off_port_id,
+ (void *)&cmd_macsec_offload_off_off,
+ NULL,
+ },
+};
+
+/* Common result structure for MACsec secure connection configure */
+struct cmd_macsec_sc_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t macsec;
+ cmdline_fixed_string_t sc;
+ cmdline_fixed_string_t tx_rx;
+ portid_t port_id;
+ struct rte_ether_addr mac;
+ uint16_t pi;
+};
+
+/* Common CLI fields for MACsec secure connection configure */
+static cmdline_parse_token_string_t cmd_macsec_sc_set =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_sc_result,
+ set, "set");
+static cmdline_parse_token_string_t cmd_macsec_sc_macsec =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_sc_result,
+ macsec, "macsec");
+static cmdline_parse_token_string_t cmd_macsec_sc_sc =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_sc_result,
+ sc, "sc");
+static cmdline_parse_token_string_t cmd_macsec_sc_tx_rx =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_sc_result,
+ tx_rx, "tx#rx");
+static cmdline_parse_token_num_t cmd_macsec_sc_port_id =
+ TOKEN_NUM_INITIALIZER
+ (struct cmd_macsec_sc_result,
+ port_id, RTE_UINT16);
+static cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
+ TOKEN_ETHERADDR_INITIALIZER
+ (struct cmd_macsec_sc_result,
+ mac);
+static cmdline_parse_token_num_t cmd_macsec_sc_pi =
+ TOKEN_NUM_INITIALIZER
+ (struct cmd_macsec_sc_result,
+ pi, RTE_UINT16);
+
+static void
+cmd_set_macsec_sc_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_macsec_sc_result *res = parsed_result;
+ int ret = -ENOTSUP;
+ int is_tx = (strcmp(res->tx_rx, "tx") == 0) ? 1 : 0;
+
+ ret = is_tx ?
+ rte_pmd_ixgbe_macsec_config_txsc(res->port_id,
+ res->mac.addr_bytes) :
+ rte_pmd_ixgbe_macsec_config_rxsc(res->port_id,
+ res->mac.addr_bytes, res->pi);
+ switch (ret) {
+ case 0:
+ break;
+ case -ENODEV:
+ fprintf(stderr, "invalid port_id %d\n", res->port_id);
+ break;
+ case -ENOTSUP:
+ fprintf(stderr, "not supported on port %d\n", res->port_id);
+ break;
+ default:
+ fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
+ }
+}
+
+static cmdline_parse_inst_t cmd_set_macsec_sc = {
+ .f = cmd_set_macsec_sc_parsed,
+ .data = NULL,
+ .help_str = "set macsec sc tx|rx <port_id> <mac> <pi>",
+ .tokens = {
+ (void *)&cmd_macsec_sc_set,
+ (void *)&cmd_macsec_sc_macsec,
+ (void *)&cmd_macsec_sc_sc,
+ (void *)&cmd_macsec_sc_tx_rx,
+ (void *)&cmd_macsec_sc_port_id,
+ (void *)&cmd_macsec_sc_mac,
+ (void *)&cmd_macsec_sc_pi,
+ NULL,
+ },
+};
+
+/* Common result structure for MACsec secure connection configure */
+struct cmd_macsec_sa_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t macsec;
+ cmdline_fixed_string_t sa;
+ cmdline_fixed_string_t tx_rx;
+ portid_t port_id;
+ uint8_t idx;
+ uint8_t an;
+ uint32_t pn;
+ cmdline_fixed_string_t key;
+};
+
+/* Common CLI fields for MACsec secure connection configure */
+static cmdline_parse_token_string_t cmd_macsec_sa_set =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_sa_result,
+ set, "set");
+static cmdline_parse_token_string_t cmd_macsec_sa_macsec =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_sa_result,
+ macsec, "macsec");
+static cmdline_parse_token_string_t cmd_macsec_sa_sa =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_sa_result,
+ sa, "sa");
+static cmdline_parse_token_string_t cmd_macsec_sa_tx_rx =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_sa_result,
+ tx_rx, "tx#rx");
+static cmdline_parse_token_num_t cmd_macsec_sa_port_id =
+ TOKEN_NUM_INITIALIZER
+ (struct cmd_macsec_sa_result,
+ port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_macsec_sa_idx =
+ TOKEN_NUM_INITIALIZER
+ (struct cmd_macsec_sa_result,
+ idx, RTE_UINT8);
+static cmdline_parse_token_num_t cmd_macsec_sa_an =
+ TOKEN_NUM_INITIALIZER
+ (struct cmd_macsec_sa_result,
+ an, RTE_UINT8);
+static cmdline_parse_token_num_t cmd_macsec_sa_pn =
+ TOKEN_NUM_INITIALIZER
+ (struct cmd_macsec_sa_result,
+ pn, RTE_UINT32);
+static cmdline_parse_token_string_t cmd_macsec_sa_key =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_macsec_sa_result,
+ key, NULL);
+
+static void
+cmd_set_macsec_sa_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_macsec_sa_result *res = parsed_result;
+ int ret = -ENOTSUP;
+ int is_tx = (strcmp(res->tx_rx, "tx") == 0) ? 1 : 0;
+ uint8_t key[16] = { 0 };
+ uint8_t xdgt0;
+ uint8_t xdgt1;
+ int key_len;
+ int i;
+
+ key_len = strlen(res->key) / 2;
+ if (key_len > 16)
+ key_len = 16;
+
+ for (i = 0; i < key_len; i++) {
+ xdgt0 = parse_and_check_key_hexa_digit(res->key, (i * 2));
+ if (xdgt0 == 0xFF)
+ return;
+ xdgt1 = parse_and_check_key_hexa_digit(res->key, (i * 2) + 1);
+ if (xdgt1 == 0xFF)
+ return;
+ key[i] = (uint8_t)((xdgt0 * 16) + xdgt1);
+ }
+
+ ret = is_tx ?
+ rte_pmd_ixgbe_macsec_select_txsa(res->port_id,
+ res->idx, res->an, res->pn, key) :
+ rte_pmd_ixgbe_macsec_select_rxsa(res->port_id,
+ res->idx, res->an, res->pn, key);
+
+ switch (ret) {
+ case 0:
+ break;
+ case -EINVAL:
+ fprintf(stderr, "invalid idx %d or an %d\n", res->idx, res->an);
+ break;
+ case -ENODEV:
+ fprintf(stderr, "invalid port_id %d\n", res->port_id);
+ break;
+ case -ENOTSUP:
+ fprintf(stderr, "not supported on port %d\n", res->port_id);
+ break;
+ default:
+ fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
+ }
+}
+
+struct cmd_vf_tc_bw_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t tc;
+ cmdline_fixed_string_t tx;
+ cmdline_fixed_string_t min_bw;
+ portid_t port_id;
+ cmdline_fixed_string_t bw_list;
+};
+
+static cmdline_parse_token_string_t cmd_vf_tc_bw_set =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_vf_tc_bw_result,
+ set, "set");
+static cmdline_parse_token_string_t cmd_vf_tc_bw_tc =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_vf_tc_bw_result,
+ tc, "tc");
+static cmdline_parse_token_string_t cmd_vf_tc_bw_tx =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_vf_tc_bw_result,
+ tx, "tx");
+static cmdline_parse_token_string_t cmd_vf_tc_bw_min_bw =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_vf_tc_bw_result,
+ min_bw, "min-bandwidth");
+static cmdline_parse_token_num_t cmd_vf_tc_bw_port_id =
+ TOKEN_NUM_INITIALIZER
+ (struct cmd_vf_tc_bw_result,
+ port_id, RTE_UINT16);
+static cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_vf_tc_bw_result,
+ bw_list, NULL);
+
+static cmdline_parse_inst_t cmd_set_macsec_sa = {
+ .f = cmd_set_macsec_sa_parsed,
+ .data = NULL,
+ .help_str = "set macsec sa tx|rx <port_id> <idx> <an> <pn> <key>",
+ .tokens = {
+ (void *)&cmd_macsec_sa_set,
+ (void *)&cmd_macsec_sa_macsec,
+ (void *)&cmd_macsec_sa_sa,
+ (void *)&cmd_macsec_sa_tx_rx,
+ (void *)&cmd_macsec_sa_port_id,
+ (void *)&cmd_macsec_sa_idx,
+ (void *)&cmd_macsec_sa_an,
+ (void *)&cmd_macsec_sa_pn,
+ (void *)&cmd_macsec_sa_key,
+ NULL,
+ },
+};
+
+static void
+cmd_tc_min_bw_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_vf_tc_bw_result *res = parsed_result;
+ struct rte_port *port;
+ uint8_t tc_num;
+ uint8_t bw[16];
+ int ret = -ENOTSUP;
+
+ if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+ return;
+
+ port = &ports[res->port_id];
+ /** Check if the port is not started **/
+ if (port->port_status != RTE_PORT_STOPPED) {
+ fprintf(stderr, "Please stop port %d first\n", res->port_id);
+ return;
+ }
+
+ ret = vf_tc_min_bw_parse_bw_list(bw, &tc_num, res->bw_list);
+ if (ret)
+ return;
+
+ ret = rte_pmd_ixgbe_set_tc_bw_alloc(res->port_id, tc_num, bw);
+
+ switch (ret) {
+ case 0:
+ break;
+ case -EINVAL:
+ fprintf(stderr, "invalid bandwidth\n");
+ break;
+ case -ENODEV:
+ fprintf(stderr, "invalid port_id %d\n", res->port_id);
+ break;
+ case -ENOTSUP:
+ fprintf(stderr, "function not implemented\n");
+ break;
+ default:
+ fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
+ }
+}
+
+static cmdline_parse_inst_t cmd_tc_min_bw = {
+ .f = cmd_tc_min_bw_parsed,
+ .data = NULL,
+ .help_str = "set tc tx min-bandwidth <port_id> <bw1, bw2, ...>",
+ .tokens = {
+ (void *)&cmd_vf_tc_bw_set,
+ (void *)&cmd_vf_tc_bw_tc,
+ (void *)&cmd_vf_tc_bw_tx,
+ (void *)&cmd_vf_tc_bw_min_bw,
+ (void *)&cmd_vf_tc_bw_port_id,
+ (void *)&cmd_vf_tc_bw_bw_list,
+ NULL,
+ },
+};
+
+static struct testpmd_cmdline_parser driver_parser = {
+ .ctx = (cmdline_parse_ctx_t[]) {
+ (cmdline_parse_inst_t *)&cmd_config_bypass,
+ (cmdline_parse_inst_t *)&cmd_set_bypass_mode,
+ (cmdline_parse_inst_t *)&cmd_set_bypass_event,
+ (cmdline_parse_inst_t *)&cmd_set_bypass_timeout,
+ (cmdline_parse_inst_t *)&cmd_show_bypass_config,
+ (cmdline_parse_inst_t *)&cmd_set_vf_split_drop_en,
+ (cmdline_parse_inst_t *)&cmd_set_macsec_offload_on,
+ (cmdline_parse_inst_t *)&cmd_set_macsec_offload_off,
+ (cmdline_parse_inst_t *)&cmd_set_macsec_sc,
+ (cmdline_parse_inst_t *)&cmd_set_macsec_sa,
+ (cmdline_parse_inst_t *)&cmd_tc_min_bw,
+ NULL
+ },
+ .help = {
+ "port config bypass (port_id) (on|off)\n",
+ " Enable/disable bypass before starting the port\n",
+
+ "set bypass mode (normal|bypass|isolate) (port_id)\n"
+ " Set the bypass mode for the lowest port on bypass enabled"
+ " NIC.\n",
+
+ "set bypass event (timeout|os_on|os_off|power_on|power_off) "
+ "mode (normal|bypass|isolate) (port_id)\n"
+ " Set the event required to initiate specified bypass mode
for"
+ " the lowest port on a bypass enabled NIC where:\n"
+ " timeout = enable bypass after watchdog timeout.\n"
+ " os_on = enable bypass when OS/board is powered
on.\n"
+ " os_off = enable bypass when OS/board is powered
off.\n"
+ " power_on = enable bypass when power supply is turned
on.\n"
+ " power_off = enable bypass when power supply is turned
off."
+ "\n",
+
+ "set bypass timeout (0|1.5|2|3|4|8|16|32)\n"
+ " Set the bypass watchdog timeout to 'n' seconds"
+ " where 0 = instant.\n",
+
+ "show bypass config (port_id)\n"
+ " Show the bypass configuration for a bypass enabled NIC"
+ " using the lowest port on the NIC.\n",
+
+ "set vf split drop (port_id) (vf_id) (on|off)\n"
+ " Set split drop enable bit for a VF from the PF.\n",
+
+ "set macsec offload (port_id) on encrypt (on|off)
replay-protect (on|off)\n"
+ " Enable MACsec offload.\n",
+
+ "set macsec offload (port_id) off\n"
+ " Disable MACsec offload.\n",
+
+ "set macsec sc (tx|rx) (port_id) (mac) (pi)\n"
+ " Configure MACsec secure connection (SC).\n",
+
+ "set macsec sa (tx|rx) (port_id) (idx) (an) (pn) (key)\n"
+ " Configure MACsec secure association (SA).\n",
+
+ "set tc tx min-bandwidth (port_id) (bw1, bw2, ...)\n"
+ " Set all TCs' min bandwidth(%%) for all PF and VFs.\n",
+
+ NULL
+ },
+};
+
+RTE_INIT(ixgbe_testpmd)
+{
+ testpmd_add_commands(&driver_parser);
+}
diff --git a/drivers/net/ixgbe/meson.build b/drivers/net/ixgbe/meson.build
index 162f8d5f46..a18908ef7c 100644
--- a/drivers/net/ixgbe/meson.build
+++ b/drivers/net/ixgbe/meson.build
@@ -20,6 +20,8 @@ sources = files(
'rte_pmd_ixgbe.c',
)
+testpmd_sources = files('ixgbe_testpmd.c')
+
deps += ['hash', 'security']
if arch_subdir == 'x86'
--
2.23.0
