Skip to contentSkip to conversation

x86/microcode tree changes for v3.19

GIT PULL Ingo Molnar 3 participants 6 messages Dec 9, 2014 – Dec 11, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-microcode-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-microcode-for-linus

# HEAD: e913b8cd4548cd0a407b7debd6ec9104e84d050d Merge tag 'microcode_fixes_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/microcode

The main changes in this cycle are:

- Reload microcode when resuming and the case when only the early loader has been utilized. (Borislav Petkov)

- Also, do not load the driver on paravirt guests. (Boris Ostrovsky)

Thanks,

Ingo

------------------>
Boris Ostrovsky (1):
x86, microcode: Don't initialize microcode code on paravirt

Borislav Petkov (3):
x86, microcode, AMD: Do not use smp_processor_id() in preemtible context x86, microcode, intel: Drop unused parameter
x86, microcode: Reload microcode on resume

 arch/x86/include/asm/microcode.h            |  2 ++
 arch/x86/include/asm/microcode_amd.h        |  4 ++-
 arch/x86/include/asm/microcode_intel.h      |  2 ++
 arch/x86/kernel/cpu/microcode/amd.c         |  8 ++---
 arch/x86/kernel/cpu/microcode/amd_early.c   | 20 +++++++++++-
 arch/x86/kernel/cpu/microcode/core.c        | 10 ++----
 arch/x86/kernel/cpu/microcode/core_early.c  | 21 +++++++++++++
 arch/x86/kernel/cpu/microcode/intel_early.c | 48 +++++++++++++++++++++++------
 8 files changed, 91 insertions(+), 24 deletions(-)
arch/x86/include/asm/microcode.h +2 -0
index 64dc362506b7..201b520521ed 100644
@@ -78,6 +78,7 @@ static inline void __exit exit_amd_microcode(void) {}
 extern void __init load_ucode_bsp(void);
 extern void load_ucode_ap(void);
 extern int __init save_microcode_in_initrd(void);
+void reload_early_microcode(void);
 #else
 static inline void __init load_ucode_bsp(void) {}
 static inline void load_ucode_ap(void) {}
@@ -85,6 +86,7 @@ static inline int __init save_microcode_in_initrd(void)
 {
 	return 0;
 }
+static inline void reload_early_microcode(void) {}
 #endif
 
 #endif /* _ASM_X86_MICROCODE_H */
arch/x86/include/asm/microcode_amd.h +3 -1
index b7b10b82d3e5..af935397e053 100644
@@ -59,7 +59,7 @@ static inline u16 find_equiv_id(struct equiv_cpu_entry *equiv_cpu_table,
 
 extern int __apply_microcode_amd(struct microcode_amd *mc_amd);
 extern int apply_microcode_amd(int cpu);
-extern enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size);
+extern enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size);
 
 #define PATCH_MAX_SIZE PAGE_SIZE
 extern u8 amd_ucode_patch[PATCH_MAX_SIZE];
@@ -68,10 +68,12 @@ extern u8 amd_ucode_patch[PATCH_MAX_SIZE];
 extern void __init load_ucode_amd_bsp(void);
 extern void load_ucode_amd_ap(void);
 extern int __init save_microcode_in_initrd_amd(void);
+void reload_ucode_amd(void);
 #else
 static inline void __init load_ucode_amd_bsp(void) {}
 static inline void load_ucode_amd_ap(void) {}
 static inline int __init save_microcode_in_initrd_amd(void) { return -EINVAL; }
+void reload_ucode_amd(void) {}
 #endif
 
 #endif /* _ASM_X86_MICROCODE_AMD_H */
arch/x86/include/asm/microcode_intel.h +2 -0
index bbe296e0bce1..dd4c20043ce7 100644
@@ -68,11 +68,13 @@ extern void __init load_ucode_intel_bsp(void);
 extern void load_ucode_intel_ap(void);
 extern void show_ucode_info_early(void);
 extern int __init save_microcode_in_initrd_intel(void);
+void reload_ucode_intel(void);
 #else
 static inline __init void load_ucode_intel_bsp(void) {}
 static inline void load_ucode_intel_ap(void) {}
 static inline void show_ucode_info_early(void) {}
 static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL; }
+static inline void reload_ucode_intel(void) {}
 #endif
 
 #if defined(CONFIG_MICROCODE_INTEL_EARLY) && defined(CONFIG_HOTPLUG_CPU)
arch/x86/kernel/cpu/microcode/amd.c +4 -4
index 8fffd845e22b..bfbbe6195e2d 100644
@@ -376,7 +376,7 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data,
 	return UCODE_OK;
 }
 
-enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size)
+enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size)
 {
 	enum ucode_state ret;
 
@@ -390,8 +390,8 @@ enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size)
 
 #if defined(CONFIG_MICROCODE_AMD_EARLY) && defined(CONFIG_X86_32)
 	/* save BSP's matching patch for early load */
-	if (cpu_data(smp_processor_id()).cpu_index == boot_cpu_data.cpu_index) {
-		struct ucode_patch *p = find_patch(smp_processor_id());
+	if (cpu_data(cpu).cpu_index == boot_cpu_data.cpu_index) {
+		struct ucode_patch *p = find_patch(cpu);
 		if (p) {
 			memset(amd_ucode_patch, 0, PATCH_MAX_SIZE);
 			memcpy(amd_ucode_patch, p->data, min_t(u32, ksize(p->data),
@@ -444,7 +444,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device,
 		goto fw_release;
 	}
 
-	ret = load_microcode_amd(c->x86, fw->data, fw->size);
+	ret = load_microcode_amd(cpu, c->x86, fw->data, fw->size);
 
  fw_release:
 	release_firmware(fw);
arch/x86/kernel/cpu/microcode/amd_early.c +19 -1
index 06674473b0e6..737737edbd1e 100644
@@ -389,7 +389,7 @@ int __init save_microcode_in_initrd_amd(void)
 	eax   = cpuid_eax(0x00000001);
 	eax   = ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff);
 
-	ret = load_microcode_amd(eax, container, container_size);
+	ret = load_microcode_amd(smp_processor_id(), eax, container, container_size);
 	if (ret != UCODE_OK)
 		retval = -EINVAL;
 
@@ -402,3 +402,21 @@ int __init save_microcode_in_initrd_amd(void)
 
 	return retval;
 }
+
+void reload_ucode_amd(void)
+{
+	struct microcode_amd *mc;
+	u32 rev, eax;
+
+	rdmsr(MSR_AMD64_PATCH_LEVEL, rev, eax);
+
+	mc = (struct microcode_amd *)amd_ucode_patch;
+
+	if (mc && rev < mc->hdr.patch_id) {
+		if (!__apply_microcode_amd(mc)) {
+			ucode_new_rev = mc->hdr.patch_id;
+			pr_info("microcode: reload patch_level=0x%08x\n",
+				ucode_new_rev);
+		}
+	}
+}
arch/x86/kernel/cpu/microcode/core.c +2 -8
index 2ce9051174e6..15c29096136b 100644
@@ -466,13 +466,7 @@ static void mc_bp_resume(void)
 	if (uci->valid && uci->mc)
 		microcode_ops->apply_microcode(cpu);
 	else if (!uci->mc)
-		/*
-		 * We might resume and not have applied late microcode but still
-		 * have a newer patch stashed from the early loader. We don't
-		 * have it in uci->mc so we have to load it the same way we're
-		 * applying patches early on the APs.
-		 */
-		load_ucode_ap();
+		reload_early_microcode();
 }
 
 static struct syscore_ops mc_syscore_ops = {
@@ -557,7 +551,7 @@ static int __init microcode_init(void)
 	struct cpuinfo_x86 *c = &cpu_data(0);
 	int error;
 
-	if (dis_ucode_ldr)
+	if (paravirt_enabled() || dis_ucode_ldr)
 		return 0;
 
 	if (c->x86_vendor == X86_VENDOR_INTEL)
arch/x86/kernel/cpu/microcode/core_early.c +21 -0
index 2c017f242a78..d45df4bd16ab 100644
@@ -176,3 +176,24 @@ int __init save_microcode_in_initrd(void)
 
 	return 0;
 }
+
+void reload_early_microcode(void)
+{
+	int vendor, x86;
+
+	vendor = x86_vendor();
+	x86 = x86_family();
+
+	switch (vendor) {
+	case X86_VENDOR_INTEL:
+		if (x86 >= 6)
+			reload_ucode_intel();
+		break;
+	case X86_VENDOR_AMD:
+		if (x86 >= 0x10)
+			reload_ucode_amd();
+		break;
+	default:
+		break;
+	}
+}
arch/x86/kernel/cpu/microcode/intel_early.c +38 -10

103 lines not on this page · raw message

#1 lore raw
Quoted 8 lines · Ingo Molnar

Linus,

Please pull the latest x86-microcode-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-microcode-for-linus

   # HEAD: e913b8cd4548cd0a407b7debd6ec9104e84d050d Merge tag 'microcode_fixes_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/microcode
Quoted 7 lines

The main changes in this cycle are:

- Reload microcode when resuming and the case when only the early loader has been utilized. (Borislav Petkov)

- Also, do not load the driver on paravirt guests. (Boris Ostrovsky)

There's one more fix from Boris that I forgot to apply - find the updated pull request below.

(If you already pulled the previous tree then you can safely pull this tree on top of it.)

Thanks,

Ingo

=====================================>

Linus,

Please pull the latest x86-microcode-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-microcode-for-linus

# HEAD: 25cdb9c86826f8d035d8aaa07fc36832e76bd8a0 x86/microcode/intel: Fish out the stashed microcode for the BSP

The main changes in this cycle are:

- Reload microcode when resuming and the case when only the early loader has been utilized. (Borislav Petkov)

- Also, do not load the driver on paravirt guests. (Boris Ostrovsky)

Thanks,

Ingo

------------------>
Boris Ostrovsky (1):
x86, microcode: Don't initialize microcode code on paravirt

Borislav Petkov (4):
x86, microcode, AMD: Do not use smp_processor_id() in preemtible context x86, microcode, intel: Drop unused parameter
x86, microcode: Reload microcode on resume x86/microcode/intel: Fish out the stashed microcode for the BSP

 arch/x86/include/asm/microcode.h            |  2 ++
 arch/x86/include/asm/microcode_amd.h        |  4 ++-
 arch/x86/include/asm/microcode_intel.h      |  2 ++
 arch/x86/kernel/cpu/microcode/amd.c         |  8 +++---
 arch/x86/kernel/cpu/microcode/amd_early.c   | 20 +++++++++++++-
 arch/x86/kernel/cpu/microcode/core.c        | 10 ++-----
 arch/x86/kernel/cpu/microcode/core_early.c  | 21 +++++++++++++++
 arch/x86/kernel/cpu/microcode/intel_early.c | 42 +++++++++++++++++++++++------
 8 files changed, 87 insertions(+), 22 deletions(-)
arch/x86/include/asm/microcode.h +2 -0
index 64dc362506b7..201b520521ed 100644
@@ -78,6 +78,7 @@ static inline void __exit exit_amd_microcode(void) {}
 extern void __init load_ucode_bsp(void);
 extern void load_ucode_ap(void);
 extern int __init save_microcode_in_initrd(void);
+void reload_early_microcode(void);
 #else
 static inline void __init load_ucode_bsp(void) {}
 static inline void load_ucode_ap(void) {}
@@ -85,6 +86,7 @@ static inline int __init save_microcode_in_initrd(void)
 {
 	return 0;
 }
+static inline void reload_early_microcode(void) {}
 #endif
 
 #endif /* _ASM_X86_MICROCODE_H */
arch/x86/include/asm/microcode_amd.h +3 -1
index b7b10b82d3e5..af935397e053 100644
@@ -59,7 +59,7 @@ static inline u16 find_equiv_id(struct equiv_cpu_entry *equiv_cpu_table,
 
 extern int __apply_microcode_amd(struct microcode_amd *mc_amd);
 extern int apply_microcode_amd(int cpu);
-extern enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size);
+extern enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size);
 
 #define PATCH_MAX_SIZE PAGE_SIZE
 extern u8 amd_ucode_patch[PATCH_MAX_SIZE];
