Changeset 92444 in vbox

Timestamp:

Nov 16, 2021 1:04:01 AM (3 years ago)

Author:

vboxsync

Message:

VMM/NEM-linux: Some very early bits. bugref:9044

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/VMM/Config.kmk (modified) (1 diff)
• src/VBox/VMM/Makefile.kmk (modified) (2 diffs)
• src/VBox/VMM/VMMR3/NEMR3.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/NEMR3Native-linux.cpp (added)
• src/VBox/VMM/include/NEMInternal.h (modified) (4 diffs)

trunk/include/VBox/err.h

@@ -2998 +2998 @@
 /** NEM failed to query dirty page bitmap. */
 #define VERR_NEM_QUERY_DIRTY_BITMAP_FAILED          (-6816)
+/** NEM is missing a require feature in the host API. */
+#define VERR_NEM_MISSING_FEATURE                    (-6817)
 
 /** NEM internal processing error \#0. */

trunk/src/VBox/VMM/Config.kmk

@@ -68 +68 @@
 endif
 ifdef VBOX_WITH_NATIVE_NEM
- if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.amd64 darwin.amd64)
+ if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), linux.amd64)
+  VMM_COMMON_DEFS += VBOX_WITH_NATIVE_NEM VBOX_WITH_NEM_R0 VBOX_WITH_PGM_NEM_MODE
+ else if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.amd64 darwin.amd64 linux.amd64)
   VMM_COMMON_DEFS += VBOX_WITH_NATIVE_NEM VBOX_WITH_NEM_R0
   ifdef VBOX_WITH_PGM_NEM_MODE

trunk/src/VBox/VMM/Makefile.kmk

@@ -226 +226 @@
 
 ifdef VBOX_WITH_NATIVE_NEM
+VBoxVMM_SOURCES.linux.amd64 += VMMR3/NEMR3Native-linux.cpp
+
 VBoxVMM_SOURCES.win.amd64 += VMMR3/NEMR3Native-win.cpp
 VBoxVMM_DEFS.win.amd64    += VBOX_WITH_NATIVE_NEM
@@ -571 +573 @@
         $(VBOX_LIB_SUPR0)
  ifdef VBOX_WITH_NATIVE_NEM
+VMMR0_SOURCES.linux.amd64 += VMMR0/NEMR0Native-stubs.cpp
+
 VMMR0_SOURCES.win.amd64 += \
         VMMR0/NEMR0Native-win.cpp \

trunk/src/VBox/VMM/VMMR3/NEMR3.cpp

@@ -374 +374 @@
 {
 #ifdef VBOX_WITH_NATIVE_NEM
-# if defined(RT_OS_WINDOWS) || defined(RT_OS_DARWIN)
     if (VM_IS_NEM_ENABLED(pVM))
         return true;
-# endif
 #else
     RT_NOREF(pVM);

trunk/src/VBox/VMM/include/NEMInternal.h

@@ -182 +182 @@
     /** Set if long mode guests are allowed. */
     bool                        fAllow64BitGuests;
-#ifdef RT_OS_WINDOWS
+
+#if defined(RT_OS_LINUX)
+    /** The '/dev/kvm' file descriptor.   */
+    int32_t                     fdKvm;
+    /** The KVM_CREATE_VM file descriptor. */
+    int32_t                     fdVm;
+
+    /** KVM_CAP_NR_MEMSLOTS. */
+    uint32_t                    cMaxMemSlots;
+    /** KVM_CAP_X86_ROBUST_SINGLESTEP. */
+    bool                        fRobustSingleStep;
+    /** KVM_GET_VCPU_MMAP_SIZE. */
+    uint32_t                    cbVCpuMmap;
+
+#elif defined(RT_OS_WINDOWS)
     /** Set if we've created the EMTs. */
     bool                        fCreatedEmts : 1;
@@ -273 +287 @@
         uint64_t                cPagesInUse;
     } R0Stats;
+
 #elif defined(RT_OS_DARWIN)
     /** Set if we've created the EMTs. */
@@ -308 +323 @@
     /** Whether \#GP needs to be intercept for mesa driver workaround. */
     bool                        fTrapXcptGpForLovelyMesaDrv: 1;
-#ifdef RT_OS_WINDOWS
+
+#if defined(RT_OS_LINUX)
+    uint8_t                     abPadding[3];
+    /** The KVM VCpu file descriptor. */
+    int32_t                     fdVCpu;
+    /** Pointer to the KVM_RUN data exchange region. */
+    R3PTRTYPE(struct kvm_run *) pRun;
+
+    /** @name Statistics
+     * @{ */
+# if 0
+    STAMCOUNTER                 StatExitPortIo;
+    STAMCOUNTER                 StatExitMemUnmapped;
+    STAMCOUNTER                 StatExitMemIntercept;
+    STAMCOUNTER                 StatExitHalt;
+    STAMCOUNTER                 StatExitInterruptWindow;
+    STAMCOUNTER                 StatExitCpuId;
+    STAMCOUNTER                 StatExitMsr;
+    STAMCOUNTER                 StatExitException;
+    STAMCOUNTER                 StatExitExceptionBp;
+    STAMCOUNTER                 StatExitExceptionDb;
+    STAMCOUNTER                 StatExitExceptionGp;
+    STAMCOUNTER                 StatExitExceptionGpMesa;
+    STAMCOUNTER                 StatExitExceptionUd;
+    STAMCOUNTER                 StatExitExceptionUdHandled;
+    STAMCOUNTER                 StatExitUnrecoverable;
+    STAMCOUNTER                 StatGetMsgTimeout;
+    STAMCOUNTER                 StatStopCpuSuccess;
+    STAMCOUNTER                 StatStopCpuPending;
+    STAMCOUNTER                 StatStopCpuPendingAlerts;
+    STAMCOUNTER                 StatStopCpuPendingOdd;
+    STAMCOUNTER                 StatCancelChangedState;
+    STAMCOUNTER                 StatCancelAlertedThread;
+    STAMCOUNTER                 StatBreakOnCancel;
+    STAMCOUNTER                 StatBreakOnFFPre;
+    STAMCOUNTER                 StatBreakOnFFPost;
+    STAMCOUNTER                 StatBreakOnStatus;
+# endif
+    STAMCOUNTER                 StatImportOnDemand;
+    STAMCOUNTER                 StatImportOnReturn;
+    STAMCOUNTER                 StatImportOnReturnSkipped;
+    STAMCOUNTER                 StatQueryCpuTick;
+    /** @} */
+
+
+#elif defined(RT_OS_WINDOWS)
     /** The current state of the interrupt windows (NEM_WIN_INTW_F_XXX). */
     uint8_t                     fCurrentInterruptWindows;
@@ -411 +471 @@
     STAMCOUNTER                 StatQueryCpuTick;
     /** @} */
+
 #elif defined(RT_OS_DARWIN)
     /** The vCPU handle associated with the EMT executing this vCPU. */