Changeset 10843

Timestamp:

07/23/08 23:49:52 (3 months ago)

Author:

vboxsync

Message:

intnet: Implemented activation on power on & resume, deactivation on power off and suspend, and setting/updating of the mac address.

Files:

• trunk/include/VBox/intnet.h (modified) (2 diffs)
• trunk/include/VBox/vmm.h (modified) (1 diff)
• trunk/src/VBox/Devices/Network/DrvIntNet.cpp (modified) (8 diffs)
• trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)

trunk/include/VBox/intnet.h

@@ -733 +733 @@
-
-/**
+ * Request buffer for INTNETR0IfSetMacAddressReq / VMMR0_DO_INTNET_IF_SET_MAC_ADDRESS.
+ * @see INTNETR0IfSetMacAddress.
+ */
+typedef struct INTNETIFSETMACADDRESSREQ
+{
+    /** The request header. */
+    SUPVMMR0REQHDR  Hdr;
+    /** Alternative to passing the taking the session from the VM handle.
+     * Either use this member or use the VM handle, don't do both. */
+    PSUPDRVSESSION  pSession;
+    /** Handle to the interface. */
+    INTNETIFHANDLE  hIf;
+    /** The new MAC address. */
+    PDMMAC          Mac;
+} INTNETIFSETMACADDRESSREQ;
+/** Pointer to an INTNETR0IfSetMacAddressReq / VMMR0_DO_INTNET_IF_SET_MAC_ADDRESS request buffer. */
+typedef INTNETIFSETMACADDRESSREQ *PINTNETIFSETMACADDRESSREQ;
+
+INTNETR0DECL(int) INTNETR0IfSetMacAddressReq(PINTNET pIntNet, PSUPDRVSESSION pSession, PINTNETIFSETMACADDRESSREQ pReq);
+
+
+/**
+ * Request buffer for INTNETR0IfSetActiveReq / VMMR0_DO_INTNET_IF_SET_ACTIVE.
+ * @see INTNETR0IfSetActive.
+ */
+typedef struct INTNETIFSETACTIVEREQ
+{
+    /** The request header. */
+    SUPVMMR0REQHDR  Hdr;
+    /** Alternative to passing the taking the session from the VM handle.
+     * Either use this member or use the VM handle, don't do both. */
+    PSUPDRVSESSION  pSession;
+    /** Handle to the interface. */
+    INTNETIFHANDLE  hIf;
+    /** The new state. */
+    bool            fActive;
+} INTNETIFSETACTIVEREQ;
+/** Pointer to an INTNETR0IfSetActiveReq / VMMR0_DO_INTNET_IF_SET_ACTIVE request buffer. */
+typedef INTNETIFSETACTIVEREQ *PINTNETIFSETACTIVEREQ;
+
+INTNETR0DECL(int) INTNETR0IfSetActiveReq(PINTNET pIntNet, PSUPDRVSESSION pSession, PINTNETIFSETACTIVEREQ pReq);
+
+
+/**
- * Request buffer for INTNETR0IfSendReq / VMMR0_DO_INTNET_IF_SEND.
- * @see INTNETR0IfSend.
@@ -854 +898 @@
- * @param   fPromiscuous    Set if the interface should be in promiscuous mode, clear if not.
- */
-
+
+
+
-
-/**

trunk/include/VBox/vmm.h

@@ -438 +438 @@
-    /** Call INTNETR0IfSetPromiscuousMode(). */
-    VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE,
+    /** Call INTNETR0IfSetMacAddress(). */
+    VMMR0_DO_INTNET_IF_SET_MAC_ADDRESS,
+    /** Call INTNETR0IfSetActive(). */
+    VMMR0_DO_INTNET_IF_SET_ACTIVE,
-    /** Call INTNETR0IfSend(). */
-    VMMR0_DO_INTNET_IF_SEND,

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

