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

net/ixgbe: move bypass init in a testpmd command

Browse Source 
Introduce a new command and remove the last part of specific port init
from testpmd.

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Ferruh Yigit <ferruh.yigit@xilinx.com>
This commit is contained in:
David Marchand 2022-07-21 10:05:47 +02:00 committed by Ferruh Yigit
parent 0100a038fa
commit 3ab51564e9
4 changed files with 89 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/test-pmd/meson.build
View File

@ -65,7 +65,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')

4
app/test-pmd/testpmd.c
View File

@ -3962,10 +3962,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))

7
doc/guides/nics/ixgbe.rst
View File

@ -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
~~~~~~~~~~~~~~~

82
drivers/net/ixgbe/ixgbe_testpmd.c
View File

@ -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"