From: Joan Bruguera <joanbrugue...@gmail.com> When resuming from suspend we don't have coherent CPU state, trying to do callthunks here isn't going to work. Specifically GS isn't set yet.
Signed-off-by: Joan Bruguera <joanbrugue...@gmail.com> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Link: https://lkml.kernel.org/r/20230109040531.7888-1-joanbrugue...@gmail.com --- arch/x86/kernel/callthunks.c | 5 +++++ arch/x86/power/cpu.c | 3 +++ 2 files changed, 8 insertions(+) --- a/arch/x86/kernel/callthunks.c +++ b/arch/x86/kernel/callthunks.c @@ -7,6 +7,7 @@ #include <linux/memory.h> #include <linux/moduleloader.h> #include <linux/static_call.h> +#include <linux/suspend.h> #include <asm/alternative.h> #include <asm/asm-offsets.h> @@ -151,6 +152,10 @@ static bool skip_addr(void *dest) dest < (void*)hypercall_page + PAGE_SIZE) return true; #endif +#ifdef CONFIG_PM_SLEEP + if (dest == restore_processor_state) + return true; +#endif return false; }
