x86/trapnr: Add event type macros to <asm/trapnr.h>
PATCH 1/1 x86/trapnr: Add event type macros to <asm/trapnr.h>
Intel VT-x classifies events into eight different types, which is inherited by FRED for event identification. As such, event type becomes a common x86 concept, and should be defined in a common x86 header.
Add event type macros to <asm/trapnr.h>, and use it in <asm/vmx.h>.
--- arch/x86/include/asm/trapnr.h | 18 ++++++++++++++++++ arch/x86/include/asm/vmx.h | 17 +++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-)
arch/x86/include/asm/trapnr.h +18 -0
@@ -2,6 +2,24 @@#ifndef _ASM_X86_TRAPNR_H#define _ASM_X86_TRAPNR_H +/* +* Event type codes used by both Intel VT-x and FRED +*/ +/* Maskable external interrupt */ +#define EVENT_TYPE_HWINT 0 +#define EVENT_TYPE_RESERVED 1 +#define EVENT_TYPE_NMI 2 +/* Hardware exceptions (e.g., page fault) */ +#define EVENT_TYPE_HWFAULT 3 +/* Software interrupt (INT n) */ +#define EVENT_TYPE_SWINT 4 +/* INT1 (ICEBP) */ +#define EVENT_TYPE_PRIVSW 5 +/* Software exception (INT3 or INTO) */ +#define EVENT_TYPE_SWFAULT 6 +/* VT-x MTF or FRED SYSCALL/SYSENTER */ +#define EVENT_TYPE_OTHER 7 +/* Interrupts/Exceptions */ #define X86_TRAP_DE 0/* Divide-by-zero */
arch/x86/include/asm/vmx.h +9 -8
@@ -17,6 +17,7 @@#include <linux/types.h> #include <uapi/asm/vmx.h> +#include <asm/trapnr.h> #include <asm/vmxfeatures.h> #define VMCS_CONTROL_BIT (x) BIT(VMX_FEATURE_##x & 0x1f)
@@ -374,14 +375,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
Quoted 7 lines · Xin Li
arch/x86/include/asm/trapnr.h +7
-0+/* +* Event type codes used by both Intel VT-x and FRED +*/ +/* Maskable external interrupt */ +#define EVENT_TYPE_HWINT 0 +#define EVENT_TYPE_RESERVED 1 +#define EVENT_TYPE_NMI 2
arch/x86/include/asm/trapnr.h line 21
Quoted 10 lines
arch/x86/include/asm/trapnr.h +10
-0+/* Hardware exceptions (e.g., page fault) */ +#define EVENT_TYPE_HWFAULT 3 +/* Software interrupt (INT n) */ +#define EVENT_TYPE_SWINT 4 +/* INT1 (ICEBP) */ +#define EVENT_TYPE_PRIVSW 5 +/* Software exception (INT3 or INTO) */ +#define EVENT_TYPE_SWFAULT 6 +/* VT-x MTF or FRED SYSCALL/SYSENTER */ +#define EVENT_TYPE_OTHER 7
So I know tglx hates on tail comments, but I find the below *MUCH* more readable than the above horror show.
Quoted 8 lines
arch/x86/include/asm/vmx.h +0
-8-#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 */
Quoted 11 lines
Quoted 11 lines
arch/x86/include/asm/trapnr.h +11
-0+/* +* Event type codes used by both Intel VT-x and FRED */ +/* Maskable external interrupt */ +#define EVENT_TYPE_HWINT 0 +#define EVENT_TYPE_RESERVED 1 +#define EVENT_TYPE_NMI 2 +/* Hardware exceptions (e.g., page fault) */ +#define EVENT_TYPE_HWFAULT 3 +/* Software interrupt (INT n) */ +#define EVENT_TYPE_SWINT 4 +/* INT1 (ICEBP) */
Quoted 8 lines
arch/x86/include/asm/trapnr.h line 21
Quoted 5 lines
arch/x86/include/asm/trapnr.h +5
-0+#define EVENT_TYPE_PRIVSW 5 +/* Software exception (INT3 or INTO) */ +#define EVENT_TYPE_SWFAULT 6 +/* VT-x MTF or FRED SYSCALL/SYSENTER */ +#define EVENT_TYPE_OTHER 7So I know tglx hates on tail comments, but I find the below *MUCH* more readable than the above horror show.
Agree, sometimes a tail comment looks much better.
Maybe tglx could give more specific directions on when it's okay to use tail comments.
Thanks!
Xin