patch 'eal/x86: defer power intrinsics variable allocation' has been queued to stable release 24.11.2

[Kevin Traynor]

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/17c59ba22a0d3dea11278bb7410d9f1de8274762

Thanks.

Kevin

---
>From 17c59ba22a0d3dea11278bb7410d9f1de8274762 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Mon, 10 Feb 2025 22:31:58 +0100
Subject: [PATCH] eal/x86: defer power intrinsics variable allocation

[ upstream commit 77e33f28c06dde70b90b9d4fa9a57062c3bf11f7 ]

The lcore variable in this code unit is only used through
rte_power_monitor*() public symbols.

Defer the unconditional lcore variable allocation in those symbols.

Fixes: 18b5049ab4fe ("eal/x86: keep power intrinsics 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/eal/x86/rte_power_intrinsics.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/eal/x86/rte_power_intrinsics.c b/lib/eal/x86/rte_power_intrinsics.c
index e4cb913590..f7d558153e 100644
--- a/lib/eal/x86/rte_power_intrinsics.c
+++ b/lib/eal/x86/rte_power_intrinsics.c
@@ -23,5 +23,11 @@ struct power_wait_status {
 RTE_LCORE_VAR_HANDLE(struct power_wait_status, wait_status);
 
-RTE_LCORE_VAR_INIT(wait_status);
+static void
+init_wait_status(void)
+{
+	if (wait_status != NULL)
+		return;
+	RTE_LCORE_VAR_ALLOC(wait_status);
+}
 
 /*
@@ -178,4 +184,5 @@ rte_power_monitor(const struct rte_power_monitor_cond *pmc,
 		return -EINVAL;
 
+	init_wait_status();
 	s = RTE_LCORE_VAR_LCORE(lcore_id, wait_status);
 
@@ -270,4 +277,5 @@ rte_power_monitor_wakeup(const unsigned int lcore_id)
 		return -EINVAL;
 
+	init_wait_status();
 	s = RTE_LCORE_VAR_LCORE(lcore_id, wait_status);
 
@@ -309,5 +317,5 @@ rte_power_monitor_multi(const struct rte_power_monitor_cond pmc[],
 		const uint32_t num, const uint64_t tsc_timestamp)
 {
-	struct power_wait_status *s = RTE_LCORE_VAR(wait_status);
+	struct power_wait_status *s;
 	uint32_t i, rc;
 
@@ -319,4 +327,7 @@ rte_power_monitor_multi(const struct rte_power_monitor_cond pmc[],
 		return -EINVAL;
 
+	init_wait_status();
+	s = RTE_LCORE_VAR(wait_status);
+
 	/* we are already inside transaction region, return */
 	if (rte_xtest() != 0)
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-12 17:29:41.210178529 +0000
+++ 0063-eal-x86-defer-power-intrinsics-variable-allocation.patch	2025-02-12 17:29:34.391946174 +0000
@@ -1 +1 @@
-From 77e33f28c06dde70b90b9d4fa9a57062c3bf11f7 Mon Sep 17 00:00:00 2001
+From 17c59ba22a0d3dea11278bb7410d9f1de8274762 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 77e33f28c06dde70b90b9d4fa9a57062c3bf11f7 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org