Changeset 97046 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 7, 2022 12:57:59 PM (2 years ago)

Author:

vboxsync

Message:

Devices/DrvIntNet,NetworkServices,Installer/darwin: First rough attempt at making the internal networking option work on macOS after all KEXTs got removed, bugref:10297

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/DrvIntNet.cpp (modified) (15 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -172 +172 @@
         VBOX_WITH_DMI_OEMSTRINGS \
         $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,) \
-        $(if $(VBOX_WITH_IOMMU_INTEL),VBOX_WITH_IOMMU_INTEL,)
+        $(if $(VBOX_WITH_IOMMU_INTEL),VBOX_WITH_IOMMU_INTEL,) \
+        $(if $(VBOX_WITH_INTNET_SERVICE_IN_R3),VBOX_WITH_INTNET_SERVICE_IN_R3,)
  VBoxDD_DEFS.win         = _WIN32_WINNT=0x0510
  ifeq ($(KBUILD_TARGET_ARCH),x86)

trunk/src/VBox/Devices/Network/DrvIntNet.cpp

@@ -31 +31 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_DRV_INTNET
+#if defined(RT_OS_DARWIN) && defined(VBOX_WITH_INTNET_SERVICE_IN_R3)
+# include <xpc/xpc.h> /* This needs to be here because it drags PVM in and cdefs.h needs to undefine it... */
+#endif
+#include <iprt/cdefs.h>
+
 #include <VBox/vmm/pdmdrv.h>
 #include <VBox/vmm/pdmnetinline.h>
@@ -195 +200 @@
     uint64_t                        u64LastReceiveTS;
 #endif
+#if defined(RT_OS_DARWIN) && defined(VBOX_WITH_INTNET_SERVICE_IN_R3)
+    /** XPC connection handle to the R3 internal network switch service. */
+    xpc_connection_t                hXpcCon;
+    /** Flag whether the R3 internal network service is being used. */
+    bool                            fIntNetR3Svc;
+    /** Size of the communication buffer in bytes. */
+    size_t                          cbBuf;
+#endif
 } DRVINTNET;
 AssertCompileMemberAlignment(DRVINTNET, XmitLock, 8);
