From patchwork Thu Nov 10 12:21:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 18098 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp111969wru; Thu, 10 Nov 2022 04:24:31 -0800 (PST) X-Google-Smtp-Source: AMsMyM4I0/Vf9nAwFhikHQj9H2hbU2LhDNMvjsGs+UJtZNUGTFCrlwVjqVJJl4gydb3GOYPgrbqv X-Received: by 2002:a63:8bc2:0:b0:46f:5bbb:7370 with SMTP id j185-20020a638bc2000000b0046f5bbb7370mr55752222pge.70.1668083071622; Thu, 10 Nov 2022 04:24:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668083071; cv=none; d=google.com; s=arc-20160816; b=w3ewcrimJshdTl/AiMTP5ItOz87bNonYg2W4qm9eaXe7DxiTK/fZRUk9T7JZp2ZYT3 uMC+Exscw6GlTae5X5I2x4WxI8zzG3c4/w6rAm6DTkrRzNvvGQK/zvXeZaizJEK+6ROF 7bQwk+TxhW7M4gk4lYDdVYdxTRdZ8JpzWg2+Ey4MmzqbSdGnJ5EywNaycrD4Gtm7MvF+ QaFlFzhizLoD+dutRFhRGZg3+Ip4afM9As7iMRpcng4R+WQgJIsN3xdxdB5thTk5r7qz AcQOhMdd8FbnOTerqIaggvvE6hS0SBARww7v4VlHQLu+L2qxhiZxw/uqwB5LxEX7ZnKX TpiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=xG/9a6H6NEua6gewILu/XAdkJNWyOE+MgdGKSbBLNCA=; b=CsPXIS++OE78/OPOch8meicM4Oqi5SzgFsJkTr5UfAc9lT9ifOrUYjett3eC7xgCT6 lS5pMosn2MRaBghe5LWKapE5gdjtfOTGASQNLm/ETTmfYUdCuRpKVG/9LCjEMfLhOHxE 3eaz/k+ivxxkqNy8IruqfQNsDGaW47qEx2RIRs2hS1Bdiu1vzZOA6QeJXG7EYow4Kndm VOkoLBH52N33tc+z5oeN7n20aOziRb8C3mR0leQ49g6t/fyNj9olSf5t4HAfKkpDStJK nfhQ10SzUW6AimawjnJKgBxOHoaCZoEBM4rUmdtl3f9LyTdX0vfmWnRSlF6fQM4nfcjM N+nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=BBQGl5Oq; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a18-20020a631a12000000b0046fe64444fcsi21874747pga.839.2022.11.10.04.24.17; Thu, 10 Nov 2022 04:24:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=BBQGl5Oq; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230328AbiKJMV4 (ORCPT + 99 others); Thu, 10 Nov 2022 07:21:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229788AbiKJMVu (ORCPT ); Thu, 10 Nov 2022 07:21:50 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4EEC71F2B; Thu, 10 Nov 2022 04:21:49 -0800 (PST) Date: Thu, 10 Nov 2022 12:21:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668082908; 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: in-reply-to:in-reply-to:references:references; bh=xG/9a6H6NEua6gewILu/XAdkJNWyOE+MgdGKSbBLNCA=; b=BBQGl5Oqsopv35OV7GkuHsZaXiQ2SGD572zmJpaN80Qzv8Xp/4x/JMsynv3t7zTDsaJilg b0UMsRIxD2r+nERQEIT3O3rXIdcuCHhHlHkDw3I+O6OEDsqzbl62cVCtwOHDrXHtnmtx9a kUA917fHCcixMWmlTCMwHj9c+qSyG5uhLreVgTx72UBFPYC7g48YoR7xO1xK346+0dgF02 6x7MFiEXcC2YE9A1LzXas3BT0BrNEnL1kTuXFUAiAqOym7jrwuHctyhtlnKb8gS7L5xPYX A/9czB7kjtMfi5o7657WqN7pkv9xRxkQGYIXzo8QiefmyfGscdvoqHdTV/mQTA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668082908; 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: in-reply-to:in-reply-to:references:references; bh=xG/9a6H6NEua6gewILu/XAdkJNWyOE+MgdGKSbBLNCA=; b=dz9wxP/Mp9nI2mtFR7Yf8dlrdhW6Sv4bGugw5sVyr56T9YpDysCMi/vBWO3jEXLWvmZBEr CrKMvvkwu6CeKkAw== From: "tip-bot2 for Juergen Gross" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/cacheinfo: Switch cache_ap_init() to hotplug callback Cc: Borislav Petkov , Juergen Gross , Borislav Petkov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221102074713.21493-15-jgross@suse.com> References: <20221102074713.21493-15-jgross@suse.com> MIME-Version: 1.0 Message-ID: <166808290694.4906.14728095964138728478.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749111874845558079?= X-GMAIL-MSGID: =?utf-8?q?1749111874845558079?= The following commit has been merged into the x86/cpu branch of tip: Commit-ID: 30f89e524becdbaa483b34902b079c9d4dfaa4a3 Gitweb: https://git.kernel.org/tip/30f89e524becdbaa483b34902b079c9d4dfaa4a3 Author: Juergen Gross AuthorDate: Wed, 02 Nov 2022 08:47:11 +01:00 Committer: Borislav Petkov CommitterDate: Thu, 10 Nov 2022 13:12:45 +01:00 x86/cacheinfo: Switch cache_ap_init() to hotplug callback Instead of explicitly calling cache_ap_init() in identify_secondary_cpu() use a CPU hotplug callback instead. By registering the callback only after having started the non-boot CPUs and initializing cache_aps_delayed_init with "true", calling set_cache_aps_delayed_init() at boot time can be dropped. It should be noted that this change results in cache_ap_init() being called a little bit later when hotplugging CPUs. By using a new hotplug slot right at the start of the low level bringup this is not problematic, as no operations requiring a specific caching mode are performed that early in CPU initialization. Suggested-by: Borislav Petkov Signed-off-by: Juergen Gross Signed-off-by: Borislav Petkov Link: https://lore.kernel.org/r/20221102074713.21493-15-jgross@suse.com Signed-off-by: Borislav Petkov --- arch/x86/include/asm/cacheinfo.h | 1 - arch/x86/kernel/cpu/cacheinfo.c | 18 +++++++++++++++--- arch/x86/kernel/cpu/common.c | 1 - arch/x86/kernel/smpboot.c | 2 -- include/linux/cpuhotplug.h | 1 + 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/cacheinfo.h b/arch/x86/include/asm/cacheinfo.h index a0ef46e..ce9685f 100644 --- a/arch/x86/include/asm/cacheinfo.h +++ b/arch/x86/include/asm/cacheinfo.h @@ -16,7 +16,6 @@ void set_cache_aps_delayed_init(bool val); bool get_cache_aps_delayed_init(void); void cache_bp_init(void); void cache_bp_restore(void); -void cache_ap_init(void); void cache_aps_init(void); #endif /* _ASM_X86_CACHEINFO_H */ diff --git a/arch/x86/kernel/cpu/cacheinfo.c b/arch/x86/kernel/cpu/cacheinfo.c index c830f85..f4e5aa2 100644 --- a/arch/x86/kernel/cpu/cacheinfo.c +++ b/arch/x86/kernel/cpu/cacheinfo.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -1139,7 +1140,7 @@ static void cache_cpu_init(void) local_irq_restore(flags); } -static bool cache_aps_delayed_init; +static bool cache_aps_delayed_init = true; void set_cache_aps_delayed_init(bool val) { @@ -1174,10 +1175,10 @@ void cache_bp_restore(void) cache_cpu_init(); } -void cache_ap_init(void) +static int cache_ap_init(unsigned int cpu) { if (!memory_caching_control || get_cache_aps_delayed_init()) - return; + return 0; /* * Ideally we should hold mtrr_mutex here to avoid MTRR entries @@ -1194,6 +1195,8 @@ void cache_ap_init(void) */ stop_machine_from_inactive_cpu(cache_rendezvous_handler, NULL, cpu_callout_mask); + + return 0; } /* @@ -1207,3 +1210,12 @@ void cache_aps_init(void) stop_machine(cache_rendezvous_handler, NULL, cpu_online_mask); set_cache_aps_delayed_init(false); } + +static int __init cache_ap_register(void) +{ + cpuhp_setup_state_nocalls(CPUHP_AP_CACHECTRL_STARTING, + "x86/cachectrl:starting", + cache_ap_init, NULL); + return 0; +} +core_initcall(cache_ap_register); diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index fd058b5..bf4ac1c 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1949,7 +1949,6 @@ void identify_secondary_cpu(struct cpuinfo_x86 *c) #ifdef CONFIG_X86_32 enable_sep_cpu(); #endif - cache_ap_init(); validate_apic_and_package_id(c); x86_spec_ctrl_setup_ap(); update_srbds_msr(); diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 1b61a48..82b311c 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1429,8 +1429,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) uv_system_init(); - set_cache_aps_delayed_init(true); - smp_quirk_init_udelay(); speculative_store_bypass_ht_init(); diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index f614479..0d277b4 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -140,6 +140,7 @@ enum cpuhp_state { */ CPUHP_AP_IDLE_DEAD, CPUHP_AP_OFFLINE, + CPUHP_AP_CACHECTRL_STARTING, CPUHP_AP_SCHED_STARTING, CPUHP_AP_RCUTREE_DYING, CPUHP_AP_CPU_PM_STARTING,