This is a note to let you know that I've just added the patch titled
x86/microcode/intel: Look into the patch cache first
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-microcode-intel-look-into-the-patch-cache-first.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From d8c3b52c00a05036e0a6b315b4b17921a7b67997 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@xxxxxxx>
Date: Wed, 28 Feb 2018 11:28:44 +0100
Subject: x86/microcode/intel: Look into the patch cache first
From: Borislav Petkov <bp@xxxxxxx>
commit d8c3b52c00a05036e0a6b315b4b17921a7b67997 upstream.
The cache might contain a newer patch - look in there first.
A follow-on change will make sure newest patches are loaded into the
cache of microcode patches.
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Tested-by: Tom Lendacky <thomas.lendacky@xxxxxxx>
Tested-by: Ashok Raj <ashok.raj@xxxxxxxxx>
Cc: Arjan Van De Ven <arjan.van.de.ven@xxxxxxxxx>
Link: https://lkml.kernel.org/r/20180228102846.13447-6-bp@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/cpu/microcode/intel.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -791,9 +791,9 @@ static int collect_cpu_info(int cpu_num,
static enum ucode_state apply_microcode_intel(int cpu)
{
- struct microcode_intel *mc;
- struct ucode_cpu_info *uci;
+ struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
struct cpuinfo_x86 *c = &cpu_data(cpu);
+ struct microcode_intel *mc;
static int prev_rev;
u32 rev;
@@ -801,11 +801,10 @@ static enum ucode_state apply_microcode_
if (WARN_ON(raw_smp_processor_id() != cpu))
return UCODE_ERROR;
- uci = ucode_cpu_info + cpu;
- mc = uci->mc;
+ /* Look for a newer patch in our cache: */
+ mc = find_patch(uci);
if (!mc) {
- /* Look for a newer patch in our cache: */
- mc = find_patch(uci);
+ mc = uci->mc;
if (!mc)
return UCODE_NFOUND;
}
Patches currently in stable-queue which might be from bp@xxxxxxx are
queue-4.15/x86-microcode-intel-check-microcode-revision-before-updating-sibling-threads.patch
queue-4.15/x86-microcode-attempt-late-loading-only-when-new-microcode-is-present.patch
queue-4.15/x86-microcode-propagate-return-value-from-updating-functions.patch
queue-4.15/x86-cpu-check-cpu-feature-bits-after-microcode-upgrade.patch
queue-4.15/x86-microcode-intel-writeback-and-invalidate-caches-before-updating-microcode.patch
queue-4.15/x86-microcode-intel-look-into-the-patch-cache-first.patch
queue-4.15/edac-mv64x60-fix-an-error-handling-path.patch
queue-4.15/x86-microcode-request-microcode-on-the-bsp.patch
queue-4.15/x86-microcode-get-rid-of-struct-apply_microcode_ctx.patch
queue-4.15/x86-microcode-fix-cpu-synchronization-routine.patch
queue-4.15/x86-microcode-synchronize-late-microcode-loading.patch
queue-4.15/x86-microcode-do-not-upload-microcode-if-cpus-are-offline.patch
queue-4.15/x86-cpu-add-a-microcode-loader-callback.patch