From: David Marchand <david.marchand@redhat.com> To: dev@dpdk.org Cc: Xiaoyun Li <xiaoyun.li@intel.com>, Aman Singh <aman.deep.singh@intel.com>, Yuying Zhang <yuying.zhang@intel.com>, Qiming Yang <qiming.yang@intel.com>, Wenjun Wu <wenjun1.wu@intel.com> Subject: [PATCH v2 3/3] net/ixgbe: move bypass init in a testpmd command Date: Fri, 17 Jun 2022 07:07:53 +0200 Message-ID: <20220617050753.1273320-3-david.marchand@redhat.com> (raw) In-Reply-To: <20220617050753.1273320-1-david.marchand@redhat.com> Introduce a new command and remove the last part of specific port init from testpmd. Signed-off-by: David Marchand <david.marchand@redhat.com> --- app/test-pmd/meson.build | 1 - app/test-pmd/testpmd.c | 4 -- doc/guides/nics/ixgbe.rst | 7 +++ drivers/net/ixgbe/ixgbe_testpmd.c | 82 +++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 5 deletions(-) diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 69c7595a45..d13e98125e 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -68,7 +68,6 @@ if dpdk_conf.has('RTE_NET_I40E') deps += 'net_i40e' endif if dpdk_conf.has('RTE_NET_IXGBE') - cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS'] deps += 'net_ixgbe' endif if dpdk_conf.has('RTE_NET_DPAA') diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 4e8523f961..e11e2e2cb8 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -3949,10 +3949,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/doc/guides/nics/ixgbe.rst b/doc/guides/nics/ixgbe.rst index ea4684c2dc..d450fc1ca0 100644 --- a/doc/guides/nics/ixgbe.rst +++ b/doc/guides/nics/ixgbe.rst @@ -418,6 +418,13 @@ Set all TCs' TX min relative bandwidth (%) globally for all PF and VFs:: testpmd> set tc tx min-bandwidth (port_id) (bw1, bw2, ...) +port config bypass +~~~~~~~~~~~~~~~~~~ + +Enable/disable bypass feature:: + + port config bypass (port_id) (on|off) + set bypass mode ~~~~~~~~~~~~~~~ diff --git a/drivers/net/ixgbe/ixgbe_testpmd.c b/drivers/net/ixgbe/ixgbe_testpmd.c index a928d0fb55..e0d161eafe 100644 --- a/drivers/net/ixgbe/ixgbe_testpmd.c +++ b/drivers/net/ixgbe/ixgbe_testpmd.c @@ -2,6 +2,9 @@ * Copyright(c) 2010-2016 Intel Corporation. */ +/* Required for ixgbe internal structures to be aligned with the driver */ +#define RTE_LIBRTE_IXGBE_BYPASS + #include <ethdev_driver.h> #include "ixgbe_ethdev.h" #include "rte_pmd_ixgbe.h" @@ -618,6 +621,71 @@ static cmdline_parse_inst_t cmd_tc_min_bw = { /* 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; @@ -636,6 +704,9 @@ cmd_set_bypass_mode_parsed(void *parsed_result, 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")) @@ -702,6 +773,9 @@ cmd_set_bypass_event_parsed(void *parsed_result, 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")) @@ -878,6 +952,9 @@ cmd_show_bypass_config_parsed(void *parsed_result, "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", @@ -973,6 +1050,11 @@ static struct testpmd_driver_commands ixgbe_cmds = { "set tc tx min-bandwidth (port_id) (bw1, bw2, ...)\n" " Set all TCs' min bandwidth(%%) for all PF and VFs.\n", }, + { + &cmd_config_bypass, + "port config bypass (port_id) (on|off)\n" + " Enable/disable bypass before starting the port\n", + }, { &cmd_set_bypass_mode, "set bypass mode (normal|bypass|isolate) (port_id)\n" -- 2.36.1
next prev parent reply other threads:[~2022-06-17 5:08 UTC|newest] Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-13 7:57 [RFC PATCH 0/4] Split driver specific commands out of testpmd David Marchand 2022-05-13 7:57 ` [RFC PATCH 1/4] app/testpmd: register driver specific commands David Marchand 2022-05-13 10:30 ` David Marchand 2022-05-13 7:57 ` [RFC PATCH 2/4] net/bonding: move testpmd commands David Marchand 2022-05-13 10:09 ` Min Hu (Connor) 2022-05-18 17:24 ` David Marchand 2022-05-18 23:25 ` Konstantin Ananyev 2022-05-19 7:40 ` David Marchand 2022-05-19 11:26 ` Thomas Monjalon 2022-05-20 6:59 ` Andrew Rybchenko 2022-05-24 9:40 ` Konstantin Ananyev 2022-05-24 10:15 ` Thomas Monjalon 2022-05-24 22:41 ` Konstantin Ananyev 2022-05-13 7:57 ` [RFC PATCH 3/4] net/i40e: " David Marchand 2022-05-13 7:57 ` [RFC PATCH 4/4] net/ixgbe: " David Marchand 2022-05-18 19:46 ` [RFC PATCH v2 0/5] Split driver specific commands out of testpmd David Marchand 2022-05-18 19:46 ` [RFC PATCH v2 1/5] app/testpmd: mark cmdline symbols as static David Marchand 2022-05-20 6:28 ` Andrew Rybchenko 2022-05-18 19:46 ` [RFC PATCH v2 2/5] app/testpmd: register driver specific commands David Marchand 2022-05-20 6:55 ` Andrew Rybchenko 2022-05-18 19:46 ` [RFC PATCH v2 3/5] net/bonding: move testpmd commands David Marchand 2022-05-20 6:55 ` Andrew Rybchenko 2022-05-18 19:46 ` [RFC PATCH v2 4/5] net/i40e: " David Marchand 2022-05-18 19:46 ` [RFC PATCH v2 5/5] net/ixgbe: " David Marchand 2022-05-20 7:04 ` [RFC PATCH v2 0/5] Split driver specific commands out of testpmd Andrew Rybchenko 2022-05-23 7:10 ` [PATCH 0/6] " David Marchand 2022-05-23 7:10 ` [PATCH 1/6] app/testpmd: mark most cmdline symbols as static David Marchand 2022-05-23 10:19 ` Dumitrescu, Cristian 2022-05-23 18:09 ` Ferruh Yigit 2022-05-23 7:10 ` [PATCH 2/6] app/testpmd: register driver specific commands David Marchand 2022-05-23 18:10 ` Ferruh Yigit 2022-05-24 10:53 ` David Marchand 2022-05-24 11:43 ` Ferruh Yigit 2022-05-24 17:21 ` Thomas Monjalon 2022-05-24 17:44 ` David Marchand 2022-05-24 17:51 ` Thomas Monjalon 2022-05-23 7:10 ` [PATCH 3/6] net/bonding: move testpmd commands David Marchand 2022-05-23 18:10 ` Ferruh Yigit 2022-06-17 5:06 ` [PATCH v2] " David Marchand 2022-06-20 17:53 ` Ferruh Yigit 2022-05-23 7:10 ` [PATCH 4/6] net/i40e: " David Marchand 2022-06-17 5:07 ` [PATCH v2] " David Marchand 2022-06-20 17:53 ` Ferruh Yigit 2022-05-23 7:10 ` [PATCH 5/6] app/testpmd: drop ixgbe bypass commands David Marchand 2022-05-23 18:10 ` Ferruh Yigit 2022-06-17 5:07 ` [PATCH v2 1/3] app/testpmd: restore " David Marchand 2022-06-17 5:07 ` [PATCH v2 2/3] net/ixgbe: move testpmd commands David Marchand 2022-06-17 5:07 ` David Marchand [this message] 2022-06-20 19:04 ` [PATCH v2 3/3] net/ixgbe: move bypass init in a testpmd command Ferruh Yigit 2022-06-23 12:35 ` Zhang, Qi Z 2022-07-21 8:05 ` [PATCH v3 1/3] app/testpmd: restore ixgbe bypass commands David Marchand 2022-07-21 8:05 ` [PATCH v3 2/3] net/ixgbe: move testpmd commands David Marchand 2022-07-21 8:05 ` [PATCH v3 3/3] net/ixgbe: move bypass init in a testpmd command David Marchand 2022-05-23 7:10 ` [PATCH 6/6] net/ixgbe: move testpmd commands David Marchand 2022-05-23 18:09 ` [PATCH 0/6] Split driver specific commands out of testpmd Ferruh Yigit 2022-05-24 20:06 ` [PATCH v2 0/2] " David Marchand 2022-05-24 20:06 ` [PATCH v2 1/2] app/testpmd: mark most cmdline symbols as static David Marchand 2022-05-31 15:15 ` Andrew Rybchenko 2022-05-24 20:06 ` [PATCH v2 2/2] app/testpmd: register driver specific commands David Marchand 2022-05-24 20:28 ` Thomas Monjalon 2022-05-31 15:14 ` Andrew Rybchenko 2022-05-31 15:18 ` David Marchand 2022-05-31 15:18 ` [PATCH v2 0/2] Split driver specific commands out of testpmd Andrew Rybchenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220617050753.1273320-3-david.marchand@redhat.com \ --to=david.marchand@redhat.com \ --cc=aman.deep.singh@intel.com \ --cc=dev@dpdk.org \ --cc=qiming.yang@intel.com \ --cc=wenjun1.wu@intel.com \ --cc=xiaoyun.li@intel.com \ --cc=yuying.zhang@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ http://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git