x86/microcode: Some fixes
Subsystems (2)
Borislav Petkov
maintainercover x86/microcode: Some fixes
From: "Borislav Petkov (AMD)" <[email protected]>
Hi,
here's a small set of fixes which materialized from me staring at the AMD side of the loader code in recent times.
Comments and suggestions are always appreciated.
Thx.
[ TODO for self: Add patches 1 and 2 in patch 3's stable field as
prerequisites for backporting. ]
Borislav Petkov (AMD) (4):
x86/microcode/amd: Remove load_microcode_amd()'s bsp parameter x86/microcode/AMD: Add a @cpu parameter to the reloading functions x86/microcode/AMD: Fix mixed steppings support x86/microcode/core: Return an error only when necessary
arch/x86/include/asm/microcode.h | 4 +- arch/x86/include/asm/microcode_amd.h | 4 +- arch/x86/kernel/cpu/microcode/amd.c | 55 +++++++++++++--------------- arch/x86/kernel/cpu/microcode/core.c | 12 +++--- 4 files changed, 36 insertions(+), 39 deletions(-)
Signature · 1 line
2.35.1
Borislav Petkov
maintainerPATCH 1/4 x86/microcode/amd: Remove load_microcode_amd()'s bsp parameter
From: "Borislav Petkov (AMD)" <[email protected]>
It is always the BSP.
No functional changes.
--- arch/x86/kernel/cpu/microcode/amd.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
arch/x86/kernel/cpu/microcode/amd.c +4 -15
@@ -553,8 +553,7 @@ void load_ucode_amd_ap(unsigned int cpuid_1_eax)apply_microcode_early_amd (cpuid_1_eax, cp.data, cp.size, false); } -static enum ucode_state -load_microcode_amd (bool save,u8 family,const u8 *data,size_t size); +static enum ucode_state load_microcode_amd (u8 family,const u8 *data,size_t size);int __init save_microcode_in_initrd_amd (unsigned int cpuid_1_eax) {
@@ -572,7 +571,7 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)if (!desc.mc)return -EINVAL ; - ret =load_microcode_amd (true,x86_family (cpuid_1_eax), desc.data, desc.size); + ret =load_microcode_amd (x86_family (cpuid_1_eax), desc.data, desc.size);if (ret >UCODE_UPDATED )return -EINVAL ;
@@ -850,8 +849,7 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data,return UCODE_OK ; } -static enum ucode_state -load_microcode_amd (bool save,u8 family,const u8 *data,size_t size) +static enum ucode_state load_microcode_amd (u8 family,const u8 *data,size_t size) {struct ucode_patch *p;enum ucode_state ret;
@@ -875,10 +873,6 @@ load_microcode_amd(bool save, u8 family, const u8 *data, size_t size) ret =UCODE_NEW ; } -/* save BSP's matching patch for early load */ -if (!save) -return ret; -memset (amd_ucode_patch,0 ,PATCH_MAX_SIZE );memcpy (amd_ucode_patch, p->data,min_t (u32, p->size,PATCH_MAX_SIZE ));
@@ -905,14 +899,9 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device) {char fw_name[36 ] ="amd-ucode/microcode_amd.bin" ;struct cpuinfo_x86 *c = &cpu_data (cpu); -bool bsp = c->cpu_index == boot_cpu_data.cpu_index;enum ucode_state ret =UCODE_NFOUND ;const struct firmware *fw; -/* reload ucode container only on the boot cpu */ -if (!bsp) -return UCODE_OK ; -if (c->x86 >=0x15 )snprintf (fw_name,sizeof (fw_name),"amd-ucode/microcode_amd_fam%.2xh.bin" , c->x86);
@@ -925,7 +914,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device)if (!verify_container (fw->data, fw->size, false)) goto fw_release; - ret =load_microcode_amd (bsp, c->x86, fw->data, fw->size); + ret =load_microcode_amd (c->x86, fw->data, fw->size); fw_release:release_firmware (fw);
Signature · 1 line
2.35.1
[tip: x86/microcode] x86/microcode/amd: Remove load_microcode_amd()'s bsp parameter
The following commit has been merged into the x86/microcode branch of tip:
The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: 2355370cd941cbb20882cc3f34460f9f2b8f9a18 Gitweb: https://git.kernel.org/tip/2355370cd941cbb20882cc3f34460f9f2b8f9a18 Author: Borislav Petkov (AMD) <[email protected]> AuthorDate: Tue, 17 Jan 2023 23:59:24 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 06 Feb 2023 11:13:04 +01:00
x86/microcode/amd: Remove load_microcode_amd()'s bsp parameter
It is always the BSP.
No functional changes.
--- arch/x86/kernel/cpu/microcode/amd.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
arch/x86/kernel/cpu/microcode/amd.c +4 -15
@@ -553,8 +553,7 @@ void load_ucode_amd_ap(unsigned int cpuid_1_eax)early_apply_microcode (cpuid_1_eax, cp.data, cp.size, false); } -static enum ucode_state -load_microcode_amd (bool save,u8 family,const u8 *data,size_t size); +static enum ucode_state load_microcode_amd (u8 family,const u8 *data,size_t size);int __init save_microcode_in_initrd_amd (unsigned int cpuid_1_eax) {
@@ -572,7 +571,7 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)if (!desc.mc)return -EINVAL ; - ret =load_microcode_amd (true,x86_family (cpuid_1_eax), desc.data, desc.size); + ret =load_microcode_amd (x86_family (cpuid_1_eax), desc.data, desc.size);if (ret >UCODE_UPDATED )return -EINVAL ;
@@ -851,8 +850,7 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data,return UCODE_OK ; } -static enum ucode_state -load_microcode_amd (bool save,u8 family,const u8 *data,size_t size) +static enum ucode_state load_microcode_amd (u8 family,const u8 *data,size_t size) {struct ucode_patch *p;enum ucode_state ret;
@@ -876,10 +874,6 @@ load_microcode_amd(bool save, u8 family, const u8 *data, size_t size) ret =UCODE_NEW ; } -/* save BSP's matching patch for early load */ -if (!save) -return ret; -memset (amd_ucode_patch,0 ,PATCH_MAX_SIZE );memcpy (amd_ucode_patch, p->data,min_t (u32, p->size,PATCH_MAX_SIZE ));
@@ -906,14 +900,9 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device) {char fw_name[36 ] ="amd-ucode/microcode_amd.bin" ;struct cpuinfo_x86 *c = &cpu_data (cpu); -bool bsp = c->cpu_index == boot_cpu_data.cpu_index;enum ucode_state ret =UCODE_NFOUND ;const struct firmware *fw; -/* reload ucode container only on the boot cpu */ -if (!bsp) -return UCODE_OK ; -if (c->x86 >=0x15 )snprintf (fw_name,sizeof (fw_name),"amd-ucode/microcode_amd_fam%.2xh.bin" , c->x86);
@@ -926,7 +915,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device)if (!verify_container (fw->data, fw->size, false)) goto fw_release; - ret =load_microcode_amd (bsp, c->x86, fw->data, fw->size); + ret =load_microcode_amd (c->x86, fw->data, fw->size); fw_release:release_firmware (fw);
Borislav Petkov
maintainerPATCH 2/4 x86/microcode/AMD: Add a @cpu parameter to the reloading functions
In reply to Borislav PetkovFrom: "Borislav Petkov (AMD)" <[email protected]>
Will be used in a subsequent change.
--- arch/x86/include/asm/microcode.h | 4 ++-- arch/x86/include/asm/microcode_amd.h | 4 ++-- arch/x86/kernel/cpu/microcode/amd.c | 2 +- arch/x86/kernel/cpu/microcode/core.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-)
arch/x86/include/asm/microcode.h +2 -2
@@ -125,13 +125,13 @@ static inline unsigned int x86_cpuid_family(void)#ifdef CONFIG_MICROCODE extern void __init load_ucode_bsp (void );extern void load_ucode_ap (void ); -void reload_early_microcode (void ); +void reload_early_microcode (unsigned int cpu);extern bool initrd_gone;void microcode_bsp_resume (void );#else static inline void __init load_ucode_bsp (void ) { }static inline void load_ucode_ap (void ) { } -static inline void reload_early_microcode (void ) { } +static inline void reload_early_microcode (unsigned int cpu) { }static inline void microcode_bsp_resume (void ) { }#endif
arch/x86/include/asm/microcode_amd.h +2 -2
@@ -47,12 +47,12 @@ struct microcode_amd {extern void __init load_ucode_amd_bsp (unsigned int family);extern void load_ucode_amd_ap (unsigned int family);extern int __init save_microcode_in_initrd_amd (unsigned int family); -void reload_ucode_amd (void ); +void reload_ucode_amd (unsigned int cpu);#else static inline void __init load_ucode_amd_bsp (unsigned int family) {}static inline void load_ucode_amd_ap (unsigned int family) {}static inline int __init save_microcode_in_initrd_amd (unsigned int family) {return -EINVAL ; } -static inline void reload_ucode_amd (void ) {} +static inline void reload_ucode_amd (unsigned int cpu) {}#endif #endif /* _ASM_X86_MICROCODE_AMD_H */
arch/x86/kernel/cpu/microcode/amd.c +1 -1
@@ -578,7 +578,7 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)return 0 ; } -void reload_ucode_amd (void ) +void reload_ucode_amd (unsigned int cpu) {struct microcode_amd *mc;u32 rev, dummy__always_unused ;
arch/x86/kernel/cpu/microcode/core.c +3 -3
@@ -298,7 +298,7 @@ struct cpio_data find_microcode_in_initrd(const char *path, bool use_pa)#endif } -void reload_early_microcode (void ) +void reload_early_microcode (unsigned int cpu) {int vendor, family;
@@ -312,7 +312,7 @@ void reload_early_microcode(void)break ;case X86_VENDOR_AMD :if (family >=0x10 ) -reload_ucode_amd (); +reload_ucode_amd (cpu);break ;default :break ;
@@ -557,7 +557,7 @@ void microcode_bsp_resume(void)if (uci->mc) microcode_ops->apply_microcode (cpu);else -reload_early_microcode (); +reload_early_microcode (cpu); }static struct syscore_ops mc_syscore_ops = {
Signature · 1 line
2.35.1
[tip: x86/microcode] x86/microcode/AMD: Add a @cpu parameter to the reloading functions
The following commit has been merged into the x86/microcode branch of tip:
The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: a5ad92134bd153a9ccdcddf09a95b088f36c3cce Gitweb: https://git.kernel.org/tip/a5ad92134bd153a9ccdcddf09a95b088f36c3cce Author: Borislav Petkov (AMD) <[email protected]> AuthorDate: Thu, 26 Jan 2023 00:08:03 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 06 Feb 2023 12:14:20 +01:00
x86/microcode/AMD: Add a @cpu parameter to the reloading functions
Will be used in a subsequent change.
--- arch/x86/include/asm/microcode.h | 4 ++-- arch/x86/include/asm/microcode_amd.h | 4 ++-- arch/x86/kernel/cpu/microcode/amd.c | 2 +- arch/x86/kernel/cpu/microcode/core.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-)
arch/x86/include/asm/microcode.h +2 -2
@@ -125,13 +125,13 @@ static inline unsigned int x86_cpuid_family(void)#ifdef CONFIG_MICROCODE extern void __init load_ucode_bsp (void );extern void load_ucode_ap (void ); -void reload_early_microcode (void ); +void reload_early_microcode (unsigned int cpu);extern bool initrd_gone;void microcode_bsp_resume (void );#else static inline void __init load_ucode_bsp (void ) { }static inline void load_ucode_ap (void ) { } -static inline void reload_early_microcode (void ) { } +static inline void reload_early_microcode (unsigned int cpu) { }static inline void microcode_bsp_resume (void ) { }#endif
arch/x86/include/asm/microcode_amd.h +2 -2
@@ -47,12 +47,12 @@ struct microcode_amd {extern void __init load_ucode_amd_bsp (unsigned int family);extern void load_ucode_amd_ap (unsigned int family);extern int __init save_microcode_in_initrd_amd (unsigned int family); -void reload_ucode_amd (void ); +void reload_ucode_amd (unsigned int cpu);#else static inline void __init load_ucode_amd_bsp (unsigned int family) {}static inline void load_ucode_amd_ap (unsigned int family) {}static inline int __init save_microcode_in_initrd_amd (unsigned int family) {return -EINVAL ; } -static inline void reload_ucode_amd (void ) {} +static inline void reload_ucode_amd (unsigned int cpu) {}#endif #endif /* _ASM_X86_MICROCODE_AMD_H */
arch/x86/kernel/cpu/microcode/amd.c +1 -1
@@ -578,7 +578,7 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)return 0 ; } -void reload_ucode_amd (void ) +void reload_ucode_amd (unsigned int cpu) {struct microcode_amd *mc;u32 rev, dummy__always_unused ;
arch/x86/kernel/cpu/microcode/core.c +3 -3
@@ -298,7 +298,7 @@ struct cpio_data find_microcode_in_initrd(const char *path, bool use_pa)#endif } -void reload_early_microcode (void ) +void reload_early_microcode (unsigned int cpu) {int vendor, family;
@@ -312,7 +312,7 @@ void reload_early_microcode(void)break ;case X86_VENDOR_AMD :if (family >=0x10 ) -reload_ucode_amd (); +reload_ucode_amd (cpu);break ;default :break ;
@@ -564,7 +564,7 @@ void microcode_bsp_resume(void)if (uci->mc) microcode_ops->apply_microcode (cpu);else -reload_early_microcode (); +reload_early_microcode (cpu); }static struct syscore_ops mc_syscore_ops = {
Borislav Petkov
maintainerPATCH 3/4 x86/microcode/AMD: Fix mixed steppings support
In reply to Borislav PetkovFrom: "Borislav Petkov (AMD)" <[email protected]>
The AMD side of the loader has always claimed to support mixed steppings. But somewhere along the way, it broke that by assuming that the cached patch blob is a single one instead of it being one per *node*.
So turn it into a per-node one so that each node can stash the blob relevant for it.
[ NB: Fixes tag is not really the exactly correct one but it is good
enough. ]
--- arch/x86/kernel/cpu/microcode/amd.c | 34 ++++++++++++++++++----------- 1 file changed, 21 insertions(+), 13 deletions(-)
arch/x86/kernel/cpu/microcode/amd.c +21 -13
@@ -55,7 +55,9 @@ struct cont_desc { };static u32 ucode_new_rev; -static u8 amd_ucode_patch[PATCH_MAX_SIZE ]; + +/* One blob per node. */ +static u8 amd_ucode_patch[MAX_NUMNODES ][PATCH_MAX_SIZE ];/* * Microcode patch container file is prepended to the initrd in cpio
@@ -428,7 +430,7 @@ apply_microcode_early_amd(u32 cpuid_1_eax, void *ucode, size_t size, bool save_p patch = (u8 (*)[PATCH_MAX_SIZE ])__pa_nodebug (&amd_ucode_patch);#else new_rev = &ucode_new_rev; - patch = &amd_ucode_patch; + patch = &amd_ucode_patch[0 ];#endif desc.cpuid_1_eax = cpuid_1_eax;
@@ -580,10 +582,10 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)void reload_ucode_amd (unsigned int cpu) { -struct microcode_amd *mc;u32 rev, dummy__always_unused ; +struct microcode_amd *mc; - mc = (struct microcode_amd *)amd_ucode_patch; + mc = (struct microcode_amd *)amd_ucode_patch[cpu_to_node (cpu)];rdmsr (MSR_AMD64_PATCH_LEVEL , rev, dummy);
@@ -851,6 +853,8 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data,static enum ucode_state load_microcode_amd (u8 family,const u8 *data,size_t size) { +struct cpuinfo_x86 *c; +unsigned int nid, cpu;struct ucode_patch *p;enum ucode_state ret;
@@ -863,18 +867,22 @@ static enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t sizreturn ret; } - p =find_patch (0 ); -if (!p) { -return ret; - }else { -if (boot_cpu_data.microcode >= p->patch_id) -return ret; +for_each_node (nid) { + cpu =cpumask_first (cpumask_of_node (nid)); + c = &cpu_data (cpu); + + p =find_patch (cpu); +if (!p) +continue ; + +if (c->microcode >= p->patch_id) +continue ; ret =UCODE_NEW ; - } -memset (amd_ucode_patch,0 ,PATCH_MAX_SIZE ); -memcpy (amd_ucode_patch, p->data,min_t (u32, p->size,PATCH_MAX_SIZE )); +memset (&amd_ucode_patch[nid],0 ,PATCH_MAX_SIZE ); +memcpy (&amd_ucode_patch[nid], p->data,min_t (u32, p->size,PATCH_MAX_SIZE )); + }return ret; }
Signature · 1 line
2.35.1
[tip: x86/microcode] x86/microcode/AMD: Fix mixed steppings support
The following commit has been merged into the x86/microcode branch of tip:
The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: 7ff6edf4fef38ab404ee7861f257e28eaaeed35f Gitweb: https://git.kernel.org/tip/7ff6edf4fef38ab404ee7861f257e28eaaeed35f Author: Borislav Petkov (AMD) <[email protected]> AuthorDate: Thu, 26 Jan 2023 16:26:17 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 06 Feb 2023 13:40:16 +01:00
x86/microcode/AMD: Fix mixed steppings support
The AMD side of the loader has always claimed to support mixed steppings. But somewhere along the way, it broke that by assuming that the cached patch blob is a single one instead of it being one per *node*.
So turn it into a per-node one so that each node can stash the blob relevant for it.
[ NB: Fixes tag is not really the exactly correct one but it is good
enough. ]
--- arch/x86/kernel/cpu/microcode/amd.c | 34 +++++++++++++++++----------- 1 file changed, 21 insertions(+), 13 deletions(-)
arch/x86/kernel/cpu/microcode/amd.c +21 -13
@@ -55,7 +55,9 @@ struct cont_desc { };static u32 ucode_new_rev; -static u8 amd_ucode_patch[PATCH_MAX_SIZE ]; + +/* One blob per node. */ +static u8 amd_ucode_patch[MAX_NUMNODES ][PATCH_MAX_SIZE ];/* * Microcode patch container file is prepended to the initrd in cpio
@@ -428,7 +430,7 @@ static bool early_apply_microcode(u32 cpuid_1_eax, void *ucode, size_t size, boo patch = (u8 (*)[PATCH_MAX_SIZE ])__pa_nodebug (&amd_ucode_patch);#else new_rev = &ucode_new_rev; - patch = &amd_ucode_patch; + patch = &amd_ucode_patch[0 ];#endif desc.cpuid_1_eax = cpuid_1_eax;
@@ -580,10 +582,10 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)void reload_ucode_amd (unsigned int cpu) { -struct microcode_amd *mc;u32 rev, dummy__always_unused ; +struct microcode_amd *mc; - mc = (struct microcode_amd *)amd_ucode_patch; + mc = (struct microcode_amd *)amd_ucode_patch[cpu_to_node (cpu)];rdmsr (MSR_AMD64_PATCH_LEVEL , rev, dummy);
@@ -852,6 +854,8 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data,static enum ucode_state load_microcode_amd (u8 family,const u8 *data,size_t size) { +struct cpuinfo_x86 *c; +unsigned int nid, cpu;struct ucode_patch *p;enum ucode_state ret;
@@ -864,18 +868,22 @@ static enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t sizreturn ret; } - p =find_patch (0 ); -if (!p) { -return ret; - }else { -if (boot_cpu_data.microcode >= p->patch_id) -return ret; +for_each_node (nid) { + cpu =cpumask_first (cpumask_of_node (nid)); + c = &cpu_data (cpu); + + p =find_patch (cpu); +if (!p) +continue ; + +if (c->microcode >= p->patch_id) +continue ; ret =UCODE_NEW ; - } -memset (amd_ucode_patch,0 ,PATCH_MAX_SIZE ); -memcpy (amd_ucode_patch, p->data,min_t (u32, p->size,PATCH_MAX_SIZE )); +memset (&amd_ucode_patch[nid],0 ,PATCH_MAX_SIZE ); +memcpy (&amd_ucode_patch[nid], p->data,min_t (u32, p->size,PATCH_MAX_SIZE )); + }return ret; }
Borislav Petkov
maintainerPATCH 4/4 x86/microcode/core: Return an error only when necessary
In reply to Borislav PetkovFrom: "Borislav Petkov (AMD)" <[email protected]>
Return an error from the late loading function which is run on each CPU only when an error has actually been encountered during the update.
--- arch/x86/kernel/cpu/microcode/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/microcode/core.c +3 -3
@@ -409,10 +409,10 @@ static int __reload_late(void *info) goto wait_for_siblings;if (err >=UCODE_NFOUND ) { -if (err ==UCODE_ERROR ) +if (err ==UCODE_ERROR ) {pr_warn ("Error reloading microcode on CPU %d\n" , cpu); - - ret =-1 ; + ret =-1 ; + } } wait_for_siblings:
Signature · 1 line
2.35.1
[tip: x86/microcode] x86/microcode/core: Return an error only when necessary
The following commit has been merged into the x86/microcode branch of tip:
The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: f33e0c893b22bf94d7985f1f2aa3872237560c74 Gitweb: https://git.kernel.org/tip/f33e0c893b22bf94d7985f1f2aa3872237560c74 Author: Borislav Petkov (AMD) <[email protected]> AuthorDate: Mon, 30 Jan 2023 13:48:04 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 06 Feb 2023 13:41:31 +01:00
x86/microcode/core: Return an error only when necessary
Return an error from the late loading function which is run on each CPU only when an error has actually been encountered during the update.
--- arch/x86/kernel/cpu/microcode/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/microcode/core.c +3 -3
@@ -409,10 +409,10 @@ static int __reload_late(void *info) goto wait_for_siblings;if (err >=UCODE_NFOUND ) { -if (err ==UCODE_ERROR ) +if (err ==UCODE_ERROR ) {pr_warn ("Error reloading microcode on CPU %d\n" , cpu); - - ret =-1 ; + ret =-1 ; + } } wait_for_siblings: