From patchwork Tue Jun 13 12:18:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 107347 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp504588vqr; Tue, 13 Jun 2023 05:28:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4zu/rByZRu7ECruP9cxXDQ+WN2BcHUnMu67ywGxmiGCFGn0HzzZET1XkLPANb/RhuPb2ob X-Received: by 2002:a19:7b1b:0:b0:4e0:a426:6ddc with SMTP id w27-20020a197b1b000000b004e0a4266ddcmr5395311lfc.0.1686659304931; Tue, 13 Jun 2023 05:28:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686659304; cv=none; d=google.com; s=arc-20160816; b=oyfpbG/Dq6vX8ydebHPaC9/FiHYJsZdHamLEzHaVbzMPAAIGHnlbtJfWlqFk7moWbE kHY/oV8Dae+9WQ70nK7dA3MvHksr3/7Z+7xZgXeZroiB7G5NzP8AyCCXH9OtLmQEvfko Wns23cBqxBzfMPXsC1M0i6Zk2szeoLFoL7axfgh4pTrbSULyffvF6e6w/B0e+lX1xFjQ 5oQDzFJ+25uogfGOKS+NYZJGPhED7gZt8R3x+/bmenpHbPZfM5rPRcQD/v9H8KX+dfFN GW4H1RSw367+bXWwxWKP+5u6Uc1CJ+biMSNEFfhcFSTWcJmo3E1vDPTuK/K9H/RLmlZn Muyg== 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=It30nabkHbbCReCgbtXuAqBgUmooGam6mg9q/6joB/ZDdRESJv2c6EdHQbhl6tTQyU ZxjsKOPc00jP7VoSffy9od/ucfcTRegYNKNSEW5ueNmgsFmj7q3GZEAx40QKgclDou+R /PPT5KFYZ+nZZedk8dfKD/pjKld5S07imIgTyXqS0Fw8OSEwDYKtzCeGsjnOklF8GTNP wyt6XOONfu3Gk4cUp0ZgB5cH4UIjBKW3HemxfJgEvExwKrI5nCXu1Lrol7GL3Vx0jxMf nAMRzYlO6TTUV64Ru04ILy2wr7wGej+iK/ebtTNEN94BaJe1TjoQ/EWPJUwcLC0wIMUZ L+qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3Uwe3XzB; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=xhpN5AOu; 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 t17-20020aa7d4d1000000b0051830de62c6si4357046edr.413.2023.06.13.05.28.00; Tue, 13 Jun 2023 05:28:24 -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=3Uwe3XzB; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=xhpN5AOu; 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 S242330AbjFMMSQ (ORCPT + 99 others); Tue, 13 Jun 2023 08:18:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242293AbjFMMSD (ORCPT ); Tue, 13 Jun 2023 08:18:03 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51B5B10C6 for ; Tue, 13 Jun 2023 05:18:02 -0700 (PDT) Message-ID: <20230613121615.874928734@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686658681; 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=3Uwe3XzBEhnjJMIexwevv7CpqOvhCrzYSk5hZZIbs9UG6BnDKAnSMlinOnDqUrOhDyi8JM fAfqYqAodrOAb0kN+GyZiwgGTwZJJTMyfgSWAqmOZNz1GZCxOZmfcIni2i3Vf6znFC8Bfw JF1Pc5X9WRVpGvSTxXzMblqMnXa1vCmz+UaUCZjOA19bSXeszZTf4krYoaa7FdyWwwuFUa kqFR2xKDEHzq5zJeETAqHydDhiAlQP4dxsYR0l7Soep0wbngULTmfzzUXaWULM2V3y51u2 hJgVWvUL1TmSQdcFY3IoTCDzFtlJX+SBa2FZEVzCDN8T3pssZj+nJFXSOo6NlQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686658681; 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=xhpN5AOuS/th5GqtT7cDKbuzAUDRbLG/yXjcoQ9RpGNpaFGApOFq1F/RqoiRVrIDFUuF2q RFKz4M60uLO8r/Ag== 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 V2 5/8] x86/smp: Use dedicated cache-line for mwait_play_dead() References: <20230613115353.599087484@linutronix.de> MIME-Version: 1.0 Date: Tue, 13 Jun 2023 14:18:00 +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,URIBL_BLOCKED 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?1768590466950404897?= X-GMAIL-MSGID: =?utf-8?q?1768590466950404897?= 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 --- 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);