patch 'ethdev: fix functions available in new device event' has been queued to stable release 24.11.2
Kevin Traynor
ktraynor at redhat.com
Thu Feb 13 10:58:24 CET 2025
Hi,
FYI, your patch has been queued to stable release 24.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/17/25. So 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://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/69fe60c6d76f3125ab1f477341260a2b59f20649
Thanks.
Kevin
---
>From 69fe60c6d76f3125ab1f477341260a2b59f20649 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
[ 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 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 6413c54e3b..9cfb397cee 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -601,7 +601,8 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner)
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_LINE(ERR, "Port ID %"PRIu16" is not allocated",
@@ -636,6 +637,13 @@ 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 {
--
2.48.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-02-12 17:29:40.588338914 +0000
+++ 0057-ethdev-fix-functions-available-in-new-device-event.patch 2025-02-12 17:29:34.372946061 +0000
@@ -1 +1 @@
-From 0b8f35358ceb0178878f72b66a36dc0ab7924377 Mon Sep 17 00:00:00 2001
+From 69fe60c6d76f3125ab1f477341260a2b59f20649 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0b8f35358ceb0178878f72b66a36dc0ab7924377 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -18,2 +19 @@
- lib/ethdev/rte_ethdev.h | 3 ++-
- 2 files changed, 13 insertions(+), 4 deletions(-)
+ 1 file changed, 11 insertions(+), 3 deletions(-)
@@ -22 +22 @@
-index b7cb26f0d3..c4079bb924 100644
+index 6413c54e3b..9cfb397cee 100644
@@ -25 +25 @@
-@@ -603,7 +603,8 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner)
+@@ -601,7 +601,8 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner)
@@ -36 +36 @@
-@@ -638,6 +639,13 @@ rte_eth_dev_socket_id(uint16_t port_id)
+@@ -636,6 +637,13 @@ rte_eth_dev_socket_id(uint16_t port_id)
@@ -51,12 +50,0 @@
-diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
-index 978104d232..40d97b17d4 100644
---- a/lib/ethdev/rte_ethdev.h
-+++ b/lib/ethdev/rte_ethdev.h
-@@ -4163,5 +4163,6 @@ 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.
-+ * 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,
More information about the stable
mailing list