x86: enable FRED for x86-64
Subsystems (16)
v7 cover x86: enable FRED for x86-64
This patch set enables FRED for x86-64.
The Intel flexible return and event delivery (FRED) architecture defines simple new transitions that change privilege level (ring transitions). The FRED architecture was designed with the following goals:
1) Improve overall performance and response time by replacing event delivery through the interrupt descriptor table (IDT event delivery) and event return by the IRET instruction with lower latency transitions.
2) Improve software robustness by ensuring that event delivery establishes the full supervisor context and that event return establishes the full user context.
The new transitions defined by the FRED architecture are FRED event delivery and, for returning from events, two FRED return instructions. FRED event delivery can effect a transition from ring 3 to ring 0, but it is used also to deliver events incident to ring 0. One FRED instruction (ERETU) effects a return from ring 0 to ring 3, while the other (ERETS) returns while remaining in ring 0.
Search for the latest FRED spec in most search engines with this search pattern:
site:intel.com FRED (flexible return and event delivery) specification
As of now there is no publicly avaiable CPU supporting FRED, thus the Intel Simics® Simulator is used as software development and testing vehicles. And it can be downloaded from:
https://www.intel.com/content/www/us/en/developer/articles/tool/simics-simulator.html
To enable FRED, the Simics package 8112 QSP-CPU needs to be installed with CPU model configured as:
$cpu_comp_class = "x86-experimental-fred"
Longer term, we should refactor common code shared by FRED and IDT into common shared files, and contain IDT code using a new config CONFIG_X86_IDT.
Changes since v6:
* Add a comment to explain why it is safe to write to a previous FRED stack frame. (Lai Jiangshan).
* Export fred_entrypoint_kernel(), required when kvm-intel built as a module.
* Reserve a REDZONE for CALL emulation and Align RSP to a 64-byte boundary before pushing a new FRED stack frame.
* Replace pt_regs csx flags prefix FRED_CSL_ with FRED_CSX_.
Changes since v5:
* Initialize system_interrupt_handlers with dispatch_table_spurious_interrupt() instead of NULL to get rid of a branch (Peter Zijlstra).
* Disallow #DB inside #MCE for robustness sake (Peter Zijlstra).
* Add a comment for FRED stack level settings (Lai Jiangshan).
* Move the NMI bit from an invalid stack frame, which caused ERETU to fault, to the fault handler's stack frame, thus to unblock NMI ASAP if NMI is blocked (Lai Jiangshan).
* Refactor VMX_DO_EVENT_IRQOFF to handle IRQ/NMI in IRQ/NMI induced VM exits when FRED is enabled (Sean Christopherson).
Changes since v4:
* Do NOT use the term "injection", which in the KVM context means to reinject an event into the guest (Sean Christopherson).
* Add the explanation of why to execute "int $2" to invoke the NMI handler in NMI caused VM exits (Sean Christopherson).
* Use cs/ss instead of csx/ssx when initializing the pt_regs structure for calling external_interrupt(), otherwise it breaks i386 build.
Changes since v3:
* Call external_interrupt() to handle IRQ in IRQ caused VM exits.
* Execute "int $2" to handle NMI in NMI caused VM exits.
* Rename csl/ssl of the pt_regs structure to csx/ssx (x for extended) (Andrew Cooper).
Changes since v2:
* Improve comments for changes in arch/x86/include/asm/idtentry.h.
Changes since v1:
* call irqentry_nmi_{enter,exit}() in both IDT and FRED debug fault kernel handler (Peter Zijlstra).
* Initialize a FRED exception handler to fred_bad_event() instead of NULL if no FRED handler defined for an exception vector (Peter Zijlstra).
* Push calling irqentry_{enter,exit}() and instrumentation_{begin,end}() down into individual FRED exception handlers, instead of in the dispatch framework (Peter Zijlstra).
H. Peter Anvin (Intel) (24):
x86/traps: let common_interrupt() handle IRQ_MOVE_CLEANUP_VECTOR x86/fred: make unions for the cs and ss fields in struct pt_regs x86/traps: add a system interrupt table for system interrupt dispatch x86/traps: add external_interrupt() to dispatch external interrupts x86/cpufeature: add the cpu feature bit for FRED x86/opcode: add ERETU, ERETS instructions to x86-opcode-map x86/objtool: teach objtool about ERETU and ERETS
x86/cpu: add X86_CR4_FRED macro
x86/fred: add Kconfig option for FRED (CONFIG_X86_FRED) x86/fred: if CONFIG_X86_FRED is disabled, disable FRED support x86/cpu: add MSR numbers for FRED configuration
x86/fred: header file with FRED definitions
x86/fred: reserve space for the FRED stack frame
x86/fred: add a page fault entry stub for FRED
x86/fred: add a debug fault entry stub for FRED
x86/fred: add a NMI entry stub for FRED
x86/fred: FRED entry/exit and dispatch code
x86/fred: FRED initialization code
x86/fred: update MSR_IA32_FRED_RSP0 during task switch x86/fred: let ret_from_fork() jmp to fred_exit_user when FRED is
enabled
x86/fred: disallow the swapgs instruction when FRED is enabled x86/fred: no ESPFIX needed when FRED is enabled
x86/fred: allow single-step trap and NMI when starting a new thread x86/fred: allow FRED systems to use interrupt vectors 0x10-0x1f
Xin Li (9):
x86/traps: add install_system_interrupt_handler() x86/fred: header file for event types
x86/fred: add a machine check entry stub for FRED x86/fred: fixup fault on ERETU by jumping to fred_entrypoint_user x86/ia32: do not modify the DPL bits for a null selector x86/fred: allow dynamic stack frame size
x86/fred: BUG() when ERETU with %rsp not equal to that when the ring 3
event was just delivered
x86/fred: disable FRED by default in its early stage
KVM: x86/vmx: refactor VMX_DO_EVENT_IRQOFF to generate FRED stack
frames
.../admin-guide/kernel-parameters.txt | 4 + arch/x86/Kconfig | 9 + arch/x86/entry/Makefile | 5 +- arch/x86/entry/entry_32.S | 2 +- arch/x86/entry/entry_64.S | 5 + arch/x86/entry/entry_64_fred.S | 62 +++++ arch/x86/entry/entry_fred.c | 222 ++++++++++++++++++ arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- arch/x86/include/asm/asm-prototypes.h | 1 + arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/disabled-features.h | 8 +- arch/x86/include/asm/entry-common.h | 3 + arch/x86/include/asm/event-type.h | 17 ++ arch/x86/include/asm/extable_fixup_types.h | 4 +- arch/x86/include/asm/fred.h | 150 ++++++++++++ arch/x86/include/asm/idtentry.h | 76 +++++- arch/x86/include/asm/irq.h | 5 + arch/x86/include/asm/irq_vectors.h | 15 +- arch/x86/include/asm/msr-index.h | 13 +- arch/x86/include/asm/processor.h | 12 +- arch/x86/include/asm/ptrace.h | 34 ++- arch/x86/include/asm/switch_to.h | 10 +- arch/x86/include/asm/thread_info.h | 35 +-- arch/x86/include/asm/traps.h | 13 + arch/x86/include/asm/vmx.h | 17 +- arch/x86/include/uapi/asm/processor-flags.h | 2 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/apic/apic.c | 11 +- arch/x86/kernel/apic/vector.c | 8 +- arch/x86/kernel/cpu/acrn.c | 7 +- arch/x86/kernel/cpu/common.c | 88 ++++--- arch/x86/kernel/cpu/mce/core.c | 15 ++ arch/x86/kernel/cpu/mshyperv.c | 22 +- arch/x86/kernel/espfix_64.c | 8 + arch/x86/kernel/fred.c | 78 ++++++ arch/x86/kernel/head_32.S | 3 +- arch/x86/kernel/idt.c | 6 +- arch/x86/kernel/irq.c | 6 +- arch/x86/kernel/irqinit.c | 7 +- arch/x86/kernel/kvm.c | 4 +- arch/x86/kernel/nmi.c | 19 ++ arch/x86/kernel/process.c | 5 + arch/x86/kernel/process_64.c | 21 +- arch/x86/kernel/signal_32.c | 21 +- arch/x86/kernel/traps.c | 175 ++++++++++++-- arch/x86/kvm/vmx/vmenter.S | 74 +++++- arch/x86/kvm/vmx/vmx.c | 16 +- arch/x86/lib/x86-opcode-map.txt | 2 +- arch/x86/mm/extable.c | 84 +++++++ arch/x86/mm/fault.c | 20 +- drivers/xen/events/events_base.c | 5 +- kernel/fork.c | 6 + tools/arch/x86/include/asm/cpufeatures.h | 1 + .../arch/x86/include/asm/disabled-features.h | 8 +- tools/arch/x86/include/asm/msr-index.h | 13 +- tools/arch/x86/lib/x86-opcode-map.txt | 2 +- tools/objtool/arch/x86/decode.c | 19 +- 57 files changed, 1306 insertions(+), 176 deletions(-) create mode 100644 arch/x86/entry/entry_64_fred.S create mode 100644 arch/x86/entry/entry_fred.c create mode 100644 arch/x86/include/asm/event-type.h create mode 100644 arch/x86/include/asm/fred.h create mode 100644 arch/x86/kernel/fred.c
Signature · 1 line
2.34.1
PATCH v7 1/33 x86/traps: let common_interrupt() handle IRQ_MOVE_CLEANUP_VECTOR
From: "H. Peter Anvin (Intel)" <[email protected]>
IRQ_MOVE_CLEANUP_VECTOR is the only one of the system IRQ vectors that is *below* FIRST_SYSTEM_VECTOR. It is a slow path, so just push it into common_interrupt() just before the spurious interrupt handling.
--- arch/x86/kernel/irq.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/kernel/irq.c +4 -0
@@ -248,6 +248,10 @@ DEFINE_IDTENTRY_IRQ(common_interrupt) desc =__this_cpu_read (vector_irq[vector]);if (likely (!IS_ERR_OR_NULL (desc))) {handle_irq (desc, regs); +#ifdef CONFIG_SMP + }else if (vector ==IRQ_MOVE_CLEANUP_VECTOR ) { +sysvec_irq_move_cleanup (regs); +#endif }else {ack_APIC_irq ();
Signature · 1 line
2.34.1
PATCH v7 2/33 x86/fred: make unions for the cs and ss fields in struct pt_regs
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Make the cs and ss fields in struct pt_regs unions between the actual selector and the unsigned long stack slot. FRED uses this space to store additional flags.
The printk changes are simply due to the cs and ss fields changed to unsigned short from unsigned long.
---
Changes since v3:
* Rename csl/ssl of the pt_regs structure to csx/ssx (x for extended) (Andrew Cooper).
--- arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- arch/x86/include/asm/ptrace.h | 34 ++++++++++++++++++++++++--- arch/x86/kernel/process_64.c | 2 +- 3 files changed, 33 insertions(+), 5 deletions(-)
arch/x86/entry/vsyscall/vsyscall_64.c +1 -1
@@ -76,7 +76,7 @@ static void warn_bad_vsyscall(const char *level, struct pt_regs *regs,if (!show_unhandled_signals)return ; -printk_ratelimited ("%s%s[%d] %s ip:%lx cs:%lx sp:%lx ax:%lx si:%lx di:%lx\n" , +printk_ratelimited ("%s%s[%d] %s ip:%lx cs:%x sp:%lx ax:%lx si:%lx di:%lx\n" , level, current->comm,task_pid_nr (current), message, regs->ip, regs->cs, regs->sp, regs->ax, regs->si, regs->di);
arch/x86/include/asm/ptrace.h +31 -3
@@ -82,12 +82,40 @@ struct pt_regs {* On hw interrupt, it's IRQ number: */ unsigned long orig_ax; -/* Return frame for iretq */ +/* Return frame for iretq/eretu/erets */ unsigned long ip; -unsigned long cs; +union { +unsigned long csx;/* cs extended: CS + any fields above it */ +struct __attribute__((__packed__ )) { +unsigned short cs;/* CS selector proper */ +unsigned int current_stack_level:2 ; +unsigned int __csx_resv1 :6 ; +unsigned int interrupt_shadowed :1 ; +unsigned int software_initiated :1 ; +unsigned int __csx_resv2 :2 ; +unsigned int nmi :1 ; +unsigned int __csx_resv3 :3 ; +unsigned int __csx_resv4 :32 ; + }; + };unsigned long flags;unsigned long sp; -unsigned long ss; +union { +unsigned long ssx;/* ss extended: SS + any fields above it */ +struct __attribute__((__packed__ )) { +unsigned short ss;/* SS selector proper */ +unsigned int __ssx_resv1 :16 ; +unsigned int vector :8 ; +unsigned int __ssx_resv2 :8 ; +unsigned int type :4 ; +unsigned int __ssx_resv3 :4 ; +unsigned int enclv :1 ; +unsigned int long_mode :1 ; +unsigned int nested :1 ; +unsigned int __ssx_resv4 :1 ; +unsigned int instr_len :4 ; + }; + };/* top of stack page */ };
arch/x86/kernel/process_64.c +1 -1
@@ -116,7 +116,7 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode,printk ("%sFS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n" , log_lvl, fs, fsindex, gs, gsindex, shadowgs); -printk ("%sCS: %04lx DS: %04x ES: %04x CR0: %016lx\n" , +printk ("%sCS: %04x DS: %04x ES: %04x CR0: %016lx\n" , log_lvl, regs->cs, ds, es, cr0);printk ("%sCR2: %016lx CR3: %016lx CR4: %016lx\n" , log_lvl, cr2, cr3, cr4);
Signature · 1 line
2.34.1
PATCH v7 3/33 x86/traps: add a system interrupt table for system interrupt dispatch
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
On x86, external interrupts are divided into the following two groups
1) system interrupts
2) external device interrupts
External device interrupts are all routed to common_interrupt(), which dispatches external device interrupts through a per-CPU external interrupt dispatch table vector_irq.
For system interrupts, add a system interrupt handler table for dispatching a system interrupt to its corresponding handler directly. Thus a software based dispatch function will be:
void external_interrupt(struct pt_regs *regs)
{
u8 vector = regs->vector;
if (is_system_interrupt(vector))
system_interrupt_handlers[vector_to_sysvec(vector)](regs);
else /* external device interrupt */
common_interrupt(regs);
}--- arch/x86/include/asm/idtentry.h | 64 +++++++++++++++++++++++++++------ arch/x86/include/asm/traps.h | 7 ++++ arch/x86/kernel/traps.c | 62 ++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 11 deletions(-)
arch/x86/include/asm/idtentry.h +53 -11
@@ -167,17 +167,22 @@ __visible noinstr void func(struct pt_regs *regs, unsigned long error_code)/** * DECLARE_IDTENTRY_IRQ - Declare functions for device interrupt IDT entry -* points (common/spurious) +* points (common/spurious) and their corresponding +* software based dispatch handlers in the non-noinstr +* text section * @vector: Vector number (ignored for C) * @func: Function name of the entry point * -* Maps to DECLARE_IDTENTRY_ERRORCODE() +* Maps to DECLARE_IDTENTRY_ERRORCODE(), plus a dispatch function prototype */ #define DECLARE_IDTENTRY_IRQ (vector, func) \ - DECLARE_IDTENTRY_ERRORCODE(vector, func) + DECLARE_IDTENTRY_ERRORCODE(vector, func); \ + void dispatch_##func(struct pt_regs *regs, unsigned long error_code)/** * DEFINE_IDTENTRY_IRQ - Emit code for device interrupt IDT entry points +* and their corresponding software based dispatch +* handlers in the non-noinstr text section * @func: Function name of the entry point * * The vector number is pushed by the low level entry stub and handed
@@ -187,6 +192,9 @@ __visible noinstr void func(struct pt_regs *regs, unsigned long error_code)* irq_enter/exit_rcu() are invoked before the function body and the * KVM L1D flush request is set. Stack switching to the interrupt stack * has to be done in the function body if necessary. +* +* dispatch_func() is a software based dispatch handler in the non-noinstr +* text section. */ #define DEFINE_IDTENTRY_IRQ (func) \ static void __##func(struct pt_regs *regs, u32 vector); \
@@ -204,31 +212,48 @@ __visible noinstr void func(struct pt_regs *regs, \irqentry_exit (regs, state); \ } \ \ +void dispatch_##func(struct pt_regs *regs, unsigned long error_code) \ +{ \ + u32 vector = (u32)(u8)error_code; \ + \ + kvm_set_cpu_l1tf_flush_l1d(); \ + run_irq_on_irqstack_cond(__##func, regs, vector); \ +} \ + \ static noinline void __##func(struct pt_regs *regs, u32 vector)/** * DECLARE_IDTENTRY_SYSVEC - Declare functions for system vector entry points +* and their corresponding software based dispatch +* handlers in the non-noinstr text section * @vector: Vector number (ignored for C) * @func: Function name of the entry point * -* Declares three functions: +* Declares four functions: * - The ASM entry point: asm_##func * - The XEN PV trap entry point: xen_##func (maybe unused) * - The C handler called from the ASM entry point +* - The C handler used in the system interrupt handler table * -* Maps to DECLARE_IDTENTRY(). +* Maps to DECLARE_IDTENTRY(), plus a dispatch table function prototype */ #define DECLARE_IDTENTRY_SYSVEC (vector, func) \ - DECLARE_IDTENTRY(vector, func) + DECLARE_IDTENTRY(vector, func); \ + void dispatch_table_##func(struct pt_regs *regs)/** * DEFINE_IDTENTRY_SYSVEC - Emit code for system vector IDT entry points +* and their corresponding software based dispatch +* handlers in the non-noinstr text section * @func: Function name of the entry point * * irqentry_enter/exit() and irq_enter/exit_rcu() are invoked before the * function body. KVM L1D flush request is set. * -* Runs the function on the interrupt stack if the entry hit kernel mode +* Runs the function on the interrupt stack if the entry hit kernel mode. +* +* dispatch_table_func() is used in the system interrupt handler table for +* system interrupts dispatching. */ #define DEFINE_IDTENTRY_SYSVEC (func) \ static void __##func(struct pt_regs *regs); \
@@ -244,11 +269,19 @@ __visible noinstr void func(struct pt_regs *regs) \irqentry_exit (regs, state); \ } \ \ +void dispatch_table_##func(struct pt_regs *regs) \ +{ \ + kvm_set_cpu_l1tf_flush_l1d(); \ + run_sysvec_on_irqstack_cond(__##func, regs); \ +} \ + \ static noinline void __##func(struct pt_regs *regs)/** * DEFINE_IDTENTRY_SYSVEC_SIMPLE - Emit code for simple system vector IDT -* entry points +* entry points and their corresponding +* software based dispatch handlers in +* the non-noinstr text section * @func: Function name of the entry point * * Runs the function on the interrupted stack. No switch to IRQ stack and
@@ -256,6 +289,9 @@ static noinline void __##func(struct pt_regs *regs)* * Only use for 'empty' vectors like reschedule IPI and KVM posted * interrupt vectors. +* +* dispatch_table_func() is used in the system interrupt handler table for +* system interrupts dispatching. */ #define DEFINE_IDTENTRY_SYSVEC_SIMPLE (func) \ static __always_inline void __##func(struct pt_regs *regs); \
@@ -273,6 +309,14 @@ __visible noinstr void func(struct pt_regs *regs) \irqentry_exit (regs, state); \ } \ \ +void dispatch_table_##func(struct pt_regs *regs) \ +{ \ + __irq_enter_raw(); \ + kvm_set_cpu_l1tf_flush_l1d(); \ + __##func (regs); \ + __irq_exit_raw(); \ +} \ + \ static __always_inline void __##func(struct pt_regs *regs)/**
@@ -634,9 +678,7 @@ DECLARE_IDTENTRY(X86_TRAP_VE, exc_virtualization_exception);/* Device interrupts common/spurious */ DECLARE_IDTENTRY_IRQ (X86_TRAP_OTHER , common_interrupt); -#ifdef CONFIG_X86_LOCAL_APIC DECLARE_IDTENTRY_IRQ (X86_TRAP_OTHER , spurious_interrupt); -#endif /* System vector entry points */ #ifdef CONFIG_X86_LOCAL_APIC
@@ -647,7 +689,7 @@ DECLARE_IDTENTRY_SYSVEC(X86_PLATFORM_IPI_VECTOR, sysvec_x86_platform_ipi);#endif #ifdef CONFIG_SMP -DECLARE_IDTENTRY (RESCHEDULE_VECTOR , sysvec_reschedule_ipi); +DECLARE_IDTENTRY_SYSVEC (RESCHEDULE_VECTOR , sysvec_reschedule_ipi);DECLARE_IDTENTRY_SYSVEC (IRQ_MOVE_CLEANUP_VECTOR , sysvec_irq_move_cleanup);DECLARE_IDTENTRY_SYSVEC (REBOOT_VECTOR , sysvec_reboot);DECLARE_IDTENTRY_SYSVEC (CALL_FUNCTION_SINGLE_VECTOR , sysvec_call_function_single);
arch/x86/include/asm/traps.h +7 -0
@@ -47,4 +47,11 @@ void __noreturn handle_stack_overflow(struct pt_regs *regs, struct stack_info *info);#endif +/* +* How system interrupt handlers are called. +*/ +#define DECLARE_SYSTEM_INTERRUPT_HANDLER (f) \ + void f (struct pt_regs *regs) +typedef DECLARE_SYSTEM_INTERRUPT_HANDLER ((*system_interrupt_handler )); +#endif /* _ASM_X86_TRAPS_H */
arch/x86/kernel/traps.c +62 -0
68 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 4/33 x86/traps: add install_system_interrupt_handler()
In reply to Xin LiSome kernel components install system interrupt handlers into the IDT, and we need to do the same for system_interrupt_handlers. A new function install_system_interrupt_handler() is added to install a system interrupt handler into both the IDT and system_interrupt_handlers.
--- arch/x86/include/asm/traps.h | 2 ++ arch/x86/kernel/cpu/acrn.c | 7 +++++-- arch/x86/kernel/cpu/mshyperv.c | 22 ++++++++++++++-------- arch/x86/kernel/kvm.c | 4 +++- arch/x86/kernel/traps.c | 10 ++++++++++ drivers/xen/events/events_base.c | 5 ++++- 6 files changed, 38 insertions(+), 12 deletions(-)
arch/x86/include/asm/traps.h +2 -0
@@ -41,6 +41,8 @@ void math_emulate(struct math_emu_info *);bool fault_in_kernel_space (unsigned long address); +void install_system_interrupt_handler (unsigned int n,const void *asm_addr,const void *addr); +#ifdef CONFIG_VMAP_STACK void __noreturn handle_stack_overflow(struct pt_regs *regs, unsigned long fault_address,
arch/x86/kernel/cpu/acrn.c +5 -2
@@ -18,6 +18,7 @@#include <asm/hypervisor.h> #include <asm/idtentry.h> #include <asm/irq_regs.h> +#include <asm/traps.h> static u32 __init acrn_detect (void ) {
@@ -26,8 +27,10 @@ static u32 __init acrn_detect(void)static void __init acrn_init_platform (void ) { -/* Setup the IDT for ACRN hypervisor callback */ -alloc_intr_gate (HYPERVISOR_CALLBACK_VECTOR , asm_sysvec_acrn_hv_callback); +/* Install system interrupt handler for ACRN hypervisor callback */ +install_system_interrupt_handler (HYPERVISOR_CALLBACK_VECTOR , + asm_sysvec_acrn_hv_callback, + sysvec_acrn_hv_callback); x86_platform.calibrate_tsc = acrn_get_tsc_khz; x86_platform.calibrate_cpu = acrn_get_tsc_khz;
arch/x86/kernel/cpu/mshyperv.c +14 -8
@@ -29,6 +29,7 @@#include <asm/i8259.h> #include <asm/apic.h> #include <asm/timer.h> +#include <asm/traps.h> #include <asm/reboot.h> #include <asm/nmi.h> #include <clocksource/hyperv_timer.h>
@@ -491,19 +492,24 @@ static void __init ms_hyperv_init_platform(void)*/ x86_platform.apic_post_init = hyperv_init;hyperv_setup_mmu_ops (); -/* Setup the IDT for hypervisor callback */ -alloc_intr_gate (HYPERVISOR_CALLBACK_VECTOR , asm_sysvec_hyperv_callback); -/* Setup the IDT for reenlightenment notifications */ +/* Install system interrupt handler for hypervisor callback */ +install_system_interrupt_handler (HYPERVISOR_CALLBACK_VECTOR , + asm_sysvec_hyperv_callback, + sysvec_hyperv_callback); + +/* Install system interrupt handler for reenlightenment notifications */ if (ms_hyperv.features &HV_ACCESS_REENLIGHTENMENT ) { -alloc_intr_gate (HYPERV_REENLIGHTENMENT_VECTOR , - asm_sysvec_hyperv_reenlightenment); +install_system_interrupt_handler (HYPERV_REENLIGHTENMENT_VECTOR , + asm_sysvec_hyperv_reenlightenment, + sysvec_hyperv_reenlightenment); } -/* Setup the IDT for stimer0 */ +/* Install system interrupt handler for stimer0 */ if (ms_hyperv.misc_features &HV_STIMER_DIRECT_MODE_AVAILABLE ) { -alloc_intr_gate (HYPERV_STIMER0_VECTOR , - asm_sysvec_hyperv_stimer0); +install_system_interrupt_handler (HYPERV_STIMER0_VECTOR , + asm_sysvec_hyperv_stimer0, + sysvec_hyperv_stimer0); }# ifdef CONFIG_SMP
arch/x86/kernel/kvm.c +3 -1
@@ -829,7 +829,9 @@ static void __init kvm_guest_init(void)if (kvm_para_has_feature (KVM_FEATURE_ASYNC_PF_INT ) && kvmapf) {static_branch_enable (&kvm_async_pf_enabled); -alloc_intr_gate (HYPERVISOR_CALLBACK_VECTOR , asm_sysvec_kvm_asyncpf_interrupt); +install_system_interrupt_handler (HYPERVISOR_CALLBACK_VECTOR , + asm_sysvec_kvm_asyncpf_interrupt, + sysvec_kvm_asyncpf_interrupt); }#ifdef CONFIG_SMP
arch/x86/kernel/traps.c +10 -0
@@ -1513,6 +1513,16 @@ static system_interrupt_handler system_interrupt_handlers[NR_SYSTEM_VECTORS] = {#endif /* CONFIG_X86_64 */ +void __init install_system_interrupt_handler (unsigned int n,const void *asm_addr,const void *addr) +{ +BUG_ON (n <FIRST_SYSTEM_VECTOR ); + +#ifdef CONFIG_X86_64 + system_interrupt_handlers[n -FIRST_SYSTEM_VECTOR ] = (system_interrupt_handler )addr; +#endif +alloc_intr_gate (n, asm_addr); +} +void __init trap_init (void ) {/* Init cpu_entry_area before IST entries are set up */
drivers/xen/events/events_base.c +4 -1
@@ -45,6 +45,7 @@#include <asm/irq.h> #include <asm/io_apic.h> #include <asm/i8259.h> +#include <asm/traps.h> #include <asm/xen/cpuid.h> #include <asm/xen/pci.h> #endif
@@ -2249,7 +2250,9 @@ static __init void xen_alloc_callback_vector(void)return ;pr_info ("Xen HVM callback vector for event delivery is enabled\n" ); - alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR, asm_sysvec_xen_hvm_callback); +install_system_interrupt_handler (HYPERVISOR_CALLBACK_VECTOR , + asm_sysvec_xen_hvm_callback, + sysvec_xen_hvm_callback); }#else void xen_setup_callback_vector (void ) {}
Signature · 1 line
2.34.1
PATCH v7 5/33 x86/traps: add external_interrupt() to dispatch external interrupts
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Add external_interrupt() to dispatch external interrupts to their handlers.
If an external interrupt is a system interrupt, dipatch it through system_interrupt_handlers table, otherwise to dispatch_common_interrupt().
---
Changes since v5:
* Initialize system_interrupt_handlers with dispatch_table_spurious_interrupt() instead of NULL to get rid of a branch (Peter Zijlstra).
--- arch/x86/kernel/traps.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
arch/x86/kernel/traps.c +26 -0
@@ -1511,6 +1511,32 @@ static system_interrupt_handler system_interrupt_handlers[NR_SYSTEM_VECTORS] = {#undef SYSV +/* +* External interrupt dispatch function. +* +* Until/unless dispatch_common_interrupt() can be taught to deal with the +* special system vectors, split the dispatch. +* +* Note: dispatch_common_interrupt() already deals with IRQ_MOVE_CLEANUP_VECTOR. +*/ +int external_interrupt (struct pt_regs *regs) +{ +unsigned int vector = regs->vector; +unsigned int sysvec = vector -FIRST_SYSTEM_VECTOR ; + +if (vector <FIRST_EXTERNAL_VECTOR ) { +pr_err ("invalid external interrupt vector %d\n" , vector); +return -EINVAL ; + } + +if (sysvec <NR_SYSTEM_VECTORS ) + system_interrupt_handlers[sysvec](regs); +else +dispatch_common_interrupt (regs, vector); + +return 0 ; +} +#endif /* CONFIG_X86_64 */ void __init install_system_interrupt_handler (unsigned int n,const void *asm_addr,const void *addr)
Signature · 1 line
2.34.1
PATCH v7 6/33 x86/cpufeature: add the cpu feature bit for FRED
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Add the CPU feature bit for FRED (Flexible Return and Event Delivery).
The Intel flexible return and event delivery (FRED) architecture defines simple new transitions that change privilege level (ring transitions). The FRED architecture was designed with the following goals:
1) Improve overall performance and response time by replacing event delivery through the interrupt descriptor table (IDT event delivery) and event return by the IRET instruction with lower latency transitions.
2) Improve software robustness by ensuring that event delivery establishes the full supervisor context and that event return establishes the full user context.
The new transitions defined by the FRED architecture are FRED event delivery and, for returning from events, two FRED return instructions. FRED event delivery can effect a transition from ring 3 to ring 0, but it is used also to deliver events incident to ring 0. One FRED instruction (ERETU) effects a return from ring 0 to ring 3, while the other (ERETS) returns while remaining in ring 0.
Search for the latest FRED spec in most search engines with this search pattern:
site:intel.com FRED (flexible return and event delivery) specification
--- arch/x86/include/asm/cpufeatures.h | 1 + tools/arch/x86/include/asm/cpufeatures.h | 1 + 2 files changed, 2 insertions(+)
arch/x86/include/asm/cpufeatures.h +1 -0
@@ -318,6 +318,7 @@#define X86_FEATURE_FZRM (12*32+10)/* "" Fast zero-length REP MOVSB */ #define X86_FEATURE_FSRS (12*32+11)/* "" Fast short REP STOSB */ #define X86_FEATURE_FSRC (12*32+12)/* "" Fast short REP {CMPSB,SCASB} */ +#define X86_FEATURE_FRED (12*32+17)/* Flexible Return and Event Delivery */ #define X86_FEATURE_LKGS (12*32+18)/* "" Load "kernel" (userspace) GS */ #define X86_FEATURE_AMX_FP16 (12*32+21)/* "" AMX fp16 Support */ #define X86_FEATURE_AVX_IFMA (12*32+23)/* "" Support for VPMADD52[H,L]UQ */
tools/arch/x86/include/asm/cpufeatures.h +1 -0
@@ -312,6 +312,7 @@#define X86_FEATURE_AVX_VNNI (12*32+ 4)/* AVX VNNI instructions */ #define X86_FEATURE_AVX512_BF16 (12*32+ 5)/* AVX512 BFLOAT16 instructions */ #define X86_FEATURE_CMPCCXADD (12*32+ 7)/* "" CMPccXADD instructions */ +#define X86_FEATURE_FRED (12*32+17)/* Flexible Return and Event Delivery */ #define X86_FEATURE_LKGS (12*32+18)/* "" Load "kernel" (userspace) GS */ #define X86_FEATURE_AMX_FP16 (12*32+21)/* "" AMX fp16 Support */ #define X86_FEATURE_AVX_IFMA (12*32+23)/* "" Support for VPMADD52[H,L]UQ */
Signature · 1 line
2.34.1
PATCH v7 7/33 x86/opcode: add ERETU, ERETS instructions to x86-opcode-map
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Add the instruction opcodes used by FRED: ERETU, ERETS.
Opcode number is per public FRED draft spec v3.0.
--- arch/x86/lib/x86-opcode-map.txt | 2 +- tools/arch/x86/lib/x86-opcode-map.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/lib/x86-opcode-map.txt +1 -1
@@ -1052,7 +1052,7 @@ EndTable GrpTable: Grp7 0: SGDT Ms | VMCALL (001),(11B) | VMLAUNCH (010),(11B) | VMRESUME (011),(11B) | VMXOFF (100),(11B) | PCONFIG (101),(11B) | ENCLV (000),(11B) -1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B) | ENCLS (111),(11B) +1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B) | ENCLS (111),(11B) | ERETU (F3),(010),(11B) | ERETS (F2),(010),(11B) 2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B) | ENCLU (111),(11B) 3: LIDT Ms 4: SMSW Mw/Rv
tools/arch/x86/lib/x86-opcode-map.txt +1 -1
@@ -1052,7 +1052,7 @@ EndTable GrpTable: Grp7 0: SGDT Ms | VMCALL (001),(11B) | VMLAUNCH (010),(11B) | VMRESUME (011),(11B) | VMXOFF (100),(11B) | PCONFIG (101),(11B) | ENCLV (000),(11B) -1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B) | ENCLS (111),(11B) +1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B) | ENCLS (111),(11B) | ERETU (F3),(010),(11B) | ERETS (F2),(010),(11B) 2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B) | ENCLU (111),(11B) 3: LIDT Ms 4: SMSW Mw/Rv
Signature · 1 line
2.34.1
PATCH v7 8/33 x86/objtool: teach objtool about ERETU and ERETS
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Update the objtool decoder to know about the ERETU and ERETS instructions (type INSN_CONTEXT_SWITCH.)
--- tools/objtool/arch/x86/decode.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
tools/objtool/arch/x86/decode.c +14 -5
@@ -509,11 +509,20 @@ int arch_decode_instruction(struct objtool_file *file, const struct section *secif (op2 ==0x01 ) { -if (modrm ==0xca ) - insn->type =INSN_CLAC ; -else if (modrm ==0xcb ) - insn->type =INSN_STAC ; - +switch (insn_last_prefix_id (&ins)) { +case INAT_PFX_REPE : +case INAT_PFX_REPNE : +if (modrm ==0xca ) +/* eretu/erets */ + insn->type =INSN_CONTEXT_SWITCH ; +break ; +default : +if (modrm ==0xca ) + insn->type =INSN_CLAC ; +else if (modrm ==0xcb ) + insn->type =INSN_STAC ; +break ; + } }else if (op2 >=0x80 && op2 <=0x8f ) { insn->type =INSN_JUMP_CONDITIONAL ;
Signature · 1 line
2.34.1
PATCH v7 9/33 x86/cpu: add X86_CR4_FRED macro
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Add X86_CR4_FRED macro for the FRED bit in %cr4. This bit should be a pinned bit, not to be changed after initialization.
--- arch/x86/include/uapi/asm/processor-flags.h | 2 ++ arch/x86/kernel/cpu/common.c | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-)
arch/x86/include/uapi/asm/processor-flags.h +2 -0
@@ -132,6 +132,8 @@#define X86_CR4_PKE _BITUL(X86_CR4_PKE_BIT)#define X86_CR4_CET_BIT 23/* enable Control-flow Enforcement Technology */ #define X86_CR4_CET _BITUL(X86_CR4_CET_BIT) +#define X86_CR4_FRED_BIT 32/* enable FRED kernel entry */ +#define X86_CR4_FRED _BITULL(X86_CR4_FRED_BIT)/* * x86-64 Task Priority Register, CR8
arch/x86/kernel/cpu/common.c +8 -3
@@ -412,10 +412,15 @@ static __always_inline void setup_umip(struct cpuinfo_x86 *c)cr4_clear_bits (X86_CR4_UMIP ); } -/* These bits should not change their value after CPU init is finished. */ +/* +* These bits should not change their value after CPU init is finished. +* The explicit cast to unsigned long suppresses a warning on i386 for +* x86-64 only feature bits >= 32. +*/ static const unsigned long cr4_pinned_mask = -X86_CR4_SMEP |X86_CR4_SMAP |X86_CR4_UMIP | -X86_CR4_FSGSBASE |X86_CR4_CET ; + (unsigned long ) + (X86_CR4_SMEP |X86_CR4_SMAP |X86_CR4_UMIP | +X86_CR4_FSGSBASE |X86_CR4_CET |X86_CR4_FRED );static DEFINE_STATIC_KEY_FALSE_RO (cr_pinning);static unsigned long cr4_pinned_bits__ro_after_init ;
Signature · 1 line
2.34.1
PATCH v7 10/33 x86/fred: add Kconfig option for FRED (CONFIG_X86_FRED)
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Add the configuration option CONFIG_X86_FRED to enable FRED.
--- arch/x86/Kconfig | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/x86/Kconfig +9 -0
@@ -500,6 +500,15 @@ config X86_CPU_RESCTRL Say N if unsure. +config X86_FRED + bool "Flexible Return and Event Delivery" + depends on X86_64 + help + When enabled, try to use Flexible Return and Event Delivery + instead of the legacy SYSCALL/SYSENTER/IDT architecture for + ring transitions and exception/interrupt handling if the + system supports. + if X86_32 config X86_BIGSMP bool "Support for big SMP systems with more than 8 CPUs"
Signature · 1 line
2.34.1
PATCH v7 11/33 x86/fred: if CONFIG_X86_FRED is disabled, disable FRED support
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Add CONFIG_X86_FRED to <asm/disabled-features.h> to make cpu_feature_enabled() work correctly with FRED.
--- arch/x86/include/asm/disabled-features.h | 8 +++++++- tools/arch/x86/include/asm/disabled-features.h | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-)
arch/x86/include/asm/disabled-features.h +7 -1
@@ -99,6 +99,12 @@# define DISABLE_TDX_GUEST (1 << (X86_FEATURE_TDX_GUEST & 31))#endif +#ifdef CONFIG_X86_FRED +# define DISABLE_FRED 0 +#else +# define DISABLE_FRED (1 << (X86_FEATURE_FRED & 31)) +#endif +/* * Make sure to add features to the correct mask */
@@ -115,7 +121,7 @@#define DISABLED_MASK10 0#define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ DISABLE_CALL_DEPTH_TRACKING) -#define DISABLED_MASK12 0 +#define DISABLED_MASK12 (DISABLE_FRED)#define DISABLED_MASK13 0#define DISABLED_MASK14 0#define DISABLED_MASK15 0
tools/arch/x86/include/asm/disabled-features.h +7 -1
@@ -99,6 +99,12 @@# define DISABLE_TDX_GUEST (1 << (X86_FEATURE_TDX_GUEST & 31))#endif +#ifdef CONFIG_X86_FRED +# define DISABLE_FRED 0 +#else +# define DISABLE_FRED (1 << (X86_FEATURE_FRED & 31)) +#endif +/* * Make sure to add features to the correct mask */
@@ -115,7 +121,7 @@#define DISABLED_MASK10 0#define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ DISABLE_CALL_DEPTH_TRACKING) -#define DISABLED_MASK12 0 +#define DISABLED_MASK12 (DISABLE_FRED)#define DISABLED_MASK13 0#define DISABLED_MASK14 0#define DISABLED_MASK15 0
Signature · 1 line
2.34.1
PATCH v7 12/33 x86/cpu: add MSR numbers for FRED configuration
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Add MSR numbers for the FRED configuration registers.
--- arch/x86/include/asm/msr-index.h | 13 ++++++++++++- tools/arch/x86/include/asm/msr-index.h | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-)
arch/x86/include/asm/msr-index.h +12 -1
@@ -36,8 +36,19 @@#define EFER_FFXSR (1<<_EFER_FFXSR)#define EFER_AUTOIBRS (1<<_EFER_AUTOIBRS) -/* Intel MSRs. Some also available on other CPUs */ +/* FRED MSRs */ +#define MSR_IA32_FRED_RSP0 0x1cc/* Level 0 stack pointer */ +#define MSR_IA32_FRED_RSP1 0x1cd/* Level 1 stack pointer */ +#define MSR_IA32_FRED_RSP2 0x1ce/* Level 2 stack pointer */ +#define MSR_IA32_FRED_RSP3 0x1cf/* Level 3 stack pointer */ +#define MSR_IA32_FRED_STKLVLS 0x1d0/* Exception stack levels */ +#define MSR_IA32_FRED_SSP0 MSR_IA32_PL0_SSP/* Level 0 shadow stack pointer */ +#define MSR_IA32_FRED_SSP1 0x1d1/* Level 1 shadow stack pointer */ +#define MSR_IA32_FRED_SSP2 0x1d2/* Level 2 shadow stack pointer */ +#define MSR_IA32_FRED_SSP3 0x1d3/* Level 3 shadow stack pointer */ +#define MSR_IA32_FRED_CONFIG 0x1d4/* Entrypoint and interrupt stack level */ +/* Intel MSRs. Some also available on other CPUs */ #define MSR_TEST_CTRL 0x00000033#define MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT 29#define MSR_TEST_CTRL_SPLIT_LOCK_DETECT BIT(MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT)
tools/arch/x86/include/asm/msr-index.h +12 -1
@@ -36,8 +36,19 @@#define EFER_FFXSR (1<<_EFER_FFXSR)#define EFER_AUTOIBRS (1<<_EFER_AUTOIBRS) -/* Intel MSRs. Some also available on other CPUs */ +/* FRED MSRs */ +#define MSR_IA32_FRED_RSP0 0x1cc/* Level 0 stack pointer */ +#define MSR_IA32_FRED_RSP1 0x1cd/* Level 1 stack pointer */ +#define MSR_IA32_FRED_RSP2 0x1ce/* Level 2 stack pointer */ +#define MSR_IA32_FRED_RSP3 0x1cf/* Level 3 stack pointer */ +#define MSR_IA32_FRED_STKLVLS 0x1d0/* Exception stack levels */ +#define MSR_IA32_FRED_SSP0 MSR_IA32_PL0_SSP/* Level 0 shadow stack pointer */ +#define MSR_IA32_FRED_SSP1 0x1d1/* Level 1 shadow stack pointer */ +#define MSR_IA32_FRED_SSP2 0x1d2/* Level 2 shadow stack pointer */ +#define MSR_IA32_FRED_SSP3 0x1d3/* Level 3 shadow stack pointer */ +#define MSR_IA32_FRED_CONFIG 0x1d4/* Entrypoint and interrupt stack level */ +/* Intel MSRs. Some also available on other CPUs */ #define MSR_TEST_CTRL 0x00000033#define MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT 29#define MSR_TEST_CTRL_SPLIT_LOCK_DETECT BIT(MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT)
Signature · 1 line
2.34.1
PATCH v7 13/33 x86/fred: header file for event types
In reply to Xin LiFRED inherits the Intel VT-x enhancement of classified events with a two-level event dispatch logic. The first-level dispatch is on the event type, not the event vector as used in the IDT architecture. This also means that vectors in different event types are orthogonal, e.g., vectors 0x10-0x1f become available as hardware interrupts.
Add a header file for event types, and also use it in <asm/vmx.h>.
--- arch/x86/include/asm/event-type.h | 17 +++++++++++++++++ arch/x86/include/asm/vmx.h | 17 +++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 arch/x86/include/asm/event-type.h
arch/x86/include/asm/event-type.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_EVENT_TYPE_H +#define _ASM_X86_EVENT_TYPE_H + +/* +* Event type codes: these are the same that are used by VTx. +*/ +#define EVENT_TYPE_HWINT 0/* Maskable external interrupt */ +#define EVENT_TYPE_RESERVED 1 +#define EVENT_TYPE_NMI 2/* Non-maskable interrupt */ +#define EVENT_TYPE_HWFAULT 3/* Hardware exceptions (e.g., page fault) */ +#define EVENT_TYPE_SWINT 4/* Software interrupt (INT n) */ +#define EVENT_TYPE_PRIVSW 5/* INT1 (ICEBP) */ +#define EVENT_TYPE_SWFAULT 6/* Software exception (INT3 or INTO) */ +#define EVENT_TYPE_OTHER 7/* FRED: SYSCALL/SYSENTER */ + +#endif
arch/x86/include/asm/vmx.h +9 -8
@@ -15,6 +15,7 @@#include <linux/bitops.h> #include <linux/types.h> #include <uapi/asm/vmx.h> +#include <asm/event-type.h> #include <asm/vmxfeatures.h> #define VMCS_CONTROL_BIT (x) BIT(VMX_FEATURE_##x & 0x1f)
@@ -372,14 +373,14 @@ enum vmcs_field {#define VECTORING_INFO_DELIVER_CODE_MASK INTR_INFO_DELIVER_CODE_MASK#define VECTORING_INFO_VALID_MASK INTR_INFO_VALID_MASK -#define INTR_TYPE_EXT_INTR (0 << 8)/* external interrupt */ -#define INTR_TYPE_RESERVED (1 << 8)/* reserved */ -#define INTR_TYPE_NMI_INTR (2 << 8)/* NMI */ -#define INTR_TYPE_HARD_EXCEPTION (3 << 8)/* processor exception */ -#define INTR_TYPE_SOFT_INTR (4 << 8)/* software interrupt */ -#define INTR_TYPE_PRIV_SW_EXCEPTION (5 << 8)/* ICE breakpoint - undocumented */ -#define INTR_TYPE_SOFT_EXCEPTION (6 << 8)/* software exception */ -#define INTR_TYPE_OTHER_EVENT (7 << 8)/* other event */ +#define INTR_TYPE_EXT_INTR (EVENT_TYPE_HWINT << 8)/* external interrupt */ +#define INTR_TYPE_RESERVED (EVENT_TYPE_RESERVED << 8)/* reserved */ +#define INTR_TYPE_NMI_INTR (EVENT_TYPE_NMI << 8)/* NMI */ +#define INTR_TYPE_HARD_EXCEPTION (EVENT_TYPE_HWFAULT << 8)/* processor exception */ +#define INTR_TYPE_SOFT_INTR (EVENT_TYPE_SWINT << 8)/* software interrupt */ +#define INTR_TYPE_PRIV_SW_EXCEPTION (EVENT_TYPE_PRIVSW << 8)/* ICE breakpoint - undocumented */ +#define INTR_TYPE_SOFT_EXCEPTION (EVENT_TYPE_SWFAULT << 8)/* software exception */ +#define INTR_TYPE_OTHER_EVENT (EVENT_TYPE_OTHER << 8)/* other event */ /* GUEST_INTERRUPTIBILITY_INFO flags. */ #define GUEST_INTR_STATE_STI 0x00000001
Signature · 1 line
2.34.1
PATCH v7 14/33 x86/fred: header file with FRED definitions
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Add a header file for FRED prototypes and definitions.
---
Changes since v6:
* Replace pt_regs csx flags prefix FRED_CSL_ with FRED_CSX_.
--- arch/x86/include/asm/fred.h | 106 ++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 arch/x86/include/asm/fred.h
arch/x86/include/asm/fred.h new file +106 -0
@@ -0,0 +1,106 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* arch/x86/include/asm/fred.h +* +* Macros for Flexible Return and Event Delivery (FRED) +*/ + +#ifndef ASM_X86_FRED_H +#define ASM_X86_FRED_H + +#ifdef CONFIG_X86_FRED + +#include <linux/const.h> +#include <asm/asm.h> + +/* +* FRED return instructions +* +* Replace with "ERETS"/"ERETU" once binutils support FRED return instructions. +* The binutils version supporting FRED instructions is still TBD, and will +* update once we have it. +*/ +#define ERETS _ASM_BYTES(0xf2,0x0f,0x01,0xca) +#define ERETU _ASM_BYTES(0xf3,0x0f,0x01,0xca) + +/* +* RSP is aligned to a 64-byte boundary before used to push a new stack frame +*/ +#define FRED_STACK_FRAME_RSP_MASK _AT(unsigned long, (~0x3f)) + +/* +* Event stack level macro for the FRED_STKLVLS MSR. +* Usage example: FRED_STKLVL(X86_TRAP_DF, 3) +* Multiple values can be ORd together. +*/ +#define FRED_STKLVL (v,l) (_AT(unsigned long, l) << (2*(v))) + +/* FRED_CONFIG MSR */ +#define FRED_CONFIG_CSL_MASK 0x3 +#define FRED_CONFIG_REDZONE_AMOUNT 1/* measured in 64-byte cache lines */ +#define FRED_CONFIG_REDZONE (_AT(unsigned long, FRED_CONFIG_REDZONE_AMOUNT) << 6) +#define FRED_CONFIG_INT_STKLVL (l) (_AT(unsigned long, l) << 9) +#define FRED_CONFIG_ENTRYPOINT (p) _AT(unsigned long, (p)) + +/* FRED event type and vector bit width and counts */ +#define FRED_EVENT_TYPE_BITS 3/* only 3 bits used in FRED 3.0 */ +#define FRED_EVENT_TYPE_COUNT _BITUL(FRED_EVENT_TYPE_BITS) +#define FRED_EVENT_VECTOR_BITS 8 +#define FRED_EVENT_VECTOR_COUNT _BITUL(FRED_EVENT_VECTOR_BITS) + +/* FRED EVENT_TYPE_OTHER vector numbers */ +#define FRED_SYSCALL 1 +#define FRED_SYSENTER 2 + +/* Flags above the CS selector (regs->csx) */ +#define FRED_CSX_ENABLE_NMI _BITUL(28) +#define FRED_CSX_ALLOW_SINGLE_STEP _BITUL(25) +#define FRED_CSX_INTERRUPT_SHADOW _BITUL(24) + +#ifndef __ASSEMBLY__ + +#include <linux/kernel.h> +#include <asm/ptrace.h> + +/* FRED stack frame information */ +struct fred_info { +unsigned long edata;/* Event data: CR2, DR6, ... */ +unsigned long resv; +}; + +/* Full format of the FRED stack frame */ +struct fred_frame { +struct pt_regs regs; +struct fred_info info; +}; + +/* Getting the FRED frame information from a pt_regs pointer */ +static __always_inline struct fred_info *fred_info(struct pt_regs *regs) +{ + return &container_of(regs, struct fred_frame, regs)->info; +} + +static __always_inline unsigned long fred_event_data (struct pt_regs *regs) +{ +return fred_info (regs)->edata; +} + +/* +* How FRED event handlers are called. +* +* FRED event delivery establishes the full supervisor context +* by pushing everything related to the event being delivered +* to the FRED stack frame, e.g., the faulting linear address +* of a #PF is pushed as event data of the FRED #PF stack frame. +* Thus a struct pt_regs has everything needed and it's the only +* input parameter required for a FRED event handler. +*/ +#define DECLARE_FRED_HANDLER (f) void f (struct pt_regs *regs) +#define DEFINE_FRED_HANDLER (f) noinstr DECLARE_FRED_HANDLER(f) +typedef DECLARE_FRED_HANDLER ((*fred_handler )); + +#endif /* __ASSEMBLY__ */ + +#endif /* CONFIG_X86_FRED */ + +#endif /* ASM_X86_FRED_H */
Signature · 1 line
2.34.1
PATCH v7 15/33 x86/fred: reserve space for the FRED stack frame
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
When using FRED, reserve space at the top of the stack frame, just like i386 does. A future version of FRED might have dynamic frame sizes, though, in which case it might be necessary to make TOP_OF_KERNEL_STACK_PADDING a variable instead of a constant.
--- arch/x86/include/asm/thread_info.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
arch/x86/include/asm/thread_info.h +9 -3
@@ -31,7 +31,9 @@* In vm86 mode, the hardware frame is much longer still, so add 16 * bytes to make room for the real-mode segments. * -* x86_64 has a fixed-length stack frame. +* x86-64 has a fixed-length stack frame, but it depends on whether +* or not FRED is enabled. Future versions of FRED might make this +* dynamic, but for now it is always 2 words longer. */ #ifdef CONFIG_X86_32 # ifdef CONFIG_VM86
@@ -39,8 +41,12 @@# else # define TOP_OF_KERNEL_STACK_PADDING 8# endif -#else -# define TOP_OF_KERNEL_STACK_PADDING 0 +#else /* x86-64 */ +# ifdef CONFIG_X86_FRED +# define TOP_OF_KERNEL_STACK_PADDING (2*8) +# else +# define TOP_OF_KERNEL_STACK_PADDING 0 +# endif #endif /*
Signature · 1 line
2.34.1
PATCH v7 16/33 x86/fred: add a page fault entry stub for FRED
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Add a page fault entry stub for FRED.
On a FRED system, the faulting address (CR2) is passed on the stack, to avoid the problem of transient state. Thus we get the page fault address from the stack instead of CR2.
--- arch/x86/include/asm/fred.h | 2 ++ arch/x86/mm/fault.c | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-)
arch/x86/include/asm/fred.h +2 -0
@@ -99,6 +99,8 @@ static __always_inline unsigned long fred_event_data(struct pt_regs *regs)#define DEFINE_FRED_HANDLER (f) noinstr DECLARE_FRED_HANDLER(f)typedef DECLARE_FRED_HANDLER ((*fred_handler )); +DECLARE_FRED_HANDLER (fred_exc_page_fault); +#endif /* __ASSEMBLY__ */ #endif /* CONFIG_X86_FRED */
arch/x86/mm/fault.c +18 -2
@@ -33,6 +33,7 @@#include <asm/kvm_para.h> /* kvm_handle_async_pf */ #include <asm/vdso.h> /* fixup_vdso_exception() */ #include <asm/irq_stack.h> +#include <asm/fred.h> /* fred_event_data() */ #define CREATE_TRACE_POINTS #include <asm/trace/exceptions.h>
@@ -1507,9 +1508,10 @@ handle_page_fault(struct pt_regs *regs, unsigned long error_code, } } -DEFINE_IDTENTRY_RAW_ERRORCODE (exc_page_fault) +static __always_inline void page_fault_common(struct pt_regs *regs, +unsigned int error_code, +unsigned long address) { -unsigned long address =read_cr2 ();irqentry_state_t state;prefetchw (¤t->mm->mmap_lock);
@@ -1556,3 +1558,17 @@ DEFINE_IDTENTRY_RAW_ERRORCODE(exc_page_fault)irqentry_exit (regs, state); } + +DEFINE_IDTENTRY_RAW_ERRORCODE (exc_page_fault) +{ +page_fault_common (regs, error_code,read_cr2 ()); +} + +#ifdef CONFIG_X86_FRED + +DEFINE_FRED_HANDLER (fred_exc_page_fault) +{ +page_fault_common (regs, regs->orig_ax,fred_event_data (regs)); +} + +#endif /* CONFIG_X86_FRED */
Signature · 1 line
2.34.1
PATCH v7 17/33 x86/fred: add a debug fault entry stub for FRED
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Add a debug fault entry stub for FRED.
On a FRED system, the debug trap status information (DR6) is passed on the stack, to avoid the problem of transient state. Furthermore, FRED transitions avoid a lot of ugly corner cases the handling of which can, and should be, skipped.
The FRED debug trap status information saved on the stack differs from DR6 in both stickiness and polarity; it is exactly what debug_read_clear_dr6() returns, and exc_debug_user()/exc_debug_kernel() expect.
---
Changes since v1:
* call irqentry_nmi_{enter,exit}() in both IDT and FRED debug fault kernel handler (Peter Zijlstra).
--- arch/x86/include/asm/fred.h | 1 + arch/x86/kernel/traps.c | 56 +++++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 15 deletions(-)
arch/x86/include/asm/fred.h +1 -0
@@ -99,6 +99,7 @@ static __always_inline unsigned long fred_event_data(struct pt_regs *regs)#define DEFINE_FRED_HANDLER (f) noinstr DECLARE_FRED_HANDLER(f)typedef DECLARE_FRED_HANDLER ((*fred_handler )); +DECLARE_FRED_HANDLER (fred_exc_debug);DECLARE_FRED_HANDLER (fred_exc_page_fault);#endif /* __ASSEMBLY__ */
arch/x86/kernel/traps.c +41 -15
88 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 18/33 x86/fred: add a NMI entry stub for FRED
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
On a FRED system, NMIs nest both with themselves and faults, transient information is saved into the stack frame, and NMI unblocking only happens when the stack frame indicates that so should happen.
Thus, the NMI entry stub for FRED is really quite small...
--- arch/x86/include/asm/fred.h | 1 + arch/x86/kernel/nmi.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)
arch/x86/include/asm/fred.h +1 -0
@@ -99,6 +99,7 @@ static __always_inline unsigned long fred_event_data(struct pt_regs *regs)#define DEFINE_FRED_HANDLER (f) noinstr DECLARE_FRED_HANDLER(f)typedef DECLARE_FRED_HANDLER ((*fred_handler )); +DECLARE_FRED_HANDLER (fred_exc_nmi);DECLARE_FRED_HANDLER (fred_exc_debug);DECLARE_FRED_HANDLER (fred_exc_page_fault);
arch/x86/kernel/nmi.c +19 -0
@@ -34,6 +34,7 @@#include <asm/cache.h> #include <asm/nospec-branch.h> #include <asm/sev.h> +#include <asm/fred.h> #define CREATE_TRACE_POINTS #include <trace/events/nmi.h>
@@ -643,6 +644,24 @@ void nmi_backtrace_stall_check(const struct cpumask *btp)#endif +#ifdef CONFIG_X86_FRED +DEFINE_FRED_HANDLER (fred_exc_nmi) +{ +/* +* With FRED, CR2 and DR6 are pushed atomically on faults, +* so we don't have to worry about saving and restoring them. +* Breakpoint faults nest, so assume it is OK to leave DR7 +* enabled. +*/ +irqentry_state_t irq_state =irqentry_nmi_enter (regs); + +inc_irq_stat (__nmi_count); +default_do_nmi (regs); + +irqentry_nmi_exit (regs, irq_state); +} +#endif +void stop_nmi (void ) { ignore_nmis++;
Signature · 1 line
2.34.1
PATCH v7 19/33 x86/fred: add a machine check entry stub for FRED
In reply to Xin LiAdd a machine check entry stub for FRED.
---
Changes since v5:
* Disallow #DB inside #MCE for robustness sake (Peter Zijlstra).
--- arch/x86/include/asm/fred.h | 1 + arch/x86/kernel/cpu/mce/core.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+)
arch/x86/include/asm/fred.h +1 -0
@@ -102,6 +102,7 @@ typedef DECLARE_FRED_HANDLER((*fred_handler));DECLARE_FRED_HANDLER (fred_exc_nmi);DECLARE_FRED_HANDLER (fred_exc_debug);DECLARE_FRED_HANDLER (fred_exc_page_fault); +DECLARE_FRED_HANDLER (fred_exc_machine_check);#endif /* __ASSEMBLY__ */
arch/x86/kernel/cpu/mce/core.c +15 -0
@@ -52,6 +52,7 @@#include <asm/mce.h> #include <asm/msr.h> #include <asm/reboot.h> +#include <asm/fred.h> #include "internal.h"
@@ -2111,6 +2112,20 @@ DEFINE_IDTENTRY_MCE_USER(exc_machine_check)exc_machine_check_user (regs); local_db_restore(dr7); } + +#ifdef CONFIG_X86_FRED +DEFINE_FRED_HANDLER (fred_exc_machine_check) +{ +unsigned long dr7; + + dr7 =local_db_save (); +if (user_mode (regs)) +exc_machine_check_user (regs); +else +exc_machine_check_kernel (regs); +local_db_restore (dr7); +} +#endif #else /* 32bit unified entry point */ DEFINE_IDTENTRY_RAW (exc_machine_check)
Signature · 1 line
2.34.1
PATCH v7 20/33 x86/fred: FRED entry/exit and dispatch code
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
The code to actually handle kernel and event entry/exit using FRED. It is split up into two files thus:
- entry_64_fred.S contains the actual entrypoints and exit code, and saves and restores registers.
- entry_fred.c contains the two-level event dispatch code for FRED. The first-level dispatch is on the event type, and the second-level is on the event vector.
---
Changes since v1:
* Initialize a FRED exception handler to fred_bad_event() instead of NULL if no FRED handler defined for an exception vector (Peter Zijlstra).
* Push calling irqentry_{enter,exit}() and instrumentation_{begin,end}() down into individual FRED exception handlers, instead of in the dispatch framework (Peter Zijlstra).
--- arch/x86/entry/Makefile | 5 +- arch/x86/entry/entry_64_fred.S | 57 +++++++++ arch/x86/entry/entry_fred.c | 220 ++++++++++++++++++++++++++++++++ arch/x86/include/asm/idtentry.h | 8 ++ 4 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 arch/x86/entry/entry_64_fred.S create mode 100644 arch/x86/entry/entry_fred.c
arch/x86/entry/Makefile +4 -1
@@ -18,6 +18,9 @@ obj-y += vdso/ obj-y += vsyscall/ obj-$(CONFIG_PREEMPTION) += thunk_$(BITS).o +CFLAGS_entry_fred.o += -fno-stack-protector +CFLAGS_REMOVE_entry_fred.o += -pg $(CC_FLAGS_FTRACE) +obj-$(CONFIG_X86_FRED) += entry_64_fred.o entry_fred.o + obj-$(CONFIG_IA32_EMULATION) += entry_64_compat.o syscall_32.o obj-$(CONFIG_X86_X32_ABI) += syscall_x32.o -
arch/x86/entry/entry_64_fred.S new file +57 -0
57 lines not on this page · raw message
arch/x86/entry/entry_fred.c new file +220 -0
220 lines not on this page · raw message
arch/x86/include/asm/idtentry.h +8 -0
@@ -82,6 +82,7 @@ static __always_inline void __##func(struct pt_regs *regs)#define DECLARE_IDTENTRY_ERRORCODE (vector, func) \ asmlinkage void asm_##func(void); \ asmlinkage void xen_asm_##func(void); \ + __visible void fred_##func(struct pt_regs *regs); \ __visible void func(struct pt_regs *regs, unsigned long error_code)/**
@@ -106,6 +107,11 @@ __visible noinstr void func(struct pt_regs *regs, \irqentry_exit (regs, state); \ } \ \ +__visible noinstr void fred_##func(struct pt_regs *regs) \ +{ \ + func (regs, regs->orig_ax); \ +} \ + \ static __always_inline void __##func(struct pt_regs *regs, \ unsigned long error_code)
@@ -622,6 +628,8 @@ DECLARE_IDTENTRY_RAW(X86_TRAP_MC, exc_machine_check);#ifdef CONFIG_XEN_PV DECLARE_IDTENTRY_RAW (X86_TRAP_MC , xenpv_exc_machine_check);#endif +#else +#define fred_exc_machine_check fred_bad_event#endif /* NMI */
Signature · 1 line
2.34.1
PATCH v7 21/33 x86/fred: FRED initialization code
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
The code to initialize FRED when it's available and _not_ disabled.
cpu_init_fred_exceptions() is the core function to initialize FRED, which
1. Sets up FRED entrypoints for events happening in ring 0 and 3.
2. Sets up a default stack for event handling.
3. Sets up dedicated event stacks for DB/NMI/MC/DF, equivalent to the IDT IST stacks.
4. Forces 32-bit system calls to use "int $0x80" only.
5. Enables FRED and invalidtes IDT.
When the FRED is used, cpu_init_exception_handling() initializes FRED through calling cpu_init_fred_exceptions(), otherwise it sets up TSS IST and loads IDT.
As FRED uses the ring 3 FRED entrypoint for SYSCALL and SYSENTER, it skips setting up SYSCALL/SYSENTER related MSRs, e.g., MSR_LSTAR.
---
Changes since v5:
* Add a comment for FRED stack level settings (Lai Jiangshan).
* Define #DB/NMI/#MC/#DF stack levels using macros.
--- arch/x86/include/asm/fred.h | 27 +++++++++++++ arch/x86/include/asm/traps.h | 2 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/cpu/common.c | 74 +++++++++++++++++++++------------- arch/x86/kernel/fred.c | 78 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/irqinit.c | 7 +++- arch/x86/kernel/traps.c | 16 +++++++- 7 files changed, 175 insertions(+), 30 deletions(-) create mode 100644 arch/x86/kernel/fred.c
arch/x86/include/asm/fred.h +27 -0
@@ -57,6 +57,19 @@#define FRED_CSX_ALLOW_SINGLE_STEP _BITUL(25)#define FRED_CSX_INTERRUPT_SHADOW _BITUL(24) +/* #DB in the kernel would imply the use of a kernel debugger. */ +#define FRED_DB_STACK_LEVEL 1 +#define FRED_NMI_STACK_LEVEL 2 +#define FRED_MC_STACK_LEVEL 2 +/* +* #DF is the highest level because a #DF means "something went wrong +* *while delivering an exception*." The number of cases for which that +* can happen with FRED is drastically reduced and basically amounts to +* "the stack you pointed me to is broken." Thus, always change stacks +* on #DF, which means it should be at the highest level. +*/ +#define FRED_DF_STACK_LEVEL 3 +#ifndef __ASSEMBLY__#include <linux/kernel.h>
@@ -104,8 +117,22 @@ DECLARE_FRED_HANDLER(fred_exc_debug);DECLARE_FRED_HANDLER (fred_exc_page_fault);DECLARE_FRED_HANDLER (fred_exc_machine_check); +/* +* The actual assembly entry and exit points +*/ +extern __visible void fred_entrypoint_user(void); + +/* +* Initialization +*/ +void cpu_init_fred_exceptions (void ); +void fred_setup_apic (void ); +#endif /* __ASSEMBLY__ */ +#else +#define cpu_init_fred_exceptions () BUG() +#define fred_setup_apic () BUG()#endif /* CONFIG_X86_FRED */ #endif /* ASM_X86_FRED_H */
arch/x86/include/asm/traps.h +2 -0
@@ -56,4 +56,6 @@ void __noreturn handle_stack_overflow(struct pt_regs *regs, void f (struct pt_regs *regs) typedef DECLARE_SYSTEM_INTERRUPT_HANDLER((*system_interrupt_handler)); +system_interrupt_handler get_system_interrupt_handler (unsigned int i); +#endif /* _ASM_X86_TRAPS_H */
arch/x86/kernel/Makefile +1 -0
@@ -47,6 +47,7 @@ obj-y += platform-quirks.o obj-y += process_$(BITS).o signal.o signal_$(BITS).o obj-y += traps.o idt.o irq.o irq_$(BITS).o dumpstack_$(BITS).o obj-y += time.o ioport.o dumpstack.o nmi.o +obj-$(CONFIG_X86_FRED) += fred.o obj-$(CONFIG_MODIFY_LDT_SYSCALL) += ldt.o obj-y += setup.o x86_init.o i8259.o irqinit.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o
arch/x86/kernel/cpu/common.c +47 -27
105 lines not on this page · raw message
arch/x86/kernel/fred.c new file +78 -0
78 lines not on this page · raw message
arch/x86/kernel/irqinit.c +6 -1
@@ -28,6 +28,7 @@#include <asm/setup.h> #include <asm/i8259.h> #include <asm/traps.h> +#include <asm/fred.h> #include <asm/prom.h> /*
@@ -96,7 +97,11 @@ void __init native_init_IRQ(void)/* Execute any quirks before the call gates are initialised: */ x86_init.irqs.pre_vector_init (); -idt_setup_apic_and_irq_gates (); +if (cpu_feature_enabled (X86_FEATURE_FRED )) +fred_setup_apic (); +else +idt_setup_apic_and_irq_gates (); +lapic_assign_system_vectors ();if (!acpi_ioapic && !of_ioapic &&nr_legacy_irqs ()) {
arch/x86/kernel/traps.c +14 -2
@@ -1537,6 +1537,14 @@ static system_interrupt_handler system_interrupt_handlers[NR_SYSTEM_VECTORS] = {#undef SYSV +system_interrupt_handler get_system_interrupt_handler (unsigned int i) +{ +if (i >=NR_SYSTEM_VECTORS ) +return NULL ; + +return system_interrupt_handlers[i]; +} +/* * External interrupt dispatch function. *
@@ -1572,7 +1580,8 @@ void __init install_system_interrupt_handler(unsigned int n, const void *asm_add#ifdef CONFIG_X86_64 system_interrupt_handlers[n -FIRST_SYSTEM_VECTOR ] = (system_interrupt_handler )addr;#endif -alloc_intr_gate (n, asm_addr); +if (!cpu_feature_enabled (X86_FEATURE_FRED )) +alloc_intr_gate (n, asm_addr); }void __init trap_init (void )
@@ -1585,7 +1594,10 @@ void __init trap_init(void)/* Initialize TSS before setting up traps so ISTs work */ cpu_init_exception_handling (); +/* Setup traps as cpu_init() might #GP */ -idt_setup_traps (); +if (!cpu_feature_enabled (X86_FEATURE_FRED )) +idt_setup_traps (); +cpu_init (); }
Signature · 1 line
2.34.1
PATCH v7 22/33 x86/fred: update MSR_IA32_FRED_RSP0 during task switch
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
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.
Update MSR_IA32_FRED_RSP0 with WRMSR instruction for now, and will use WRMSRNS/WRMSRLIST for performance once it gets upstreamed.
--- arch/x86/include/asm/switch_to.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
arch/x86/include/asm/switch_to.h +9 -2
@@ -68,9 +68,16 @@ 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 )) { +/* +* Will use WRMSRNS/WRMSRLIST for performance once it's upstreamed. +*/ +wrmsrl (MSR_IA32_FRED_RSP0 , +task_top_of_stack (task) +TOP_OF_KERNEL_STACK_PADDING ); + }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 }
Signature · 1 line
2.34.1
PATCH v7 23/33 x86/fred: let ret_from_fork() jmp to fred_exit_user when FRED is enabled
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Let ret_from_fork() jmp to fred_exit_user when FRED is enabled, otherwise the existing IDT code is chosen.
--- arch/x86/entry/entry_64.S | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/entry/entry_64.S +5 -0
@@ -299,7 +299,12 @@ SYM_CODE_START_NOALIGN(ret_from_fork) UNWIND_HINT_REGS movq %rsp, %rdi call syscall_exit_to_user_mode /* returns with IRQs disabled */ +#ifdef CONFIG_X86_FRED + ALTERNATIVE "jmp swapgs_restore_regs_and_return_to_usermode", \ + "jmp fred_exit_user", X86_FEATURE_FRED +#else jmp swapgs_restore_regs_and_return_to_usermode +#endif 1: /* kernel thread */
Signature · 1 line
2.34.1
Re: [PATCH v7 23/33] x86/fred: let ret_from_fork() jmp to fred_exit_user when FRED is enabled
arch/x86/entry/entry_64.S SYM_CODE_START_NOALIGN(ret_from_fork) · line 307
Quoted 12 lines · Xin Li
arch/x86/entry/entry_64.S +5
-0@@ -299,7 +299,12 @@ SYM_CODE_START_NOALIGN(ret_from_fork) UNWIND_HINT_REGS movq %rsp, %rdi call syscall_exit_to_user_mode /* returns with IRQs disabled */ +#ifdef CONFIG_X86_FRED + ALTERNATIVE "jmp swapgs_restore_regs_and_return_to_usermode", \ + "jmp fred_exit_user", X86_FEATURE_FRED +#else jmp swapgs_restore_regs_and_return_to_usermode +#endif
Does the #ifdef really buy us anything here?
I guess it might save a *TINY* amount of time at alternative processing time. But that doesn't really seem worth it.
RE: [PATCH v7 23/33] x86/fred: let ret_from_fork() jmp to fred_exit_user when FRED is enabled
Quoted 15 lines · Xin Li
arch/x86/entry/entry_64.S SYM_CODE_START_NOALIGN(ret_from_fork) · line 306
Quoted 11 lines
arch/x86/entry/entry_64.S +4
-0@@ -299,7 +299,12 @@ SYM_CODE_START_NOALIGN(ret_from_fork) UNWIND_HINT_REGS movq %rsp, %rdi call syscall_exit_to_user_mode /* returns with IRQs disabled */ +#ifdef CONFIG_X86_FRED + ALTERNATIVE "jmp swapgs_restore_regs_and_return_to_usermode", \ + "jmp fred_exit_user", X86_FEATURE_FRED #else jmp swapgs_restore_regs_and_return_to_usermode +#endifDoes the #ifdef really buy us anything here?
Quoted 2 lines
I guess it might save a *TINY* amount of time at alternative processing time. But that doesn't really seem worth it.
You have kept saying not to use #ifdef if possible, and I tried to get if of them.
Somehow I ended up with overlooking this _unnecessary_ change, will remove.
Thanks!
Xin
RE: [PATCH v7 23/33] x86/fred: let ret_from_fork() jmp to fred_exit_user when FRED is enabled
Quoted 30 lines
-----Original Message-----
From: Li, Xin3 <[email protected]>
Sent: Monday, April 10, 2023 11:32 AM
To: Hansen, Dave <[email protected]>; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Christopherson,, Sean <[email protected]>; [email protected]; Shankar, Ravi V <[email protected]>; [email protected]; Kang, Shan <[email protected]>
Subject: RE: [PATCH v7 23/33] x86/fred: letret_from_fork()jmp tofred_exit_userwhen FRED is enabledQuoted 15 lines · Xin Li
arch/x86/entry/entry_64.S SYM_CODE_START_NOALIGN(ret_from_fork) · line 306
Quoted 11 lines
arch/x86/entry/entry_64.S +4
-0@@ -299,7 +299,12 @@ SYM_CODE_START_NOALIGN(ret_from_fork) UNWIND_HINT_REGS movq %rsp, %rdi call syscall_exit_to_user_mode /* returns with IRQs disabled */ +#ifdef CONFIG_X86_FRED + ALTERNATIVE "jmp swapgs_restore_regs_and_return_to_usermode", \ + "jmp fred_exit_user", X86_FEATURE_FRED #else jmp swapgs_restore_regs_and_return_to_usermode +#endifDoes the #ifdef really buy us anything here?
Quoted 6 lines
Quoted 2 lines
I guess it might save a *TINY* amount of time at alternative processing time. But that doesn't really seem worth it.
You have kept saying not to use #ifdef if possible, and I tried to get if of them.
Somehow I ended up with overlooking this _unnecessary_ change, will remove.
Actually I didn't overlook it, the reason I keep the #ifdef is the symbol "fred_exit_user" is missing otherwise, which is defined only if we have CONFIG_X86_FRED.
Thanks!
Xin
PATCH v7 24/33 x86/fred: disallow the swapgs instruction when FRED is enabled
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
The FRED architecture establishes the full supervisor/user through:
1) FRED event delivery swaps the value of the GS base address and that of the IA32_KERNEL_GS_BASE MSR.
2) ERETU swaps the value of the GS base address and that of the IA32_KERNEL_GS_BASE MSR.
Thus, the swapgs instruction is disallowed when FRED is enabled, otherwise it causes #UD.
--- arch/x86/kernel/process_64.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/kernel/process_64.c +4 -2
@@ -165,7 +165,8 @@ static noinstr unsigned long __rdgsbase_inactive(void)lockdep_assert_irqs_disabled (); -if (!cpu_feature_enabled (X86_FEATURE_XENPV )) { +if (!cpu_feature_enabled (X86_FEATURE_FRED ) && + !cpu_feature_enabled (X86_FEATURE_XENPV )) {native_swapgs (); gsbase =rdgsbase ();native_swapgs ();
@@ -190,7 +191,8 @@ static noinstr void __wrgsbase_inactive(unsigned long gsbase) {lockdep_assert_irqs_disabled (); -if (!cpu_feature_enabled (X86_FEATURE_XENPV )) { +if (!cpu_feature_enabled (X86_FEATURE_FRED ) && + !cpu_feature_enabled (X86_FEATURE_XENPV )) {native_swapgs ();wrgsbase (gsbase);native_swapgs ();
Signature · 1 line
2.34.1
PATCH v7 25/33 x86/fred: no ESPFIX needed when FRED is enabled
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Because FRED always restores the full value of %rsp, ESPFIX is no longer needed when it's enabled.
--- arch/x86/kernel/espfix_64.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/x86/kernel/espfix_64.c +8 -0
@@ -106,6 +106,10 @@ void __init init_espfix_bsp(void)pgd_t *pgd;p4d_t *p4d; +/* FRED systems don't need ESPFIX */ +if (cpu_feature_enabled (X86_FEATURE_FRED )) +return ; +/* Install the espfix pud into the kernel page directory */ pgd = &init_top_pgt[pgd_index (ESPFIX_BASE_ADDR )]; p4d =p4d_alloc (&init_mm, pgd,ESPFIX_BASE_ADDR );
@@ -129,6 +133,10 @@ void init_espfix_ap(int cpu)void *stack_page;pteval_t ptemask; +/* FRED systems don't need ESPFIX */ +if (cpu_feature_enabled (X86_FEATURE_FRED )) +return ; +/* We only have to do this once... */ if (likely (per_cpu (espfix_stack, cpu)))return ;/* Already initialized */
Signature · 1 line
2.34.1
PATCH v7 26/33 x86/fred: allow single-step trap and NMI when starting a new thread
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
Allow single-step trap and NMI when starting a new thread, thus once the new thread returns to ring3, single-step trap and NMI are both enabled immediately.
High-order 48 bits above the lowest 16 bit CS are discarded by the legacy IRET instruction, thus can be set unconditionally, even when FRED is not enabled.
--- arch/x86/include/asm/fred.h | 11 +++++++++++ arch/x86/kernel/process_64.c | 13 +++++++------ 2 files changed, 18 insertions(+), 6 deletions(-)
arch/x86/include/asm/fred.h +11 -0
@@ -70,6 +70,14 @@*/ #define FRED_DF_STACK_LEVEL 3 +/* +* High-order 48 bits above the lowest 16 bit CS are discarded by the +* legacy IRET instruction, thus can be set unconditionally, even when +* FRED is not enabled. +*/ +#define CSX_PROCESS_START \ + (FRED_CSX_ENABLE_NMI | FRED_CSX_ALLOW_SINGLE_STEP) +#ifndef __ASSEMBLY__#include <linux/kernel.h>
@@ -133,6 +141,9 @@ void fred_setup_apic(void);#else #define cpu_init_fred_exceptions () BUG()#define fred_setup_apic () BUG() + +#define CSX_PROCESS_START 0 +#endif /* CONFIG_X86_FRED */ #endif /* ASM_X86_FRED_H */
arch/x86/kernel/process_64.c +7 -6
@@ -55,6 +55,7 @@#include <asm/resctrl.h> #include <asm/unistd.h> #include <asm/fsgsbase.h> +#include <asm/fred.h> #ifdef CONFIG_IA32_EMULATION /* Not included via unistd.h */ #include <asm/unistd_32_ia32.h>
@@ -506,7 +507,7 @@ void x86_gsbase_write_task(struct task_struct *task, unsigned long gsbase)static void start_thread_common (struct pt_regs *regs,unsigned long new_ip,unsigned long new_sp, -unsigned int _cs,unsigned int _ss,unsigned int _ds) +u16 _cs,u16 _ss,u16 _ds) {WARN_ON_ONCE (regs !=current_pt_regs ());
@@ -521,11 +522,11 @@ start_thread_common(struct pt_regs *regs, unsigned long new_ip,loadsegment (ds, _ds);load_gs_index (0 ); - regs->ip = new_ip; - regs->sp = new_sp; - regs->cs = _cs; - regs->ss = _ss; - regs->flags =X86_EFLAGS_IF ; + regs->ip = new_ip; + regs->sp = new_sp; + regs->csx = _cs |CSX_PROCESS_START ; + regs->ssx = _ss; + regs->flags =X86_EFLAGS_IF |X86_EFLAGS_FIXED ; }void
Signature · 1 line
2.34.1
PATCH v7 27/33 x86/fred: fixup fault on ERETU by jumping to fred_entrypoint_user
In reply to Xin LiIf the stack frame contains an invalid user context (e.g. due to invalid SS, a non-canonical RIP, etc.) the ERETU instruction will trap (#SS or #GP).
From a Linux point of view, this really should be considered a user space failure, so use the standard fault fixup mechanism to intercept the fault, fix up the exception frame, and redirect execution to fred_entrypoint_user. The end result is that it appears just as if the hardware had taken the exception immediately after completing the transition to user space.
---
Changes since v6:
* Add a comment to explain why it is safe to write to a previous FRED stack frame. (Lai Jiangshan).
Changes since v5:
* Move the NMI bit from an invalid stack frame, which caused ERETU to fault, to the fault handler's stack frame, thus to unblock NMI ASAP if NMI is blocked (Lai Jiangshan).
--- arch/x86/entry/entry_64_fred.S | 8 ++- arch/x86/include/asm/extable_fixup_types.h | 4 +- arch/x86/mm/extable.c | 76 ++++++++++++++++++++++ 3 files changed, 85 insertions(+), 3 deletions(-)
arch/x86/entry/entry_64_fred.S +6 -2
@@ -5,8 +5,10 @@ * The actual FRED entry points. */ #include <linux/linkage.h> -#include <asm/errno.h> +#include <asm/asm.h> #include <asm/asm-offsets.h> +#include <asm/errno.h> +#include <asm/export.h> #include <asm/fred.h> #include "calling.h"
@@ -38,7 +40,9 @@ SYM_CODE_START_NOALIGN(fred_entrypoint_user) call fred_entry_from_user SYM_INNER_LABEL(fred_exit_user, SYM_L_GLOBAL) FRED_EXIT - ERETU +1: ERETU + + _ASM_EXTABLE_TYPE(1b, fred_entrypoint_user, EX_TYPE_ERETU) SYM_CODE_END(fred_entrypoint_user) .fill fred_entrypoint_kernel - ., 1, 0xcc
arch/x86/include/asm/extable_fixup_types.h +3 -1
@@ -64,6 +64,8 @@#define EX_TYPE_UCOPY_LEN4 (EX_TYPE_UCOPY_LEN | EX_DATA_IMM(4))#define EX_TYPE_UCOPY_LEN8 (EX_TYPE_UCOPY_LEN | EX_DATA_IMM(8)) -#define EX_TYPE_ZEROPAD 20/* longword load with zeropad on fault */ +#define EX_TYPE_ZEROPAD 20/* longword load with zeropad on fault */ + +#define EX_TYPE_ERETU 21#endif
arch/x86/mm/extable.c +76 -0
94 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 28/33 x86/ia32: do not modify the DPL bits for a null selector
In reply to Xin LiWhen a null selector is to be loaded into a segment register, reload_segments() sets its DPL bits to 3. Later when the IRET instruction loads it, it zeros the segment register. The two operations offset each other to actually effect a nop.
Unlike IRET, ERETU does not make any of DS, ES, FS, or GS null if it is found to have DPL < 3. It is expected that a FRED-enabled operating system will return to ring 3 (in compatibility mode) only when those segments all have DPL = 3.
Thus when FRED is enabled, we end up with having 3 in a segment register even when it is initially set to 0.
Fix it by not modifying the DPL bits for a null selector.
--- arch/x86/kernel/signal_32.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
arch/x86/kernel/signal_32.c +13 -8
@@ -36,22 +36,27 @@#ifdef CONFIG_IA32_EMULATION #include <asm/ia32_unistd.h> +static inline u16 usrseg (u16 sel) +{ +return sel <=3 ? sel : sel |3 ; +} +static inline void reload_segments (struct sigcontext_32 *sc) {unsigned int cur;savesegment (gs, cur); -if ((sc->gs |0x03 ) != cur) -load_gs_index (sc->gs |0x03 ); +if (usrseg (sc->gs) != cur) +load_gs_index (usrseg (sc->gs));savesegment (fs, cur); -if ((sc->fs |0x03 ) != cur) -loadsegment (fs, sc->fs |0x03 ); +if (usrseg (sc->fs) != cur) +loadsegment (fs,usrseg (sc->fs));savesegment (ds, cur); -if ((sc->ds |0x03 ) != cur) -loadsegment (ds, sc->ds |0x03 ); +if (usrseg (sc->ds) != cur) +loadsegment (ds,usrseg (sc->ds));savesegment (es, cur); -if ((sc->es |0x03 ) != cur) -loadsegment (es, sc->es |0x03 ); +if (usrseg (sc->es) != cur) +loadsegment (es,usrseg (sc->es)); }#define sigset32_t compat_sigset_t
Signature · 1 line
2.34.1
PATCH v7 29/33 x86/fred: allow FRED systems to use interrupt vectors 0x10-0x1f
In reply to Xin LiFrom: "H. Peter Anvin (Intel)" <[email protected]>
FRED inherits the Intel VT-x enhancement of classified events with a two-level event dispatch logic. The first-level dispatch is on the event type, and the second-level is on the event vector. This also means that vectors in different event types are orthogonal, thus, vectors 0x10-0x1f become available as hardware interrupts.
Enable interrupt vectors 0x10-0x1f on FRED systems (interrupt 0x80 is already enabled.) Most of these changes are about removing the assumption that the lowest-priority vector is hard-wired to 0x20.
--- arch/x86/include/asm/idtentry.h | 4 ++-- arch/x86/include/asm/irq.h | 5 +++++ arch/x86/include/asm/irq_vectors.h | 15 +++++++++++---- arch/x86/kernel/apic/apic.c | 11 ++++++++--- arch/x86/kernel/apic/vector.c | 8 +++++++- arch/x86/kernel/fred.c | 4 ++-- arch/x86/kernel/idt.c | 6 +++--- arch/x86/kernel/irq.c | 2 +- arch/x86/kernel/traps.c | 2 ++ 9 files changed, 41 insertions(+), 16 deletions(-)
arch/x86/include/asm/idtentry.h +2 -2
@@ -546,8 +546,8 @@ __visible noinstr void func(struct pt_regs *regs, \*/ .align IDT_ALIGNSYM_CODE_START (irq_entries_start ) - vector=FIRST_EXTERNAL_VECTOR - .rept NR_EXTERNAL_VECTORS + vector=FIRST_EXTERNAL_VECTOR_IDT + .rept FIRST_SYSTEM_VECTOR - FIRST_EXTERNAL_VECTOR_IDT UNWIND_HINT_IRET_REGS 0 : ENDBR
arch/x86/include/asm/irq.h +5 -0
@@ -11,6 +11,11 @@#include <asm/apicdef.h> #include <asm/irq_vectors.h> +/* +* The first available IRQ vector +*/ +extern unsigned int __ro_after_init first_external_vector; +/* * The irq entry code is in the noinstr section and the start/end of * __irqentry_text is emitted via labels. Make the build fail if
arch/x86/include/asm/irq_vectors.h +11 -4
@@ -31,15 +31,23 @@/* * IDT vectors usable for external interrupt sources start at 0x20. -* (0x80 is the syscall vector, 0x30-0x3f are for ISA) +* (0x80 is the syscall vector, 0x30-0x3f are for ISA). +* +* With FRED we can also use 0x10-0x1f even though those overlap +* exception vectors as FRED distinguishes exceptions and interrupts. +* Therefore, FIRST_EXTERNAL_VECTOR is no longer a constant. */ -#define FIRST_EXTERNAL_VECTOR 0x20 +#define FIRST_EXTERNAL_VECTOR_IDT 0x20 +#define FIRST_EXTERNAL_VECTOR_FRED 0x10 +#define FIRST_EXTERNAL_VECTOR first_external_vector/* * Reserve the lowest usable vector (and hence lowest priority) 0x20 for * triggering cleanup after irq migration. 0x21-0x2f will still be used * for device interrupts. */ +#define IRQ_MOVE_CLEANUP_VECTOR_IDT FIRST_EXTERNAL_VECTOR_IDT +#define IRQ_MOVE_CLEANUP_VECTOR_FRED FIRST_EXTERNAL_VECTOR_FRED#define IRQ_MOVE_CLEANUP_VECTOR FIRST_EXTERNAL_VECTOR#define IA32_SYSCALL_VECTOR 0x80
@@ -48,7 +56,7 @@* Vectors 0x30-0x3f are used for ISA interrupts. * round up to the next 16-vector boundary */ -#define ISA_IRQ_VECTOR (irq) (((FIRST_EXTERNAL_VECTOR + 16) & ~15) + irq) +#define ISA_IRQ_VECTOR (irq) (((FIRST_EXTERNAL_VECTOR_IDT + 16) & ~15) + irq)/* * Special IRQ vectors used by the SMP architecture, 0xf0-0xff
@@ -114,7 +122,6 @@#define FIRST_SYSTEM_VECTOR NR_VECTORS#endif -#define NR_EXTERNAL_VECTORS (FIRST_SYSTEM_VECTOR - FIRST_EXTERNAL_VECTOR)#define NR_SYSTEM_VECTORS (NR_VECTORS - FIRST_SYSTEM_VECTOR)/*
arch/x86/kernel/apic/apic.c +8 -3
@@ -1621,12 +1621,17 @@ static void setup_local_APIC(void)/* * Set Task Priority to 'accept all except vectors 0-31'. An APIC * vector in the 16-31 range could be delivered if TPR == 0, but we -* would think it's an exception and terrible things will happen. We -* never change this later on. +* would think it's an exception and terrible things will happen, +* unless we are using FRED in which case interrupts and +* exceptions are distinguished by type code. +* +* We never change this later on. */ +BUG_ON (!first_external_vector); + value =apic_read (APIC_TASKPRI ); value &= ~APIC_TPRI_MASK ; - value |=0x10 ; + value |= (first_external_vector -0x10 ) &APIC_TPRI_MASK ;apic_write (APIC_TASKPRI , value);/* Clear eventually stale ISR/IRR bits */
arch/x86/kernel/apic/vector.c +7 -1
@@ -46,6 +46,7 @@ static struct irq_matrix *vector_matrix;#ifdef CONFIG_SMP static DEFINE_PER_CPU(struct hlist_head, cleanup_list);#endif +unsigned int first_external_vector =FIRST_EXTERNAL_VECTOR_IDT ;void lock_vector_lock (void ) {
@@ -796,7 +797,12 @@ int __init arch_early_irq_init(void)* Allocate the vector matrix allocator data structure and limit the * search area. */ - vector_matrix =irq_alloc_matrix (NR_VECTORS ,FIRST_EXTERNAL_VECTOR , +if (cpu_feature_enabled (X86_FEATURE_FRED )) + first_external_vector =FIRST_EXTERNAL_VECTOR_FRED ; +else + first_external_vector =FIRST_EXTERNAL_VECTOR_IDT ; + + vector_matrix =irq_alloc_matrix (NR_VECTORS , first_external_vector,FIRST_SYSTEM_VECTOR );BUG_ON (!vector_matrix);
arch/x86/kernel/fred.c +2 -2
@@ -56,7 +56,7 @@ void __init fred_setup_apic(void) {int i; -for (i =0 ; i <FIRST_EXTERNAL_VECTOR ; i++) +for (i =0 ; i <FIRST_EXTERNAL_VECTOR_FRED ; i++)set_bit (i, system_vectors);/*
@@ -65,7 +65,7 @@ void __init fred_setup_apic(void)* /proc/interrupts. */ #ifdef CONFIG_SMP -set_bit (IRQ_MOVE_CLEANUP_VECTOR , system_vectors); +set_bit (IRQ_MOVE_CLEANUP_VECTOR_FRED , system_vectors);#endif for (i =0 ; i <NR_SYSTEM_VECTORS ; i++) {
arch/x86/kernel/idt.c +3 -3
@@ -131,7 +131,7 @@ static const __initconst struct idt_data apic_idts[] = {INTG (RESCHEDULE_VECTOR , asm_sysvec_reschedule_ipi),INTG (CALL_FUNCTION_VECTOR , asm_sysvec_call_function),INTG (CALL_FUNCTION_SINGLE_VECTOR , asm_sysvec_call_function_single), -INTG (IRQ_MOVE_CLEANUP_VECTOR , asm_sysvec_irq_move_cleanup), +INTG (IRQ_MOVE_CLEANUP_VECTOR_IDT , asm_sysvec_irq_move_cleanup), INTG(REBOOT_VECTOR, asm_sysvec_reboot), #endif
@@ -274,13 +274,13 @@ static void __init idt_map_in_cea(void)*/ void __init idt_setup_apic_and_irq_gates (void ) { -int i =FIRST_EXTERNAL_VECTOR ; +int i =FIRST_EXTERNAL_VECTOR_IDT ;void *entry;idt_setup_from_table (idt_table, apic_idts,ARRAY_SIZE (apic_idts), true);for_each_clear_bit_from (i, system_vectors,FIRST_SYSTEM_VECTOR ) { - entry = irq_entries_start +IDT_ALIGN * (i -FIRST_EXTERNAL_VECTOR ); + entry = irq_entries_start +IDT_ALIGN * (i -FIRST_EXTERNAL_VECTOR_IDT );set_intr_gate (i, entry); }
arch/x86/kernel/irq.c +1 -1
@@ -359,7 +359,7 @@ void fixup_irqs(void)* vector_lock because the cpu is already marked !online, so * nothing else will touch it. */ -for (vector =FIRST_EXTERNAL_VECTOR ; vector <NR_VECTORS ; vector++) { +for (vector = first_external_vector; vector <NR_VECTORS ; vector++) {if (IS_ERR_OR_NULL (__this_cpu_read (vector_irq[vector])))continue ;
arch/x86/kernel/traps.c +2 -0
@@ -1489,6 +1489,8 @@ DEFINE_IDTENTRY_IRQ(spurious_interrupt)pr_info ("Spurious interrupt (vector 0x%x) on CPU#%d, should never happen.\n" , vector, smp_processor_id()); } + +unsigned int first_external_vector =FIRST_EXTERNAL_VECTOR_IDT ;#endif static void dispatch_table_spurious_interrupt (struct pt_regs *regs)
Signature · 1 line
2.34.1
PATCH v7 30/33 x86/fred: allow dynamic stack frame size
In reply to Xin LiA FRED stack frame could contain different amount of information for different event types, or perhaps even for different instances of the same event type. Thus we need to eliminate the need of any advance information of the stack frame size to allow dynamic stack frame size.
Implement it through:
1) add a new field user_pt_regs to thread_info, and initialize it with a pointer to a virtual pt_regs structure at the top of a thread stack.
2) save a pointer to the user-space pt_regs structure created by fred_entrypoint_user() to user_pt_regs in fred_entry_from_user().
3) initialize the init_thread_info's user_pt_regs with a pointer to a virtual pt_regs structure at the top of init stack.
This approach also works for IDT, thus we unify the code.
--- arch/x86/entry/entry_32.S | 2 +- arch/x86/entry/entry_fred.c | 2 ++ arch/x86/include/asm/entry-common.h | 3 +++ arch/x86/include/asm/processor.h | 12 +++------ arch/x86/include/asm/switch_to.h | 3 +-- arch/x86/include/asm/thread_info.h | 41 ++++------------------------- arch/x86/kernel/head_32.S | 3 +-- arch/x86/kernel/process.c | 5 ++++ kernel/fork.c | 6 +++++ 9 files changed, 27 insertions(+), 50 deletions(-)
arch/x86/entry/entry_32.S +1 -1
@@ -1244,7 +1244,7 @@ SYM_CODE_START(rewind_stack_and_make_dead) xorl %ebp, %ebp movl PER_CPU_VAR(pcpu_hot + X86_top_of_stack), %esi - leal -TOP_OF_KERNEL_STACK_PADDING-PTREGS_SIZE(%esi), %esp + leal -PTREGS_SIZE(%esi), %esp call make_task_dead 1: jmp 1b
arch/x86/entry/entry_fred.c +2 -0
@@ -178,6 +178,8 @@ __visible noinstr void fred_entry_from_user(struct pt_regs *regs) [EVENT_TYPE_OTHER] = fred_syscall_slow }; + current->thread_info.user_pt_regs = regs; +/* * FRED employs a two-level event dispatch mechanism, with * the first-level on the type of an event and the second-level
arch/x86/include/asm/entry-common.h +3 -0
@@ -12,6 +12,9 @@/* Check that the stack and regs on entry from user mode are sane. */ static __always_inline void arch_enter_from_user_mode(struct pt_regs *regs) { +if (!cpu_feature_enabled (X86_FEATURE_FRED )) + current->thread_info.user_pt_regs = regs; +if (IS_ENABLED (CONFIG_DEBUG_ENTRY )) {/* * Make sure that the entry code gave us a sensible EFLAGS
arch/x86/include/asm/processor.h +3 -9
@@ -626,17 +626,11 @@ static inline void spin_lock_prefetch(const void *x)prefetchw (x); } -#define TOP_OF_INIT_STACK ((unsigned long)&init_stack + sizeof(init_stack) - \ - TOP_OF_KERNEL_STACK_PADDING) +#define TOP_OF_INIT_STACK ((unsigned long)&init_stack + sizeof(init_stack)) -#define task_top_of_stack (task) ((unsigned long)(task_pt_regs(task) + 1)) +#define task_top_of_stack (task) ((unsigned long)task_stack_page(task) + THREAD_SIZE) -#define task_pt_regs (task) \ -({ \ - unsigned long __ptr = (unsigned long)task_stack_page(task); \ - __ptr += THREAD_SIZE - TOP_OF_KERNEL_STACK_PADDING; \ - ((struct pt_regs *)__ptr) - 1; \ -}) +#define task_pt_regs (task) ((task)->thread_info.user_pt_regs)#ifdef CONFIG_X86_32 #define INIT_THREAD { \
arch/x86/include/asm/switch_to.h +1 -2
@@ -72,8 +72,7 @@ static inline void update_task_stack(struct task_struct *task)/* * Will use WRMSRNS/WRMSRLIST for performance once it's upstreamed. */ -wrmsrl (MSR_IA32_FRED_RSP0 , -task_top_of_stack (task) +TOP_OF_KERNEL_STACK_PADDING ); +wrmsrl (MSR_IA32_FRED_RSP0 ,task_top_of_stack (task)); }else if (cpu_feature_enabled (X86_FEATURE_XENPV )) {/* Xen PV enters the kernel on the thread stack. */ load_sp0 (task_top_of_stack (task));
arch/x86/include/asm/thread_info.h +5 -36
70 lines not on this page · raw message
arch/x86/kernel/head_32.S +1 -2
@@ -517,8 +517,7 @@ SYM_DATA_END(initial_page_table) * reliably detect the end of the stack. */ SYM_DATA(initial_stack, - .long init_thread_union + THREAD_SIZE - - SIZEOF_PTREGS - TOP_OF_KERNEL_STACK_PADDING) + .long init_thread_union + THREAD_SIZE - SIZEOF_PTREGS) __INITRODATA int_msg:
arch/x86/kernel/process.c +5 -0
@@ -98,6 +98,11 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)return 0 ; } +void arch_init_user_pt_regs (struct task_struct *tsk) +{ + tsk->thread_info.user_pt_regs = (struct pt_regs *)task_top_of_stack (tsk)-1 ; +} +#ifdef CONFIG_X86_64 void arch_release_task_struct (struct task_struct *tsk) {
kernel/fork.c +6 -0
@@ -953,6 +953,10 @@ int __weak arch_dup_task_struct(struct task_struct *dst,return 0 ; } +void __weak arch_init_user_pt_regs (struct task_struct *tsk) +{ +} +void set_task_stack_end_magic (struct task_struct *tsk) {unsigned long *stackend;
@@ -980,6 +984,8 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node)if (err) goto free_tsk; +arch_init_user_pt_regs (tsk); +#ifdef CONFIG_THREAD_INFO_IN_TASK refcount_set (&tsk->stack_refcount,1 );#endif
Signature · 1 line
2.34.1
PATCH v7 31/33 x86/fred: BUG() when ERETU with %rsp not equal to that when the ring 3 event was just delivered
In reply to Xin LiA FRED stack frame generated by a ring 3 event should never be messed up, and the first thing we must make sure is that at the time an ERETU instruction is executed, %rsp must have the same address as that when the user level event was just delivered.
However we don't want to bother the normal code path of ERETU because it's on the hotest code path, a good choice is to do this check when ERETU faults.
--- arch/x86/mm/extable.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/x86/mm/extable.c +8 -0
@@ -204,6 +204,14 @@ static bool ex_handler_eretu(const struct exception_table_entry *fixup,unsigned short ss = uregs->ss;unsigned short cs = uregs->cs; +/* +* A FRED stack frame generated by a ring 3 event should never be +* messed up, and the first thing we must make sure is that at the +* time an ERETU instruction is executed, %rsp must have the same +* address as that when the user level event was just delivered. +*/ +BUG_ON (uregs != current->thread_info.user_pt_regs); +/* * Move the NMI bit from the invalid stack frame, which caused ERETU * to fault, to the fault handler's stack frame, thus to unblock NMI
Signature · 1 line
2.34.1
PATCH v7 32/33 x86/fred: disable FRED by default in its early stage
In reply to Xin LiDisable FRED by default in its early stage.
To enable FRED, a new kernel command line option "fred" needs to be added.
--- Documentation/admin-guide/kernel-parameters.txt | 4 ++++ arch/x86/kernel/cpu/common.c | 3 +++ 2 files changed, 7 insertions(+)
Documentation/admin-guide/kernel-parameters.txt +4 -0
@@ -1498,6 +1498,10 @@ Warning: use of this parameter will taint the kernel and may cause unknown problems. + fred + Forcefully enable flexible return and event delivery, + which is otherwise disabled by default. + ftrace=[tracer] [FTRACE] will set and start the specified tracer as early as possible in order to facilitate early
arch/x86/kernel/cpu/common.c +3 -0
@@ -1467,6 +1467,9 @@ static void __init cpu_parse_early_param(void)char *argptr = arg, *opt;int arglen, taint =0 ; +if (!cmdline_find_option_bool (boot_command_line,"fred" )) +setup_clear_cpu_cap (X86_FEATURE_FRED ); +#ifdef CONFIG_X86_32 if (cmdline_find_option_bool (boot_command_line,"no387" )) #ifdef CONFIG_MATH_EMULATION
Signature · 1 line
2.34.1
PATCH v7 33/33 KVM: x86/vmx: refactor VMX_DO_EVENT_IRQOFF to generate FRED stack frames
In reply to Xin LiComparing to an IDT stack frame, a FRED stack frame has extra 16 bytes of information pushed at the regular stack top and 8 bytes of error code _always_ pushed at the regular stack bottom, VMX_DO_EVENT_IRQOFF can be refactored to generate FRED stack frames with event type and vector properly set. Thus, IRQ/NMI can be handled with the existing approach when FRED is enabled.
As a FRED stack frame always contains an error code pushed by hardware, call a trampoline function first to have the return instruction address pushed on the regular stack. Then the trampoline function pushes an error code (0 for both IRQ and NMI) and jumps to fred_entrypoint_kernel() for NMI handling or calls external_interrupt() for IRQ handling.
The trampoline function for IRQ handling pushes general purpose registers to form a pt_regs structure and then use it to call external_interrupt(). As a result, IRQ handling does not execute any noinstr code.
Export fred_entrypoint_kernel() and external_interrupt() for above changes.
---
Changes since v6:
* Export fred_entrypoint_kernel(), required when kvm-intel built as a module.
* Reserve a REDZONE for CALL emulation and Align RSP to a 64-byte boundary before pushing a new FRED stack frame.
--- arch/x86/entry/entry_64_fred.S | 1 + arch/x86/include/asm/asm-prototypes.h | 1 + arch/x86/include/asm/fred.h | 1 + arch/x86/include/asm/traps.h | 2 + arch/x86/kernel/traps.c | 5 ++ arch/x86/kvm/vmx/vmenter.S | 74 ++++++++++++++++++++++++++- arch/x86/kvm/vmx/vmx.c | 16 +++++- 7 files changed, 96 insertions(+), 4 deletions(-)
arch/x86/entry/entry_64_fred.S +1 -0
@@ -59,3 +59,4 @@ SYM_CODE_START_NOALIGN(fred_entrypoint_kernel) FRED_EXIT ERETS SYM_CODE_END(fred_entrypoint_kernel) +EXPORT_SYMBOL(fred_entrypoint_kernel)
arch/x86/include/asm/asm-prototypes.h +1 -0
@@ -12,6 +12,7 @@#include <asm/special_insns.h> #include <asm/preempt.h> #include <asm/asm.h> +#include <asm/fred.h> #include <asm/gsseg.h> #ifndef CONFIG_X86_CMPXCHG64
arch/x86/include/asm/fred.h +1 -0
@@ -129,6 +129,7 @@ DECLARE_FRED_HANDLER(fred_exc_machine_check);* The actual assembly entry and exit points */ extern __visible void fred_entrypoint_user(void); +extern __visible void fred_entrypoint_kernel(void);/* * Initialization
arch/x86/include/asm/traps.h +2 -0
@@ -58,4 +58,6 @@ typedef DECLARE_SYSTEM_INTERRUPT_HANDLER((*system_interrupt_handler));system_interrupt_handler get_system_interrupt_handler (unsigned int i); +int external_interrupt (struct pt_regs *regs); +#endif /* _ASM_X86_TRAPS_H */
arch/x86/kernel/traps.c +5 -0
@@ -1573,6 +1573,11 @@ int external_interrupt(struct pt_regs *regs) return 0; } +#if IS_ENABLED (CONFIG_KVM_INTEL ) +/* For KVM VMX to handle IRQs in IRQ induced VM exits. */ +EXPORT_SYMBOL_GPL (external_interrupt); +#endif +#endif /* CONFIG_X86_64 */ void __init install_system_interrupt_handler (unsigned int n,const void *asm_addr,const void *addr)
arch/x86/kvm/vmx/vmenter.S +72 -2
119 lines not on this page · raw message
arch/x86/kvm/vmx/vmx.c +14 -2
@@ -6875,7 +6875,9 @@ static void vmx_apicv_post_state_restore(struct kvm_vcpu *vcpu) }void vmx_do_interrupt_irqoff (unsigned long entry); +void vmx_do_fred_interrupt_irqoff (unsigned int vector);void vmx_do_nmi_irqoff (void ); +void vmx_do_fred_nmi_irqoff (void );static void handle_nm_fault_irqoff (struct kvm_vcpu *vcpu) {
@@ -6923,7 +6925,12 @@ static void handle_external_interrupt_irqoff(struct kvm_vcpu *vcpu)return ;kvm_before_interrupt (vcpu,KVM_HANDLING_IRQ ); -vmx_do_interrupt_irqoff (gate_offset (desc)); +#ifdef CONFIG_X86_64 +if (cpu_feature_enabled (X86_FEATURE_FRED )) +vmx_do_fred_interrupt_irqoff (vector); + else +#endif +vmx_do_interrupt_irqoff (gate_offset (desc));kvm_after_interrupt (vcpu); vcpu->arch.at_instruction_boundary = true;
@@ -7209,7 +7216,12 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_vcpu *vcpu,if ((u16 )vmx->exit_reason.basic ==EXIT_REASON_EXCEPTION_NMI &&is_nmi (vmx_get_intr_info (vcpu))) {kvm_before_interrupt (vcpu,KVM_HANDLING_NMI ); -vmx_do_nmi_irqoff (); +#ifdef CONFIG_X86_64 +if (cpu_feature_enabled (X86_FEATURE_FRED )) +vmx_do_fred_nmi_irqoff (); + else +#endif +vmx_do_nmi_irqoff ();kvm_after_interrupt (vcpu); }
Signature · 1 line
2.34.1