@@ -72 +72 @@
-    /** The network interface. */
-    PPDMINETWORKPORT        pPort;
+    /** The network config interface.
+     * Can (in theory at least) be NULL. */
+    PPDMINETWORKCONFIG      pConfigIf;
-    /** Pointer to the driver instance. */
-    PPDMDRVINS              pDrvIns;
@@ -111 +114 @@
-/** Converts a pointer to DRVINTNET::INetworkConnector to a PDRVINTNET. */
-#define PDMINETWORKCONNECTOR_2_DRVINTNET(pInterface) ( (PDRVINTNET)((uintptr_t)pInterface - RT_OFFSETOF(DRVINTNET, INetworkConnector)) )
+
+
+/**
+ * Updates the MAC address on the kernel side.
+ *
+ * @returns VBox status code.
+ * @param   pThis       The driver instance.
+ */
+static int drvIntNetUpdateMacAddress(PDRVINTNET pThis)
+{
+    if (!pThis->pConfigIf)
+        return VINF_SUCCESS;
+
+    INTNETIFSETMACADDRESSREQ SetMacAddressReq;
+    SetMacAddressReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    SetMacAddressReq.Hdr.cbReq = sizeof(SetMacAddressReq);
+    SetMacAddressReq.pSession = NIL_RTR0PTR;
+    SetMacAddressReq.hIf = pThis->hIf;
+    int rc = pThis->pConfigIf->pfnGetMac(pThis->pConfigIf, &SetMacAddressReq.Mac);
+    if (RT_SUCCESS(rc))
+        rc = pThis->pDrvIns->pDrvHlp->pfnSUPCallVMMR0Ex(pThis->pDrvIns, VMMR0_DO_INTNET_IF_SET_MAC_ADDRESS,
+                                                        &SetMacAddressReq, sizeof(SetMacAddressReq));
+
+    Log(("drvIntNetUpdateMacAddress: %.*Rhxs rc=%Rrc\n", sizeof(SetMacAddressReq.Mac), &SetMacAddressReq.Mac, rc));
+    return rc;
+}
+
+
+/**
+ * Sets the kernel interface active or inactive.
+ *
+ * Worker for poweron, poweroff, suspend and resume.
+ *
+ * @returns VBox status code.
+ * @param   pThis       The driver instance.
+ * @param   fActive     The new state.
+ */
+static int drvIntNetSetActive(PDRVINTNET pThis, bool fActive)
+{
+    if (!pThis->pConfigIf)
+        return VINF_SUCCESS;
+
+    INTNETIFSETACTIVEREQ SetActiveReq;
+    SetActiveReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    SetActiveReq.Hdr.cbReq = sizeof(SetActiveReq);
+    SetActiveReq.pSession = NIL_RTR0PTR;
+    SetActiveReq.hIf = pThis->hIf;
+    SetActiveReq.fActive = fActive;
+    int rc = pThis->pDrvIns->pDrvHlp->pfnSUPCallVMMR0Ex(pThis->pDrvIns, VMMR0_DO_INTNET_IF_SET_ACTIVE,
+                                                        &SetActiveReq, sizeof(SetActiveReq));
+
+    Log(("drvIntNetUpdateMacAddress: fActive=%d rc=%Rrc\n", fActive, rc));
+    AssertRC(rc);
+    return rc;
+}
-
-
@@ -541 +599 @@
-    PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
-    if (!pThis->fActivateEarlyDeactivateLate)
+    {
-        ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_SUSPENDED);
+        drvIntNetSetActive(pThis, false /* fActive */);
+    }
-}
-
@@ -558 +619 @@
-        ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_RUNNING);
-        RTSemEventSignal(pThis->EventSuspended);
+        drvIntNetUpdateMacAddress(pThis); /* (could be a state restore) */
+        drvIntNetSetActive(pThis, true /* fActive */);
-    }
-}
@@ -572 +635 @@
-    PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
-    if (!pThis->fActivateEarlyDeactivateLate)
+    {
-        ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_SUSPENDED);
+        drvIntNetSetActive(pThis, false /* fActive */);
+    }
-}
-
@@ -589 +655 @@
-        ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_RUNNING);
-        RTSemEventSignal(pThis->EventSuspended);
+        drvIntNetUpdateMacAddress(pThis);
+        drvIntNetSetActive(pThis, true /* fActive */);
-    }
-}
@@ -704 +772 @@
-        return VERR_PDM_MISSING_INTERFACE_ABOVE;
-    }
+    pThis->pConfigIf = (PPDMINETWORKCONFIG)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_NETWORK_CONFIG);
-
-    /*
@@ -887 +956 @@
-        ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_RUNNING);
-        RTSemEventSignal(pThis->EventSuspended);
+        drvIntNetUpdateMacAddress(pThis);
+        drvIntNetSetActive(pThis, true /* fActive */);
-    }
-

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

