From nobody Fri Sep 12 03:13:28 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCC70C001E0 for ; Wed, 9 Aug 2023 19:13:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231190AbjHITM7 (ORCPT ); Wed, 9 Aug 2023 15:12:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232469AbjHITMe (ORCPT ); Wed, 9 Aug 2023 15:12:34 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 136D62718; Wed, 9 Aug 2023 12:12:25 -0700 (PDT) Date: Wed, 09 Aug 2023 19:12:20 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691608340; h=from:from:sender:sender:reply-to: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; bh=ePpxdb54UK1w0dW/aOACxgPueYpJk/5MQbAXokeoOik=; b=IpgwJJIZbEC5wSbbiRbn/KNdZhihTac2Yba+t5gaOwpJa4ZcN/ez/lri/i6wPfubh8kd+t qHKdiEOjQZcLDRNF9s7ArsKKvK0+5RnsQaleLPWNc07EnB+v2s3Jw5NErp7ViSZhn7HHiT dK2zt93RF0dpy0dIn3ekjOvhIx6sMK+l0mwTzqiQ4tNhccrvZKzwYVgFz2LrxLzcfnzwpX W9VlKFg3hQqxXQQEPxJkvTjFMFfNxUczuNEMsYg+3O/WUIHF4hX9z1CQAMlJaYmVXf4TBq 6qX5XZBgVSgU0ldUEhpD3erkcz38zr9geZxLnn1nPJ0vBNooawhgIYp26gn0HA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691608340; h=from:from:sender:sender:reply-to: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; bh=ePpxdb54UK1w0dW/aOACxgPueYpJk/5MQbAXokeoOik=; b=E5h8WbS6BmrP1KupnMEWHiruGuAewEsq1N4R9g15wU+3ovKy4xN8F6o+I/PBlqFPyK6Y5x 5xBqn42mhgU33pDA== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] x86/apic: Mop up early_per_cpu() abuse Cc: Thomas Gleixner , Dave Hansen , "Peter Zijlstra (Intel)" , Michael Kelley , Sohil Mehta , Juergen Gross , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169160834035.27769.6808573188622126756.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/apic branch of tip: Commit-ID: e3243ed0142bb438bbd284c8c04f4c8e0c2ff498 Gitweb: https://git.kernel.org/tip/e3243ed0142bb438bbd284c8c04f4c8e0= c2ff498 Author: Thomas Gleixner AuthorDate: Tue, 08 Aug 2023 15:03:54 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 11:58:24 -07:00 x86/apic: Mop up early_per_cpu() abuse UV X2APIC uses the per CPU variable from: native_smp_prepare_cpus() uv_system_init() uv_system_init_hub() which is long after the per CPU areas have been set up. Signed-off-by: Thomas Gleixner Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) Tested-by: Michael Kelley Tested-by: Sohil Mehta Tested-by: Juergen Gross # Xen PV (dom0 and unpriv. guest) --- arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2ap= ic_uv_x.c index 0d812fd..8b14451 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -1843,7 +1843,7 @@ static void __init uv_system_init_hub(void) =20 /* Initialize per CPU info: */ for_each_possible_cpu(cpu) { - int apicid =3D early_per_cpu(x86_cpu_to_apicid, cpu); + int apicid =3D per_cpu(x86_cpu_to_apicid, cpu); unsigned short bid; unsigned short pnode;