patch 'eventdev: fix device pointer for vdev-based devices' has been queued to stable release 22.11.4
Xueming Li
xuemingl at nvidia.com
Mon Dec 11 11:10:28 CET 2023
Hi,
FYI, your patch has been queued to stable release 22.11.4
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/13/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=0beed895efdc0a7fe2aaf89e1f9829e9f379108d
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 0beed895efdc0a7fe2aaf89e1f9829e9f379108d Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Wed, 18 Oct 2023 14:39:31 +0100
Subject: [PATCH] eventdev: fix device pointer for vdev-based devices
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 928b5c701f254c64a7adb0051c0cfd25e8365584 ]
The eventdevs based on vdevs, rather than on e.g. HW PCI devices, were,
as a rule, not setting the ".dev" pointer in the eventdev structure.
This caused issues as a NULL pointer was returned in calls to info_get,
triggering crashes if the pointer is passed unchecked to e.g.
rte_dev_name() to print out the name of an event device.
Most effective, and future-proofed fix, is to not rely on the eventdev
drivers to set the pointer themselves, but to change the vdev init
function to take the vdev struct as parameter, and set the "dev" pointer
centrally on init. This allows us to fix all drivers in one go, enforced
by compiler error if the parameter is missing.
Fixes: aaa4a221da26 ("event/sw: add new software-only eventdev driver")
Fixes: 46a186b1f0c5 ("event/dsw: add device registration and build system")
Fixes: bbbb929da5e6 ("event/skeleton: add skeleton eventdev driver")
Fixes: 3c7f3dcfb099 ("event/opdl: add PMD main body and helper function")
Fixes: 9caac5dd1e7f ("event/dpaa: introduce PMD")
Fixes: 8a5d7a8ec74b ("event/dpaa2: initialize device")
Fixes: 34498de6000f ("event/octeontx: add octeontx eventdev driver")
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
drivers/event/dpaa/dpaa_eventdev.c | 6 +++---
drivers/event/dpaa2/dpaa2_eventdev.c | 6 +++---
drivers/event/dsw/dsw_evdev.c | 2 +-
drivers/event/octeontx/ssovf_evdev.c | 2 +-
drivers/event/opdl/opdl_evdev.c | 2 +-
drivers/event/skeleton/skeleton_eventdev.c | 6 +++---
drivers/event/sw/sw_evdev.c | 2 +-
lib/eventdev/eventdev_pmd_vdev.h | 3 ++-
8 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c
index 4b3d16735b..2532abbe78 100644
--- a/drivers/event/dpaa/dpaa_eventdev.c
+++ b/drivers/event/dpaa/dpaa_eventdev.c
@@ -993,14 +993,14 @@ dpaa_event_check_flags(const char *params)
}
static int
-dpaa_event_dev_create(const char *name, const char *params)
+dpaa_event_dev_create(const char *name, const char *params, struct rte_vdev_device *vdev)
{
struct rte_eventdev *eventdev;
struct dpaa_eventdev *priv;
eventdev = rte_event_pmd_vdev_init(name,
sizeof(struct dpaa_eventdev),
- rte_socket_id());
+ rte_socket_id(), vdev);
if (eventdev == NULL) {
DPAA_EVENTDEV_ERR("Failed to create eventdev vdev %s", name);
goto fail;
@@ -1050,7 +1050,7 @@ dpaa_event_dev_probe(struct rte_vdev_device *vdev)
params = rte_vdev_device_args(vdev);
- return dpaa_event_dev_create(name, params);
+ return dpaa_event_dev_create(name, params, vdev);
}
static int
diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c
index fa1a1ade80..1e64806849 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev.c
@@ -1086,7 +1086,7 @@ dpaa2_eventdev_setup_dpci(struct dpaa2_dpci_dev *dpci_dev,
}
static int
-dpaa2_eventdev_create(const char *name)
+dpaa2_eventdev_create(const char *name, struct rte_vdev_device *vdev)
{
struct rte_eventdev *eventdev;
struct dpaa2_eventdev *priv;
@@ -1096,7 +1096,7 @@ dpaa2_eventdev_create(const char *name)
eventdev = rte_event_pmd_vdev_init(name,
sizeof(struct dpaa2_eventdev),
- rte_socket_id());
+ rte_socket_id(), vdev);
if (eventdev == NULL) {
DPAA2_EVENTDEV_ERR("Failed to create Event device %s", name);
goto fail;
@@ -1190,7 +1190,7 @@ dpaa2_eventdev_probe(struct rte_vdev_device *vdev)
name = rte_vdev_device_name(vdev);
DPAA2_EVENTDEV_INFO("Initializing %s", name);
- return dpaa2_eventdev_create(name);
+ return dpaa2_eventdev_create(name, vdev);
}
static int
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 6c5cde2468..abe8e68525 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -434,7 +434,7 @@ dsw_probe(struct rte_vdev_device *vdev)
name = rte_vdev_device_name(vdev);
dev = rte_event_pmd_vdev_init(name, sizeof(struct dsw_evdev),
- rte_socket_id());
+ rte_socket_id(), vdev);
if (dev == NULL)
return -EFAULT;
diff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c
index 650266b996..d5e223077d 100644
--- a/drivers/event/octeontx/ssovf_evdev.c
+++ b/drivers/event/octeontx/ssovf_evdev.c
@@ -880,7 +880,7 @@ ssovf_vdev_probe(struct rte_vdev_device *vdev)
}
eventdev = rte_event_pmd_vdev_init(name, sizeof(struct ssovf_evdev),
- rte_socket_id());
+ rte_socket_id(), vdev);
if (eventdev == NULL) {
ssovf_log_err("Failed to create eventdev vdev %s", name);
return -ENOMEM;
diff --git a/drivers/event/opdl/opdl_evdev.c b/drivers/event/opdl/opdl_evdev.c
index 9ce8b39b60..08ace84bbe 100644
--- a/drivers/event/opdl/opdl_evdev.c
+++ b/drivers/event/opdl/opdl_evdev.c
@@ -696,7 +696,7 @@ opdl_probe(struct rte_vdev_device *vdev)
}
}
dev = rte_event_pmd_vdev_init(name,
- sizeof(struct opdl_evdev), socket_id);
+ sizeof(struct opdl_evdev), socket_id, vdev);
if (dev == NULL) {
PMD_DRV_LOG(ERR, "eventdev vdev init() failed");
diff --git a/drivers/event/skeleton/skeleton_eventdev.c b/drivers/event/skeleton/skeleton_eventdev.c
index 8513b9a013..45c13c62c7 100644
--- a/drivers/event/skeleton/skeleton_eventdev.c
+++ b/drivers/event/skeleton/skeleton_eventdev.c
@@ -427,12 +427,12 @@ RTE_PMD_REGISTER_PCI_TABLE(event_skeleton_pci, pci_id_skeleton_map);
/* VDEV based event device */
static int
-skeleton_eventdev_create(const char *name, int socket_id)
+skeleton_eventdev_create(const char *name, int socket_id, struct rte_vdev_device *vdev)
{
struct rte_eventdev *eventdev;
eventdev = rte_event_pmd_vdev_init(name,
- sizeof(struct skeleton_eventdev), socket_id);
+ sizeof(struct skeleton_eventdev), socket_id, vdev);
if (eventdev == NULL) {
PMD_DRV_ERR("Failed to create eventdev vdev %s", name);
goto fail;
@@ -458,7 +458,7 @@ skeleton_eventdev_probe(struct rte_vdev_device *vdev)
name = rte_vdev_device_name(vdev);
RTE_LOG(INFO, PMD, "Initializing %s on NUMA node %d\n", name,
rte_socket_id());
- return skeleton_eventdev_create(name, rte_socket_id());
+ return skeleton_eventdev_create(name, rte_socket_id(), vdev);
}
static int
diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
index 3531821dd4..2a2763ee9b 100644
--- a/drivers/event/sw/sw_evdev.c
+++ b/drivers/event/sw/sw_evdev.c
@@ -1074,7 +1074,7 @@ sw_probe(struct rte_vdev_device *vdev)
min_burst_size, deq_burst_size, refill_once);
dev = rte_event_pmd_vdev_init(name,
- sizeof(struct sw_evdev), socket_id);
+ sizeof(struct sw_evdev), socket_id, vdev);
if (dev == NULL) {
SW_LOG_ERR("eventdev vdev init() failed");
return -EFAULT;
diff --git a/lib/eventdev/eventdev_pmd_vdev.h b/lib/eventdev/eventdev_pmd_vdev.h
index 5fa9d699ac..bb433ba955 100644
--- a/lib/eventdev/eventdev_pmd_vdev.h
+++ b/lib/eventdev/eventdev_pmd_vdev.h
@@ -45,7 +45,7 @@ extern "C" {
__rte_internal
static inline struct rte_eventdev *
rte_event_pmd_vdev_init(const char *name, size_t dev_private_size,
- int socket_id)
+ int socket_id, struct rte_vdev_device *vdev)
{
struct rte_eventdev *eventdev;
@@ -67,6 +67,7 @@ rte_event_pmd_vdev_init(const char *name, size_t dev_private_size,
rte_panic("Cannot allocate memzone for private device"
" data");
}
+ eventdev->dev = &vdev->device;
return eventdev;
}
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-12-11 17:56:23.364347700 +0800
+++ 0003-eventdev-fix-device-pointer-for-vdev-based-devices.patch 2023-12-11 17:56:22.877652300 +0800
@@ -1 +1 @@
-From 928b5c701f254c64a7adb0051c0cfd25e8365584 Mon Sep 17 00:00:00 2001
+From 0beed895efdc0a7fe2aaf89e1f9829e9f379108d Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 928b5c701f254c64a7adb0051c0cfd25e8365584 ]
@@ -25 +27,0 @@
-Cc: stable at dpdk.org
@@ -41 +43 @@
-index f615da3813..46a9b88c73 100644
+index 4b3d16735b..2532abbe78 100644
@@ -44 +46 @@
-@@ -994,14 +994,14 @@ dpaa_event_check_flags(const char *params)
+@@ -993,14 +993,14 @@ dpaa_event_check_flags(const char *params)
@@ -61 +63 @@
-@@ -1051,7 +1051,7 @@ dpaa_event_dev_probe(struct rte_vdev_device *vdev)
+@@ -1050,7 +1050,7 @@ dpaa_event_dev_probe(struct rte_vdev_device *vdev)
@@ -71 +73 @@
-index ffc5550f85..dd4e64395f 100644
+index fa1a1ade80..1e64806849 100644
@@ -102 +104 @@
-index 785c12f61f..1209e73a9d 100644
+index 6c5cde2468..abe8e68525 100644
@@ -105 +107 @@
-@@ -435,7 +435,7 @@ dsw_probe(struct rte_vdev_device *vdev)
+@@ -434,7 +434,7 @@ dsw_probe(struct rte_vdev_device *vdev)
@@ -115 +117 @@
-index 0eb9358981..a16f24e088 100644
+index 650266b996..d5e223077d 100644
@@ -128 +130 @@
-index dd25749654..0cccaf7e97 100644
+index 9ce8b39b60..08ace84bbe 100644
@@ -131 +133 @@
-@@ -697,7 +697,7 @@ opdl_probe(struct rte_vdev_device *vdev)
+@@ -696,7 +696,7 @@ opdl_probe(struct rte_vdev_device *vdev)
@@ -141 +143 @@
-index dd2dab2e27..7df032b7da 100644
+index 8513b9a013..45c13c62c7 100644
@@ -144 +146 @@
-@@ -428,12 +428,12 @@ RTE_PMD_REGISTER_PCI_TABLE(event_skeleton_pci, pci_id_skeleton_map);
+@@ -427,12 +427,12 @@ RTE_PMD_REGISTER_PCI_TABLE(event_skeleton_pci, pci_id_skeleton_map);
@@ -159 +161 @@
-@@ -459,7 +459,7 @@ skeleton_eventdev_probe(struct rte_vdev_device *vdev)
+@@ -458,7 +458,7 @@ skeleton_eventdev_probe(struct rte_vdev_device *vdev)
@@ -169 +171 @@
-index 6d1816b76d..55e7735cb0 100644
+index 3531821dd4..2a2763ee9b 100644
@@ -172 +174 @@
-@@ -1075,7 +1075,7 @@ sw_probe(struct rte_vdev_device *vdev)
+@@ -1074,7 +1074,7 @@ sw_probe(struct rte_vdev_device *vdev)
More information about the stable
mailing list