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.
It adds a new API "rte_eth_dev_conf_info_get()" to help testpmd get
device configuration info.
Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings")
Cc: sta...@dpdk.org
Signed-off-by: Jie Wang <jie1x.w...@intel.com>
---
app/test-pmd/testpmd.c | 33 +++++++++++++++++++++++++++++++++
app/test-pmd/testpmd.h | 2 ++
app/test-pmd/util.c | 15 +++++++++++++++
lib/ethdev/rte_ethdev.c | 27 +++++++++++++++++++++++++++
lib/ethdev/rte_ethdev.h | 26 ++++++++++++++++++++++++++
5 files changed, 103 insertions(+)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 6cbe9ba3c8..9a78805673 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2461,6 +2461,9 @@ start_port(portid_t pid)
}
if (port->need_reconfig > 0) {
+ struct rte_eth_dev_conf_info dev_conf_info;
+ int k;
+
port->need_reconfig = 0;
if (flow_isolate_all) {
@@ -2498,6 +2501,36 @@ start_port(portid_t pid)
port->need_reconfig = 1;
return -1;
}
+ /* get offloads */
+ if (0 !=
+ eth_dev_conf_info_get_print_err(pi,
+ &dev_conf_info)) {
+ rte_exit(EXIT_FAILURE,
+ "rte_eth_dev_conf_info_get() failed\n");
+ return -1;
+ }
+ /* Apply Rx offloads configuration */
+ if (dev_conf_info.rx_offloads !=
+ port->dev_conf.rxmode.offloads) {
+ port->dev_conf.rxmode.offloads =
+ dev_conf_info.rx_offloads;
+ for (k = 0;
+ k < port->dev_info.max_rx_queues;
+ k++)
+ port->rx_conf[k].offloads =
+ dev_conf_info.rx_offloads;
+ }
+ /* Apply Tx offloads configuration */
+ if (dev_conf_info.tx_offloads !=
+ port->dev_conf.txmode.offloads) {
+ port->dev_conf.txmode.offloads =
+ dev_conf_info.tx_offloads;
+ for (k = 0;
+ k < port->dev_info.max_tx_queues;
+ k++)
+ port->tx_conf[k].offloads =
+ dev_conf_info.tx_offloads;
+ }
}
if (port->need_reconfig_queues > 0) {
port->need_reconfig_queues = 0;
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 16a3598e48..4cf69a17a3 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -950,6 +950,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_dev_conf_info *dev_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 5dd7157947..c6992fba7a 100644
--- a/app/test-pmd/util.c
+++ b/app/test-pmd/util.c
@@ -440,6 +440,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_dev_conf_info *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 config (port %u) info:
%s\n",
+ port_id, strerror(-ret));
+
+ return ret;
+}
+
void
eth_set_promisc_mode(uint16_t port, int enable)
{
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 9d95cd11e1..74184099a1 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -3458,6 +3458,33 @@ rte_eth_dev_info_get(uint16_t port_id, struct
rte_eth_dev_info *dev_info)
return 0;
}
+int
+rte_eth_dev_conf_info_get(uint16_t port_id,
+ struct rte_eth_dev_conf_info *dev_conf_info)
+{
+ struct rte_eth_dev *dev;
+
+ RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+ dev = &rte_eth_devices[port_id];
+
+ if (dev_conf_info == NULL) {
+ RTE_ETHDEV_LOG(ERR, "Cannot get ethdev port %u config info to
NULL\n",
+ port_id);
+ return -EINVAL;
+ }
+
+ /*
+ * Init dev_conf_info before port_id check since caller does not have
+ * return status and does not know if get is successful or not.
+ */
+ memset(dev_conf_info, 0, sizeof(struct rte_eth_dev_conf_info));
+
+ dev_conf_info->rx_offloads = dev->data->dev_conf.rxmode.offloads;
+ dev_conf_info->tx_offloads = dev->data->dev_conf.txmode.offloads;
+
+ return 0;
+}
+
int
rte_eth_dev_get_supported_ptypes(uint16_t port_id, uint32_t ptype_mask,
uint32_t *ptypes, int num)
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index d2b27c351f..70a2db550f 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -1587,6 +1587,15 @@ struct rte_eth_dev_info {
void *reserved_ptrs[2]; /**< Reserved for future fields */
};
+/**
+ * Ethernet device configuration information structure.
+ * Used to retrieve information about configured device.
+ */
+struct rte_eth_dev_conf_info {
+ uint64_t rx_offloads; /**rxmode offloads */
+ uint64_t tx_offloads; /**txmode offloads */
+};
+
/**
* RX/TX queue states
*/
@@ -3058,6 +3067,23 @@ int rte_eth_macaddr_get(uint16_t port_id, struct
rte_ether_addr *mac_addr);
*/
int rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info);
+/**
+ * Retrieve the contextual information of an Ethernet device.
+ *
+ * @param port_id
+ * The port identifier of the Ethernet device.
+ * @param dev_conf_info
+ * A pointer to a structure of type *rte_eth_dev_conf_info* to be filled with
+ * the contextual information of the Ethernet device.
+ * @return
+ * - (0) if successful.
+ * - (-ENOTSUP) if support for dev_infos_get() does not exist for the device.
+ * - (-ENODEV) if *port_id* invalid.
+ * - (-EINVAL) if bad parameter.
+ */
+int rte_eth_dev_conf_info_get(uint16_t port_id,
+ struct rte_eth_dev_conf_info *dev_conf_info);
+
/**
* Retrieve the firmware version of a device.
*
--
2.25.1
