From: Ashok Raj <ashok.raj@intel.com>
To: Borislav Petkov <bp@alien8.de>, Thomas Gleixner <tglx@linutronix.de>
Cc: Ashok Raj <ashok.raj@intel.com>,
LKML <linux-kernel@vger.kernel.org>, x86 <x86@kernel.org>,
Ingo Molnar <mingo@kernel.org>, Tony Luck <tony.luck@intel.com>,
Dave Hansen <dave.hansen@intel.com>,
Alison Schofield <alison.schofield@intel.com>,
Reinette Chatre <reinette.chatre@intel.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Stefan Talpalaru <stefantalpalaru@yahoo.com>,
David Woodhouse <dwmw2@infradead.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Jonathan Corbet <corbet@lwn.net>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Peter Zilstra <peterz@infradead.org>,
Andy Lutomirski <luto@kernel.org>,
Andrew Cooper <Andrew.Cooper3@citrix.com>
Subject: [Patch v3 Part2 9/9] x86/microcode: Provide an option to override minrev enforcement
Date: Mon, 30 Jan 2023 13:39:55 -0800 [thread overview]
Message-ID: <20230130213955.6046-10-ashok.raj@intel.com> (raw)
In-Reply-To: <20230130213955.6046-1-ashok.raj@intel.com>
Minimum Required Revision (minrev) is enforced strictly. All new patches
will have a minrev that is not zero. But there might be a transition time
for some that need this enforcement to be relaxed.
When the override is enabled, the kernel will be tainted.
Provide a debugfs variable to override the minrev enforcement.
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Cc: LKML <linux-kernel@vger.kernel.org>
Cc: x86 <x86@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Alison Schofield <alison.schofield@intel.com>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Cc: Thomas Gleixner (Intel) <tglx@linutronix.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Stefan Talpalaru <stefantalpalaru@yahoo.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Cc: Peter Zilstra (Intel) <peterz@infradead.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Andrew Cooper <Andrew.Cooper3@citrix.com>
---
arch/x86/include/asm/microcode.h | 2 ++
arch/x86/kernel/cpu/microcode/core.c | 15 +++++++++++++--
arch/x86/kernel/cpu/microcode/intel.c | 8 ++++++++
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 3d48143e84a9..d82f22d50ebd 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -16,6 +16,8 @@ struct ucode_patch {
extern struct list_head microcode_cache;
+extern bool override_minrev;
+
struct cpu_signature {
unsigned int sig;
unsigned int pf;
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index be5d70396b79..dbcccbd46ab8 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -23,6 +23,7 @@
#include <linux/miscdevice.h>
#include <linux/capability.h>
#include <linux/firmware.h>
+#include <linux/debugfs.h>
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/mutex.h>
@@ -43,7 +44,9 @@
#define DRIVER_VERSION "2.2"
static struct microcode_ops *microcode_ops;
+static struct dentry *dentry_ucode;
static bool dis_ucode_ldr = true;
+bool override_minrev;
bool initrd_gone;
@@ -494,7 +497,11 @@ static ssize_t reload_store(struct device *dev,
pr_err("Attempting late microcode loading - it is dangerous and taints the kernel.\n");
pr_err("You should switch to early loading, if possible.\n");
ret = -EINVAL;
- goto put;
+
+ if (!override_minrev)
+ goto put;
+
+ pr_info("Overriding minrev\n");
}
tmp_ret = microcode_ops->request_microcode_fw(bsp, µcode_pdev->dev);
@@ -519,7 +526,7 @@ static ssize_t reload_store(struct device *dev,
*/
if (load_ret == 0) {
ret = size;
- if (!safe_late_load) {
+ if (!safe_late_load || override_minrev) {
add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_STILL_OK);
pr_warn("Microcode late loading tainted the kernel\n");
}
@@ -692,7 +699,11 @@ static int __init microcode_init(void)
cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/microcode:online",
mc_cpu_online, mc_cpu_down_prep);
+ dentry_ucode = debugfs_create_dir("microcode", NULL);
+ debugfs_create_bool("override_minrev", 0644, dentry_ucode, &override_minrev);
+
pr_info("Microcode Update Driver: v%s.", DRIVER_VERSION);
+ pr_info("Override minrev %s\n", override_minrev ? "enabled" : "disabled");
return 0;
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index 601c586be7b6..ec5a29ebee8e 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -139,6 +139,14 @@ static int is_lateload_safe(struct microcode_header_intel *mc_header)
{
struct ucode_cpu_info uci;
+ /*
+ * If minrev is bypassed via debugfs, then allow late-load.
+ */
+ if (override_minrev) {
+ pr_info("Bypassing minrev enforcement via debugfs\n");
+ return 0;
+ }
+
/*
* When late-loading, ensure the header declares a minimum revision
* required to perform a late-load.
--
2.37.2
prev parent reply other threads:[~2023-01-30 21:40 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-30 21:39 [Patch v3 Part2 0/9] x86/microcode: Declare microcode safe for late loading Ashok Raj
2023-01-30 21:39 ` [Patch v3 Part2 1/9] x86/microcode: Taint kernel only if microcode loading was successful Ashok Raj
2023-01-31 11:50 ` Borislav Petkov
2023-01-31 16:51 ` Ashok Raj
2023-01-31 20:20 ` Borislav Petkov
2023-01-31 22:54 ` Ashok Raj
2023-02-01 12:44 ` Borislav Petkov
2023-02-01 15:42 ` Ashok Raj
2023-02-01 21:47 ` Ashok Raj
2023-02-01 22:06 ` Borislav Petkov
2023-02-01 22:19 ` Ashok Raj
2023-02-01 22:26 ` Borislav Petkov
2023-01-31 12:17 ` Li, Aubrey
2023-01-31 15:32 ` Ashok Raj
2023-01-30 21:39 ` [Patch v3 Part2 2/9] x86/microcode: Report invalid writes to reload sysfs file Ashok Raj
2023-01-31 15:57 ` [tip: x86/microcode] x86/microcode: Allow only "1" as a late reload trigger value tip-bot2 for Ashok Raj
2023-01-30 21:39 ` [Patch v3 Part2 3/9] x86/microcode/intel: Fix collect_cpu_info() to reflect current microcode Ashok Raj
2023-01-31 16:48 ` Borislav Petkov
2023-01-31 17:34 ` Luck, Tony
2023-01-31 17:41 ` Ashok Raj
2023-01-31 20:40 ` Borislav Petkov
2023-01-31 20:49 ` Luck, Tony
2023-01-31 21:08 ` Borislav Petkov
2023-01-31 22:32 ` Ashok Raj
2023-01-31 22:43 ` Luck, Tony
2023-02-01 12:53 ` Borislav Petkov
2023-02-01 15:13 ` Ashok Raj
2023-02-01 15:25 ` Borislav Petkov
2023-02-01 16:15 ` Luck, Tony
2023-02-01 19:13 ` Dave Hansen
2023-02-01 19:32 ` Ashok Raj
2023-01-30 21:39 ` [Patch v3 Part2 4/9] x86/microcode: Do not call apply_microcode() on sibling threads Ashok Raj
2023-02-01 22:21 ` Dave Hansen
2023-02-01 22:40 ` Borislav Petkov
2023-02-02 2:51 ` Ashok Raj
2023-02-02 9:40 ` Borislav Petkov
2023-02-02 16:34 ` Ashok Raj
2023-01-30 21:39 ` [Patch v3 Part2 5/9] x86/microcode: Move late load warning to the same function that taints kernel Ashok Raj
2023-01-30 21:39 ` [Patch v3 Part2 6/9] x86/microcode/intel: Add minimum required revision to microcode header Ashok Raj
2023-01-30 21:39 ` [Patch v3 Part2 7/9] x86/microcode: Add a generic mechanism to declare support for minrev Ashok Raj
2023-01-30 21:39 ` [Patch v3 Part2 8/9] x86/microcode/intel: Drop wbinvd() from microcode loading Ashok Raj
2023-01-30 21:39 ` Ashok Raj [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230130213955.6046-10-ashok.raj@intel.com \
--to=ashok.raj@intel.com \
--cc=Andrew.Cooper3@citrix.com \
--cc=alison.schofield@intel.com \
--cc=benh@kernel.crashing.org \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=dave.hansen@intel.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rafael@kernel.org \
--cc=reinette.chatre@intel.com \
--cc=stefantalpalaru@yahoo.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).