drivers: hv: mshv_vtl: Support for Secure AVIC

Author: romank-msft

arch/x86/include/asm/apic.h

@@ -245,6 +245,7 @@ static inline u64 native_x2apic_icr_read(void)
 extern void x2apic_savic_update_vector(unsigned int cpu,
 				unsigned int vector,
 				bool set);
+extern void x2apic_savic_init_backing_page(void *backing_page);
 #else
 static inline void x2apic_savic_update_vector(unsigned int cpu,
 					      unsigned int vector,								      bool set) { }

arch/x86/include/asm/sev.h

@@ -109,7 +109,12 @@ struct rmp_state {
 	u32 asid;
 } __packed;
 
-#define RMPADJUST_VMSA_PAGE_BIT		BIT(16)
+/* Target VMPL takes the first byte */
+#define RMPADJUST_ENABLE_READ			BIT(8)
+#define RMPADJUST_ENABLE_WRITE			BIT(9)
+#define RMPADJUST_USER_EXECUTE			BIT(10)
+#define RMPADJUST_KERNEL_EXECUTE		BIT(11)
+#define RMPADJUST_VMSA_PAGE_BIT			BIT(16)
 
 /* SNP Guest message request */
 struct snp_req_data {

arch/x86/include/asm/svm.h

@@ -5,7 +5,8 @@
 #include <uapi/asm/svm.h>
 #include <uapi/asm/kvm.h>
 
-#include <asm/hyperv-tlfs.h>
+/* TODO: including into mshv_vtl_main.c breaks the build. */
+// #include <asm/hyperv-tlfs.h>
 
 /*
  * 32-bit intercept words in the VMCB Control Area, starting
@@ -164,7 +165,8 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
 	 * for use by hypervisor/software.
 	 */
 	union {
-		struct hv_vmcb_enlightenments hv_enlightenments;
+		/* TODO: including into mshv_vtl_main.c breaks the build. */
+		// struct hv_vmcb_enlightenments hv_enlightenments;
 		u8 reserved_sw[32];
 	};
 };
@@ -195,6 +197,9 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
 #define V_IGN_TPR_SHIFT 20
 #define V_IGN_TPR_MASK (1 << V_IGN_TPR_SHIFT)
 
+#define V_GUEST_BUSY_SHIFT 63
+#define V_GUEST_BUSY_MASK (1ULL << V_GUEST_BUSY_SHIFT)
+
 #define V_IRQ_INJECTION_BITS_MASK (V_IRQ_MASK | V_INTR_PRIO_MASK | V_IGN_TPR_MASK)
 
 #define V_INTR_MASKING_SHIFT 24

arch/x86/kernel/apic/x2apic_savic.c

@@ -362,7 +362,7 @@ void x2apic_savic_update_vector(unsigned int cpu, unsigned int vector, bool set)
 		test_and_clear_bit(VEC_POS(vector), reg);
 }
 
-static void init_backing_page(void *backing_page)
+void x2apic_savic_init_backing_page(void *backing_page)
 {
 	u32 hv_apic_id;
 	u32 apic_id;
@@ -412,7 +412,7 @@ static void x2apic_savic_setup(void)
 		return;
 
 	backing_page = this_cpu_read(apic_backing_page);
-	init_backing_page(backing_page);
+	x2apic_savic_init_backing_page(backing_page);
 	gpa = __pa(backing_page);
 	gfn = gpa >> PAGE_SHIFT;