x86/fred: Update MSR_IA32_FRED_RSP0 during task switch

MSR_IA32_FRED_RSP0 is used during ring 3 event delivery, and needs to
be updated to point to the top of next task stack during task switch.

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Signed-off-by: Xin Li <xin3.li@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Tested-by: Shan Kang <shan.kang@intel.com>
Link: https://lore.kernel.org/r/20231205105030.8698-18-xin3.li@intel.com

diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
index f42dbf17f52b0ee12ec74f34d1fb551743be0e6c..c3bd0c0758c9a4366181b0e83c52c83142475d84 100644 (file)
--- a/arch/x86/include/asm/switch_to.h
+++ b/arch/x86/include/asm/switch_to.h
@@ -70,9 +70,13 @@ static inline void update_task_stack(struct task_struct *task)
 #ifdef CONFIG_X86_32
        this_cpu_write(cpu_tss_rw.x86_tss.sp1, task->thread.sp0);
 #else
-       /* Xen PV enters the kernel on the thread stack. */
-       if (cpu_feature_enabled(X86_FEATURE_XENPV))
+       if (cpu_feature_enabled(X86_FEATURE_FRED)) {
+               /* WRMSRNS is a baseline feature for FRED. */
+               wrmsrns(MSR_IA32_FRED_RSP0, (unsigned long)task_stack_page(task) + THREAD_SIZE);
+       } else if (cpu_feature_enabled(X86_FEATURE_XENPV)) {
+               /* Xen PV enters the kernel on the thread stack. */
                load_sp0(task_top_of_stack(task));
+       }
 #endif
 }