patch 'ethdev: fix functions available in new device event' has been queued to stable release 23.11.4
Xueming Li
xuemingl at nvidia.com
Tue Feb 18 13:34:31 CET 2025
Hi,
FYI, your patch has been queued to stable release 23.11.4
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
Please shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=c1c2fd8405a0f6bef24a1a1375ddafdecf285f7e
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From c1c2fd8405a0f6bef24a1a1375ddafdecf285f7e Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Fri, 17 Jan 2025 17:12:10 +0800
Subject: [PATCH] ethdev: fix functions available in new device event
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 0b8f35358ceb0178878f72b66a36dc0ab7924377 ]
During probing, before the port becomes generally available, the
rte_eth_dev_socket_id() and rte_eth_dev_owner_*() are available to
the application.
Fixes: 7dcd73e37965 ("drivers/bus: set device NUMA node to unknown by default")
Fixes: 53ef1b34776b ("ethdev: add sanity checks in control APIs")
Signed-off-by: Huisong Li <lihuisong at huawei.com>
Acked-by: Thomas Monjalon <thomas at monjalon.net>
---
lib/ethdev/rte_ethdev.c | 14 +++++++++++---
lib/ethdev/rte_ethdev.h | 8 +++++++-
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index dfcdf76fee..86fd457f78 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -600,9 +600,10 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner)
struct rte_eth_dev *ethdev;
int ret;
- RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
- ethdev = &rte_eth_devices[port_id];
+ if (port_id >= RTE_MAX_ETHPORTS)
+ return -ENODEV;
+ ethdev = &rte_eth_devices[port_id];
if (!eth_dev_is_allocated(ethdev)) {
RTE_ETHDEV_LOG(ERR, "Port ID %"PRIu16" is not allocated\n",
port_id);
@@ -635,8 +636,15 @@ int
rte_eth_dev_socket_id(uint16_t port_id)
{
int socket_id = SOCKET_ID_ANY;
+ struct rte_eth_dev *ethdev;
- if (!rte_eth_dev_is_valid_port(port_id)) {
+ if (port_id >= RTE_MAX_ETHPORTS) {
+ rte_errno = EINVAL;
+ return socket_id;
+ }
+
+ ethdev = &rte_eth_devices[port_id];
+ if (!eth_dev_is_allocated(ethdev)) {
rte_errno = EINVAL;
} else {
socket_id = rte_eth_devices[port_id].data->numa_node;
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 545799c341..089bf3626d 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -4029,7 +4029,13 @@ enum rte_eth_event_type {
RTE_ETH_EVENT_VF_MBOX, /**< message from the VF received by PF */
RTE_ETH_EVENT_MACSEC, /**< MACsec offload related event */
RTE_ETH_EVENT_INTR_RMV, /**< device removal event */
- RTE_ETH_EVENT_NEW, /**< port is probed */
+ /**
+ * The port is being probed, i.e. allocated and not yet available.
+ * It is too early to check validity, query infos, and configure
+ * the port. But some functions, like rte_eth_dev_socket_id() and
+ * rte_eth_dev_owner_*() are available to the application.
+ */
+ RTE_ETH_EVENT_NEW,
RTE_ETH_EVENT_DESTROY, /**< port is released */
RTE_ETH_EVENT_IPSEC, /**< IPsec offload related event */
RTE_ETH_EVENT_FLOW_AGED,/**< New aged-out flows is detected */
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-02-18 19:39:02.017703608 +0800
+++ 0036-ethdev-fix-functions-available-in-new-device-event.patch 2025-02-18 19:39:00.538244063 +0800
@@ -1 +1 @@
-From 0b8f35358ceb0178878f72b66a36dc0ab7924377 Mon Sep 17 00:00:00 2001
+From c1c2fd8405a0f6bef24a1a1375ddafdecf285f7e Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 0b8f35358ceb0178878f72b66a36dc0ab7924377 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -18,2 +20,2 @@
- lib/ethdev/rte_ethdev.h | 3 ++-
- 2 files changed, 13 insertions(+), 4 deletions(-)
+ lib/ethdev/rte_ethdev.h | 8 +++++++-
+ 2 files changed, 18 insertions(+), 4 deletions(-)
@@ -22 +24 @@
-index b7cb26f0d3..c4079bb924 100644
+index dfcdf76fee..86fd457f78 100644
@@ -25 +27 @@
-@@ -602,9 +602,10 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner)
+@@ -600,9 +600,10 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner)
@@ -36 +38 @@
- RTE_ETHDEV_LOG_LINE(ERR, "Port ID %"PRIu16" is not allocated",
+ RTE_ETHDEV_LOG(ERR, "Port ID %"PRIu16" is not allocated\n",
@@ -38 +40 @@
-@@ -637,8 +638,15 @@ int
+@@ -635,8 +636,15 @@ int
@@ -56 +58 @@
-index 978104d232..40d97b17d4 100644
+index 545799c341..089bf3626d 100644
@@ -59,5 +61,8 @@
-@@ -4162,7 +4162,8 @@ enum rte_eth_event_type {
- /**
- * The port is being probed, i.e. allocated and not yet available.
- * It is too early to check validity, query infos, and configure
-- * the port.
+@@ -4029,7 +4029,13 @@ enum rte_eth_event_type {
+ RTE_ETH_EVENT_VF_MBOX, /**< message from the VF received by PF */
+ RTE_ETH_EVENT_MACSEC, /**< MACsec offload related event */
+ RTE_ETH_EVENT_INTR_RMV, /**< device removal event */
+- RTE_ETH_EVENT_NEW, /**< port is probed */
++ /**
++ * The port is being probed, i.e. allocated and not yet available.
++ * It is too early to check validity, query infos, and configure
@@ -66,2 +71,2 @@
- */
- RTE_ETH_EVENT_NEW,
++ */
++ RTE_ETH_EVENT_NEW,
@@ -68,0 +74,2 @@
+ RTE_ETH_EVENT_IPSEC, /**< IPsec offload related event */
+ RTE_ETH_EVENT_FLOW_AGED,/**< New aged-out flows is detected */
More information about the stable
mailing list