b27def5172
Sync some patchs from upstreaming, includind some bugfixes, hns3 pmd flow rule priority feature, hns3 pmd outer VLAN flow match feature, and support dump reigser names and filter. This patch set is modified as follows: - net/hns3: fix cannot fully use hardware flow director table - net/hns3: fix error code for repeatedly create counter - net/hns3: support flow rule priority - common/nfp: use new kvargs process API - net/tap: use new kvargs process API - net/sfc: use new kvargs process API - kvargs: rework process API - net/hns3: fix variable type - net/hns3: fix pointer offset - net/hns3: fix error log - net/hns3: support filtering registers by module names - net/hns3: support reporting names of registers - net/hns3: refactor register dump - net/hns3: remove separators between register module - net/hns3: fix dump counter of registers - net/hns3: remove some basic address dump - telemetry: register command with private argument - ethdev: fix race on ports in telemetry endpoints - ethdev: add telemetry command for registers - ethdev: add report of register names and filter - net/hns3: support outer VLAN flow match - net/hns3: register VLAN flow match mode parameter - net/hns3: support general tunnel flow match - net/hns3: restrict tunnel flow rule to one header - net/hns3: remove ROH devices - net/hns3: dump queue head and tail pointer info - dmadev: fix potential null pointer access - net/hns3: verify reset type from firmware - ethdev: verify queue ID in Tx done cleanup Signed-off-by: Dengdui Huang <huangdengdui@huawei.com> (cherry picked from commit a1c828e1eb9cf716187d2a7656023e95bdce9b55)
131 lines
6.6 KiB
Diff
131 lines
6.6 KiB
Diff
From b4003561f3345fd745a6636cfa4b89711338e3f1 Mon Sep 17 00:00:00 2001
|
|
From: Robin Jarry <rjarry@redhat.com>
|
|
Date: Mon, 14 Oct 2024 21:32:37 +0200
|
|
Subject: ethdev: fix race on ports in telemetry endpoints
|
|
|
|
[ upstream commit 6f96937dada54d5cfc8def0955b0807759b45ac4 ]
|
|
|
|
While invoking telemetry commands (which may happen at any time, out of
|
|
control of the application), an application thread may concurrently
|
|
add/remove ports. The telemetry callbacks may then access partially
|
|
initialized/uninitialised ethdev data.
|
|
|
|
Reuse the ethdev lock that protects port allocation/destruction and the
|
|
new telemetry callback register api that takes an additional private
|
|
argument. Pass eth_dev_telemetry_do as the main callback and the actual
|
|
endpoint callbacks as private argument.
|
|
|
|
Fixes: c190daedb9b1 ("ethdev: add telemetry callbacks")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Robin Jarry <rjarry@redhat.com>
|
|
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
|
|
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
---
|
|
lib/ethdev/rte_ethdev_telemetry.c | 69 ++++++++++++++++++++++---------
|
|
1 file changed, 50 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/lib/ethdev/rte_ethdev_telemetry.c b/lib/ethdev/rte_ethdev_telemetry.c
|
|
index b01028ce9b..128c8e0012 100644
|
|
--- a/lib/ethdev/rte_ethdev_telemetry.c
|
|
+++ b/lib/ethdev/rte_ethdev_telemetry.c
|
|
@@ -1395,45 +1395,76 @@ eth_dev_handle_port_tm_node_caps(const char *cmd __rte_unused,
|
|
return ret;
|
|
}
|
|
|
|
+static int eth_dev_telemetry_do(const char *cmd, const char *params, void *arg,
|
|
+ struct rte_tel_data *d)
|
|
+{
|
|
+ telemetry_cb fn = arg;
|
|
+ int ret;
|
|
+
|
|
+ /* Protect against port removal while invoking callback, calling ethdev API. */
|
|
+ rte_spinlock_lock(rte_mcfg_ethdev_get_lock());
|
|
+ ret = fn(cmd, params, d);
|
|
+ rte_spinlock_unlock(rte_mcfg_ethdev_get_lock());
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
RTE_INIT(ethdev_init_telemetry)
|
|
{
|
|
- rte_telemetry_register_cmd("/ethdev/list", eth_dev_handle_port_list,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/list",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_list,
|
|
"Returns list of available ethdev ports. Takes no parameters");
|
|
- rte_telemetry_register_cmd("/ethdev/stats", eth_dev_handle_port_stats,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/stats",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_stats,
|
|
"Returns the common stats for a port. Parameters: int port_id");
|
|
- rte_telemetry_register_cmd("/ethdev/xstats", eth_dev_handle_port_xstats,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/xstats",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_xstats,
|
|
"Returns the extended stats for a port. Parameters: int port_id,hide_zero=true|false(Optional for indicates hide zero xstats)");
|
|
#ifndef RTE_EXEC_ENV_WINDOWS
|
|
- rte_telemetry_register_cmd("/ethdev/dump_priv", eth_dev_handle_port_dump_priv,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/dump_priv",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_dump_priv,
|
|
"Returns dump private information for a port. Parameters: int port_id");
|
|
#endif
|
|
- rte_telemetry_register_cmd("/ethdev/link_status",
|
|
- eth_dev_handle_port_link_status,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/link_status",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_link_status,
|
|
"Returns the link status for a port. Parameters: int port_id");
|
|
- rte_telemetry_register_cmd("/ethdev/info", eth_dev_handle_port_info,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/info",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_info,
|
|
"Returns the device info for a port. Parameters: int port_id");
|
|
- rte_telemetry_register_cmd("/ethdev/module_eeprom", eth_dev_handle_port_module_eeprom,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/module_eeprom",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_module_eeprom,
|
|
"Returns module EEPROM info with SFF specs. Parameters: int port_id");
|
|
- rte_telemetry_register_cmd("/ethdev/macs", eth_dev_handle_port_macs,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/macs",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_macs,
|
|
"Returns the MAC addresses for a port. Parameters: int port_id");
|
|
- rte_telemetry_register_cmd("/ethdev/flow_ctrl", eth_dev_handle_port_flow_ctrl,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/flow_ctrl",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_flow_ctrl,
|
|
"Returns flow ctrl info for a port. Parameters: int port_id");
|
|
- rte_telemetry_register_cmd("/ethdev/rx_queue", eth_dev_handle_port_rxq,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/rx_queue",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_rxq,
|
|
"Returns Rx queue info for a port. Parameters: int port_id, int queue_id (Optional if only one queue)");
|
|
- rte_telemetry_register_cmd("/ethdev/tx_queue", eth_dev_handle_port_txq,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/tx_queue",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_txq,
|
|
"Returns Tx queue info for a port. Parameters: int port_id, int queue_id (Optional if only one queue)");
|
|
- rte_telemetry_register_cmd("/ethdev/dcb", eth_dev_handle_port_dcb,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/dcb",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_dcb,
|
|
"Returns DCB info for a port. Parameters: int port_id");
|
|
- rte_telemetry_register_cmd("/ethdev/rss_info", eth_dev_handle_port_rss_info,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/rss_info",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_rss_info,
|
|
"Returns RSS info for a port. Parameters: int port_id");
|
|
- rte_telemetry_register_cmd("/ethdev/fec", eth_dev_handle_port_fec,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/fec",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_fec,
|
|
"Returns FEC info for a port. Parameters: int port_id");
|
|
- rte_telemetry_register_cmd("/ethdev/vlan", eth_dev_handle_port_vlan,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/vlan",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_vlan,
|
|
"Returns VLAN info for a port. Parameters: int port_id");
|
|
- rte_telemetry_register_cmd("/ethdev/tm_capability", eth_dev_handle_port_tm_caps,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/tm_capability",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_tm_caps,
|
|
"Returns TM Capabilities info for a port. Parameters: int port_id");
|
|
- rte_telemetry_register_cmd("/ethdev/tm_level_capability", eth_dev_handle_port_tm_level_caps,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/tm_level_capability",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_tm_level_caps,
|
|
"Returns TM Level Capabilities info for a port. Parameters: int port_id, int level_id (see tm_capability for the max)");
|
|
- rte_telemetry_register_cmd("/ethdev/tm_node_capability", eth_dev_handle_port_tm_node_caps,
|
|
+ rte_telemetry_register_cmd_arg("/ethdev/tm_node_capability",
|
|
+ eth_dev_telemetry_do, eth_dev_handle_port_tm_node_caps,
|
|
"Returns TM Node Capabilities info for a port. Parameters: int port_id, int node_id (see tm_capability for the max)");
|
|
}
|
|
--
|
|
2.20.1.windows.1
|
|
|