patch 'event/cnxk: fix timer operations in secondary process' has been queued to stable release 21.11.4

Kevin Traynor ktraynor at redhat.com
Thu Feb 23 16:05:30 CET 2023


Hi,

FYI, your patch has been queued to stable release 21.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 02/28/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://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/9b7ac0283708ebb7a5372d4d704a4db1f379b827

Thanks.

Kevin

---
>From 9b7ac0283708ebb7a5372d4d704a4db1f379b827 Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula at marvell.com>
Date: Sun, 5 Feb 2023 12:03:47 +0530
Subject: [PATCH] event/cnxk: fix timer operations in secondary process

[ upstream commit 5f3d1c4ad7c35fb1eeb654b27019798ee6245a4b ]

Fix event timer fast-path ops not being initialized in secondary
process.

Fixes: dd519f83dd96 ("event/cnxk: add timer adapter capabilities")

Signed-off-by: Pavan Nikhilesh <pbhagavatula at marvell.com>
---
 drivers/event/cnxk/cnxk_tim_evdev.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c b/drivers/event/cnxk/cnxk_tim_evdev.c
index 99b3acee7c..ffecdb7448 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -357,4 +357,5 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
 {
 	struct cnxk_tim_evdev *dev = cnxk_tim_priv_get();
+	struct cnxk_tim_ring *tim_ring;
 
 	RTE_SET_USED(flags);
@@ -377,4 +378,10 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
 	dev->event_dev = (struct rte_eventdev *)(uintptr_t)evdev;
 	*caps = RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT;
+
+	tim_ring = ((struct rte_event_timer_adapter_data
+			     *)((char *)caps - offsetof(struct rte_event_timer_adapter_data, caps)))
+			   ->adapter_priv;
+	if (tim_ring != NULL && rte_eal_process_type() == RTE_PROC_SECONDARY)
+		cnxk_tim_set_fp_ops(tim_ring);
 	*ops = &cnxk_tim_ops;
 
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:24.772153390 +0000
+++ 0039-event-cnxk-fix-timer-operations-in-secondary-process.patch	2023-02-23 14:46:23.760235931 +0000
@@ -1 +1 @@
-From 5f3d1c4ad7c35fb1eeb654b27019798ee6245a4b Mon Sep 17 00:00:00 2001
+From 9b7ac0283708ebb7a5372d4d704a4db1f379b827 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5f3d1c4ad7c35fb1eeb654b27019798ee6245a4b ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 6ff3ca72f7..f2862f3292 100644
+index 99b3acee7c..ffecdb7448 100644
@@ -21 +22 @@
-@@ -379,4 +379,5 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
+@@ -357,4 +357,5 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
@@ -27,3 +28,3 @@
-@@ -401,4 +402,10 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
- 	*caps = RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT |
- 		RTE_EVENT_TIMER_ADAPTER_CAP_PERIODIC;
+@@ -377,4 +378,10 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
+ 	dev->event_dev = (struct rte_eventdev *)(uintptr_t)evdev;
+ 	*caps = RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT;



More information about the stable mailing list