drivers: hv: mshv_vtl: Support for Secure AVIC

Signed-off-by: Roman Kisel <romank@linux.microsoft.com>
Signed-off-by: Tianyu Lan <tiala@microsoft.com>

Author: romank-msft

Microsoft/hcl-x64.config

@@ -2,23 +2,20 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86_64 6.18.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 13.3.0-6ubuntu2~24.04) 13.3.0"
+CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 9.4.0-1ubuntu1~20.04.2) 9.4.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130300
+CONFIG_GCC_VERSION=90400
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24200
+CONFIG_AS_VERSION=23400
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24200
+CONFIG_LD_VERSION=23400
 CONFIG_LLD_VERSION=0
-CONFIG_RUSTC_VERSION=109101
-CONFIG_RUSTC_LLVM_VERSION=210102
+CONFIG_RUSTC_VERSION=109500
+CONFIG_RUSTC_LLVM_VERSION=220102
 CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y
 CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_ASSUME=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
 CONFIG_RUSTC_HAS_COERCE_POINTEE=y
@@ -305,6 +302,7 @@ CONFIG_ARCH_CPUIDLE_HALTPOLL=y
 # CONFIG_JAILHOUSE_GUEST is not set
 # CONFIG_ACRN_GUEST is not set
 # CONFIG_BHYVE_GUEST is not set
+# CONFIG_INTEL_TDX_GUEST is not set
 CONFIG_CC_HAS_MARCH_NATIVE=y
 # CONFIG_X86_NATIVE_CPU is not set
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
@@ -356,6 +354,7 @@ CONFIG_MICROCODE=y
 CONFIG_X86_MSR=y
 # CONFIG_X86_CPUID is not set
 CONFIG_X86_DIRECT_GBPAGES=y
+# CONFIG_AMD_MEM_ENCRYPT is not set
 CONFIG_NUMA=y
 CONFIG_AMD_NUMA=y
 CONFIG_NODES_SHIFT=6
@@ -410,26 +409,16 @@ CONFIG_X86_BUS_LOCK_DETECT=y
 CONFIG_CC_HAS_NAMED_AS=y
 CONFIG_CC_HAS_NAMED_AS_FIXED_SANITIZERS=y
 CONFIG_USE_X86_SEG_SUPPORT=y
-CONFIG_CC_HAS_SLS=y
 CONFIG_CC_HAS_RETURN_THUNK=y
 CONFIG_CC_HAS_ENTRY_PADDING=y
 CONFIG_FUNCTION_PADDING_CFI=11
 CONFIG_FUNCTION_PADDING_BYTES=16
-CONFIG_CALL_PADDING=y
-CONFIG_HAVE_CALL_THUNKS=y
-CONFIG_CALL_THUNKS=y
-CONFIG_PREFIX_SYMBOLS=y
 CONFIG_CPU_MITIGATIONS=y
 # CONFIG_MITIGATION_PAGE_TABLE_ISOLATION is not set
 CONFIG_MITIGATION_RETPOLINE=y
 # CONFIG_MITIGATION_RETHUNK is not set
-# CONFIG_MITIGATION_UNRET_ENTRY is not set
-# CONFIG_MITIGATION_CALL_DEPTH_TRACKING is not set
-# CONFIG_CALL_THUNKS_DEBUG is not set
 CONFIG_MITIGATION_IBPB_ENTRY=y
 CONFIG_MITIGATION_IBRS_ENTRY=y
-# CONFIG_MITIGATION_SRSO is not set
-# CONFIG_MITIGATION_SLS is not set
 # CONFIG_MITIGATION_GDS is not set
 # CONFIG_MITIGATION_RFDS is not set
 # CONFIG_MITIGATION_SPECTRE_BHI is not set
@@ -442,7 +431,6 @@ CONFIG_MITIGATION_IBRS_ENTRY=y
 # CONFIG_MITIGATION_SPECTRE_V2 is not set
 # CONFIG_MITIGATION_SRBDS is not set
 # CONFIG_MITIGATION_SSB is not set
-# CONFIG_MITIGATION_ITS is not set
 # CONFIG_MITIGATION_TSA is not set
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
@@ -471,7 +459,6 @@ CONFIG_ARCH_SUPPORTS_ACPI=y
 # Bus options (PCI etc.)
 #
 CONFIG_PCI_DIRECT=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
 # CONFIG_ISA_BUS is not set
 # CONFIG_ISA_DMA_API is not set
 CONFIG_AMD_NB=y
@@ -508,6 +495,9 @@ CONFIG_X86_DISABLED_FEATURE_CENTAUR_MCR=y
 CONFIG_X86_DISABLED_FEATURE_PKU=y
 CONFIG_X86_DISABLED_FEATURE_OSPKE=y
 CONFIG_X86_DISABLED_FEATURE_PTI=y
+CONFIG_X86_DISABLED_FEATURE_RETHUNK=y
+CONFIG_X86_DISABLED_FEATURE_UNRET=y
+CONFIG_X86_DISABLED_FEATURE_CALL_DEPTH=y
 CONFIG_X86_DISABLED_FEATURE_LAM=y
 CONFIG_X86_DISABLED_FEATURE_ENQCMD=y
 CONFIG_X86_DISABLED_FEATURE_SGX=y
@@ -544,6 +534,7 @@ CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_CALL_SELFTEST is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -1909,16 +1900,9 @@ CONFIG_DEFAULT_SECURITY_DAC=y
 #
 # Memory initialization
 #
-CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
-# CONFIG_ZERO_CALL_USED_REGS is not set
 # end of Memory initialization
 
 #
@@ -2213,7 +2197,6 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
 # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
-# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_GDB_SCRIPTS=y
 CONFIG_FRAME_WARN=2048
@@ -2242,8 +2225,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_ARCH_HAS_UBSAN=y
 # CONFIG_UBSAN is not set
 CONFIG_HAVE_ARCH_KCSAN=y
-CONFIG_HAVE_KCSAN_COMPILER=y
-# CONFIG_KCSAN is not set
 # end of Generic Kernel Debugging Instruments
 
 #

arch/x86/include/asm/apic.h

@@ -241,6 +241,12 @@ static inline u64 native_x2apic_icr_read(void)
 	return val;
 }
 
+#if defined(CONFIG_AMD_SECURE_AVIC)
+extern void x2apic_savic_init_backing_page(void *backing_page);
+#else
+static inline void x2apic_savic_init_backing_page(void *backing_page) {}
+#endif
+
 extern int x2apic_mode;
 extern int x2apic_phys;
 extern void __init x2apic_set_max_apicid(u32 apicid);

arch/x86/include/asm/sev.h

@@ -141,7 +141,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

@@ -190,6 +190,9 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
 #define V_GIF_SHIFT 9
 #define V_GIF_MASK (1 << V_GIF_SHIFT)
 
+#define V_INT_SHADOW_SHIFT 10
+#define V_INT_SHADOW_MASK (1 << V_INT_SHADOW_SHIFT)
+
 #define V_NMI_PENDING_SHIFT 11
 #define V_NMI_PENDING_MASK (1 << V_NMI_PENDING_SHIFT)
 
@@ -202,6 +205,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

@@ -331,6 +331,18 @@ static void savic_eoi(void)
 	}
 }
 
+void x2apic_savic_init_backing_page(void *ap)
+{
+	u32 apic_id;
+
+	/*
+	 * Before Secure AVIC is enabled, APIC msr reads are intercepted.
+	 * APIC_ID msr read returns the value from the Hypervisor.
+	 */
+	apic_id = native_apic_msr_read(APIC_ID);
+	apic_set_reg(ap, APIC_ID, apic_id);
+}
+
 static void savic_teardown(void)
 {
 	/* Disable Secure AVIC */
@@ -348,12 +360,7 @@ static void savic_setup(void)
 	if (!cc_platform_has(CC_ATTR_SNP_SECURE_AVIC))
 		return;
 
-	/*
-	 * Before Secure AVIC is enabled, APIC MSR reads are intercepted.
-	 * APIC_ID MSR read returns the value from the hypervisor.
-	 */
-	apic_set_reg(ap, APIC_ID, native_apic_msr_read(APIC_ID));
-
+	x2apic_savic_init_backing_page(ap);
 	gpa = __pa(ap);
 
 	gfn = gpa >> PAGE_SHIFT;