From patchwork Tue Jun 20 13:00:51 2023 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: 110468 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3657912vqr; Tue, 20 Jun 2023 06:17:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4RqP2wTdglW6H6Fo763zZeWAFPEhInTMxcOgqY26SUsY6erVoAbpYTg0reKRgA1C0cH23K X-Received: by 2002:a17:902:8ec8:b0:1b3:c578:c3e9 with SMTP id x8-20020a1709028ec800b001b3c578c3e9mr6816760plo.62.1687267060976; Tue, 20 Jun 2023 06:17:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687267060; cv=none; d=google.com; s=arc-20160816; b=Dwtdo1b9o9/69Zis4+yArVRUWy7YFj7oZBJO93a8Bx7ktZpaCbsvXXgun5lnz5XfH/ 5p+D/xJeH14GGTuhlZJ1muD8JfYLYnO7irBSTM8U4J3ZD1FVORs1M+jqjOpe6MOyNO8a n5OxhWkuuPpob+9XC9Rh8Q1sY07F5vcVWs57Xj+RueFCUYICcB/hpwFjrcDPMD49atMf 5kEGcI52t+wuKJkxBjRaQ+ZA2yCuFBtOTqg9W7oTQs1gUngSz8nrqu/F4x6oKq7IpTyR ilSreVZvzuKEz09YeDgAQ/psJolgw6vAM9x3NeX/kkH01P+qGIvZxg4jUdcP2ze5/9Yb XPPg== 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=iQWwYgNWQFdPkD+2uT8p3Wf1mUDeQcjcVwJqecz8ss8=; b=jnnMud8hB6xw1SMjtRqeF2c+KN8o+yQVJcD2AUAhgK4N3lUX0rsmZ//ghNUyk4tneA TnZsRNzwkzueQSLWVXGA4Ng34B2bvGwcyOOT2qU9Lh6PSrNud1Jou91ynFQ8ZBf/BCBJ iKTAxvAoPA5b9nGXe49T+awa8N9xPWBo3rxvOpF+exhbXFEf0/m2DGxWxgSvKnPeuzI2 Fpz/2x+bfdaaU11ODkTwIq4zrTlKUIMWlHAjBVS2aCv3LOnCV+vFjhG5eVmpYirSG7KR IJuehCGLVttSLZDuYW5GcLxWn81Bj6/VzN9HcddxoyIATn7p5s1Bz3JHYKzUV/CjM3Mc BpYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=zaTmYCNQ; 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 h16-20020a170902f55000b001afdfd0b363si2006659plf.489.2023.06.20.06.17.26; Tue, 20 Jun 2023 06:17:40 -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=zaTmYCNQ; 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 S231324AbjFTNBg (ORCPT + 99 others); Tue, 20 Jun 2023 09:01:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232756AbjFTNBR (ORCPT ); Tue, 20 Jun 2023 09:01:17 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0FF319A7; Tue, 20 Jun 2023 06:00:53 -0700 (PDT) Date: Tue, 20 Jun 2023 13:00:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1687266051; 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=iQWwYgNWQFdPkD+2uT8p3Wf1mUDeQcjcVwJqecz8ss8=; b=zaTmYCNQnKN+YNnZZ208LviJu1xlo5l3PczYt1DJ3zg9tJQS1dbRFrFxJyLIqZiOQyZw7N P/CLrNURfFgXmAMw9u5AxqvVT9orAtYH5VRZwsQj80Co40mCUYSg+CEnfvjY9M3gB39X0l +vmE0s8kavXa6I7cj3GQEljWcadVjAPEI8eRz99uH0K9doq85xBeOhSnXciHSqF4PB8nCF ezf9px6duD9V18q18PwkTO0W//gpVv/FmJIhMOoVuoAJjRbO9rZgDj1pyxSqdL2oBVfIDF g1Jlp1fWfpPafn0MNVvYBlmphegOwuX3tII4/lwnOYyW1JiN5xdQu1zi5KOX3Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1687266051; 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=iQWwYgNWQFdPkD+2uT8p3Wf1mUDeQcjcVwJqecz8ss8=; b=ybV8hW6AERQjmzRMuNPzpq8Pxl67hQDOJjbc6nKndIeSNoulXC5NW99PwbC67eqPeSKfPw fH3FmqFGVURqdmDg== 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/core] x86/smp: Use dedicated cache-line for mwait_play_dead() Cc: Thomas Gleixner , Ashok Raj , "Borislav Petkov (AMD)" , stable@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230615193330.434553750@linutronix.de> References: <20230615193330.434553750@linutronix.de> MIME-Version: 1.0 Message-ID: <168726605135.404.14181848725041591301.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,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?1768802786264732393?= X-GMAIL-MSGID: =?utf-8?q?1769227745665882352?= The following commit has been merged into the x86/core branch of tip: Commit-ID: f9c9987bf52f4e42e940ae217333ebb5a4c3b506 Gitweb: https://git.kernel.org/tip/f9c9987bf52f4e42e940ae217333ebb5a4c3b506 Author: Thomas Gleixner AuthorDate: Thu, 15 Jun 2023 22:33:55 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 20 Jun 2023 14:51:47 +02:00 x86/smp: Use dedicated cache-line for mwait_play_dead() 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 MWAIT: kexec(). This is required 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) Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20230615193330.434553750@linutronix.de --- arch/x86/kernel/smpboot.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 352f0ce..c5ac5d7 100644 --- 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);