Changeset 81519 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 24, 2019 1:25:31 PM (5 years ago)

Author:

vboxsync

Message:

DevSmc,PDM: Converted the SMC device to the new style. Converted PDMDevHlpCallR0 to use PDMDEVREGR0::pfnRequest and ditch the inefficient symbol resolving stuff. The SMC device was the only user I could find for this helper. bugref:9218

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/PDMR0Device.cpp (modified) (6 diffs)
• VMMR0/VMMR0.cpp (modified) (2 diffs)
• VMMR3/PDM.cpp (modified) (1 diff)
• VMMR3/PDMDevHlp.cpp (modified) (2 diffs)
• VMMR3/PDMDevice.cpp (modified) (1 diff)

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

@@ -1544 +1544 @@
 
 /**
- * PDMDevHlpCallR0 helper.
- *
- * @returns See PFNPDMDEVREQHANDLERR0.
- * @param   pGVM    The global (ring-0) VM structure. (For validation.)
- * @param   pReq    Pointer to the request buffer.
- */
-VMMR0_INT_DECL(int) PDMR0DeviceCallReqHandler(PGVM pGVM, PPDMDEVICECALLREQHANDLERREQ pReq)
-{
-    /*
-     * Validate input and make the call.
-     */
-    int rc = GVMMR0ValidateGVM(pGVM);
-    if (RT_SUCCESS(rc))
-    {
-        AssertPtrReturn(pReq, VERR_INVALID_POINTER);
-        AssertMsgReturn(pReq->Hdr.cbReq == sizeof(*pReq), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER);
-
-        PPDMDEVINS pDevIns = pReq->pDevInsR0;
-        AssertPtrReturn(pDevIns, VERR_INVALID_POINTER);
-        AssertReturn(pDevIns->Internal.s.pGVM == pGVM, VERR_INVALID_PARAMETER);
-
-        PFNPDMDEVREQHANDLERR0 pfnReqHandlerR0 = pReq->pfnReqHandlerR0;
-        AssertPtrReturn(pfnReqHandlerR0, VERR_INVALID_POINTER);
-
-        rc = pfnReqHandlerR0(pDevIns, pReq->uOperation, pReq->u64Arg);
-    }
-    return rc;
-}
-
-
-/**
  * Worker for PDMR0DeviceCreate that does the actual instantiation.
  *
@@ -1948 +1917 @@
  * @param   pGVM    The global (ring-0) VM structure.
  * @param   pReq    Pointer to the request buffer.
- * @thread  EMT(0)
- */
-VMMR0_INT_DECL(int) PDMR0DeviceGenCallReqHandler(PGVM pGVM, PPDMDEVICEGENCALLREQ pReq)
+ * @thread  EMT(0), except for PDMDEVICEGENCALL_REQUEST which can be any EMT.
+ */
+VMMR0_INT_DECL(int) PDMR0DeviceGenCallReqHandler(PGVM pGVM, PPDMDEVICEGENCALLREQ pReq, VMCPUID idCpu)
 {
     /*
@@ -1957 +1926 @@
     AssertReturn(pReq->Hdr.cbReq == sizeof(*pReq), VERR_INVALID_PARAMETER);
 
-    int rc = GVMMR0ValidateGVMandEMT(pGVM, 0);
+    int rc = GVMMR0ValidateGVMandEMT(pGVM, idCpu);
     AssertRCReturn(rc, rc);
 
@@ -1973 +1942 @@
         case PDMDEVICEGENCALL_CONSTRUCT:
             AssertMsgBreakStmt(pGVM->enmVMState < VMSTATE_CREATED, ("enmVMState=%d\n", pGVM->enmVMState), rc = VERR_INVALID_STATE);
+            AssertReturn(idCpu == 0,  VERR_VM_THREAD_NOT_EMT);
             if (pDevIns->pReg->pfnConstruct)
                 rc = pDevIns->pReg->pfnConstruct(pDevIns);
@@ -1980 +1950 @@
             AssertMsgBreakStmt(pGVM->enmVMState < VMSTATE_CREATED || pGVM->enmVMState >= VMSTATE_DESTROYING,
                                ("enmVMState=%d\n", pGVM->enmVMState), rc = VERR_INVALID_STATE);
+            AssertReturn(idCpu == 0,  VERR_VM_THREAD_NOT_EMT);
             if (pDevIns->pReg->pfnDestruct)
             {
@@ -1985 +1956 @@
                 rc = VINF_SUCCESS;
             }
+            break;
+
+        case PDMDEVICEGENCALL_REQUEST:
+            if (pDevIns->pReg->pfnRequest)
+                rc = pDevIns->pReg->pfnRequest(pDevIns, pReq->Params.Req.uReq, pReq->Params.Req.uArg);
+            else
+                rc = VERR_INVALID_FUNCTION;
             break;
 

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

@@ -1980 +1980 @@
         }
 
-        case VMMR0_DO_PDM_DEVICE_CALL_REQ_HANDLER:
-        {
-            if (!pReqHdr || u64Arg || idCpu != NIL_VMCPUID)
-                return VERR_INVALID_PARAMETER;
-            rc = PDMR0DeviceCallReqHandler(pGVM, (PPDMDEVICECALLREQHANDLERREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
-            break;
-        }
-
         case VMMR0_DO_PDM_DEVICE_CREATE:
         {
@@ -2000 +1991 @@
         case VMMR0_DO_PDM_DEVICE_GEN_CALL:
         {
-            if (!pReqHdr || u64Arg || idCpu != 0)
-                return VERR_INVALID_PARAMETER;
-            rc = PDMR0DeviceGenCallReqHandler(pGVM, (PPDMDEVICEGENCALLREQ)pReqHdr);
+            if (!pReqHdr || u64Arg)
+                return VERR_INVALID_PARAMETER;
+            rc = PDMR0DeviceGenCallReqHandler(pGVM, (PPDMDEVICEGENCALLREQ)pReqHdr, idCpu);
             VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;

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

@@ -818 +818 @@
             LogFlow(("pdmR3DevTerm: Destroying (ring-0) - device '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance));
             PDMDEVICEGENCALLREQ Req;
+            RT_ZERO(Req.Params);
             Req.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
             Req.Hdr.cbReq    = sizeof(Req);

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

@@ -3425 +3425 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
-    PVM pVM = pDevIns->Internal.s.pVMR3;
-    VM_ASSERT_EMT(pVM);
+    PVM    pVM = pDevIns->Internal.s.pVMR3;
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+    AssertReturn(pVCpu, VERR_VM_THREAD_IS_EMT);
     LogFlow(("pdmR3DevHlp_CallR0: caller='%s'/%d: uOperation=%#x u64Arg=%#RX64\n",
              pDevIns->pReg->szName, pDevIns->iInstance, uOperation, u64Arg));
@@ -3438 +3439 @@
     if (pDevIns->pReg->fFlags & PDM_DEVREG_FLAGS_R0)
     {
-        char szSymbol[          sizeof("devR0") + sizeof(pDevIns->pReg->szName) + sizeof("ReqHandler")];
-        strcat(strcat(strcpy(szSymbol, "devR0"),         pDevIns->pReg->szName),         "ReqHandler");
-        szSymbol[sizeof("devR0") - 1] = RT_C_TO_UPPER(szSymbol[sizeof("devR0") - 1]);
-
-        PFNPDMDRVREQHANDLERR0 pfnReqHandlerR0;
-        rc = pdmR3DevGetSymbolR0Lazy(pDevIns, szSymbol, &pfnReqHandlerR0);
-        if (RT_SUCCESS(rc))
-        {
-            /*
-             * Make the ring-0 call.
-             */
-            PDMDEVICECALLREQHANDLERREQ Req;
-            Req.Hdr.u32Magic    = SUPVMMR0REQHDR_MAGIC;
-            Req.Hdr.cbReq       = sizeof(Req);
-            Req.pDevInsR0       = PDMDEVINS_2_R0PTR(pDevIns);
-            Req.pfnReqHandlerR0 = pfnReqHandlerR0;
-            Req.uOperation      = uOperation;
-            Req.u32Alignment    = 0;
-            Req.u64Arg          = u64Arg;
-            rc = SUPR3CallVMMR0Ex(VMCC_GET_VMR0_FOR_CALL(pVM), NIL_VMCPUID, VMMR0_DO_PDM_DEVICE_CALL_REQ_HANDLER, 0, &Req.Hdr);
-        }
-        else
-            pfnReqHandlerR0 = NIL_RTR0PTR;
+        /*
+         * Make the ring-0 call.
+         */
+        PDMDEVICEGENCALLREQ Req;
+        RT_ZERO(Req.Params);
+        Req.Hdr.u32Magic    = SUPVMMR0REQHDR_MAGIC;
+        Req.Hdr.cbReq       = sizeof(Req);
+        Req.pDevInsR3       = pDevIns;
+        Req.idxR0Device     = pDevIns->Internal.s.idxR0Device;
+        Req.enmCall         = PDMDEVICEGENCALL_REQUEST;
+        Req.Params.Req.uReq = uOperation;
+        Req.Params.Req.uArg = u64Arg;
+        rc = VMMR3CallR0Emt(pVM, pVCpu, VMMR0_DO_PDM_DEVICE_GEN_CALL, 0, &Req.Hdr);
     }
     else

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

@@ -479 +479 @@
         {
             PDMDEVICEGENCALLREQ Req;
+            RT_ZERO(Req.Params);
             Req.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
             Req.Hdr.cbReq    = sizeof(Req);