arch/x86: mshyperv: Discover Confidential VMBus availability

Confidential VMBus requires enabling paravisor SynIC, and
the x86_64 guest has to inspect the Virtualization Stack (VS)
CPUID leaf to see if Confidential VMBus is available. If it is,
the guest shall enable the paravisor SynIC.

Read the relevant data from the VS CPUID leaf. Refactor the
code to avoid repeating CPUID and add flags to the struct
ms_hyperv_info. For ARM64, the flag for Confidential VMBus
is not set which provides the desired behaviour for now as
it is not available on ARM64 just yet. Once ARM64 CCA guests
are supported, this flag will be set unconditionally when
running such a guest.

Signed-off-by: Roman Kisel <romank@linux.microsoft.com>
Reviewed-by: Michael Kelley <mhklinux@outlook.com>
Signed-off-by: Wei Liu <wei.liu@kernel.org>

diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index 217a41b63df36045afa5a2fbb0f617ff97512445..1369fae7d8a93922768fdb800787d63fc6449a83 100644 (file)
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -440,7 +440,7 @@ EXPORT_SYMBOL_GPL(hv_get_hypervisor_version);
 
 static void __init ms_hyperv_init_platform(void)
 {
-       int hv_max_functions_eax;
+       int hv_max_functions_eax, eax;
 
 #ifdef CONFIG_PARAVIRT
        pv_info.name = "Hyper-V";
@@ -478,6 +478,19 @@ static void __init ms_hyperv_init_platform(void)
                pr_info("Hyper-V: running on a nested hypervisor\n");
        }
 
+       /*
+        * There is no check against the max function for HYPERV_CPUID_VIRT_STACK_* CPUID
+        * leaves as the hypervisor doesn't handle them. Even a nested root partition (L2
+        * root) will not get them because the nested (L1) hypervisor filters them out.
+        * These are handled through intercept processing by the Windows Hyper-V stack
+        * or the paravisor.
+        */
+       eax = cpuid_eax(HYPERV_CPUID_VIRT_STACK_PROPERTIES);
+       ms_hyperv.confidential_vmbus_available =
+               eax & HYPERV_VS_PROPERTIES_EAX_CONFIDENTIAL_VMBUS_AVAILABLE;
+       ms_hyperv.msi_ext_dest_id =
+               eax & HYPERV_VS_PROPERTIES_EAX_EXTENDED_IOAPIC_RTE;
+
        if (ms_hyperv.features & HV_ACCESS_FREQUENCY_MSRS &&
            ms_hyperv.misc_features & HV_FEATURE_FREQUENCY_MSRS_AVAILABLE) {
                x86_platform.calibrate_tsc = hv_get_tsc_khz;
@@ -678,21 +691,10 @@ static bool __init ms_hyperv_x2apic_available(void)
  * pci-hyperv host bridge.
  *
  * Note: for a Hyper-V root partition, this will always return false.
- * The hypervisor doesn't expose these HYPERV_CPUID_VIRT_STACK_* cpuids by
- * default, they are implemented as intercepts by the Windows Hyper-V stack.
- * Even a nested root partition (L2 root) will not get them because the
- * nested (L1) hypervisor filters them out.
  */
 static bool __init ms_hyperv_msi_ext_dest_id(void)
 {
-       u32 eax;
-
-       eax = cpuid_eax(HYPERV_CPUID_VIRT_STACK_INTERFACE);
-       if (eax != HYPERV_VS_INTERFACE_EAX_SIGNATURE)
-               return false;
-
-       eax = cpuid_eax(HYPERV_CPUID_VIRT_STACK_PROPERTIES);
-       return eax & HYPERV_VS_PROPERTIES_EAX_EXTENDED_IOAPIC_RTE;
+       return ms_hyperv.msi_ext_dest_id;
 }
 
 #ifdef CONFIG_AMD_MEM_ENCRYPT

diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h
index db84aced16586928ca29e49ad96b5c60c4641933..8da1893365f0064050bb85b36fa5456235b59087 100644 (file)
--- a/include/asm-generic/mshyperv.h
+++ b/include/asm-generic/mshyperv.h
@@ -62,6 +62,8 @@ struct ms_hyperv_info {
                };
        };
        u64 shared_gpa_boundary;
+       bool msi_ext_dest_id;
+       bool confidential_vmbus_available;
 };
 extern struct ms_hyperv_info ms_hyperv;
 extern bool hv_nested;