儲存庫 vbox 的更動 103156

時間撮記:

2024-2-1 上午10:23:11 (13 月 以前)

作者:

vboxsync

svn:sync-xref-src-repo-rev:

161409

訊息:

ValidationKit/{common,testboxscript}: Add a has native API support flag when signing on indicating whether the testbox supports testing through NEM (Hyper-V on Windows, KVM on Linux and Hypervisor.framework on macOS). This is the first part not touching the actual testmanager, bugref:10592

位置:

trunk/src/VBox/ValidationKit

檔案:

• common/constants/tbreq.py (修改) (1 筆差異)
• testboxscript/TestBoxHelper.cpp (修改) (7 筆差異)
• testboxscript/testboxscript_real.py (修改) (3 筆差異)

trunk/src/VBox/ValidationKit/common/constants/tbreq.py

@@ -86 +86 @@
 SIGNON_PARAM_HAS_IOMMU          = 'HAS_IOMMU';
 SIGNON_PARAM_WITH_RAW_MODE      = 'WITH_RAW_MODE';
+SIGNON_PARAM_HAS_NATIVE_API     = 'HAS_NATIVE_API';
 SIGNON_PARAM_MEM_SIZE           = 'MEM_SIZE';
 SIGNON_PARAM_SCRATCH_SIZE       = 'SCRATCH_SIZE';

trunk/src/VBox/ValidationKit/testboxscript/TestBoxHelper.cpp

@@ -63 +63 @@
 # include <sys/types.h>
 # include <sys/sysctl.h>
+#elif defined(RT_OS_WINDOWS)
+# include <iprt/nt/nt-and-windows.h>
+# include <iprt/ldr.h>
+
+extern "C" HRESULT WINAPI 
+WHvGetCapability(UINT32 CapabilityCode, VOID *CapabilityBuffer, UINT32 CapabilityBufferSizeInBytes, UINT32 *WrittenSizeInBytes);
+#elif defined(RT_OS_LINUX)
+# include <sys/stat.h>
+# include <fcntl.h>
+# include <unistd.h>
 #endif
 
@@ -470 +480 @@
 }
 
+
+static bool isNativeApiSupported(void)
+{
+    bool fSupported = false;
+
+#if defined(RT_OS_DARWIN)
+    /*
+     * The kern.hv_support parameter indicates support for the hypervisor API
+     * in the kernel.
+     */
+    int32_t fHvSupport = 0;
+    size_t  cbOld = sizeof(fHvSupport);
+    if (sysctlbyname("kern.hv_support", &fHvSupport, &cbOld, NULL, 0) == 0)
+    {
+        if (fHvSupport != 0)
+            fSupported = true;
+    }
+
+#elif defined(RT_OS_WINDOWS)
+    /*
+     * Check whether we can load WinHvPlatform.dll and whether the Hypervisor
+     * capability is present.
+     */
+    RTLDRMOD hLdrMod;
+    int rc = RTLdrLoadSystem("WinHvPlatform.dll", false /*fNoUnload*/, &hLdrMod);
+    if (RT_SUCCESS(rc))
+    {
+        decltype(WHvGetCapability) *pfnWHvGetCapability;
+
+        rc = RTLdrGetSymbol(hLdrMod, "WHvGetCapability", (void **)&pfnWHvGetCapability);
+        if (RT_SUCCESS(rc))
+        {
+            BOOL fHypervisorPresent = FALSE;
+            SetLastError(0);
+            HRESULT hrc = pfnWHvGetCapability(0 /*WHvCapabilityCodeHypervisorPresent*/,
+                                              &fHypervisorPresent,
+                                              sizeof(fHypervisorPresent),
+                                              NULL);
+            if (   SUCCEEDED(hrc)
+                && fHypervisorPresent)
+                fSupported = true;
+        }
+
+        RTLdrClose(hLdrMod);
+    }
+
+#elif defined(RT_OS_LINUX)
+    /* Check by opening /dev/kvm. */
+    int fdKvm = open("/dev/kvm", O_RDWR | O_CLOEXEC);
+    if (fdKvm >= 0)
+    {
+        close(fdKvm);
+        fSupported = true;
+    }
+#endif  
+
+    return fSupported;
+}
+
+/** Print the 'true' if native API virtualization is supported, 'false' if not and
+ * 'dunno' if we cannot tell. */
+static RTEXITCODE handlerNativeApi(int argc, char **argv)
+{
+    NOREF(argc); NOREF(argv);
+
+    int cch = RTPrintf(isNativeApiSupported() ? "true\n" : "false\n");
+    return cch > 0 ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
+}
+
+
 typedef enum { HWVIRTTYPE_NONE, HWVIRTTYPE_VTX, HWVIRTTYPE_AMDV, HVIRTTYPE_ARMV8 } HWVIRTTYPE;
 static HWVIRTTYPE isHwVirtSupported(void)
 {
-#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+    /* No native virtualization supported on macOS anymore (for the VBox versions we care about). */
+#if !defined RT_OS_DARWIN
+# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     uint32_t uEax, uEbx, uEcx, uEdx;
 
@@ -493 +575 @@
             return HWVIRTTYPE_AMDV;
     }
