packages/dpdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dpdk/0402-app-testpmd-allow-offload-config-for-all-ports.patch
Dengdui Huang ab5939fabf sync some bugfix from upstreaming about testpmd and doc 
Sync some bugfix from upstreaming about testpmd and doc, modifies
are as follow:
- support set RSS hash algorithm
- ethdev: add new API to get RSS hash algorithm by name
- doc: fix description of RSS features
- doc: fix RSS flow description in hns3 guide
- doc: update features in hns3 guide
- doc: fix hns3 build option about max queue number
- app/testpmd: check port and queue Rx/Tx offloads
- app/testpmd: fix Tx offload command
- app/testpmd: allow offload config for all ports
- app/testpmd: fix tunnel TSO configuration
- app/testpmd: add explicit check for tunnel TSO
- app/testpmd: fix tunnel TSO capability check
- app/testpmd: remove useless check in TSO command

Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
(cherry picked from commit 7868d4e3ae469277d4b47241e84c77f53e09423b)
2023-12-09 10:35:25 +08:00

360 lines
13 KiB
Diff
Raw Blame History

From 7830c0aee5eff3f97a39b2a49ead39ffa315182f Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui@huawei.com>
Date: Fri, 10 Nov 2023 17:10:13 +0800
Subject: [PATCH 402/410] app/testpmd: allow offload config for all ports
[ upstream commit 6280fe565b44aad684cab320939acdd52ec1a9ec ]
Support config Rx/Tx offload for all ports in following commands:
1. port config all rx_offload (offloading) (on|off)
2. port config all tx_offload (offloading) (on|off)
Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@amd.com>
Acked-by: Huisong Li <lihuisong@huawei.com>
---
app/test-pmd/cmdline.c | 205 ++++++++++++++++++--
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8 +-
2 files changed, 189 insertions(+), 24 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index fd897dc80c..f380d35eec 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -867,7 +867,7 @@ static void cmd_help_long_parsed(void *parsed_result,
"port config (port_id) udp_tunnel_port add|rm vxlan|geneve|ecpri (udp_port)\n\n"
" Add/remove UDP tunnel port for tunneling offload\n\n"
- "port config <port_id> rx_offload all|vlan_strip|"
+ "port config (port_id|all) rx_offload all|vlan_strip|"
"ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
"outer_ipv4_cksum|macsec_strip|header_split|"
"vlan_filter|vlan_extend|scatter|"
@@ -883,7 +883,7 @@ static void cmd_help_long_parsed(void *parsed_result,
" Enable or disable a per queue Rx offloading"
" only on a specific Rx queue\n\n"
- "port config (port_id) tx_offload all|vlan_insert|"
+ "port config (port_id|all) tx_offload all|vlan_insert|"
"ipv4_cksum|udp_cksum|tcp_cksum|sctp_cksum|tcp_tso|"
"udp_tso|outer_ipv4_cksum|qinq_insert|vxlan_tnl_tso|"
"gre_tnl_tso|ipip_tnl_tso|geneve_tnl_tso|"
@@ -16210,12 +16210,8 @@ search_rx_offload(const char *name)
}
static void
-cmd_config_per_port_rx_offload_parsed(void *parsed_result,
- __rte_unused struct cmdline *cl,
- __rte_unused void *data)
+config_port_rx_offload(portid_t port_id, char *name, bool on)
{
- struct cmd_config_per_port_rx_offload_result *res = parsed_result;
- portid_t port_id = res->port_id;
struct rte_eth_dev_info dev_info;
struct rte_port *port = &ports[port_id];
uint16_t nb_rx_queues;
@@ -16234,18 +16230,18 @@ cmd_config_per_port_rx_offload_parsed(void *parsed_result,
if (ret != 0)
return;
- if (!strcmp(res->offload, "all")) {
+ if (!strcmp(name, "all")) {
offload = dev_info.rx_offload_capa;
} else {
- offload = search_rx_offload(res->offload);
+ offload = search_rx_offload(name);
if (offload == 0) {
- fprintf(stderr, "Unknown offload name: %s\n", res->offload);
+ fprintf(stderr, "Unknown offload name: %s\n", name);
return;
}
}
nb_rx_queues = dev_info.nb_rx_queues;
- if (!strcmp(res->on_off, "on")) {
+ if (on) {
port->dev_conf.rxmode.offloads |= offload;
for (q = 0; q < nb_rx_queues; q++)
port->rx_conf[q].offloads |= offload;
@@ -16258,6 +16254,18 @@ cmd_config_per_port_rx_offload_parsed(void *parsed_result,
cmd_reconfig_device_queue(port_id, 1, 1);
}
+static void
+cmd_config_per_port_rx_offload_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_config_per_port_rx_offload_result *res = parsed_result;
+ bool on;
+
+ on = strcmp(res->on_off, "on") == 0;
+ config_port_rx_offload(res->port_id, res->offload, on);
+}
+
cmdline_parse_inst_t cmd_config_per_port_rx_offload = {
.f = cmd_config_per_port_rx_offload_parsed,
.data = NULL,
@@ -16277,6 +16285,79 @@ cmdline_parse_inst_t cmd_config_per_port_rx_offload = {
}
};
+/* Enable/Disable all port Rx offloading */
+struct cmd_config_all_port_rx_offload_result {
+ cmdline_fixed_string_t port;
+ cmdline_fixed_string_t config;
+ cmdline_fixed_string_t port_all;
+ cmdline_fixed_string_t rx_offload;
+ cmdline_fixed_string_t offload;
+ cmdline_fixed_string_t on_off;
+};
+
+static cmdline_parse_token_string_t cmd_config_all_port_rx_offload_result_port =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_config_all_port_rx_offload_result,
+ port, "port");
+static cmdline_parse_token_string_t cmd_config_all_port_rx_offload_result_config =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_config_all_port_rx_offload_result,
+ config, "config");
+
+static cmdline_parse_token_string_t cmd_config_all_port_rx_offload_result_port_all =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_all_port_rx_offload_result,
+ port_all, "all");
+static cmdline_parse_token_string_t cmd_config_all_port_rx_offload_result_rx_offload =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_config_all_port_rx_offload_result,
+ rx_offload, "rx_offload");
+static cmdline_parse_token_string_t cmd_config_all_port_rx_offload_result_offload =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_config_all_port_rx_offload_result,
+ offload, "all#vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
+ "qinq_strip#outer_ipv4_cksum#macsec_strip#"
+ "vlan_filter#vlan_extend#"
+ "scatter#buffer_split#timestamp#security#"
+ "keep_crc#rss_hash");
+static cmdline_parse_token_string_t cmd_config_all_port_rx_offload_result_on_off =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_config_all_port_rx_offload_result,
+ on_off, "on#off");
+
+static void
+cmd_config_all_port_rx_offload_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_config_all_port_rx_offload_result *res = parsed_result;
+ bool on_off;
+ portid_t i;
+
+ on_off = strcmp(res->on_off, "on") == 0;
+ RTE_ETH_FOREACH_DEV(i)
+ config_port_rx_offload(i, res->offload, on_off);
+
+}
+
+static cmdline_parse_inst_t cmd_config_all_port_rx_offload = {
+ .f = cmd_config_all_port_rx_offload_parsed,
+ .data = NULL,
+ .help_str = "port config all rx_offload all|vlan_strip|ipv4_cksum|"
+ "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
+ "macsec_strip|vlan_filter|vlan_extend|"
+ "scatter|buffer_split|timestamp|security|"
+ "keep_crc|rss_hash on|off",
+ .tokens = {
+ (void *)&cmd_config_all_port_rx_offload_result_port,
+ (void *)&cmd_config_all_port_rx_offload_result_config,
+ (void *)&cmd_config_all_port_rx_offload_result_port_all,
+ (void *)&cmd_config_all_port_rx_offload_result_rx_offload,
+ (void *)&cmd_config_all_port_rx_offload_result_offload,
+ (void *)&cmd_config_all_port_rx_offload_result_on_off,
+ NULL,
+ }
+};
+
/* Enable/Disable a per queue offloading */
struct cmd_config_per_queue_rx_offload_result {
cmdline_fixed_string_t port;
@@ -16641,12 +16722,8 @@ search_tx_offload(const char *name)
}
static void
-cmd_config_per_port_tx_offload_parsed(void *parsed_result,
- __rte_unused struct cmdline *cl,
- __rte_unused void *data)
+config_port_tx_offload(portid_t port_id, char *name, bool on)
{
- struct cmd_config_per_port_tx_offload_result *res = parsed_result;
- portid_t port_id = res->port_id;
struct rte_eth_dev_info dev_info;
struct rte_port *port = &ports[port_id];
uint16_t nb_tx_queues;
@@ -16665,18 +16742,18 @@ cmd_config_per_port_tx_offload_parsed(void *parsed_result,
if (ret != 0)
return;
- if (!strcmp(res->offload, "all")) {
+ if (!strcmp(name, "all")) {
offload = dev_info.tx_offload_capa;
} else {
- offload = search_tx_offload(res->offload);
+ offload = search_tx_offload(name);
if (offload == 0) {
- fprintf(stderr, "Unknown offload name: %s\n", res->offload);
+ fprintf(stderr, "Unknown offload name: %s\n", name);
return;
}
}
nb_tx_queues = dev_info.nb_tx_queues;
- if (!strcmp(res->on_off, "on")) {
+ if (on) {
port->dev_conf.txmode.offloads |= offload;
for (q = 0; q < nb_tx_queues; q++)
port->tx_conf[q].offloads |= offload;
@@ -16689,6 +16766,18 @@ cmd_config_per_port_tx_offload_parsed(void *parsed_result,
cmd_reconfig_device_queue(port_id, 1, 1);
}
+static void
+cmd_config_per_port_tx_offload_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_config_per_port_tx_offload_result *res = parsed_result;
+ bool on;
+
+ on = strcmp(res->on_off, "on");
+ config_port_tx_offload(res->port_id, res->offload, on);
+}
+
cmdline_parse_inst_t cmd_config_per_port_tx_offload = {
.f = cmd_config_per_port_tx_offload_parsed,
.data = NULL,
@@ -16710,6 +16799,80 @@ cmdline_parse_inst_t cmd_config_per_port_tx_offload = {
}
};
+/* Enable/Disable all port Tx offloading */
+struct cmd_config_all_port_tx_offload_result {
+ cmdline_fixed_string_t port;
+ cmdline_fixed_string_t config;
+ cmdline_fixed_string_t port_all;
+ cmdline_fixed_string_t tx_offload;
+ cmdline_fixed_string_t offload;
+ cmdline_fixed_string_t on_off;
+};
+
+static cmdline_parse_token_string_t cmd_config_all_port_tx_offload_result_port =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_config_all_port_tx_offload_result,
+ port, "port");
+static cmdline_parse_token_string_t cmd_config_all_port_tx_offload_result_config =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_config_all_port_tx_offload_result,
+ config, "config");
+static cmdline_parse_token_string_t cmd_config_all_port_tx_offload_result_port_all =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_all_port_tx_offload_result,
+ port_all, "all");
+static cmdline_parse_token_string_t cmd_config_all_port_tx_offload_result_tx_offload =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_config_all_port_tx_offload_result,
+ tx_offload, "tx_offload");
+static cmdline_parse_token_string_t cmd_config_all_port_tx_offload_result_offload =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_config_all_port_tx_offload_result,
+ offload, "all#vlan_insert#ipv4_cksum#udp_cksum#tcp_cksum#"
+ "sctp_cksum#tcp_tso#udp_tso#outer_ipv4_cksum#"
+ "qinq_insert#vxlan_tnl_tso#gre_tnl_tso#"
+ "ipip_tnl_tso#geneve_tnl_tso#macsec_insert#"
+ "mt_lockfree#multi_segs#mbuf_fast_free#security#"
+ "send_on_timestamp");
+static cmdline_parse_token_string_t cmd_config_all_port_tx_offload_result_on_off =
+ TOKEN_STRING_INITIALIZER
+ (struct cmd_config_all_port_tx_offload_result,
+ on_off, "on#off");
+
+static void
+cmd_config_all_port_tx_offload_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_config_all_port_tx_offload_result *res = parsed_result;
+ portid_t i;
+ bool on_off;
+
+ on_off = strcmp(res->on_off, "on") == 0;
+ RTE_ETH_FOREACH_DEV(i)
+ config_port_tx_offload(i, res->offload, on_off);
+}
+
+static cmdline_parse_inst_t cmd_config_all_port_tx_offload = {
+ .f = cmd_config_all_port_tx_offload_parsed,
+ .data = NULL,
+ .help_str = "port config all tx_offload "
+ "all|vlan_insert|ipv4_cksum|udp_cksum|tcp_cksum|"
+ "sctp_cksum|tcp_tso|udp_tso|outer_ipv4_cksum|"
+ "qinq_insert|vxlan_tnl_tso|gre_tnl_tso|"
+ "ipip_tnl_tso|geneve_tnl_tso|macsec_insert|"
+ "mt_lockfree|multi_segs|mbuf_fast_free|security|"
+ "send_on_timestamp on|off",
+ .tokens = {
+ (void *)&cmd_config_all_port_tx_offload_result_port,
+ (void *)&cmd_config_all_port_tx_offload_result_config,
+ (void *)&cmd_config_all_port_tx_offload_result_port_all,
+ (void *)&cmd_config_all_port_tx_offload_result_tx_offload,
+ (void *)&cmd_config_all_port_tx_offload_result_offload,
+ (void *)&cmd_config_all_port_tx_offload_result_on_off,
+ NULL,
+ }
+};
+
/* Enable/Disable a per queue offloading */
struct cmd_config_per_queue_tx_offload_result {
cmdline_fixed_string_t port;
@@ -18021,10 +18184,12 @@ cmdline_parse_ctx_t main_ctx[] = {
(cmdline_parse_inst_t *)&cmd_rx_offload_get_capa,
(cmdline_parse_inst_t *)&cmd_rx_offload_get_configuration,
(cmdline_parse_inst_t *)&cmd_config_per_port_rx_offload,
+ (cmdline_parse_inst_t *)&cmd_config_all_port_rx_offload,
(cmdline_parse_inst_t *)&cmd_config_per_queue_rx_offload,
(cmdline_parse_inst_t *)&cmd_tx_offload_get_capa,
(cmdline_parse_inst_t *)&cmd_tx_offload_get_configuration,
(cmdline_parse_inst_t *)&cmd_config_per_port_tx_offload,
+ (cmdline_parse_inst_t *)&cmd_config_all_port_tx_offload,
(cmdline_parse_inst_t *)&cmd_config_per_queue_tx_offload,
#ifdef RTE_LIB_BPF
(cmdline_parse_inst_t *)&cmd_operate_bpf_ld_parse,
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index a81296d2ba..226569c545 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1767,9 +1767,9 @@ Reset ptype mapping table::
config per port Rx offloading
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Enable or disable a per port Rx offloading on all Rx queues of a port::
+Enable or disable port Rx offloading on all Rx queues of a port::
- testpmd> port config (port_id) rx_offload (offloading) on|off
+ testpmd> port config (port_id|all) rx_offload (offloading) on|off
* ``offloading``: can be any of these offloading capability:
all, vlan_strip, ipv4_cksum, udp_cksum, tcp_cksum, tcp_lro,
@@ -1797,9 +1797,9 @@ This command should be run when the port is stopped, or else it will fail.
config per port Tx offloading
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Enable or disable a per port Tx offloading on all Tx queues of a port::
+Enable or disable port Tx offloading on all Tx queues of a port::
- testpmd> port config (port_id) tx_offload (offloading) on|off
+ testpmd> port config (port_id|all) tx_offload (offloading) on|off
* ``offloading``: can be any of these offloading capability:
all, vlan_insert, ipv4_cksum, udp_cksum, tcp_cksum,
--
2.33.0
Reference in New Issue View Git Blame Copy Permalink