stuartl/linux-stable
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git synced 2025-10-08 13:15:50 +10:00
Code Issues Releases Wiki Activity

x86/smpboot: Restrict soft_restart_cpu() to SEV

Browse Source 
Now that the CPU0 hotplug cruft is gone, the only user is AMD SEV.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Tested-by: Helge Deller <deller@gmx.de> # parisc
Tested-by: Guilherme G. Piccoli <gpiccoli@igalia.com> # Steam Deck
Link: https://lore.kernel.org/r/20230512205255.822234014@linutronix.de
This commit is contained in:
Thomas Gleixner 2023-05-12 23:07:08 +02:00 committed by Peter Zijlstra
parent 5475abbde7
commit cded367976
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/callthunks.c
View File

@ -133,7 +133,7 @@ static bool skip_addr(void *dest)
/* Accounts directly */ /* Accounts directly */
if (dest == ret_from_fork) if (dest == ret_from_fork)
return true; return true;
#ifdef CONFIG_HOTPLUG_CPU #if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_AMD_MEM_ENCRYPT)
if (dest == soft_restart_cpu) if (dest == soft_restart_cpu)
return true; return true;
#endif #endif

14
arch/x86/kernel/head_32.S
View File

@ -138,20 +138,6 @@ SYM_CODE_START(startup_32)
jmp .Ldefault_entry jmp .Ldefault_entry
SYM_CODE_END(startup_32) SYM_CODE_END(startup_32)
#ifdef CONFIG_HOTPLUG_CPU
/*
* Entry point for soft restart of a CPU. Invoked from xxx_play_dead() for
* restarting the boot CPU or for restarting SEV guest CPUs after CPU hot
* unplug. Everything is set up already except the stack.
*/
SYM_FUNC_START(soft_restart_cpu)
movl initial_stack, %ecx
movl %ecx, %esp
call *(initial_code)
1: jmp 1b
SYM_FUNC_END(soft_restart_cpu)
#endif
/* /*
* Non-boot CPU entry point; entered from trampoline.S * Non-boot CPU entry point; entered from trampoline.S
* We can't lgdt here, because lgdt itself uses a data segment, but * We can't lgdt here, because lgdt itself uses a data segment, but

2
arch/x86/kernel/head_64.S
View File

@ -375,7 +375,7 @@ SYM_CODE_END(secondary_startup_64)
#include "verify_cpu.S" #include "verify_cpu.S"
#include "sev_verify_cbit.S" #include "sev_verify_cbit.S"
#ifdef CONFIG_HOTPLUG_CPU #if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_AMD_MEM_ENCRYPT)
/* /*
* Entry point for soft restart of a CPU. Invoked from xxx_play_dead() for * Entry point for soft restart of a CPU. Invoked from xxx_play_dead() for
* restarting the boot CPU or for restarting SEV guest CPUs after CPU hot * restarting the boot CPU or for restarting SEV guest CPUs after CPU hot