x86/mce: protect nr_cpus from rebooting by broadcast mce
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest4 patches 2 repliesIn review
- v14 patches 5 repliesSuperseded
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | x86/apic: correct the ENO in generic_processor_info()arch/ | +1 | 0 replies | |
| 2/4 | x86/apic: record capped cpu in generic_processor_info()arch/ arch/ arch/ | +21 | 0 replies | |
| 3/4 | x86/smp: send capped cpus to a stable state when smp_init()arch/ arch/ arch/ +3 more | +97 | 0 replies | |
| 4/4 | x86/smp: disallow MCE handler on rebooting AParch/ | +8 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [PATCHv2 0/4] x86/mce: protect nr_cpus from rebooting by broadcast mce
v1 -> v2: fix compile warning and error on x86_32
This series include two related groups:
[1-3/4]: protect nr_cpus from rebooting by broadcast mce [4/4]: improve "kexec -l" robustness against broadcast mce
When I tried to fix [1], Thomas raised concern about the nr_cpus' vulnerability to unexpected rebooting by broadcast mce. After analysis, I think only the following first case suffers from the rebooting by broadcast mce. [1-3/4] aims to fix that issue.
*** Back ground ***
On x86 it's required to have all logical CPUs set CR4.MCE=1. Otherwise, a broadcast MCE observing CR4.MCE=0b on any core will shutdown the machine.
The option 'nosmt' has already complied with the above rule by Thomas's patch. For detail, refer to 506a66f3748 (Revert "x86/apic: Ignore secondary threads if nosmt=force")
But for nr_cpus option, the exposure to broadcast MCE is a little complicated, and can be categorized into three cases.
-1. boot up by BIOS. Since no one set CR4.MCE=1, nr_cpus risks rebooting by broadcast MCE.
-2. boot up by "kexec -p nr_cpus=". Since the 1st kernel has all cpus' CR4.MCE=1 set before kexec -p, nr_cpus is free of rebooting by broadcast MCE. Furthermore, the crashed kernel's wreckage, including page table and text, is not touched by capture kernel. Hence if MCE event happens on capped cpu, do_machine_check->__mc_check_crashing_cpu() runs smoothly and returns immediately, the capped cpu is still pinned on "halt".
-3. boot up by "kexec -l nr_cpus=". As "kexec -p", it is free of rebooting by broadcast MCE. But the 1st kernel's wreckage is discarded and changed. when capped cpus execute do_machine_check(), they may crack the new kernel. But this is not related with broadcast MCE, and need an extra fix.
*** Solution ***
"nr_cpus" can not follow the same way as "nosmt". Because nr_cpus limits the allocation of percpu area and some other kthread memory, which is critical to cpu hotplug framework. Instead, developing a dedicated SIPI callback make_capped_cpu_stable() for capped cpu, which does not lean on percpu area to work.
[1]: https://lkml.org/lkml/2019/7/5/3
To: Gleixner <[email protected]>
To: Andy Lutomirski <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: Peter Zijlstra <[email protected]>
To: [email protected]
Cc: Masami Hiramatsu <[email protected]>
Cc: Qian Cai <[email protected]>
Cc: Vlastimil Babka <[email protected]>
Cc: Daniel Drake <[email protected]>
Cc: Jacob Pan <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Eric Biederman <[email protected]>
Cc: [email protected]
Cc: Dave Young <[email protected]>
Cc: Baoquan He <[email protected]>
Cc: [email protected]
---
Pingfan Liu (4):
x86/apic: correct the ENO in generic_processor_info() x86/apic: record capped cpu in generic_processor_info() x86/smp: send capped cpus to a stable state when smp_init() x86/smp: disallow MCE handler on rebooting AP
arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/smp.h | 3 ++ arch/x86/kernel/apic/apic.c | 23 ++++++++---- arch/x86/kernel/cpu/common.c | 7 ++++ arch/x86/kernel/smp.c | 8 +++++ arch/x86/kernel/smpboot.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ kernel/smp.c | 6 ++++ 7 files changed, 124 insertions(+), 7 deletions(-)
Signature · 1 line
2.7.5