The driver may change offloads info into dev->data->dev_conf
in dev_configure which may cause port->dev_conf and port->rx_conf
contain outdated values.
This patch updates the offloads info if it changes to fix this issue.
Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings")
Cc: sta...@dpdk.org
Signed-off-by: Jie Wang <jie1x.w...@intel.com>
---
app/test-pmd/cmdline.c | 14 ++++++++++++--
app/test-pmd/testpmd.c | 34 ++++++++++++++++++++++++++++++++++
app/test-pmd/testpmd.h | 2 ++
app/test-pmd/util.c | 15 +++++++++++++++
4 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index a9efd027c3..3ef8f99358 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -15997,6 +15997,7 @@ cmd_rx_offload_get_configuration_parsed(
struct rte_eth_dev_info dev_info;
portid_t port_id = res->port_id;
struct rte_port *port = &ports[port_id];
+ struct rte_eth_conf dev_conf_info;
uint64_t port_offloads;
uint64_t queue_offloads;
uint16_t nb_rx_queues;
@@ -16005,7 +16006,11 @@ cmd_rx_offload_get_configuration_parsed(
printf("Rx Offloading Configuration of port %d :\n", port_id);
- port_offloads = port->dev_conf.rxmode.offloads;
+ ret = eth_dev_conf_info_get_print_err(port_id, &dev_conf_info);
+ if (ret != 0)
+ return;
+
+ port_offloads = dev_conf_info.rxmode.offloads;
printf(" Port :");
print_rx_offloads(port_offloads);
printf("\n");
@@ -16411,6 +16416,7 @@ cmd_tx_offload_get_configuration_parsed(
struct rte_eth_dev_info dev_info;
portid_t port_id = res->port_id;
struct rte_port *port = &ports[port_id];
+ struct rte_eth_conf dev_conf_info;
uint64_t port_offloads;
uint64_t queue_offloads;
uint16_t nb_tx_queues;
@@ -16419,7 +16425,11 @@ cmd_tx_offload_get_configuration_parsed(
printf("Tx Offloading Configuration of port %d :\n", port_id);
- port_offloads = port->dev_conf.txmode.offloads;
+ ret = eth_dev_conf_info_get_print_err(port_id, &dev_conf_info);
+ if (ret != 0)
+ return;
+
+ port_offloads = dev_conf_info.txmode.offloads;
printf(" Port :");
print_tx_offloads(port_offloads);
printf("\n");
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 97ae52e17e..56e6e80739 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2531,6 +2531,9 @@ start_port(portid_t pid)
}
if (port->need_reconfig > 0) {
+ struct rte_eth_conf dev_conf_info;
+ int k;
+
port->need_reconfig = 0;
if (flow_isolate_all) {
@@ -2568,6 +2571,37 @@ start_port(portid_t pid)
port->need_reconfig = 1;
return -1;
}
+ /* get rte_eth_conf info */
+ if (0 !=
+ eth_dev_conf_info_get_print_err(pi,
+ &dev_conf_info)) {
+ fprintf(stderr,
+ "port %d can not get device
configuration info\n",
+ pi);
+ return -1;
+ }
+ /* Apply Rx offloads configuration */
+ if (dev_conf_info.rxmode.offloads !=
+ port->dev_conf.rxmode.offloads) {
+ port->dev_conf.rxmode.offloads |=
+ dev_conf_info.rxmode.offloads;
+ for (k = 0;
+ k < port->dev_info.max_rx_queues;
+ k++)
+ port->rx_conf[k].offloads |=
+ dev_conf_info.rxmode.offloads;
+ }
+ /* Apply Tx offloads configuration */
+ if (dev_conf_info.txmode.offloads !=
+ port->dev_conf.txmode.offloads) {
+ port->dev_conf.txmode.offloads |=
+ dev_conf_info.txmode.offloads;
+ for (k = 0;
+ k < port->dev_info.max_tx_queues;
+ k++)
+ port->tx_conf[k].offloads |=
+ dev_conf_info.txmode.offloads;
+ }
}
if (port->need_reconfig_queues > 0 && is_proc_primary()) {
port->need_reconfig_queues = 0;
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 5863b2f43f..48dad40986 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -960,6 +960,8 @@ void show_gro(portid_t port_id);
void setup_gso(const char *mode, portid_t port_id);
int eth_dev_info_get_print_err(uint16_t port_id,
struct rte_eth_dev_info *dev_info);
+int eth_dev_conf_info_get_print_err(uint16_t port_id,
+ struct rte_eth_conf *dev_conf_info);
void eth_set_promisc_mode(uint16_t port_id, int enable);
void eth_set_allmulticast_mode(uint16_t port, int enable);
int eth_link_get_nowait_print_err(uint16_t port_id, struct rte_eth_link *link);
diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c
index 14a9a251fb..f04786c50f 100644
--- a/app/test-pmd/util.c
+++ b/app/test-pmd/util.c
@@ -444,6 +444,21 @@ eth_dev_info_get_print_err(uint16_t port_id,
return ret;
}
+int
+eth_dev_conf_info_get_print_err(uint16_t port_id,
+ struct rte_eth_conf *dev_conf_info)
+{
+ int ret;
+
+ ret = rte_eth_dev_conf_info_get(port_id, dev_conf_info);
+ if (ret != 0)
+ fprintf(stderr,
+ "Error during getting device configuration (port %u)
info: %s\n",
+ port_id, strerror(-ret));
+
+ return ret;
+}
+
void
eth_set_promisc_mode(uint16_t port, int enable)
{
--
2.25.1
