From patchwork Mon Jun 5 14:13:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 103298 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2724891vqr; Mon, 5 Jun 2023 07:27:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4mZyZz9UGcsnfV/PWZ2glPZ3J8sKyuom0WWVELraKAhjR34nPsU2Tw1uLI0geuKiKZQtVM X-Received: by 2002:a17:902:ed02:b0:1a9:6dfb:4b09 with SMTP id b2-20020a170902ed0200b001a96dfb4b09mr2901315pld.67.1685975257619; Mon, 05 Jun 2023 07:27:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685975257; cv=none; d=google.com; s=arc-20160816; b=PyMdp++4Y4B7wrhLtGhkx9uABmf8MBGTE8IHQTYkg4tIhGNiUsim2W57Ydf9aZOwhg 12QBzc5f0n/7bZNbFujtVA61MAnnkgVXDwDYenlegTjcHw60+AHo3TKljh/70U1AZVai 5NwGS/LOt37+Mcv6VBhE49F50haK+vfcCQ0gPpsN4nj+Is4e2xGFZP2pawqDRpX15zy4 u2YNE7CzAdf8JeYa8cMpRNUb8XL8djAInEUbM+fJUUQEzPlOQVOzTqk8nPdL6aQ0RCj0 R+FS943LUQRr+85c64opzyk0yFs0hJiqMrm3jvHX/HTQ6Wjkir7xVREmauh+imx3AxZm LtQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=SGE4tUC1sWwRR9jCAS9yVbQ5aa6kFGDoLqc9u9ISFFA=; b=o0koJpF6cKI9auXTGM7LwqBmvpA1wqG3jm6xxLEE/PWdz9vf7RJQvAAWtsFH9cdyyT B/2rFbFym4TH4awrRotFTKRfG6E32GqsRraf1+u82tya/QX71mqLmMQIiI61mxt0H/Ej s2IqCB281tSQeDGwsa5rn6Z6r//GVQVTFX9WN6e6Hr6FqffZ+Pv7+NdiE30rOdlNmeqv TwqrtX1Yw0KNxNzOOrWmT32RKqirFHCaKW2Nd7Yp2r4wOhnn6mzWO7k21VZcEgQYr4Dx rjT60zFyaVjjbntmPq2K0oXb3N//kPIEU8xpg4QKicESuUgflqy0q2jd2obxwVoZZMXY ke5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=temperror (no key for signature) header.i=@alien8.de header.s=dkim header.b=RHp12ldR; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i14-20020a170902c94e00b001a1e0fd406csi5657191pla.217.2023.06.05.07.27.16; Mon, 05 Jun 2023 07:27:37 -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=temperror (no key for signature) header.i=@alien8.de header.s=dkim header.b=RHp12ldR; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229938AbjFEOPc (ORCPT + 99 others); Mon, 5 Jun 2023 10:15:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232019AbjFEOOb (ORCPT ); Mon, 5 Jun 2023 10:14:31 -0400 Received: from mail.skyhub.de (mail.skyhub.de [IPv6:2a01:4f8:190:11c2::b:1457]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F48D1989 for ; Mon, 5 Jun 2023 07:13:43 -0700 (PDT) Received: from zn.tnic (pd9530d32.dip0.t-ipconnect.de [217.83.13.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 11D101EC05F5; Mon, 5 Jun 2023 16:13:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1685974420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=SGE4tUC1sWwRR9jCAS9yVbQ5aa6kFGDoLqc9u9ISFFA=; b=RHp12ldRdB2HIWsI7lnO3WJwQLYybgFayOW3XeqzdUvxwgGUwdalT9iMi0MpdrQWj6eC+K z0tKd3s4r55ZmVPbAzgsteuezQ98wDKuIYvC9fe9rcLhfPOqq+W2jWVTDt5RWDVm7ItWK5 vzS0eBjUzHWAsHY3skF+Ciim6NOppDM= From: Borislav Petkov To: X86 ML Cc: LKML , stable@kernel.org Subject: [PATCH 1/2] x86/microcode/AMD: Load late on both threads too Date: Mon, 5 Jun 2023 16:13:31 +0200 Message-Id: <20230605141332.25948-1-bp@alien8.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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?1767873191944139701?= X-GMAIL-MSGID: =?utf-8?q?1767873191944139701?= From: "Borislav Petkov (AMD)" Do the same as early loading - load on both threads. Signed-off-by: Borislav Petkov (AMD) Cc: --- arch/x86/kernel/cpu/microcode/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index f14f4ea0b537..87208e46f7ed 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -700,7 +700,7 @@ static enum ucode_state apply_microcode_amd(int cpu) rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy); /* need to apply patch? */ - if (rev >= mc_amd->hdr.patch_id) { + if (rev > mc_amd->hdr.patch_id) { ret = UCODE_OK; goto out; } From patchwork Mon Jun 5 14:13:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 103299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2725081vqr; Mon, 5 Jun 2023 07:27:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ISXtmN5o19vtd6eYFi21WbAg5IiVBqYdmb3KEdNiY2mWQScrQ70AW+Ooz+kAp07za2ocg X-Received: by 2002:a05:6a21:78a3:b0:10f:3fa0:fd8e with SMTP id bf35-20020a056a2178a300b0010f3fa0fd8emr2668880pzc.27.1685975278105; Mon, 05 Jun 2023 07:27:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685975278; cv=none; d=google.com; s=arc-20160816; b=lSg3pfjiTiePCGY22dJWkDipLwbBzYm8ZYSRZpAP0KoPFYYZCOwQkoLN17woIJmC58 7nTa642HINmukwd5wOLxMmCMQu8D/m2RRWHbZd1ex5uAUJg6KqMqgBjlHp+I0DTXjLZo 4eN9c0WUD1FrHZvuaZNJTJwkgwz1iBPyYaWnDv9rX00DL0rSce0731GY3pcteOFwqSEu R7/GIZhebY+xj44fLF2IKYV1ofMeTv7y+1HiZs6vMqkX/4d0UVHmHRmfCsL2LR6U906F PeviO4ZHzHd5j7c1Hsb3Gc88ApQo5Jn0wqeYwINxqKY9EoXb0A0e3w4vaV00K8CJzlqw /NdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YhyAZLEUyE1A2LYVBDZDDCS94zaRZtJ6Q0ck7+veq5o=; b=DFrPqRasDO5GGD4LXT1MLQHz6MmgQoyir6GvspKhOqz2q0wirb/fOCTvcVgRsEH44T bXFIyQ7f5a3WqKN9/JtSJKe4INbIDrOaxuMi+AMkCLNrxXoif4XjypZghObBh70p77zI zOmzbcHom/T6kQwF93PNK0OGVQTyr+nUc0mTvDQnde4qX/MDUzSTlJLpdBnwY1yv5bHN zBhseDV1mStAu85ZvW0/rOgwc+cFgPwhB381VjJbFB5Q5sIWt5q1YO6mQ2W/ur9Zn2vT sbj/2/F6PbIVjj6juZe/FLOkH/1O3yW7Da09407+c3swIuhrF0rXpWwSiKHjdKefTtxP Aq7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=temperror (no key for signature) header.i=@alien8.de header.s=dkim header.b="M8os/lB5"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a24-20020aa795b8000000b0063b8935bcbasi5172942pfk.310.2023.06.05.07.27.46; Mon, 05 Jun 2023 07:27:58 -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=temperror (no key for signature) header.i=@alien8.de header.s=dkim header.b="M8os/lB5"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233190AbjFEOPm (ORCPT + 99 others); Mon, 5 Jun 2023 10:15:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234539AbjFEOOp (ORCPT ); Mon, 5 Jun 2023 10:14:45 -0400 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5BE0E5E for ; Mon, 5 Jun 2023 07:13:52 -0700 (PDT) Received: from zn.tnic (pd9530d32.dip0.t-ipconnect.de [217.83.13.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 89EF01EC0645; Mon, 5 Jun 2023 16:13:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1685974420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YhyAZLEUyE1A2LYVBDZDDCS94zaRZtJ6Q0ck7+veq5o=; b=M8os/lB5hFhUZ2O2UhLjGnoWNWEBICJ6j2vNJRaPePD5/W9t25vOSNShyhTbZ/bHpp/kDx AjzE7ykhqBpUsXIVQrGwy0CwDbd76L2oV3Te26dSreWiitqXonu7nKTTOJgXqU8XNkDOyc Jy+qIgZPX5yebRA8B3Uh8m7ppvwxsWE= From: Borislav Petkov To: X86 ML Cc: LKML Subject: [PATCH 2/2] x86/microcode: Add a "microcode=" command line option Date: Mon, 5 Jun 2023 16:13:32 +0200 Message-Id: <20230605141332.25948-2-bp@alien8.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230605141332.25948-1-bp@alien8.de> References: <20230605141332.25948-1-bp@alien8.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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?1767873213316243106?= X-GMAIL-MSGID: =?utf-8?q?1767873213316243106?= From: "Borislav Petkov (AMD)" It will be used to control microcode loader behavior. Add the first chicken bit: to control whether the AMD side should load microcode late on all logical SMT threads. Signed-off-by: Borislav Petkov (AMD) --- .../admin-guide/kernel-parameters.txt | 7 +++ arch/x86/kernel/cpu/microcode/amd.c | 5 ++- arch/x86/kernel/cpu/microcode/core.c | 44 +++++++++++++++++++ arch/x86/kernel/cpu/microcode/internal.h | 16 +++++++ 4 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 arch/x86/kernel/cpu/microcode/internal.h diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 9e5bab29685f..b88ff022402c 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3228,6 +3228,13 @@ mga= [HW,DRM] + microcode= [X86] Control the behavior of the microcode + loader. Available options: + + no_late_all - do not load on all SMT threads on + AMD. Loading on all logical threads is enabled by + default. + min_addr=nn[KMG] [KNL,BOOT,IA-64] All physical memory below this physical address is ignored. diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 87208e46f7ed..76b530697951 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -36,6 +36,8 @@ #include #include +#include "internal.h" + static struct equiv_cpu_table { unsigned int num_entries; struct equiv_cpu_entry *entry; @@ -700,7 +702,8 @@ static enum ucode_state apply_microcode_amd(int cpu) rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy); /* need to apply patch? */ - if (rev > mc_amd->hdr.patch_id) { + if ((rev > mc_amd->hdr.patch_id) || + (rev == mc_amd->hdr.patch_id && !(control & LATE_ALL_THREADS))) { ret = UCODE_OK; goto out; } diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 3afcf3de0dd4..5f3185d2814c 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -40,11 +40,15 @@ #include #include +#include "internal.h" + #define DRIVER_VERSION "2.2" static struct microcode_ops *microcode_ops; static bool dis_ucode_ldr = true; +unsigned long control = LATE_ALL_THREADS; + bool initrd_gone; LIST_HEAD(microcode_cache); @@ -522,8 +526,32 @@ static ssize_t processor_flags_show(struct device *dev, return sprintf(buf, "0x%x\n", uci->cpu_sig.pf); } +static ssize_t control_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sprintf(buf, "0x%lx\n", control); +} + +static ssize_t control_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + unsigned long val; + + if (kstrtoul(buf, 0, &val) < 0) + return -ERANGE; + + if (val & CONTROL_FLAGS_MASK) + return -EINVAL; + + control = val; + + return count; +} + static DEVICE_ATTR_RO(version); static DEVICE_ATTR_RO(processor_flags); +static DEVICE_ATTR_ADMIN_RW(control); static struct attribute *mc_default_attrs[] = { &dev_attr_version.attr, @@ -622,6 +650,7 @@ static struct attribute *cpu_root_microcode_attrs[] = { #ifdef CONFIG_MICROCODE_LATE_LOADING &dev_attr_reload.attr, #endif + &dev_attr_control.attr, NULL }; @@ -683,3 +712,18 @@ static int __init microcode_init(void) } fs_initcall(save_microcode_in_initrd); late_initcall(microcode_init); + +static int __init parse_cmdline_param(char *str) +{ + if (!str) + return 0; + + if (*str == '=') + str++; + + if (!strcmp(str, "no_late_all")) + control &= ~LATE_ALL_THREADS; + + return 1; +} +__setup("microcode", parse_cmdline_param); diff --git a/arch/x86/kernel/cpu/microcode/internal.h b/arch/x86/kernel/cpu/microcode/internal.h new file mode 100644 index 000000000000..5e3c5fc3851f --- /dev/null +++ b/arch/x86/kernel/cpu/microcode/internal.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __X86_MICROCODE_INTERNAL_H__ +#define __X86_MICROCODE_INTERNAL_H__ + +extern unsigned long control; + +/* Loader control flags. */ +enum control_flags { + __LATE_ALL_THREADS = 0, + __CONTROL_FLAGS_NUM, +}; + +#define LATE_ALL_THREADS BIT_ULL(__LATE_ALL_THREADS) +#define CONTROL_FLAGS_MASK ~(BIT_ULL(__CONTROL_FLAGS_NUM) - 1) + +#endif /* __X86_MICROCODE_INTERNAL_H__ */