-#elif defined(RT_ARCH_ARM64)
-# if defined(RT_OS_DARWIN)
-    /*
-     * The kern.hv_support parameter indicates support for the hypervisor API in the
-     * kernel, which is the only way for virtualization on macOS on Apple Silicon.
-     */
-    int32_t fHvSupport = 0;
-    size_t  cbOld = sizeof(fHvSupport);
-    if (sysctlbyname("kern.hv_support", &fHvSupport, &cbOld, NULL, 0) == 0)
-    {
-        if (fHvSupport != 0)
-            return HVIRTTYPE_ARMV8;
-    }
 # endif
 #endif
@@ -529 +598 @@
 
     HWVIRTTYPE  enmHwVirt  = isHwVirtSupported();
+    if (enmHwVirt == HWVIRTTYPE_NONE)
+        fSupported = 0;
 #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
-    if (enmHwVirt == HWVIRTTYPE_AMDV)
+    else if (enmHwVirt == HWVIRTTYPE_AMDV)
     {
         uint32_t uEax, uEbx, uEcx, uEdx;
@@ -589 +660 @@
         }
     }
-# elif defined(RT_OS_DARWIN)
-    else if (enmHwVirt == HWVIRTTYPE_VTX)
-    {
-        /*
-         * The kern.hv_support parameter indicates support for the hypervisor API in the
-         * kernel, which in turn is documented require nested paging and unrestricted
-         * guest mode.  So, if it's there and set we've got nested paging.  Howeber, if
-         * it's there and clear we have not definite answer as it might be due to lack
-         * of unrestricted guest mode support.
-         */
-        int32_t fHvSupport = 0;
-        size_t  cbOld = sizeof(fHvSupport);
-        if (sysctlbyname("kern.hv_support", &fHvSupport, &cbOld, NULL, 0) == 0)
-        {
-            if (fHvSupport != 0)
-                fSupported = true;
-        }
-    }
 # endif
-#elif defined(RT_ARCH_ARM64)
-    /* On ARM nested paging is always supported if virtualization is there. */
-    if (enmHwVirt == HVIRTTYPE_ARMV8)
-        fSupported = 1;
 #endif
 
@@ -625 +674 @@
     NOREF(argc); NOREF(argv);
     HWVIRTTYPE  enmHwVirt  = isHwVirtSupported();
+    bool        fNativeApi = isNativeApiSupported();
     int         fSupported = 0;
 
-    if (enmHwVirt != HWVIRTTYPE_NONE)
+    if (   enmHwVirt != HWVIRTTYPE_NONE
+        || fNativeApi)
     {
 #if defined(RT_ARCH_AMD64)
@@ -767 +818 @@
         { "nestedpaging",   handlerCpuNestedPaging, true },
         { "longmode",       handlerCpuLongMode,     true },
+        { "nativeapi",      handlerNativeApi,       true },
         { "memsize",        handlerMemSize,         true },
         { "report",         handlerReport,          true },

trunk/src/VBox/ValidationKit/testboxscript/testboxscript_real.py

@@ -184 +184 @@
             constants.tbreq.SIGNON_PARAM_HAS_64_BIT_GUEST: { self.VALUE: self._can64BitGuest(),        self.FN: None },
             constants.tbreq.SIGNON_PARAM_HAS_IOMMU:        { self.VALUE: self._hasHostIoMmu(),         self.FN: None },
+            constants.tbreq.SIGNON_PARAM_HAS_NATIVE_API:   { self.VALUE: self._hasHostNativeApi(),     self.FN: None },
             #constants.tbreq.SIGNON_PARAM_WITH_RAW_MODE:    { self.VALUE: self._withRawModeSupport(),   self.FN: None },
             constants.tbreq.SIGNON_PARAM_SCRIPT_REV:       { self.VALUE: self._getScriptRev(),         self.FN: None },
@@ -559 +560 @@
             self._oOptions.fHasIoMmu = False;
         return self._oOptions.fHasIoMmu;
+
+    def _hasHostNativeApi(self):
+        """
+        Check if the host supports the native API/NEM mode.
+        """
+        if self._oOptions.fHasNativeApi is None:
+            self._oOptions.fHasNativeApi = self._getHelperOutput('nativeapi');
+        return self._oOptions.fHasNativeApi;
 
     def _withRawModeSupport(self):
@@ -1005 +1014 @@
                           dest="fCan64BitGuest", action="store_false", default=None,
                           help="Host cannot execute 64-bit guests");
+        parser.add_option("--native-api",
+                          dest="fHasNativeApi", action="store_true", default=None,
+                          help="Native API virtualization is available");
+        parser.add_option("--no-native-api",
+                          dest="fHasNativeApi", action="store_false", default=None,
+                          help="Native API virtualization is not available");
         parser.add_option("--io-mmu",
                           dest="fHasIoMmu", action="store_true", default=None,