@@ -1167 +1167 @@
-
-/**
+ * Sets the MAC address of an interface.
+ *
+ * @returns VBox status code.
+ * @param   pIntNet         The instance handle.
+ * @param   hIf             The interface handle.
+ * @param   pSession        The caller's session.
+ * @param   pMAC            The new MAC address.
+ */
+INTNETR0DECL(int) INTNETR0IfSetMacAddress(PINTNET pIntNet, INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PCPDMMAC pMac)
+{
+    LogFlow(("INTNETR0IfSetMacAddress: pIntNet=%p hIf=%RX32 pMac=%p:{%.6Rhxs}\n", pIntNet, hIf, pMac, pMac));
+
+    /*
+     * Validate & translate input.
+     */
+    AssertPtrReturn(pIntNet, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pMac, VERR_INVALID_PARAMETER);
+    PINTNETIF pIf = (PINTNETIF)RTHandleTableLookupWithCtx(pIntNet->hHtIfs, hIf, pSession);
+    if (!pIf)
+    {
+        Log(("INTNETR0IfSetMacAddress: returns VERR_INVALID_HANDLE\n"));
+        return VERR_INVALID_HANDLE;
+    }
+
+    /*
+     * Grab the network semaphore and make the change.
+     */
+    int rc;
+    PINTNETNETWORK pNetwork = pIf->pNetwork;
+    if (pNetwork)
+    {
+        rc = RTSemFastMutexRequest(pNetwork->FastMutex);
+        if (RT_SUCCESS(rc))
+        {
+            if (memcmp(&pIf->Mac, pMac, sizeof(pIf->Mac)))
+            {
+                Log(("INTNETR0IfSetMacAddress: hIf=%RX32: Changed from %.6Rhxs -> %.6Rhxs\n",
+                     hIf, &pIf->Mac, pMac));
+                pIf->Mac = *pMac;
+                pIf->fMacSet = true;
+            }
+
+            rc = RTSemFastMutexRelease(pNetwork->FastMutex);
+        }
+    }
+    else
+        rc = VERR_WRONG_ORDER;
+
+    intnetR0IfRelease(pIf, pSession);
+    return rc;
+}
+
+
+/**
+ * VMMR0 request wrapper for INTNETR0IfSetMacAddress.
+ *
+ * @returns see INTNETR0IfSetMacAddress.
+ * @param   pIntNet         The internal networking instance.
+ * @param   pSession        The caller's session.
+ * @param   pReq            The request packet.
+ */
+INTNETR0DECL(int) INTNETR0IfSetMacAddressReq(PINTNET pIntNet, PSUPDRVSESSION pSession, PINTNETIFSETMACADDRESSREQ pReq)
+{
+    if (RT_UNLIKELY(pReq->Hdr.cbReq != sizeof(*pReq)))
+        return VERR_INVALID_PARAMETER;
+    return INTNETR0IfSetMacAddress(pIntNet, pReq->hIf, pSession, &pReq->Mac);
+}
+
+
+/**
- * Worker for intnetR0IfSetActive.
- *
@@ -1256 +1326 @@
-        return VERR_WRONG_ORDER;
-    return intnetR0NetworkSetIfActive(pNetwork, pIf, fActive);
+}
+
+
+/**
+ * Sets the active property of an interface.
+ *
+ * @returns VBox status code.
+ * @param   pIntNet         The instance handle.
+ * @param   hIf             The interface handle.
+ * @param   pSession        The caller's session.
+ * @param   fActive         The new state.
+ */
+INTNETR0DECL(int) INTNETR0IfSetActive(PINTNET pIntNet, INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, bool fActive)
+{
+    LogFlow(("INTNETR0IfSetActive: pIntNet=%p hIf=%RX32 fActive=%RTbool\n", pIntNet, hIf, fActive));
+
+    /*
+     * Validate & translate input.
+     */
+    AssertPtrReturn(pIntNet, VERR_INVALID_PARAMETER);
+    PINTNETIF pIf = (PINTNETIF)RTHandleTableLookupWithCtx(pIntNet->hHtIfs, hIf, pSession);
+    if (!pIf)
+    {
+        Log(("INTNETR0IfSetActive: returns VERR_INVALID_HANDLE\n"));
+        return VERR_INVALID_HANDLE;
+    }
+
+    /*
+     * Hand it to the network since it might involve the trunk
+     * and things are tricky there wrt to locking order.
+     */
+    int rc;
+    PINTNETNETWORK pNetwork = pIf->pNetwork;
+    if (pNetwork)
+        rc = intnetR0NetworkSetIfActive(pNetwork, pIf, fActive);
+    else
+        rc = VERR_WRONG_ORDER;
+
+    intnetR0IfRelease(pIf, pSession);
+    return rc;
+}
+
+
+/**
+ * VMMR0 request wrapper for INTNETR0IfSetActive.
+ *
+ * @returns see INTNETR0IfSetActive.
+ * @param   pIntNet         The internal networking instance.
+ * @param   pSession        The caller's session.
+ * @param   pReq            The request packet.
+ */
+INTNETR0DECL(int) INTNETR0IfSetActiveReq(PINTNET pIntNet, PSUPDRVSESSION pSession, PINTNETIFSETACTIVEREQ pReq)
+{
+    if (RT_UNLIKELY(pReq->Hdr.cbReq != sizeof(*pReq)))
+        return VERR_INVALID_PARAMETER;
+    return INTNETR0IfSetActive(pIntNet, pReq->hIf, pSession, pReq->fActive);
-}
-

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -670 +670 @@
-DECLINLINE(bool) vmmR0IsValidSession(PVM pVM, PSUPDRVSESSION pClaimedSession, PSUPDRVSESSION pSession)
-{
-
-
+
+
+
+
+
+
-        return false;
-    if (pVM)
@@ -909 +913 @@
-                return VERR_NOT_SUPPORTED;
-            return INTNETR0IfSetPromiscuousModeReq(g_pIntNet, pSession, (PINTNETIFSETPROMISCUOUSMODEREQ)pReqHdr);
+
+        case VMMR0_DO_INTNET_IF_SET_MAC_ADDRESS:
+            if (u64Arg || !pReqHdr || !vmmR0IsValidSession(pVM, ((PINTNETIFSETMACADDRESSREQ)pReqHdr)->pSession, pSession))
+                return VERR_INVALID_PARAMETER;
+            if (!g_pIntNet)
+                return VERR_NOT_SUPPORTED;
+            return INTNETR0IfSetMacAddressReq(g_pIntNet, pSession, (PINTNETIFSETMACADDRESSREQ)pReqHdr);
+
+        case VMMR0_DO_INTNET_IF_SET_ACTIVE:
+            if (u64Arg || !pReqHdr || !vmmR0IsValidSession(pVM, ((PINTNETIFSETACTIVEREQ)pReqHdr)->pSession, pSession))
+                return VERR_INVALID_PARAMETER;
+            if (!g_pIntNet)
+                return VERR_NOT_SUPPORTED;
+            return INTNETR0IfSetActiveReq(g_pIntNet, pSession, (PINTNETIFSETACTIVEREQ)pReqHdr);
-
-        case VMMR0_DO_INTNET_IF_SEND: