Changeset 36232 in vbox for trunk/src

Timestamp:

Mar 9, 2011 4:41:09 PM (14 years ago)

Author:

vboxsync

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

70453

Message:

RTCPUSET, SUPDrv: Preparation for supporting 256 CPUs/cores/threads.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDrv.c (modified) (1 diff)
• HostDrivers/Support/SUPDrvIOC.h (modified) (3 diffs)
• HostDrivers/Support/SUPLib.cpp (modified) (2 diffs)
• Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp (modified) (1 diff)
• Runtime/r0drv/darwin/mp-r0drv-darwin.cpp (modified) (1 diff)
• Runtime/r0drv/freebsd/mp-r0drv-freebsd.c (modified) (1 diff)
• Runtime/r0drv/linux/mp-r0drv-linux.c (modified) (1 diff)
• Runtime/r0drv/nt/initterm-r0drv-nt.cpp (modified) (1 diff)
• Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c (modified) (1 diff)
• Runtime/r3/darwin/mp-darwin.cpp (modified) (1 diff)
• Runtime/r3/freebsd/mp-freebsd.cpp (modified) (1 diff)
• Runtime/r3/win/mp-win.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -1393 +1393 @@
         }
 
+        case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_CALL_VMMR0_BIG):
+        {
+            /* validate */
+            PSUPCALLVMMR0 pReq = (PSUPCALLVMMR0)pReqHdr;
+            Log4(("SUP_IOCTL_CALL_VMMR0_BIG: op=%u in=%u arg=%RX64 p/t=%RTproc/%RTthrd\n",
+                  pReq->u.In.uOperation, pReq->Hdr.cbIn, pReq->u.In.u64Arg, RTProcSelf(), RTThreadNativeSelf()));
+
+            PSUPVMMR0REQHDR pVMMReq = (PSUPVMMR0REQHDR)&pReq->abReqPkt[0];
+            REQ_CHECK_EXPR_FMT(pReq->Hdr.cbIn >= SUP_IOCTL_CALL_VMMR0_BIG_SIZE(sizeof(SUPVMMR0REQHDR)),
+                               ("SUP_IOCTL_CALL_VMMR0_BIG: cbIn=%#x < %#lx\n", pReq->Hdr.cbIn, SUP_IOCTL_CALL_VMMR0_BIG_SIZE(sizeof(SUPVMMR0REQHDR))));
+            REQ_CHECK_EXPR(SUP_IOCTL_CALL_VMMR0_BIG, pVMMReq->u32Magic == SUPVMMR0REQHDR_MAGIC);
+            REQ_CHECK_SIZES_EX(SUP_IOCTL_CALL_VMMR0_BIG, SUP_IOCTL_CALL_VMMR0_BIG_SIZE_IN(pVMMReq->cbReq), SUP_IOCTL_CALL_VMMR0_BIG_SIZE_OUT(pVMMReq->cbReq));
+
+            /* execute */
+            if (RT_LIKELY(pDevExt->pfnVMMR0EntryEx))
+                pReq->Hdr.rc = pDevExt->pfnVMMR0EntryEx(pReq->u.In.pVMR0, pReq->u.In.idCpu, pReq->u.In.uOperation, pVMMReq, pReq->u.In.u64Arg, pSession);
+            else
+                pReq->Hdr.rc = VERR_WRONG_ORDER;
+
+            if (    RT_FAILURE(pReq->Hdr.rc)
+                &&  pReq->Hdr.rc != VERR_INTERRUPTED
+                &&  pReq->Hdr.rc != VERR_TIMEOUT)
+                Log(("SUP_IOCTL_CALL_VMMR0_BIG: rc=%Rrc op=%u out=%u arg=%RX64 p/t=%RTproc/%RTthrd\n",
+                     pReq->Hdr.rc, pReq->u.In.uOperation, pReq->Hdr.cbOut, pReq->u.In.u64Arg, RTProcSelf(), RTThreadNativeSelf()));
+            else
+                Log4(("SUP_IOCTL_CALL_VMMR0_BIG: rc=%Rrc op=%u out=%u arg=%RX64 p/t=%RTproc/%RTthrd\n",
+                      pReq->Hdr.rc, pReq->u.In.uOperation, pReq->Hdr.cbOut, pReq->u.In.u64Arg, RTProcSelf(), RTThreadNativeSelf()));
+            VBOXDRV_SUPDRV_IOCTL_RETURN(pSession, uIOCtl, pReqHdr, VINF_SUCCESS, pReq->Hdr.rc);
+            return 0;
+        }
+
         case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_GET_PAGING_MODE):
         {

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -193 +193 @@
  *          - None.
  */
-#define SUPDRV_IOC_VERSION                              0x00160000
+#define SUPDRV_IOC_VERSION                              0x00160001
 
 /** SUP_IOCTL_COOKIE. */
@@ -484 +484 @@
 /** @name SUP_IOCTL_CALL_VMMR0
  * Call the R0 VMM Entry point.
- *
- * @todo Might have to convert this to a big request...
  * @{
  */
@@ -513 +511 @@
     uint8_t                 abReqPkt[1];
 } SUPCALLVMMR0, *PSUPCALLVMMR0;