@@ -219 +232 @@
 
 /**
+ * Calls the internal networking switch service living in either R0 or in another R3 process.
+ *
+ * @returns VBox status code.
+ * @param   pThis           The internal network driver instance data.
+ * @param   uOperation      The operation to execute.
+ * @param   pvArg           Pointer to the argument data.
+ * @param   cbArg           Size of the argument data in bytes.
+ */
+static int drvR3IntNetCallSvc(PDRVINTNET pThis, uint32_t uOperation, void *pvArg, unsigned cbArg)
+{
+#if defined(RT_OS_DARWIN) && defined(VBOX_WITH_INTNET_SERVICE_IN_R3)
+    if (pThis->fIntNetR3Svc)
+    {
+        xpc_object_t hObj = xpc_dictionary_create_empty();
+        xpc_dictionary_set_uint64(hObj, "req-id", uOperation);
+        xpc_dictionary_set_data(hObj, "req", pvArg, cbArg);
+        xpc_object_t hObjReply = xpc_connection_send_message_with_reply_sync(pThis->hXpcCon, hObj);
+        int rc = (int)xpc_dictionary_get_int64(hObjReply, "rc");
+
+        size_t cbReply = 0;
+        const void *pvData = xpc_dictionary_get_data(hObjReply, "reply", &cbReply);
+        AssertRelease(cbReply == cbArg);
+        memcpy(pvArg, pvData, cbArg);
+        xpc_release(hObjReply);
+
+        return rc;
+    }
+    else
+#endif
+        return PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, uOperation, pvArg, cbArg);
+}
+
+
+/**
+ * Calls the internal networking switch service living in either R0 or in another R3 process.
+ *
+ * @returns VBox status code.
+ * @param   pThis           The internal network driver instance data.
+ * @param   uOperation      The operation to execute.
+ * @param   pvArg           Pointer to the argument data.
+ * @param   cbArg           Size of the argument data in bytes.
+ */
+static int drvR3IntNetCallSvcAsync(PDRVINTNET pThis, uint32_t uOperation, void *pvArg, unsigned cbArg)
+{
+#if defined(RT_OS_DARWIN) && defined(VBOX_WITH_INTNET_SERVICE_IN_R3)
+    if (pThis->fIntNetR3Svc)
+    {
+        xpc_object_t hObj = xpc_dictionary_create_empty();
+        xpc_dictionary_set_uint64(hObj, "req-id", uOperation);
+        xpc_dictionary_set_data(hObj, "req", pvArg, cbArg);
+        xpc_connection_send_message(pThis->hXpcCon, hObj);
+        return VINF_SUCCESS;
+    }
+    else
+#endif
+        return PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, uOperation, pvArg, cbArg);
+}
+
+
+/**
+ * Map the ring buffer pointer into this process R3 address space.
+ *
+ * @returns VBox status code.
+ * @param   pThis           The internal network driver instance data.
+ */
+static int drvR3IntNetMapBufferPointers(PDRVINTNET pThis)
+{
+    int rc = VINF_SUCCESS;
+
+    INTNETIFGETBUFFERPTRSREQ GetBufferPtrsReq;
+    GetBufferPtrsReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    GetBufferPtrsReq.Hdr.cbReq = sizeof(GetBufferPtrsReq);
+    GetBufferPtrsReq.pSession = NIL_RTR0PTR;
+    GetBufferPtrsReq.hIf = pThis->hIf;
+    GetBufferPtrsReq.pRing3Buf = NULL;
+    GetBufferPtrsReq.pRing0Buf = NIL_RTR0PTR;
+
+#if defined(RT_OS_DARWIN) && defined(VBOX_WITH_INTNET_SERVICE_IN_R3)
+    if (pThis->fIntNetR3Svc)
+    {
+        xpc_object_t hObj = xpc_dictionary_create_empty();
+        xpc_dictionary_set_uint64(hObj, "req-id", VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS);
+        xpc_dictionary_set_data(hObj, "req", &GetBufferPtrsReq, sizeof(GetBufferPtrsReq));
+        xpc_object_t hObjReply = xpc_connection_send_message_with_reply_sync(pThis->hXpcCon, hObj);
+        rc = (int)xpc_dictionary_get_int64(hObjReply, "rc");
+        if (RT_SUCCESS(rc))
+        {
+            /* Get the shared memory object. */
+            xpc_object_t hObjShMem = xpc_dictionary_get_value(hObjReply, "buf-ptr");
+            size_t cbMem = xpc_shmem_map(hObjShMem, (void **)&pThis->pBufR3);
+            if (!cbMem)
+                rc = VERR_NO_MEMORY;
+            else
+                pThis->cbBuf = cbMem;
+        }
+        xpc_release(hObjReply);
+    }
+    else
+#endif
+    {
+        rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS, &GetBufferPtrsReq, sizeof(GetBufferPtrsReq));
+        if (RT_SUCCESS(rc))
+        {
+            AssertRelease(RT_VALID_PTR(GetBufferPtrsReq.pRing3Buf));
+            pThis->pBufR3 = GetBufferPtrsReq.pRing3Buf;
+#ifdef VBOX_WITH_DRVINTNET_IN_R0
+            pThis->pBufR0 = GetBufferPtrsReq.pRing0Buf;
+#endif
+        }
+    }
+
+    return rc;
+}
+
+
+/**
  * Updates the MAC address on the kernel side.
  *
@@ -236 +365 @@
     int rc = pThis->pIAboveConfigR3->pfnGetMac(pThis->pIAboveConfigR3, &SetMacAddressReq.Mac);
     if (RT_SUCCESS(rc))
-        rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SET_MAC_ADDRESS,
-                                     &SetMacAddressReq, sizeof(SetMacAddressReq));
+        rc = drvR3IntNetCallSvc(pThis, VMMR0_DO_INTNET_IF_SET_MAC_ADDRESS,
+                                &SetMacAddressReq, sizeof(SetMacAddressReq));
 
     Log(("drvR3IntNetUpdateMacAddress: %.*Rhxs rc=%Rrc\n", sizeof(SetMacAddressReq.Mac), &SetMacAddressReq.Mac, rc));
@@ -264 +393 @@
     SetActiveReq.hIf = pThis->hIf;
     SetActiveReq.fActive = fActive;
-    int rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SET_ACTIVE,
-                                     &SetActiveReq, sizeof(SetActiveReq));
+    int rc = drvR3IntNetCallSvc(pThis, VMMR0_DO_INTNET_IF_SET_ACTIVE,
+                                &SetActiveReq, sizeof(SetActiveReq));
 
     Log(("drvR3IntNetSetActive: fActive=%d rc=%Rrc\n", fActive, rc));
@@ -314 +443 @@
     SendReq.pSession = NIL_RTR0PTR;
     SendReq.hIf = pThis->hIf;
-    int rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
+    int rc = drvR3IntNetCallSvc(pThis, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
 #else
     int rc = IntNetR0IfSend(pThis->hIf, pThis->pSupDrvSession);
@@ -560 +689 @@
     Req.hIf             = pThis->hIf;
     Req.fPromiscuous    = fPromiscuous;
-    int rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE, &Req, sizeof(Req));
+    int rc = drvR3IntNetCallSvc(pThis, VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE, &Req, sizeof(Req));
 #else  /* IN_RING0 */
     int rc = IntNetR0IfSetPromiscuousMode(pThis->hIf, pThis->pSupDrvSession, fPromiscuous);
