From patchwork Thu Jan 12 10:41:50 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: 42357 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3813315wrt; Thu, 12 Jan 2023 02:53:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXsEOCra1nc9WBDUSCe+kPXyTjSpFD5fhW0cyWUYw6iAp9mo1C6WIxrf3cDgfIxfxLa4jWHm X-Received: by 2002:a17:907:c24e:b0:7c0:1db5:ea10 with SMTP id tj14-20020a170907c24e00b007c01db5ea10mr82989925ejc.53.1673520794875; Thu, 12 Jan 2023 02:53:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673520794; cv=none; d=google.com; s=arc-20160816; b=pQqwXjEG6YasE1R4sQtRkKsvjTp5Ib2MRTYiM5l2ILXogwagNE0wsVHDtdcLreB90O sm43V21LmXfVNwZr9oK2f6rHlCTG0msHQtcdkP8w/OJjqDeqyzBPVdYZ5kcDHzTdZX4u GBm5xCN8c2fKBLK9SPmhRc7x/jQkLPqJF2Tc2ZErSxxVKiyIM8YPq94v3D4xtf1YTXbr rk0pdIyR8g8V4VMfjV3TCNiuXKOvERAJcKvaXZfDFwHwqM7sEcFdmj1fElOj3QSSb2Ih klFvG6TgalBql5PL30iPpU88Z1L/+jLGmE09hQX6Bld4VAz0wuTYPZzz3oRYOfaBIVAh XMUA== 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=l5SOEF2nIRTJ795tnPp75YTjnJZP/VrV7respELeucs=; b=dOhFuiP+mvRNOJcXAfGgfYQ9soz5Vrl1RHajkLy26C8ijufN7N/kU+GAUEiIj4lRWI kco2CB29By3239c3mXW3IXOV32rIfWN+I9wxkKsS4Q3NTmLOXnIF8d2cf1bQbq6yd6ln y/5o+1/o5Ak8WPEtvNw2y5ujZxOgdwBjG0Zfk9tp3oqcNWgXnG3YA8xLSjk90Wq5skeh B1Uev/xHySsyMuaIculuGBeAGvvJzT5QqX8nQpFlQDOdas9tVmk5BGIi/5NW7es7MC0u Olo6rtcfJ+D0vSpbP9iK2UrCoqPcq1bf5edUy/PypluJEtzD/3O+Mw2KSc4S5IJ8huJH UV4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ql2iUcEa; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 ht17-20020a170907609100b007adfe2889efsi17732906ejc.607.2023.01.12.02.52.49; Thu, 12 Jan 2023 02:53:14 -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=ql2iUcEa; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 S231992AbjALKuE (ORCPT + 99 others); Thu, 12 Jan 2023 05:50:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239761AbjALKtX (ORCPT ); Thu, 12 Jan 2023 05:49:23 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33D151E3D9; Thu, 12 Jan 2023 02:41:52 -0800 (PST) Date: Thu, 12 Jan 2023 10:41:50 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1673520110; 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=l5SOEF2nIRTJ795tnPp75YTjnJZP/VrV7respELeucs=; b=ql2iUcEacyAeNg3ed0/DCVsR2yKvru65exXlHzag8vwmLr0gYWG+jC77KwMrwUcQCaRytG GOhk45hUn79JUD/0QyOAfEn1S69d/3shrk+so8n8R13k+s21ci3C5Hj24EchYbQRM9Jad6 TcQlspgOuLk2Suz7RigySarrfkU8qvPfInXarzzPr0jCwvigY+P8HoWthn2rOXuOJhFhkb jVGi+qP7iYZK7zhuTCMrFCqs20/yGbEvonDXoKrKEvPH7y7XAA5+z0VzM8DEer4QYNipFh M18qx4Mc59KUzI/cOxy9HTnN0jXR//kKXhlMuVEXHK1Boi+iGX8WS0oA1CCWtg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1673520110; 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=l5SOEF2nIRTJ795tnPp75YTjnJZP/VrV7respELeucs=; b=icfSo/P/EnESWB8djUiftrSfc1pC/41ipvTrd862cD3pCQ52oAdu0Aom6CjamusJGPx9kY LYWWCDQimAH6BUCA== From: "tip-bot2 for Breno Leitao" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/bugs: Reset speculation control settings on init Cc: Pawan Gupta , Breno Leitao , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221128153148.1129350-1-leitao@debian.org> References: <20221128153148.1129350-1-leitao@debian.org> MIME-Version: 1.0 Message-ID: <167352011025.4906.15940595409237822889.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?1754813740751289849?= X-GMAIL-MSGID: =?utf-8?q?1754813740751289849?= The following commit has been merged into the x86/cpu branch of tip: Commit-ID: 0125acda7d76b943ca55811df40ed6ec0ecf670f Gitweb: https://git.kernel.org/tip/0125acda7d76b943ca55811df40ed6ec0ecf670f Author: Breno Leitao AuthorDate: Mon, 28 Nov 2022 07:31:48 -08:00 Committer: Borislav Petkov (AMD) CommitterDate: Thu, 12 Jan 2023 11:37:01 +01:00 x86/bugs: Reset speculation control settings on init Currently, x86_spec_ctrl_base is read at boot time and speculative bits are set if Kconfig items are enabled. For example, IBRS is enabled if CONFIG_CPU_IBRS_ENTRY is configured, etc. These MSR bits are not cleared if the mitigations are disabled. This is a problem when kexec-ing a kernel that has the mitigation disabled from a kernel that has the mitigation enabled. In this case, the MSR bits are not cleared during the new kernel boot. As a result, this might have some performance degradation that is hard to pinpoint. This problem does not happen if the machine is (hard) rebooted because the bit will be cleared by default. [ bp: Massage. ] Suggested-by: Pawan Gupta Signed-off-by: Breno Leitao Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20221128153148.1129350-1-leitao@debian.org --- arch/x86/include/asm/msr-index.h | 4 ++++ arch/x86/kernel/cpu/bugs.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 37ff475..cb359d6 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -49,6 +49,10 @@ #define SPEC_CTRL_RRSBA_DIS_S_SHIFT 6 /* Disable RRSBA behavior */ #define SPEC_CTRL_RRSBA_DIS_S BIT(SPEC_CTRL_RRSBA_DIS_S_SHIFT) +/* A mask for bits which the kernel toggles when controlling mitigations */ +#define SPEC_CTRL_MITIGATIONS_MASK (SPEC_CTRL_IBRS | SPEC_CTRL_STIBP | SPEC_CTRL_SSBD \ + | SPEC_CTRL_RRSBA_DIS_S) + #define MSR_IA32_PRED_CMD 0x00000049 /* Prediction Command */ #define PRED_CMD_IBPB BIT(0) /* Indirect Branch Prediction Barrier */ diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 19e1ce0..5f33704 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -145,9 +145,17 @@ void __init check_bugs(void) * have unknown values. AMD64_LS_CFG MSR is cached in the early AMD * init code as it is not enumerated and depends on the family. */ - if (boot_cpu_has(X86_FEATURE_MSR_SPEC_CTRL)) + if (cpu_feature_enabled(X86_FEATURE_MSR_SPEC_CTRL)) { rdmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base); + /* + * Previously running kernel (kexec), may have some controls + * turned ON. Clear them and let the mitigations setup below + * rediscover them based on configuration. + */ + x86_spec_ctrl_base &= ~SPEC_CTRL_MITIGATIONS_MASK; + } + /* Select the proper CPU mitigations before patching alternatives: */ spectre_v1_select_mitigation(); spectre_v2_select_mitigation();