+/** @} */
+
+
+/** @name SUP_IOCTL_CALL_VMMR0_BIG
+ * Version of SUP_IOCTL_CALL_VMMR0 for dealing with large requests.
+ * @{
+ */
+#define SUP_IOCTL_CALL_VMMR0_BIG                        SUP_CTL_CODE_BIG(27)
+#define SUP_IOCTL_CALL_VMMR0_BIG_SIZE(cbReq)            RT_UOFFSETOF(SUPCALLVMMR0, abReqPkt[cbReq])
+#define SUP_IOCTL_CALL_VMMR0_BIG_SIZE_IN(cbReq)         SUP_IOCTL_CALL_VMMR0_SIZE(cbReq)
+#define SUP_IOCTL_CALL_VMMR0_BIG_SIZE_OUT(cbReq)        SUP_IOCTL_CALL_VMMR0_SIZE(cbReq)
 /** @} */
 

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -267 +267 @@
         strcpy(CookieReq.u.In.szMagic, SUPCOOKIE_MAGIC);
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
-        const uint32_t uMinVersion = /*(SUPDRV_IOC_VERSION & 0xffff0000) == 0x00160000
-                                   ?  0x00160000
-                                   :*/ SUPDRV_IOC_VERSION & 0xffff0000;
+        const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00160000
+                                   ? 0x00160001
+                                   : SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = uMinVersion;
         rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_COOKIE, &CookieReq, SUP_IOCTL_COOKIE_SIZE);
@@ -656 +656 @@
         memcpy(pReqHdr, &pReq->abReqPkt[0], cbReq);
     }
-    else /** @todo may have to remove the size limits one this request... */
-        AssertMsgFailedReturn(("cbReq=%#x\n", pReqHdr->cbReq), VERR_INTERNAL_ERROR);
+    else if (pReqHdr->cbReq <= _512K)
+    {
+        AssertPtrReturn(pReqHdr, VERR_INVALID_POINTER);
+        AssertReturn(pReqHdr->u32Magic == SUPVMMR0REQHDR_MAGIC, VERR_INVALID_MAGIC);
+        const size_t cbReq = pReqHdr->cbReq;
+
+        PSUPCALLVMMR0 pReq = (PSUPCALLVMMR0)RTMemTmpAlloc(SUP_IOCTL_CALL_VMMR0_BIG_SIZE(cbReq));
+        pReq->Hdr.u32Cookie         = g_u32Cookie;
+        pReq->Hdr.u32SessionCookie  = g_u32SessionCookie;
+        pReq->Hdr.cbIn              = SUP_IOCTL_CALL_VMMR0_BIG_SIZE_IN(cbReq);
+        pReq->Hdr.cbOut             = SUP_IOCTL_CALL_VMMR0_BIG_SIZE_OUT(cbReq);
+        pReq->Hdr.fFlags            = SUPREQHDR_FLAGS_DEFAULT;
+        pReq->Hdr.rc                = VERR_INTERNAL_ERROR;
+        pReq->u.In.pVMR0            = pVMR0;
+        pReq->u.In.idCpu            = idCpu;
+        pReq->u.In.uOperation       = uOperation;
+        pReq->u.In.u64Arg           = u64Arg;
+        memcpy(&pReq->abReqPkt[0], pReqHdr, cbReq);
+        rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_CALL_VMMR0_BIG, pReq, SUP_IOCTL_CALL_VMMR0_BIG_SIZE(cbReq));
+        if (RT_SUCCESS(rc))
+            rc = pReq->Hdr.rc;
+        memcpy(pReqHdr, &pReq->abReqPkt[0], cbReq);
+        RTMemTmpFree(pReq);
+    }
+    else
+        AssertMsgFailedReturn(("cbReq=%#x\n", pReqHdr->cbReq), VERR_OUT_OF_RANGE);
     return rc;
 }

