Re: [patch V4 part 3 20/29] x86/entry: Provide IDTENTRY_ERRORCODE

2020-05-13 Thread Andy Lutomirski
On Tue, May 5, 2020 at 7:15 AM Thomas Gleixner  wrote:
>
> From: Thomas Gleixner 
>
> Same as IDTENTRY but the C entry point has an error code argument.
>


Acked-by: Andy Lutomirski 


[patch V4 part 3 20/29] x86/entry: Provide IDTENTRY_ERRORCODE

2020-05-05 Thread Thomas Gleixner
From: Thomas Gleixner 

Same as IDTENTRY but the C entry point has an error code argument.

Signed-off-by: Thomas Gleixner 

---
 arch/x86/include/asm/idtentry.h |   46 
 1 file changed, 46 insertions(+)

--- a/arch/x86/include/asm/idtentry.h
+++ b/arch/x86/include/asm/idtentry.h
@@ -57,6 +57,49 @@ static __always_inline void __##func(str
\
 static __always_inline void __##func(struct pt_regs *regs)
 
+/**
+ * DECLARE_IDTENTRY_ERRORCODE - Declare functions for simple IDT entry points
+ * 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
+ *
+ * Same as DECLARE_IDTENTRY, but has an extra error_code argument for the
+ * C-handler.
+ */
+#define DECLARE_IDTENTRY_ERRORCODE(vector, func)   \
+   asmlinkage void asm_##func(void);   \
+   asmlinkage void xen_asm_##func(void);   \
+   __visible void func(struct pt_regs *regs, unsigned long error_code)
+
+/**
+ * DEFINE_IDTENTRY_ERRORCODE - Emit code for simple IDT entry points
+ *Error code pushed by hardware
+ * @func:  Function name of the entry point
+ *
+ * Same as DEFINE_IDTENTRY, but has an extra error_code argument
+ */
+#define DEFINE_IDTENTRY_ERRORCODE(func)
\
+static __always_inline void __##func(struct pt_regs *regs, \
+unsigned long error_code); \
+   \
+__visible noinstr void func(struct pt_regs *regs,  \
+   unsigned long error_code)   \
+{  \
+   idtentry_enter(regs);   \
+   instr_begin();  \
+   __##func (regs, error_code);\
+   instr_end();\
+   idtentry_exit(regs);\
+}  \
+   \
+static __always_inline void __##func(struct pt_regs *regs, \
+unsigned long error_code)
+
 #else /* !__ASSEMBLY__ */
 
 /*
@@ -65,6 +108,9 @@ static __always_inline void __##func(str
 #define DECLARE_IDTENTRY(vector, func) \
idtentry vector asm_##func func has_error_code=0 sane=1
 
+#define DECLARE_IDTENTRY_ERRORCODE(vector, func)   \
+   idtentry vector asm_##func func has_error_code=1 sane=1
+
 #endif /* __ASSEMBLY__ */
 
 /*