From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DC09446211 for ; Thu, 13 Feb 2025 11:02:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D4B6142EE7; Thu, 13 Feb 2025 11:02:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7AC5C42EE7 for ; Thu, 13 Feb 2025 11:02:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eMwm7ydn5TqdK6CGxMX64S0AMe2QxtKFvgxq1TJnX/s=; b=g9I8EJ1qTFgAYz2msn1Lh99maCEIIJvilu4e549YKIS4vis9DM6/itqOsAr8oCVgJRxs+q rIusipvbkHQnvW6eESgpuNbh0rzzo8KkdvW5TXWof5Q0h+iqBi2V9X08lLBUqQUDe801zW URwQgSxKxaBpgQ+8Lmpm16mgPJGLsUc= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-92-tUCZjLNsMqOPDKZNViZ3mA-1; Thu, 13 Feb 2025 05:02:11 -0500 X-MC-Unique: tUCZjLNsMqOPDKZNViZ3mA-1 X-Mimecast-MFC-AGG-ID: tUCZjLNsMqOPDKZNViZ3mA_1739440930 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EAB2418D9594; Thu, 13 Feb 2025 10:02:09 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7918E1800365; Thu, 13 Feb 2025 10:02:07 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Anatoly Burakov , Frode Nordahl , dpdk stable Subject: patch 'eal/x86: defer power intrinsics variable allocation' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:30 +0000 Message-ID: <20250213095933.362078-63-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: -8V3n9hJtg7idiFzeGxJkaq2V0v_05g6kKShANXKGko_1739440930 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Acked-by: Anatoly Burakov Acked-by: Frode Nordahl --- 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@dpdk.org