81 lines
2.4 KiB
Diff
81 lines
2.4 KiB
Diff
From 1e54d0c7bca44e2cf58c769e420c5ffcefb58ea1 Mon Sep 17 00:00:00 2001
|
|
From: Jason Zeng <jason.zeng@intel.com>
|
|
Date: Wed, 22 Feb 2023 13:59:37 +0800
|
|
Subject: [PATCH] linux-headers: include missing changes from 6.0
|
|
|
|
Signed-off-by: Jason Zeng <jason.zeng@intel.com>
|
|
---
|
|
linux-headers/asm-x86/kvm.h | 6 +++++-
|
|
linux-headers/linux/kvm.h | 12 ++++++++++++
|
|
2 files changed, 17 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/linux-headers/asm-x86/kvm.h b/linux-headers/asm-x86/kvm.h
|
|
index 2ab4f1818a..46e730b62f 100644
|
|
--- a/linux-headers/asm-x86/kvm.h
|
|
+++ b/linux-headers/asm-x86/kvm.h
|
|
@@ -324,6 +324,7 @@ struct kvm_reinject_control {
|
|
#define KVM_VCPUEVENT_VALID_SHADOW 0x00000004
|
|
#define KVM_VCPUEVENT_VALID_SMM 0x00000008
|
|
#define KVM_VCPUEVENT_VALID_PAYLOAD 0x00000010
|
|
+#define KVM_VCPUEVENT_VALID_TRIPLE_FAULT 0x00000020
|
|
|
|
/* Interrupt shadow states */
|
|
#define KVM_X86_SHADOW_INT_MOV_SS 0x01
|
|
@@ -358,7 +359,10 @@ struct kvm_vcpu_events {
|
|
__u8 smm_inside_nmi;
|
|
__u8 latched_init;
|
|
} smi;
|
|
- __u8 reserved[27];
|
|
+ struct {
|
|
+ __u8 pending;
|
|
+ } triple_fault;
|
|
+ __u8 reserved[26];
|
|
__u8 exception_has_payload;
|
|
__u64 exception_payload;
|
|
};
|
|
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
|
index 7870cd0280..cda9016d49 100644
|
|
--- a/linux-headers/linux/kvm.h
|
|
+++ b/linux-headers/linux/kvm.h
|
|
@@ -269,6 +269,7 @@ struct kvm_xen_exit {
|
|
#define KVM_EXIT_AP_RESET_HOLD 32
|
|
#define KVM_EXIT_X86_BUS_LOCK 33
|
|
#define KVM_EXIT_XEN 34
|
|
+#define KVM_EXIT_NOTIFY 37
|
|
|
|
/* For KVM_EXIT_INTERNAL_ERROR */
|
|
/* Emulate instruction failed. */
|
|
@@ -469,6 +470,11 @@ struct kvm_run {
|
|
} msr;
|
|
/* KVM_EXIT_XEN */
|
|
struct kvm_xen_exit xen;
|
|
+ /* KVM_EXIT_NOTIFY */
|
|
+ struct {
|
|
+#define KVM_NOTIFY_CONTEXT_INVALID (1 << 0)
|
|
+ __u32 flags;
|
|
+ } notify;
|
|
/* Fix the size of the union. */
|
|
char padding[256];
|
|
};
|
|
@@ -1116,6 +1122,8 @@ struct kvm_ppc_resize_hpt {
|
|
#define KVM_CAP_VM_GPA_BITS 207
|
|
#define KVM_CAP_XSAVE2 208
|
|
#define KVM_CAP_SYS_ATTRIBUTES 209
|
|
+#define KVM_CAP_X86_TRIPLE_FAULT_EVENT 218
|
|
+#define KVM_CAP_X86_NOTIFY_VMEXIT 219
|
|
|
|
#define KVM_CAP_ARM_CPU_FEATURE 555
|
|
|
|
@@ -2013,4 +2021,8 @@ struct kvm_stats_desc {
|
|
/* Available with KVM_CAP_XSAVE2 */
|
|
#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
|
|
|
|
+/* Available with KVM_CAP_X86_NOTIFY_VMEXIT */
|
|
+#define KVM_X86_NOTIFY_VMEXIT_ENABLED (1ULL << 0)
|
|
+#define KVM_X86_NOTIFY_VMEXIT_USER (1ULL << 1)
|
|
+
|
|
#endif /* __LINUX_KVM_H */
|
|
--
|
|
2.27.0
|
|
|