patch 'power: defer lcore variable allocation' has been queued to stable release 24.11.2
Kevin Traynor
ktraynor at redhat.com
Thu Feb 13 10:58:29 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/5803893830512c9ebc2c4c3ac81b895e478c6893
Thanks.
Kevin
---
>From 5803893830512c9ebc2c4c3ac81b895e478c6893 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Mon, 10 Feb 2025 22:31:56 +0100
Subject: [PATCH] power: defer lcore variable allocation
[ upstream commit 108d30ab8d7a63fea4842c6079fe2669af17ae11 ]
The lcore variable in this code unit is only used through
rte_power_ethdev_pmgmt_queue_*() public symbols.
Defer the unconditional lcore variable allocation in those symbols.
Fixes: 130643319579 ("power: keep per-lcore state in lcore variable")
Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
Acked-by: Frode Nordahl <frode.nordahl at canonical.com>
---
lib/power/rte_power_pmd_mgmt.c | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/lib/power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c
index a2fff3b765..369ce3c354 100644
--- a/lib/power/rte_power_pmd_mgmt.c
+++ b/lib/power/rte_power_pmd_mgmt.c
@@ -73,4 +73,20 @@ struct __rte_cache_aligned pmd_core_cfg {
static RTE_LCORE_VAR_HANDLE(struct pmd_core_cfg, lcore_cfgs);
+static void
+init_lcore_cfgs(void)
+{
+ struct pmd_core_cfg *lcore_cfg;
+ unsigned int lcore_id;
+
+ if (lcore_cfgs != NULL)
+ return;
+
+ RTE_LCORE_VAR_ALLOC(lcore_cfgs);
+
+ /* initialize all tailqs */
+ RTE_LCORE_VAR_FOREACH(lcore_id, lcore_cfg, lcore_cfgs)
+ TAILQ_INIT(&lcore_cfg->head);
+}
+
static inline bool
queue_equal(const union queue *l, const union queue *r)
@@ -518,4 +534,5 @@ rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id, uint16_t port_id,
}
+ init_lcore_cfgs();
lcore_cfg = RTE_LCORE_VAR_LCORE(lcore_id, lcore_cfgs);
@@ -619,4 +636,6 @@ rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id,
/* no need to check queue id as wrong queue id would not be enabled */
+
+ init_lcore_cfgs();
lcore_cfg = RTE_LCORE_VAR_LCORE(lcore_id, lcore_cfgs);
@@ -769,14 +788,6 @@ rte_power_pmd_mgmt_get_scaling_freq_max(unsigned int lcore)
RTE_INIT(rte_power_ethdev_pmgmt_init) {
- unsigned int lcore_id;
- struct pmd_core_cfg *lcore_cfg;
int i;
- RTE_LCORE_VAR_ALLOC(lcore_cfgs);
-
- /* initialize all tailqs */
- RTE_LCORE_VAR_FOREACH(lcore_id, lcore_cfg, lcore_cfgs)
- TAILQ_INIT(&lcore_cfg->head);
-
/* initialize config defaults */
emptypoll_max = 512;
--
2.48.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-02-12 17:29:41.113460121 +0000
+++ 0062-power-defer-lcore-variable-allocation.patch 2025-02-12 17:29:34.390946168 +0000
@@ -1 +1 @@
-From 108d30ab8d7a63fea4842c6079fe2669af17ae11 Mon Sep 17 00:00:00 2001
+From 5803893830512c9ebc2c4c3ac81b895e478c6893 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 108d30ab8d7a63fea4842c6079fe2669af17ae11 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list