diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/entry/entry_32.S | 6 | ||||
| -rw-r--r-- | arch/x86/entry/entry_64.S | 6 | ||||
| -rw-r--r-- | arch/x86/include/asm/idtentry.h | 67 | ||||
| -rw-r--r-- | arch/x86/include/asm/traps.h | 2 |
4 files changed, 80 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index eb64e78052e1..8c0e07e2860f 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -753,6 +753,12 @@ SYM_CODE_END(\asmsym) .endm /* + * Include the defines which emit the idt entries which are shared + * shared between 32 and 64 bit. + */ +#include <asm/idtentry.h> + +/* * %eax: prev task * %edx: next task */ diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 96ad26f1bcf3..ee0716290557 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -699,6 +699,12 @@ SYM_CODE_END(\asmsym) .endm /* + * Include the defines which emit the idt entries which are shared + * shared between 32 and 64 bit. + */ +#include <asm/idtentry.h> + +/* * Interrupt entry helper function. * * Entry runs with interrupts off. Stack layout at entry: diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h new file mode 100644 index 000000000000..bbd81e200b32 --- /dev/null +++ b/arch/x86/include/asm/idtentry.h @@ -0,0 +1,67 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_IDTENTRY_H +#define _ASM_X86_IDTENTRY_H + +/* Interrupts/Exceptions */ +#include <asm/trapnr.h> + +#ifndef __ASSEMBLY__ + +/** + * DECLARE_IDTENTRY - Declare functions for simple IDT entry points + * No error code pushed by hardware + * @vector: Vector number (ignored for C) + * @func: Function name of the entry point + * + * Declares three 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 + * + * Note: This is the C variant of DECLARE_IDTENTRY(). As the name says it + * declares the entry points for usage in C code. There is an ASM variant + * as well which is used to emit the entry stubs in entry_32/64.S. + */ +#define DECLARE_IDTENTRY(vector, func) \ + asmlinkage void asm_##func(void); \ + asmlinkage void xen_asm_##func(void); \ + __visible void func(struct pt_regs *regs) + +/** + * DEFINE_IDTENTRY - Emit code for simple IDT entry points + * @func: Function name of the entry point + * + * @func is called from ASM entry code with interrupts disabled. + * + * The macro is written so it acts as function definition. Append the + * body with a pair of curly brackets. + * + * idtentry_enter() contains common code which has to be invoked before + * arbitrary code in the body. idtentry_exit() contains common code + * which has to run before returning to the low level assembly code. + */ +#define DEFINE_IDTENTRY(func) \ +static __always_inline void __##func(struct pt_regs *regs); \ + \ +__visible noinstr void func(struct pt_regs *regs) \ +{ \ + idtentry_enter(regs); \ + instrumentation_begin(); \ + __##func (regs); \ + instrumentation_end(); \ + idtentry_exit(regs); \ +} \ + \ +static __always_inline void __##func(struct pt_regs *regs) + +#else /* !__ASSEMBLY__ */ + +/* + * The ASM variants for DECLARE_IDTENTRY*() which emit the ASM entry stubs. + */ +#define DECLARE_IDTENTRY(vector, func) \ + idtentry vector asm_##func func has_error_code=0 sane=1 + +#endif /* __ASSEMBLY__ */ + +#endif diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h index 2376620dc66f..814273f8b166 100644 --- a/arch/x86/include/asm/traps.h +++ b/arch/x86/include/asm/traps.h @@ -6,8 +6,8 @@ #include <linux/kprobes.h> #include <asm/debugreg.h> +#include <asm/idtentry.h> #include <asm/siginfo.h> /* TRAP_TRACE, ... */ -#include <asm/trapnr.h> #define dotraplinkage __visible |