@@ -68,10 +68,12 @@ extern u8 amd_ucode_patch[PATCH_MAX_SIZE];
 extern void __init load_ucode_amd_bsp(void);
 extern void load_ucode_amd_ap(void);
 extern int __init save_microcode_in_initrd_amd(void);
+void reload_ucode_amd(void);
 #else
 static inline void __init load_ucode_amd_bsp(void) {}
 static inline void load_ucode_amd_ap(void) {}
 static inline int __init save_microcode_in_initrd_amd(void) { return -EINVAL; }
+void reload_ucode_amd(void) {}
 #endif
 
 #endif /* _ASM_X86_MICROCODE_AMD_H */
arch/x86/include/asm/microcode_intel.h +2 -0
index bbe296e0bce1..dd4c20043ce7 100644
@@ -68,11 +68,13 @@ extern void __init load_ucode_intel_bsp(void);
 extern void load_ucode_intel_ap(void);
 extern void show_ucode_info_early(void);
 extern int __init save_microcode_in_initrd_intel(void);
+void reload_ucode_intel(void);
 #else
 static inline __init void load_ucode_intel_bsp(void) {}
 static inline void load_ucode_intel_ap(void) {}
 static inline void show_ucode_info_early(void) {}
 static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL; }
+static inline void reload_ucode_intel(void) {}
 #endif
 
 #if defined(CONFIG_MICROCODE_INTEL_EARLY) && defined(CONFIG_HOTPLUG_CPU)
