From patchwork Thu Jun 15 20:33:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 108712 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp904280vqr; Thu, 15 Jun 2023 13:43:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7yrYWp2OO1CLDMgy9cD7hHi2LM9/wDvlzMmYML9wdG6FEpyr0MrphbPFwB/hrQrtbnfqdH X-Received: by 2002:a17:90a:414b:b0:25c:1fb6:b9f7 with SMTP id m11-20020a17090a414b00b0025c1fb6b9f7mr144546pjg.1.1686861787883; Thu, 15 Jun 2023 13:43:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686861787; cv=none; d=google.com; s=arc-20160816; b=r/myTNIXxqiBWKUWuU9x8IkIm9wjovKRFsPAL7ti1lHoN4sIjhScDyI8dKMHYhps7Q 53/9tnauzH2rEIBwRkFw65T+T47Lad/UaknCK4Xdkc4Otfjgaf9iIha14tLNyJDMpYGU RaxBx5Nrde85BWcAQTEA17rw1HskRGX5hfsuJY4Brj0D7/sBtIPTEJnmV+KrMHBB/TkK UB8MEtYH/v13UgjEAxg5u9krgE8LzYBo2Se429glHavPlilQ/V0ID2+l6XocbVM8PxyU Gbtq7KXQ3ND+8JKb8GpjuRCG9bchBNOzJu/WKkDS6nzk1UdrG/Cyy4EmkBFR3UW1bezy I7pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=tVfoJ5rLMlFkeEBpRbPrXavA+I9P+UPy7NG09ZxG1es=; b=tk1Edm8QkkOqNOJ/gnjWyV45HgoHdAIgzJsNSK0SpVNlwvUEfHe8RdVuMR+lU8JXD7 YjQl8IJn5lmhEPu6PBH4jwplI0fY13zcYKdPVqCFwhBuE4O4ozNetaR0+wAS/LOxrwfN XzNaJzYEEJuywlKUXMfCB2hhafidM5dF8EXBIyXNvqHb2PJTbwUV2yA83NCfAcNLHSjZ Hml1BGtOtouAXS2lWDGfgWfpUUF8+1xjj262vDg2Km4pXEXG3MZstAkC4lYdIHE9/5bY 5hsZ9ldCnVIie2R53PqlZFh5tOmmqhDBpQljAmj24znvHNphtj37JYAhqkNxgOpVBt20 TEiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=S4BfXxBX; dkim=neutral (no key) header.i=@linutronix.de header.b=fAYM2QaS; 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 fz12-20020a17090b024c00b0025bae7f2b10si137049pjb.13.2023.06.15.13.42.54; Thu, 15 Jun 2023 13:43:07 -0700 (PDT) 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=S4BfXxBX; dkim=neutral (no key) header.i=@linutronix.de header.b=fAYM2QaS; 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 S229509AbjFOUeL (ORCPT + 99 others); Thu, 15 Jun 2023 16:34:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232118AbjFOUd6 (ORCPT ); Thu, 15 Jun 2023 16:33:58 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AB57271E for ; Thu, 15 Jun 2023 13:33:57 -0700 (PDT) Message-ID: <20230615193330.434553750@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686861236; 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: references:references; bh=tVfoJ5rLMlFkeEBpRbPrXavA+I9P+UPy7NG09ZxG1es=; b=S4BfXxBXNNJ5B3Kp+5KHAQzKf+LHuMTTDNRQ2Am/JAHpHjLeI40iWPmcHky8GX7D86imf9 WN5xDCrx8DQwywDGBBBpJZwb8xc33QMaTcTH/UNNUHjDh9kjbru/3f4eNm2AI5uYYhPJat l7BQM8YiYFtHnO5HPNh/5/7bMwzHPW8CxVdAdmR+k0lfNJymnq6f6rgubuJRByrdPs79Ag 2bBxV4ztnQiWNH6Kq1Vanpttnl2f5lZFk0d2JgqjaMO6A1rGBAhpovcKIR3Aqz0Y+1dxsd 6MeaxuZxcTaSfog5eYKbCXegS159q/o5SQNqzCHm4qDfD+Rb7LPThHYXYdQznA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686861236; 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: references:references; bh=tVfoJ5rLMlFkeEBpRbPrXavA+I9P+UPy7NG09ZxG1es=; b=fAYM2QaSuEVf7/qNOLCtOFT0tvHkbuo21+sU5Ov4SwNWaS62e10Dqg6NP1nrDVaz+BUZZF GCNaWS7/oTKuSvCw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Mario Limonciello , Tom Lendacky , Tony Battersby , Ashok Raj , Tony Luck , Arjan van de Veen , Eric Biederman , Ashok Raj Subject: [patch v3 4/7] x86/smp: Use dedicated cache-line for mwait_play_dead() References: <20230615190036.898273129@linutronix.de> MIME-Version: 1.0 Date: Thu, 15 Jun 2023 22:33:55 +0200 (CEST) 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,T_SCC_BODY_TEXT_LINE 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?1768802786264732393?= X-GMAIL-MSGID: =?utf-8?q?1768802786264732393?= Monitoring idletask::thread_info::flags in mwait_play_dead() has been an obvious choice as all what is needed is a cache line which is not written by other CPUs. But there is a use case where a "dead" CPU needs to be brought out of that mwait(): kexec(). The CPU needs to be brought out of mwait before kexec() as kexec() can overwrite text, pagetables, stacks and the monitored cacheline of the original kernel. The latter causes mwait to resume execution which obviously causes havoc on the kexec kernel which results usually in triple faults. Use a dedicated per CPU storage to prepare for that. Signed-off-by: Thomas Gleixner Reviewed-by: Ashok Raj Reviewed-by: Borislav Petkov (AMD) --- arch/x86/kernel/smpboot.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -101,6 +101,17 @@ EXPORT_PER_CPU_SYMBOL(cpu_die_map); DEFINE_PER_CPU_READ_MOSTLY(struct cpuinfo_x86, cpu_info); EXPORT_PER_CPU_SYMBOL(cpu_info); +struct mwait_cpu_dead { + unsigned int control; + unsigned int status; +}; + +/* + * Cache line aligned data for mwait_play_dead(). Separate on purpose so + * that it's unlikely to be touched by other CPUs. + */ +static DEFINE_PER_CPU_ALIGNED(struct mwait_cpu_dead, mwait_cpu_dead); + /* Logical package management. We might want to allocate that dynamically */ unsigned int __max_logical_packages __read_mostly; EXPORT_SYMBOL(__max_logical_packages); @@ -1758,10 +1769,10 @@ EXPORT_SYMBOL_GPL(cond_wakeup_cpu0); */ static inline void mwait_play_dead(void) { + struct mwait_cpu_dead *md = this_cpu_ptr(&mwait_cpu_dead); unsigned int eax, ebx, ecx, edx; unsigned int highest_cstate = 0; unsigned int highest_subcstate = 0; - void *mwait_ptr; int i; if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD || @@ -1796,13 +1807,6 @@ static inline void mwait_play_dead(void) (highest_subcstate - 1); } - /* - * This should be a memory location in a cache line which is - * unlikely to be touched by other processors. The actual - * content is immaterial as it is not actually modified in any way. - */ - mwait_ptr = ¤t_thread_info()->flags; - wbinvd(); while (1) { @@ -1814,9 +1818,9 @@ static inline void mwait_play_dead(void) * case where we return around the loop. */ mb(); - clflush(mwait_ptr); + clflush(md); mb(); - __monitor(mwait_ptr, 0, 0); + __monitor(md, 0, 0); mb(); __mwait(eax, 0);