tip-queue 2015-07-16
Subsystems (2)
Borislav Petkov
maintainercover tip-queue 2015-07-16
From: Borislav Petkov <[email protected]>
Hi,
here are two microcode loader changes for making certain patch levels applied by the firmware, final.
Please apply, thanks.
Borislav Petkov (2):
x86/microcode/amd: Extract current patch level read to a function x86/microcode/amd: Do not overwrite final patch levels
arch/x86/include/asm/microcode_amd.h | 1 + arch/x86/kernel/cpu/microcode/amd.c | 52 +++++++++++++++++++++++++++++-- arch/x86/kernel/cpu/microcode/amd_early.c | 24 ++++++++------ 3 files changed, 65 insertions(+), 12 deletions(-)
Signature · 1 line
2.5.0.rc2.28.g6003e7f
Borislav Petkov
maintainerPATCH 1/2 x86/microcode/amd: Extract current patch level read to a function
From: Borislav Petkov <[email protected]>
Pave the way for checking the current patch level of the microcode in a core. We want to be able to do stuff depending on the patch level - in this case decide whether to update or not. But that will be added in a later patch; here we do not introduce any functionality change.
Drop unused local var uci assignment, while at it.
--- arch/x86/include/asm/microcode_amd.h | 1 + arch/x86/kernel/cpu/microcode/amd.c | 24 ++++++++++++++++++++++-- arch/x86/kernel/cpu/microcode/amd_early.c | 17 +++++++---------- 3 files changed, 30 insertions(+), 12 deletions(-)
arch/x86/include/asm/microcode_amd.h +1 -0
@@ -76,4 +76,5 @@ static inline int __init save_microcode_in_initrd_amd(void) { return -EINVAL; }void reload_ucode_amd (void ) {}#endif +extern bool check_current_patch_level (u32 *rev);#endif /* _ASM_X86_MICROCODE_AMD_H */
arch/x86/kernel/cpu/microcode/amd.c +22 -2
@@ -177,6 +177,25 @@ static unsigned int verify_patch_size(u8 family, u32 patch_size,return patch_size; } +/* +* Check the current patch level on this CPU. +* +* @rev: Use it to return the patch level. It is set to 0 in the case of +* error. +* +* Returns: +* - true: if update should stop +* - false: otherwise +*/ +bool check_current_patch_level (u32 *rev) +{ +u32 dummy; + +rdmsr (MSR_AMD64_PATCH_LEVEL , *rev, dummy); + +return false; +} +int __apply_microcode_amd (struct microcode_amd *mc_amd) {u32 rev, dummy;
@@ -197,7 +216,7 @@ int apply_microcode_amd(int cpu)struct microcode_amd *mc_amd;struct ucode_cpu_info *uci;struct ucode_patch *p; -u32 rev, dummy; +u32 rev;BUG_ON (raw_smp_processor_id () != cpu);
@@ -210,7 +229,8 @@ int apply_microcode_amd(int cpu) mc_amd = p->data; uci->mc = p->data; -rdmsr (MSR_AMD64_PATCH_LEVEL , rev, dummy); +if (check_current_patch_level (&rev)) +return -1 ;/* need to apply patch? */ if (rev >= mc_amd->hdr.patch_id) {
arch/x86/kernel/cpu/microcode/amd_early.c +7 -10
@@ -196,9 +196,8 @@ static void apply_ucode_in_initrd(void *ucode, size_t size, bool save_patch)return ; } -/* find ucode and update if needed */ - -native_rdmsr (MSR_AMD64_PATCH_LEVEL , rev, eax); +if (check_current_patch_level (&rev)) +return ;while (left >0 ) {struct microcode_amd *mc;
@@ -319,7 +318,6 @@ static void __init get_bsp_sig(void)void load_ucode_amd_ap (void ) {unsigned int cpu =smp_processor_id (); -struct ucode_cpu_info *uci = ucode_cpu_info + cpu;struct equiv_cpu_entry *eq;struct microcode_amd *mc;u32 rev, eax;
@@ -332,10 +330,8 @@ void load_ucode_amd_ap(void)if (!container)return ; -rdmsr (MSR_AMD64_PATCH_LEVEL , rev, eax); - - uci->cpu_sig.rev = rev; - uci->cpu_sig.sig = eax; +if (check_current_patch_level (&rev)) +return ; eax =cpuid_eax (0x00000001 ); eq = (struct equiv_cpu_entry *)(container +CONTAINER_HDR_SZ );
@@ -424,9 +420,10 @@ int __init save_microcode_in_initrd_amd(void)void reload_ucode_amd (void ) {struct microcode_amd *mc; -u32 rev, eax; +u32 rev; -rdmsr (MSR_AMD64_PATCH_LEVEL , rev, eax); +if (check_current_patch_level (&rev)) +return ; mc = (struct microcode_amd *)amd_ucode_patch;
Signature · 1 line
2.5.0.rc2.28.g6003e7f
tip-bot for Borislav Petkov
merge bot[tip:x86/microcode] x86/microcode/amd: Extract current patch level read to a function
x86/microcode/amd: Extract current patch level read to a function
Commit-ID: 7708698e783e304da0fac10052dddce1193f47a8 Gitweb: http://git.kernel.org/tip/7708698e783e304da0fac10052dddce1193f47a8 Author: Borislav Petkov <[email protected]> AuthorDate: Thu, 16 Jul 2015 10:05:46 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 21 Jul 2015 09:45:40 +0200
x86/microcode/amd: Extract current patch level read to a function
Pave the way for checking the current patch level of the microcode in a core. We want to be able to do stuff depending on the patch level - in this case decide whether to update or not. But that will be added in a later patch; here we do not introduce any functionality change.
Drop unused local var uci assignment, while at it.
--- arch/x86/include/asm/microcode_amd.h | 1 + arch/x86/kernel/cpu/microcode/amd.c | 24 ++++++++++++++++++++++-- arch/x86/kernel/cpu/microcode/amd_early.c | 17 +++++++---------- 3 files changed, 30 insertions(+), 12 deletions(-)
arch/x86/include/asm/microcode_amd.h +1 -0
@@ -76,4 +76,5 @@ static inline int __init save_microcode_in_initrd_amd(void) { return -EINVAL; }void reload_ucode_amd (void ) {}#endif +extern bool check_current_patch_level (u32 *rev);#endif /* _ASM_X86_MICROCODE_AMD_H */
arch/x86/kernel/cpu/microcode/amd.c +22 -2
@@ -177,6 +177,25 @@ static unsigned int verify_patch_size(u8 family, u32 patch_size,return patch_size; } +/* +* Check the current patch level on this CPU. +* +* @rev: Use it to return the patch level. It is set to 0 in the case of +* error. +* +* Returns: +* - true: if update should stop +* - false: otherwise +*/ +bool check_current_patch_level (u32 *rev) +{ +u32 dummy; + +rdmsr (MSR_AMD64_PATCH_LEVEL , *rev, dummy); + +return false; +} +int __apply_microcode_amd (struct microcode_amd *mc_amd) {u32 rev, dummy;
@@ -197,7 +216,7 @@ int apply_microcode_amd(int cpu)struct microcode_amd *mc_amd;struct ucode_cpu_info *uci;struct ucode_patch *p; -u32 rev, dummy; +u32 rev;BUG_ON (raw_smp_processor_id () != cpu);
@@ -210,7 +229,8 @@ int apply_microcode_amd(int cpu) mc_amd = p->data; uci->mc = p->data; -rdmsr (MSR_AMD64_PATCH_LEVEL , rev, dummy); +if (check_current_patch_level (&rev)) +return -1 ;/* need to apply patch? */ if (rev >= mc_amd->hdr.patch_id) {
arch/x86/kernel/cpu/microcode/amd_early.c +7 -10
@@ -196,9 +196,8 @@ static void apply_ucode_in_initrd(void *ucode, size_t size, bool save_patch)return ; } -/* find ucode and update if needed */ - -native_rdmsr (MSR_AMD64_PATCH_LEVEL , rev, eax); +if (check_current_patch_level (&rev)) +return ;while (left >0 ) {struct microcode_amd *mc;
@@ -319,7 +318,6 @@ static void __init get_bsp_sig(void)void load_ucode_amd_ap (void ) {unsigned int cpu =smp_processor_id (); -struct ucode_cpu_info *uci = ucode_cpu_info + cpu;struct equiv_cpu_entry *eq;struct microcode_amd *mc;u32 rev, eax;
@@ -332,10 +330,8 @@ void load_ucode_amd_ap(void)if (!container)return ; -rdmsr (MSR_AMD64_PATCH_LEVEL , rev, eax); - - uci->cpu_sig.rev = rev; - uci->cpu_sig.sig = eax; +if (check_current_patch_level (&rev)) +return ; eax =cpuid_eax (0x00000001 ); eq = (struct equiv_cpu_entry *)(container +CONTAINER_HDR_SZ );
@@ -424,9 +420,10 @@ int __init save_microcode_in_initrd_amd(void)void reload_ucode_amd (void ) {struct microcode_amd *mc; -u32 rev, eax; +u32 rev; -rdmsr (MSR_AMD64_PATCH_LEVEL , rev, eax); +if (check_current_patch_level (&rev)) +return ; mc = (struct microcode_amd *)amd_ucode_patch;
Borislav Petkov
maintainerPATCH 2/2 x86/microcode/amd: Do not overwrite final patch levels
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
A certain number of patch levels of applied microcode should not be overwritten by the microcode loader, otherwise bad things will happen.
Check those and abort update if the current core has one of those final patch levels applied by the BIOS. 32-bit needs special handling, of course.
See https://bugzilla.suse.com/show_bug.cgi?id=913996 for more info.
--- arch/x86/include/asm/microcode_amd.h | 2 +- arch/x86/kernel/cpu/microcode/amd.c | 38 +++++++++++++++++++++++++++---- arch/x86/kernel/cpu/microcode/amd_early.c | 13 ++++++++--- 3 files changed, 44 insertions(+), 9 deletions(-)
arch/x86/include/asm/microcode_amd.h +1 -1
@@ -76,5 +76,5 @@ static inline int __init save_microcode_in_initrd_amd(void) { return -EINVAL; }void reload_ucode_amd (void ) {}#endif -extern bool check_current_patch_level (u32 *rev); +extern bool check_current_patch_level (u32 *rev,bool early);#endif /* _ASM_X86_MICROCODE_AMD_H */
arch/x86/kernel/cpu/microcode/amd.c +33 -5
@@ -178,6 +178,16 @@ static unsigned int verify_patch_size(u8 family, u32 patch_size, }/* +* Those patch levels cannot be updated to newer ones and thus should be final. +*/ +static u32 final_levels[] = { +0x01000098 , +0x0100009f , +0x010000af , +0 ,/* T-101 terminator */ +}; + +/* * Check the current patch level on this CPU. * * @rev: Use it to return the patch level. It is set to 0 in the case of
@@ -187,13 +197,31 @@ static unsigned int verify_patch_size(u8 family, u32 patch_size,* - true: if update should stop * - false: otherwise */ -bool check_current_patch_level (u32 *rev) +bool check_current_patch_level (u32 *rev,bool early) { -u32 dummy; +u32 lvl, dummy, i; +bool ret = false; +u32 *levels; + +rdmsr (MSR_AMD64_PATCH_LEVEL , lvl, dummy); + +if (IS_ENABLED (CONFIG_X86_32 ) && early) + levels = (u32 *)__pa_nodebug (&final_levels); +else + levels = final_levels; + +for (i =0 ; levels[i]; i++) { +if (lvl == levels[i]) { + lvl =0 ; + ret = true; +break ; + } + } -rdmsr (MSR_AMD64_PATCH_LEVEL , *rev, dummy); +if (rev) + *rev = lvl; -return false; +return ret; }int __apply_microcode_amd (struct microcode_amd *mc_amd)
@@ -229,7 +257,7 @@ int apply_microcode_amd(int cpu) mc_amd = p->data; uci->mc = p->data; -if (check_current_patch_level (&rev)) +if (check_current_patch_level (&rev, false))return -1 ;/* need to apply patch? */
arch/x86/kernel/cpu/microcode/amd_early.c +10 -3
@@ -196,7 +196,7 @@ static void apply_ucode_in_initrd(void *ucode, size_t size, bool save_patch)return ; } -if (check_current_patch_level (&rev)) +if (check_current_patch_level (&rev, true))return ;while (left >0 ) {
@@ -330,7 +330,10 @@ void load_ucode_amd_ap(void)if (!container)return ; -if (check_current_patch_level (&rev)) +/* +* 64-bit runs with paging enabled, thus early==false. +*/ +if (check_current_patch_level (&rev, false))return ; eax =cpuid_eax (0x00000001 );
@@ -422,7 +425,11 @@ void reload_ucode_amd(void)struct microcode_amd *mc;u32 rev; -if (check_current_patch_level (&rev)) +/* +* early==false because this is a syscore ->resume path and by +* that time paging is long enabled. +*/ +if (check_current_patch_level (&rev, false))return ; mc = (struct microcode_amd *)amd_ucode_patch;
Signature · 1 line
2.5.0.rc2.28.g6003e7f
tip-bot for Borislav Petkov
merge bot[tip:x86/microcode] x86/microcode/amd: Do not overwrite final patch levels
x86/microcode/amd: Do not overwrite final patch levels
Commit-ID: d48a9c164b45c5cc40f00c12231564f9aac8ab1d Gitweb: http://git.kernel.org/tip/d48a9c164b45c5cc40f00c12231564f9aac8ab1d Author: Borislav Petkov <[email protected]> AuthorDate: Thu, 16 Jul 2015 10:05:47 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 21 Jul 2015 09:45:40 +0200
x86/microcode/amd: Do not overwrite final patch levels
A certain number of patch levels of applied microcode should not be overwritten by the microcode loader, otherwise bad things will happen.
Check those and abort update if the current core has one of those final patch levels applied by the BIOS. 32-bit needs special handling, of course.
See https://bugzilla.suse.com/show_bug.cgi?id=913996 for more info.
--- arch/x86/include/asm/microcode_amd.h | 2 +- arch/x86/kernel/cpu/microcode/amd.c | 38 +++++++++++++++++++++++++++---- arch/x86/kernel/cpu/microcode/amd_early.c | 13 ++++++++--- 3 files changed, 44 insertions(+), 9 deletions(-)
arch/x86/include/asm/microcode_amd.h +1 -1
@@ -76,5 +76,5 @@ static inline int __init save_microcode_in_initrd_amd(void) { return -EINVAL; }void reload_ucode_amd (void ) {}#endif -extern bool check_current_patch_level (u32 *rev); +extern bool check_current_patch_level (u32 *rev,bool early);#endif /* _ASM_X86_MICROCODE_AMD_H */
arch/x86/kernel/cpu/microcode/amd.c +33 -5
@@ -178,6 +178,16 @@ static unsigned int verify_patch_size(u8 family, u32 patch_size, }/* +* Those patch levels cannot be updated to newer ones and thus should be final. +*/ +static u32 final_levels[] = { +0x01000098 , +0x0100009f , +0x010000af , +0 ,/* T-101 terminator */ +}; + +/* * Check the current patch level on this CPU. * * @rev: Use it to return the patch level. It is set to 0 in the case of
@@ -187,13 +197,31 @@ static unsigned int verify_patch_size(u8 family, u32 patch_size,* - true: if update should stop * - false: otherwise */ -bool check_current_patch_level (u32 *rev) +bool check_current_patch_level (u32 *rev,bool early) { -u32 dummy; +u32 lvl, dummy, i; +bool ret = false; +u32 *levels; + +rdmsr (MSR_AMD64_PATCH_LEVEL , lvl, dummy); + +if (IS_ENABLED (CONFIG_X86_32 ) && early) + levels = (u32 *)__pa_nodebug (&final_levels); +else + levels = final_levels; + +for (i =0 ; levels[i]; i++) { +if (lvl == levels[i]) { + lvl =0 ; + ret = true; +break ; + } + } -rdmsr (MSR_AMD64_PATCH_LEVEL , *rev, dummy); +if (rev) + *rev = lvl; -return false; +return ret; }int __apply_microcode_amd (struct microcode_amd *mc_amd)
@@ -229,7 +257,7 @@ int apply_microcode_amd(int cpu) mc_amd = p->data; uci->mc = p->data; -if (check_current_patch_level (&rev)) +if (check_current_patch_level (&rev, false))return -1 ;/* need to apply patch? */
arch/x86/kernel/cpu/microcode/amd_early.c +10 -3
@@ -196,7 +196,7 @@ static void apply_ucode_in_initrd(void *ucode, size_t size, bool save_patch)return ; } -if (check_current_patch_level (&rev)) +if (check_current_patch_level (&rev, true))return ;while (left >0 ) {
@@ -330,7 +330,10 @@ void load_ucode_amd_ap(void)if (!container)return ; -if (check_current_patch_level (&rev)) +/* +* 64-bit runs with paging enabled, thus early==false. +*/ +if (check_current_patch_level (&rev, false))return ; eax =cpuid_eax (0x00000001 );
@@ -422,7 +425,11 @@ void reload_ucode_amd(void)struct microcode_amd *mc;u32 rev; -if (check_current_patch_level (&rev)) +/* +* early==false because this is a syscore ->resume path and by +* that time paging is long enabled. +*/ +if (check_current_patch_level (&rev, false))return ; mc = (struct microcode_amd *)amd_ucode_patch;