arch/x86/kernel/cpu/microcode/amd.c +4 -4
index 8fffd845e22b..bfbbe6195e2d 100644
@@ -376,7 +376,7 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data,
 	return UCODE_OK;
 }
 
-enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size)
+enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size)
 {
 	enum ucode_state ret;
 
@@ -390,8 +390,8 @@ enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size)
 
 #if defined(CONFIG_MICROCODE_AMD_EARLY) && defined(CONFIG_X86_32)
 	/* save BSP's matching patch for early load */
-	if (cpu_data(smp_processor_id()).cpu_index == boot_cpu_data.cpu_index) {
-		struct ucode_patch *p = find_patch(smp_processor_id());
+	if (cpu_data(cpu).cpu_index == boot_cpu_data.cpu_index) {
+		struct ucode_patch *p = find_patch(cpu);
 		if (p) {
 			memset(amd_ucode_patch, 0, PATCH_MAX_SIZE);
 			memcpy(amd_ucode_patch, p->data, min_t(u32, ksize(p->data),
@@ -444,7 +444,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device,
 		goto fw_release;
 	}
 
-	ret = load_microcode_amd(c->x86, fw->data, fw->size);
+	ret = load_microcode_amd(cpu, c->x86, fw->data, fw->size);
 
  fw_release:
 	release_firmware(fw);
arch/x86/kernel/cpu/microcode/amd_early.c +19 -1
index 06674473b0e6..737737edbd1e 100644
@@ -389,7 +389,7 @@ int __init save_microcode_in_initrd_amd(void)
 	eax   = cpuid_eax(0x00000001);
 	eax   = ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff);
 
-	ret = load_microcode_amd(eax, container, container_size);
+	ret = load_microcode_amd(smp_processor_id(), eax, container, container_size);
 	if (ret != UCODE_OK)
 		retval = -EINVAL;
 
@@ -402,3 +402,21 @@ int __init save_microcode_in_initrd_amd(void)
 
 	return retval;
 }
+
+void reload_ucode_amd(void)
+{
+	struct microcode_amd *mc;
+	u32 rev, eax;
+
+	rdmsr(MSR_AMD64_PATCH_LEVEL, rev, eax);
+
+	mc = (struct microcode_amd *)amd_ucode_patch;
+
+	if (mc && rev < mc->hdr.patch_id) {
+		if (!__apply_microcode_amd(mc)) {
+			ucode_new_rev = mc->hdr.patch_id;
+			pr_info("microcode: reload patch_level=0x%08x\n",
+				ucode_new_rev);
+		}
+	}
+}
arch/x86/kernel/cpu/microcode/core.c +2 -8
index 2ce9051174e6..15c29096136b 100644
@@ -466,13 +466,7 @@ static void mc_bp_resume(void)
 	if (uci->valid && uci->mc)
 		microcode_ops->apply_microcode(cpu);
 	else if (!uci->mc)
-		/*
-		 * We might resume and not have applied late microcode but still
-		 * have a newer patch stashed from the early loader. We don't
-		 * have it in uci->mc so we have to load it the same way we're
-		 * applying patches early on the APs.
-		 */
-		load_ucode_ap();
+		reload_early_microcode();
 }
 
 static struct syscore_ops mc_syscore_ops = {
@@ -557,7 +551,7 @@ static int __init microcode_init(void)
 	struct cpuinfo_x86 *c = &cpu_data(0);
 	int error;
 
-	if (dis_ucode_ldr)
+	if (paravirt_enabled() || dis_ucode_ldr)
 		return 0;
 
 	if (c->x86_vendor == X86_VENDOR_INTEL)
arch/x86/kernel/cpu/microcode/core_early.c +21 -0
index 2c017f242a78..d45df4bd16ab 100644
@@ -176,3 +176,24 @@ int __init save_microcode_in_initrd(void)
 
 	return 0;
 }
+
+void reload_early_microcode(void)
+{
+	int vendor, x86;
+
+	vendor = x86_vendor();
+	x86 = x86_family();
+
+	switch (vendor) {
+	case X86_VENDOR_INTEL:
+		if (x86 >= 6)
+			reload_ucode_intel();
+		break;
+	case X86_VENDOR_AMD:
+		if (x86 >= 0x10)
+			reload_ucode_amd();
+		break;
+	default:
+		break;
+	}
+}
arch/x86/kernel/cpu/microcode/intel_early.c +34 -8

73 lines not on this page · raw message

#2 lore raw
Quoted 4 lines · Ingo Molnar

Please pull the latest x86-microcode-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-microcode-for-linus

Hmm. There's a conflict with commit 02ecc41abcea ("x86, microcode:
Limit the microcode reloading to 64-bit for now"), but I'm going to assume that the issue is fixed now, and that commit fbae4ba8c4a3 ("x86, microcode: Reload microcode on resume") that causes the conflict also handles the 32-bit case correctly. So my merge is going to just remove the X86_64 test, effectively undoing that first commit, ratehr than keep it around.

If it turns out that the 64-bit limitation needs to be still in place, holler. We can re-do the ugly 64-bit limit thing if required.

Linus

#3 lore raw
Quoted 8 lines · Linus Torvalds
Quoted 4 lines · Ingo Molnar

Please pull the latest x86-microcode-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-microcode-for-linus

Hmm. There's a conflict with commit 02ecc41abcea ("x86,
microcode: Limit the microcode reloading to 64-bit for now"),

Sorry, should have mentioned that explicitly, but forgot about it.

Quoted 10 lines

but I'm going to assume that the issue is fixed now, and that commit fbae4ba8c4a3 ("x86, microcode: Reload microcode on resume") that causes the conflict also handles the 32-bit case correctly. So my merge is going to just remove the X86_64 test, effectively undoing that first commit, ratehr than keep it around.

If it turns out that the 64-bit limitation needs to be still in place, holler. We can re-do the ugly 64-bit limit thing if required.

Hm, so in my own conflict resolution I kept that check, last I heard Boris was still seeing weirdnesses (read: crashes) on 32-bit and I'm not sure even the full series fixes it all.

In any case, would be nice to double check this and reinstate the limitation explicitly if it's still needed, or apply a fix. Boris?

Thanks,

Ingo

maintainer
#4 lore raw
Quoted 12 lines · Ingo Molnar
Quoted 2 lines

Hmm. There's a conflict with commit 02ecc41abcea ("x86,
microcode: Limit the microcode reloading to 64-bit for now"),

Sorry, should have mentioned that explicitly, but forgot about it.

Quoted 6 lines

but I'm going to assume that the issue is fixed now, and that commit fbae4ba8c4a3 ("x86, microcode: Reload microcode on resume") that causes the conflict also handles the 32-bit case correctly. So my merge is going to just remove the X86_64 test, effectively undoing that first commit, ratehr than keep it around.

Yes, this is the intended outcome.

Quoted 11 lines
Quoted 3 lines

If it turns out that the 64-bit limitation needs to be still in place, holler. We can re-do the ugly 64-bit limit thing if required.

Hm, so in my own conflict resolution I kept that check, last I heard Boris was still seeing weirdnesses (read: crashes) on 32-bit and I'm not sure even the full series fixes it all.

In any case, would be nice to double check this and reinstate the limitation explicitly if it's still needed, or apply a fix. Boris?

The problem was that while I was testing 32-bit on an IVB laptop, the machine would triple-fault on resuming from disk. Sometimes, not on each resume cycle. So I thought this was originally caused by the changes to the early reloading mechanism.

However, I did a coarse bisection all the way back to 3.10 and the issue still exists. So it either is this particular laptop or 32-bit suspend from disk has been always broken.

In any case, the current mainline state of the microcode loader should be the correct one, I've been testing it on AMD and Intel, both early and/xor late microcode loader, suspend to disk and to ram and all works fine.

stable@ would need addressing at some point but I'd like to leave it in mainline a bit to see some more testing and backport it to stable when there's more confidence all is ok.

Thanks guys.

Signature · 5 lines
Regards/Gruss,
    Boris.

Sent from a fat crate under my desk. Formatting is fine.
--
#5 lore raw
Quoted 7 lines · Borislav Petkov
Quoted 6 lines · Ingo Molnar
Quoted 2 lines

Hmm. There's a conflict with commit 02ecc41abcea ("x86,
microcode: Limit the microcode reloading to 64-bit for now"),

Sorry, should have mentioned that explicitly, but forgot about it.

Quoted 8 lines
Quoted 6 lines
Quoted 6 lines

but I'm going to assume that the issue is fixed now, and that commit fbae4ba8c4a3 ("x86, microcode: Reload microcode on resume") that causes the conflict also handles the 32-bit case correctly. So my merge is going to just remove the X86_64 test, effectively undoing that first commit, ratehr than keep it around.

Yes, this is the intended outcome.

Ok, great!

Thanks,

Ingo