trunk/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp

@@ -32 +32 @@
 #include "internal/iprt.h"
 
+#include <iprt/cpuset.h>
+
 
 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
 {
-    return idCpu != NIL_RTCPUID ? (int) idCpu : -1;
+    return idCpu < RTCPUSET_MAX_CPUS && idCpu != NIL_RTCPUID ? (int) idCpu : -1;
 }
 RT_EXPORT_SYMBOL(RTMpCpuIdToSetIndex);

trunk/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp

@@ -86 +86 @@
 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
 {
-    return idCpu < MY_DARWIN_MAX_CPUS ? (int)idCpu : -1;
+    return idCpu < RTCPUSET_MAX_CPUS && idCpu < MY_DARWIN_MAX_CPUS ? (int)idCpu : -1;
 }
 

trunk/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c

@@ -46 +46 @@
 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
 {
-    return idCpu <= mp_maxid ? (int)idCpu : -1;
+    return idCpu < RTCPUSET_MAX_CPUS && idCpu <= mp_maxid ? (int)idCpu : -1;
 }
 

trunk/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c

@@ -48 +48 @@
 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
 {
-    return idCpu < NR_CPUS ? (int)idCpu : -1;
+    return idCpu < RTCPUSET_MAX_CPUS && idCpu < NR_CPUS ? (int)idCpu : -1;
 }
 RT_EXPORT_SYMBOL(RTMpCpuIdToSetIndex);

trunk/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp

@@ -83 +83 @@
 #endif
     RTCpuSetEmpty(&g_rtMpNtCpuSet);
+#ifdef RT_WITH_LOTS_OF_CPUS
+# error "port me"
+#endif
     RTCpuSetFromU64(&g_rtMpNtCpuSet, ActiveProcessors);
 

trunk/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c

@@ -57 +57 @@
 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
 {
-    return idCpu < vbi_cpu_maxcount() ? idCpu : -1;
+    return idCpu < RTCPUSET_MAX_CPUS && idCpu < vbi_cpu_maxcount() ? idCpu : -1;
 }
 

trunk/src/VBox/Runtime/r3/darwin/mp-darwin.cpp

@@ -70 +70 @@
 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
 {
-    return idCpu < rtMpDarwinMaxCpus() ? idCpu : -1;
+    return idCpu < RTCPUSET_MAX_CPUS && idCpu < rtMpDarwinMaxCpus() ? idCpu : -1;
 }
 

trunk/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp

@@ -66 +66 @@
 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
 {
-    return idCpu < rtMpFreeBsdMaxCpus() ? idCpu : -1;
+    return idCpu < RTCPUSET_MAX_CPUS && idCpu < rtMpFreeBsdMaxCpus() ? idCpu : -1;
 }
 

trunk/src/VBox/Runtime/r3/win/mp-win.cpp

@@ -34 +34 @@
 #include <iprt/cpuset.h>
 #include <iprt/assert.h>
+
+
+AssertCompile(MAXIMUM_PROCESSORS <= RTCPUSET_MAX_CPUS);
 
 
@@ -93 +96 @@
     SYSTEM_INFO SysInfo;
     GetSystemInfo(&SysInfo);
+#ifdef RT_WITH_LOTS_OF_CPUS
+# error "port me"
+#endif
     return RTCpuSetFromU64(pSet, SysInfo.dwActiveProcessorMask);
 }