From: Thomas Gleixner <tglx@xxxxxxxxxxxxx> commit ecfd41089348fa4cc767dc588367e9fdf8cb6b9d upstream find_blobs_in_containers() is invoked on every CPU but overwrites unconditionally ucode_cpu_info of CPU0. Fix this by using the proper CPU data and move the assignment into the call site apply_ucode_from_containers() so that the function can be reused. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx> Link: https://lore.kernel.org/r/20231010150702.433454320@xxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/cpu/microcode/amd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -503,9 +503,6 @@ static void find_blobs_in_containers(uns if (!get_builtin_microcode(&cp, x86_family(cpuid_1_eax))) cp = find_microcode_in_initrd(ucode_path); - /* Needed in load_microcode_amd() */ - ucode_cpu_info->cpu_sig.sig = cpuid_1_eax; - *ret = cp; } @@ -513,6 +510,9 @@ static void apply_ucode_from_containers( { struct cpio_data cp = { }; + /* Needed in load_microcode_amd() */ + ucode_cpu_info[smp_processor_id()].cpu_sig.sig = cpuid_1_eax; + find_blobs_in_containers(cpuid_1_eax, &cp); if (!(cp.data && cp.size)) return; Patches currently in stable-queue which might be from tglx@xxxxxxxxxxxxx are queue-6.6/x86-microcode-intel-cleanup-code-further.patch queue-6.6/x86-microcode-intel-simplify-scan_microcode.patch queue-6.6/x86-microcode-mop-up-early-loading-leftovers.patch queue-6.6/x86-microcode-provide-new-control-functions.patch queue-6.6/x86-microcode-intel-save-the-microcode-only-after-a-successful-late-load.patch queue-6.6/x86-microcode-32-move-early-loading-after-paging-enable.patch queue-6.6/x86-microcode-intel-simplify-early-loading.patch queue-6.6/x86-microcode-add-per-cpu-control-field.patch queue-6.6/x86-microcode-add-per-cpu-result-state.patch queue-6.6/x86-microcode-prepare-for-minimal-revision-check.patch queue-6.6/x86-microcode-intel-simplify-and-rename-generic_load_microcode.patch queue-6.6/x86-microcode-amd-get-rid-of-the-_load_microcode_amd-forward-declaration.patch queue-6.6/x86-microcode-handle-offline-cpus-correctly.patch queue-6.6/x86-microcode-get-rid-of-the-schedule-work-indirection.patch queue-6.6/x86-microcode-intel-rework-intel_cpu_collect_info.patch queue-6.6/x86-microcode-amd-use-cached-microcode-for-ap-load.patch queue-6.6/x86-microcode-replace-the-all-in-one-rendevous-handler.patch queue-6.6/x86-microcode-amd-add-get_patch_level.patch queue-6.6/x86-apic-provide-apic_force_nmi_on_cpu.patch queue-6.6/sched-core-prevent-rescheduling-when-interrupts-are-disabled.patch queue-6.6/x86-cpu-fix-warm-boot-hang-regression-on-amd-sc1100-.patch queue-6.6/x86-microcode-intel-rework-intel_find_matching_signature.patch queue-6.6/x86-microcode-remove-pointless-apply-invocation.patch queue-6.6/x86-microcode-intel-reuse-intel_cpu_collect_info.patch queue-6.6/x86-microcode-amd-use-correct-per-cpu-ucode_cpu_info.patch queue-6.6/x86-microcode-amd-cache-builtin-initrd-microcode-early.patch queue-6.6/x86-microcode-protect-against-instrumentation.patch queue-6.6/x86-microcode-clean-up-mc_cpu_down_prep.patch queue-6.6/x86-microcode-amd-cache-builtin-microcode-too.patch queue-6.6/x86-microcode-amd-merge-early_apply_microcode-into-its-single-callsite.patch queue-6.6/x86-microcode-rendezvous-and-load-in-nmi.patch queue-6.6/x86-microcode-intel-rip-out-mixed-stepping-support-for-intel-cpus.patch queue-6.6/x86-microcode-intel-unify-microcode-apply-functions.patch queue-6.6/intel_idle-handle-older-cpus-which-stop-the-tsc-in-deeper-c-states-correctly.patch queue-6.6/x86-microcode-intel-switch-to-kvmalloc.patch queue-6.6/x86-microcode-clarify-the-late-load-logic.patch queue-6.6/x86-microcode-sanitize-__wait_for_cpus.patch queue-6.6/x86-microcode-rework-early-revisions-reporting.patch queue-6.6/rcuref-plug-slowpath-race-in-rcuref_put.patch queue-6.6/x86-microcode-handle-nosmt-correctly.patch