@@ -692 +821 @@
 static int drvR3IntNetRecvRun(PDRVINTNET pThis)
 {
-    PPDMDRVINS pDrvIns = pThis->pDrvInsR3;
     LogFlow(("drvR3IntNetRecvRun: pThis=%p\n", pThis));
 
@@ -869 +997 @@
         WaitReq.cMillies     = 30000; /* 30s - don't wait forever, timeout now and then. */
         STAM_PROFILE_ADV_STOP(&pThis->StatReceive, a);
-        int rc = PDMDrvHlpSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_IF_WAIT, &WaitReq, sizeof(WaitReq));
-        if (    RT_FAILURE(rc)
-            &&  rc != VERR_TIMEOUT
-            &&  rc != VERR_INTERRUPTED)
+
+#if defined(RT_OS_DARWIN) && defined(VBOX_WITH_INTNET_SERVICE_IN_R3)
+        if (pThis->fIntNetR3Svc)
         {
-            LogFlow(("drvR3IntNetRecvRun: returns %Rrc\n", rc));
-            return rc;
+            /* Send an asynchronous message. */
+            int rc = drvR3IntNetCallSvcAsync(pThis, VMMR0_DO_INTNET_IF_WAIT, &WaitReq, sizeof(WaitReq));
+            if (RT_SUCCESS(rc))
+            {
+                /* Wait on the receive semaphore. */
+                rc = RTSemEventWait(pThis->hRecvEvt, 30 * RT_MS_1SEC);
+                if (    RT_FAILURE(rc)
+                    &&  rc != VERR_TIMEOUT
+                    &&  rc != VERR_INTERRUPTED)
+                {
+                    LogFlow(("drvR3IntNetRecvRun: returns %Rrc\n", rc));
+                    return rc;
+                }
+            }
+        }
+        else
+#endif
+        {
+            int rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_WAIT, &WaitReq, sizeof(WaitReq));
+            if (    RT_FAILURE(rc)
+                &&  rc != VERR_TIMEOUT
+                &&  rc != VERR_INTERRUPTED)
+            {
+                LogFlow(("drvR3IntNetRecvRun: returns %Rrc\n", rc));
+                return rc;
+            }
         }
         STAM_PROFILE_ADV_START(&pThis->StatReceive, a);
@@ -1029 +1180 @@
         SendReq.pSession = NIL_RTR0PTR;
         SendReq.hIf = pThis->hIf;
-        PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
+        drvR3IntNetCallSvc(pThis, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
 
         rc = IntNetRingWriteFrame(&pThis->pBufR3->Send, pvBuf, (uint32_t)cb);
@@ -1041 +1192 @@
         SendReq.pSession = NIL_RTR0PTR;
         SendReq.hIf = pThis->hIf;
-        rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
+        rc = drvR3IntNetCallSvc(pThis, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
     }
 
@@ -1201 +1352 @@
     if (pThis->hIf != INTNET_HANDLE_INVALID)
     {
-        INTNETIFABORTWAITREQ AbortWaitReq;
-        AbortWaitReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-        AbortWaitReq.Hdr.cbReq    = sizeof(AbortWaitReq);
-        AbortWaitReq.pSession     = NIL_RTR0PTR;
-        AbortWaitReq.hIf          = pThis->hIf;
-        AbortWaitReq.fNoMoreWaits = true;
-        int rc = PDMDrvHlpSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_IF_ABORT_WAIT, &AbortWaitReq, sizeof(AbortWaitReq));
-        AssertMsg(RT_SUCCESS(rc) || rc == VERR_SEM_DESTROYED, ("%Rrc\n", rc)); RT_NOREF_PV(rc);
+#if defined(RT_OS_DARWIN) && defined(VBOX_WITH_INTNET_SERVICE_IN_R3)
+        if (!pThis->fIntNetR3Svc) /* The R3 service case is handled b the hRecEvt event semaphore. */
+#endif
+        {
+            INTNETIFABORTWAITREQ AbortWaitReq;
+            AbortWaitReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+            AbortWaitReq.Hdr.cbReq    = sizeof(AbortWaitReq);
+            AbortWaitReq.pSession     = NIL_RTR0PTR;
+            AbortWaitReq.hIf          = pThis->hIf;
+            AbortWaitReq.fNoMoreWaits = true;
+            int rc = drvR3IntNetCallSvc(pThis, VMMR0_DO_INTNET_IF_ABORT_WAIT, &AbortWaitReq, sizeof(AbortWaitReq));
+            AssertMsg(RT_SUCCESS(rc) || rc == VERR_SEM_DESTROYED, ("%Rrc\n", rc)); RT_NOREF_PV(rc);
+        }
     }
 
@@ -1270 +1426 @@
         CloseReq.hIf = pThis->hIf;
         pThis->hIf = INTNET_HANDLE_INVALID;
-        int rc = PDMDrvHlpSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_IF_CLOSE, &CloseReq, sizeof(CloseReq));
+        int rc = drvR3IntNetCallSvc(pThis, VMMR0_DO_INTNET_IF_CLOSE, &CloseReq, sizeof(CloseReq));
         AssertRC(rc);
     }
 
+#if defined(RT_OS_DARWIN) && defined(VBOX_WITH_INTNET_SERVICE_IN_R3)
+    if (pThis->fIntNetR3Svc)
+    {
+        /* Unmap the shared buffer. */
+        munmap(pThis->pBufR3, pThis->cbBuf);
+        xpc_connection_cancel(pThis->hXpcCon);
+        pThis->fIntNetR3Svc = false;
+        pThis->hXpcCon      = NULL;
+    }
+#endif
 
     /*
@@ -1765 +1931 @@
      * Create the interface.
      */
-    if (SUPR3IsDriverless()) /** @todo This is probably not good enough for doing fuzz testing, but later... */
+    if (SUPR3IsDriverless())
+    {
+#if defined(RT_OS_DARWIN) && defined(VBOX_WITH_INTNET_SERVICE_IN_R3)
+        xpc_connection_t hXpcCon = xpc_connection_create(INTNET_R3_SVC_NAME, NULL);
+        xpc_connection_set_event_handler(hXpcCon, ^(xpc_object_t hObj) {
+            if (xpc_get_type(hObj) == XPC_TYPE_ERROR)
+            {
+                /** @todo Error handling - reconnecting. */                
+            }
+            else
+            {
+                /* Out of band messages should only come when there is something to receive. */
+                RTSemEventSignal(pThis->hRecvEvt);
+            }
+        });
+
+        xpc_connection_activate(hXpcCon);
+        pThis->hXpcCon      = hXpcCon;
+        pThis->fIntNetR3Svc = true;
+#else
+        /** @todo This is probably not good enough for doing fuzz testing, but later... */
         return PDMDrvHlpVMSetError(pDrvIns, VERR_SUP_DRIVERLESS, RT_SRC_POS,
                                    N_("Cannot attach to '%s' in driverless mode"), pThis->szNetwork);
+#endif
+    }
     OpenReq.hIf = INTNET_HANDLE_INVALID;
-    rc = PDMDrvHlpSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_OPEN, &OpenReq, sizeof(OpenReq));
+    rc = drvR3IntNetCallSvc(pThis, VMMR0_DO_INTNET_OPEN, &OpenReq, sizeof(OpenReq));
     if (RT_FAILURE(rc))
     {
@@ -1798 +1986 @@
      * Get default buffer.
      */
-    INTNETIFGETBUFFERPTRSREQ GetBufferPtrsReq;
-    GetBufferPtrsReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-    GetBufferPtrsReq.Hdr.cbReq = sizeof(GetBufferPtrsReq);
-    GetBufferPtrsReq.pSession = NIL_RTR0PTR;
-    GetBufferPtrsReq.hIf = pThis->hIf;
-    GetBufferPtrsReq.pRing3Buf = NULL;
-    GetBufferPtrsReq.pRing0Buf = NIL_RTR0PTR;
-    rc = PDMDrvHlpSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS, &GetBufferPtrsReq, sizeof(GetBufferPtrsReq));
+    rc = drvR3IntNetMapBufferPointers(pThis);
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
                                    N_("Failed to get ring-3 buffer for the newly created interface to '%s'"), pThis->szNetwork);
-    AssertRelease(RT_VALID_PTR(GetBufferPtrsReq.pRing3Buf));
-    pThis->pBufR3 = GetBufferPtrsReq.pRing3Buf;
-#ifdef VBOX_WITH_DRVINTNET_IN_R0
-    pThis->pBufR0 = GetBufferPtrsReq.pRing0Buf;
-#endif
 
     /*