x86/microcode: Make sure boot_cpu_data.microcode is up-to-date

prarit · KAGA-KOKO · commit 370a132bb222 · 2018-09-02T14:10:54.000+02:00
When preparing an MCE record for logging, boot_cpu_data.microcode is used to read out the microcode revision on the box. However, on systems where late microcode update has happened, the microcode revision output in a MCE log record is wrong because boot_cpu_data.microcode is not updated when the microcode gets updated. But, the microcode revision saved in boot_cpu_data's microcode member should be kept up-to-date, regardless, for consistency. Make it so. Fixes: fa94d0c ("x86/MCE: Save microcode revision in machine check records") Signed-off-by: Prarit Bhargava <prarit@redhat.com> Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: sironi@amazon.de Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20180731112739.32338-1-prarit@redhat.com
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
@@ -537,6 +537,10 @@ static enum ucode_state apply_microcode_amd(int cpu)
 	uci->cpu_sig.rev = mc_amd->hdr.patch_id;
 	c->microcode = mc_amd->hdr.patch_id;
 
+	/* Update boot_cpu_data's revision too, if we're on the BSP: */
+	if (c->cpu_index == boot_cpu_data.cpu_index)
+		boot_cpu_data.microcode = mc_amd->hdr.patch_id;
+
 	return UCODE_UPDATED;
 }
 
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
@@ -851,6 +851,10 @@ static enum ucode_state apply_microcode_intel(int cpu)
 	uci->cpu_sig.rev = rev;
 	c->microcode = rev;
 
+	/* Update boot_cpu_data's revision too, if we're on the BSP: */
+	if (c->cpu_index == boot_cpu_data.cpu_index)
+		boot_cpu_data.microcode = rev;
+
 	return UCODE_UPDATED;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -537,6 +537,10 @@ static enum ucode_state apply_microcode_amd(int cpu)`
`537`	`537`	`uci->cpu_sig.rev = mc_amd->hdr.patch_id;`
`538`	`538`	`c->microcode = mc_amd->hdr.patch_id;`
`539`	`539`
	`540`	`+ /* Update boot_cpu_data's revision too, if we're on the BSP: */`
	`541`	`+ if (c->cpu_index == boot_cpu_data.cpu_index)`
	`542`	`+ boot_cpu_data.microcode = mc_amd->hdr.patch_id;`
	`543`	`+`
`540`	`544`	`return UCODE_UPDATED;`
`541`	`545`	`}`
`542`	`546`
Original file line number	Diff line number	Diff line change
`@@ -851,6 +851,10 @@ static enum ucode_state apply_microcode_intel(int cpu)`
`851`	`851`	`uci->cpu_sig.rev = rev;`
`852`	`852`	`c->microcode = rev;`
`853`	`853`
	`854`	`+ /* Update boot_cpu_data's revision too, if we're on the BSP: */`
	`855`	`+ if (c->cpu_index == boot_cpu_data.cpu_index)`
	`856`	`+ boot_cpu_data.microcode = rev;`
	`857`	`+`
`854`	`858`	`return UCODE_UPDATED;`
`855`	`859`	`}`
`856`	`860`