diff options
| author | Josh Poimboeuf <jpoimboe@redhat.com> | 2018-08-10 09:31:10 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw@amazon.co.uk> | 2018-08-10 09:32:15 +0200 |
| commit | 07d981ad4cf1e78361c6db1c28ee5ba105f96cc1 (patch) | |
| tree | 454a7eb59e1bb52ff4707a29220f239efba26a73 /arch/x86/kernel/cpu/microcode | |
| parent | tools headers: Synchronise x86 cpufeatures.h for L1TF additions (diff) | |
| download | linux-07d981ad4cf1e78361c6db1c28ee5ba105f96cc1.tar.xz linux-07d981ad4cf1e78361c6db1c28ee5ba105f96cc1.zip | |
x86/microcode: Allow late microcode loading with SMT disabled
The kernel unnecessarily prevents late microcode loading when SMT is
disabled. It should be safe to allow it if all the primary threads are
online.
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Acked-by: Borislav Petkov <bp@suse.de>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/core.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 08286269fd24..b9bc8a1a584e 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -509,12 +509,20 @@ static struct platform_device *microcode_pdev; static int check_online_cpus(void) { - if (num_online_cpus() == num_present_cpus()) - return 0; + unsigned int cpu; - pr_err("Not all CPUs online, aborting microcode update.\n"); + /* + * Make sure all CPUs are online. It's fine for SMT to be disabled if + * all the primary threads are still online. + */ + for_each_present_cpu(cpu) { + if (topology_is_primary_thread(cpu) && !cpu_online(cpu)) { + pr_err("Not all CPUs online, aborting microcode update.\n"); + return -EINVAL; + } + } - return -EINVAL; + return 0; } static atomic_t late_cpus_in; |