Changeset 41622 in vbox for trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.h

Timestamp:

Jun 8, 2012 1:01:44 PM (13 years ago)

Author:

vboxsync

Message:

Runtime/r0drv/Solaris: Implemented large page support. Fixed possible freeing of wrong pages with regular 4K pages.

File:

• trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.h (modified) (9 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.h

@@ -41 +41 @@
 {
     uint64_t *paPhysAddrs;
+    size_t    cbPageSize;
     uint_t    fPageAccess;
 } SEGVBOX_CRARGS;
@@ -48 +49 @@
 {
     uint_t    fPageAccess;
+    size_t    cbPageSize;
 } SEGVBOX_DATA;
 typedef SEGVBOX_DATA *PSEGVBOX_DATA;
@@ -65 +67 @@
     AssertPtr(pData);
 
+    /*
+     * Currently we only map _4K pages but this segment driver can handle any size
+     * supported by the Solaris HAT layer.
+     */
+    size_t cbPageSize  = pArgs->cbPageSize;
+    size_t uPageShift  = 0;
+    switch (cbPageSize)
+    {
+        case _4K: uPageShift = 12; break;
+        case _2M: uPageShift = 21; break;
+        default:  AssertReleaseMsgFailed(("Unsupported page size for mapping cbPageSize=%llx\n", cbPageSize)); break;
+    }
+
     hat_map(pAddrSpace->a_hat, pSeg->s_base, pSeg->s_size, HAT_MAP);
     pData->fPageAccess = pArgs->fPageAccess | PROT_USER;
+    pData->cbPageSize  = cbPageSize;
 
     pSeg->s_ops  = &s_SegVBoxOps;
@@ -75 +91 @@
      */
     caddr_t virtAddr = pSeg->s_base;
-    pgcnt_t cPages   = (pSeg->s_size + PAGESIZE - 1) >> PAGESHIFT;
-    for (pgcnt_t iPage = 0; iPage < cPages; ++iPage, virtAddr += PAGESIZE)
+    pgcnt_t cPages   = (pSeg->s_size + cbPageSize - 1) >> uPageShift;
+    for (pgcnt_t iPage = 0; iPage < cPages; ++iPage, virtAddr += cbPageSize)
     {
-        hat_devload(pAddrSpace->a_hat, virtAddr, PAGESIZE, pArgs->paPhysAddrs[iPage] >> PAGESHIFT,
-                    pData->fPageAccess | HAT_UNORDERED_OK, HAT_LOAD | HAT_LOAD_LOCK);
+        hat_devload(pAddrSpace->a_hat, virtAddr, cbPageSize, pArgs->paPhysAddrs[iPage] >> uPageShift,
+                    pData->fPageAccess | HAT_UNORDERED_OK, HAT_LOAD_LOCK);
     }
 
@@ -98 +114 @@
 
     pDstData->fPageAccess  = pSrcData->fPageAccess;
+    pDstData->cbPageSize   = pSrcData->cbPageSize;
     pDstSeg->s_ops         = &s_SegVBoxOps;
     pDstSeg->s_data        = pDstData;
@@ -107 +124 @@
 static int rtR0SegVBoxSolUnmap(seg_t *pSeg, caddr_t virtAddr, size_t cb)
 {
-    /** @todo make these into release assertions. */
-    if (   virtAddr < pSeg->s_base
-        || virtAddr + cb > pSeg->s_base + pSeg->s_size
-        || (cb & PAGEOFFSET) || ((uintptr_t)virtAddr & PAGEOFFSET))
+    PSEGVBOX_DATA pData = pSeg->s_data;
+
+    AssertRelease(pData);
+    AssertReleaseMsg(virtAddr >= pSeg->s_base, ("virtAddr=%p s_base=%p\n", virtAddr, pSeg->s_base));
+    AssertReleaseMsg(virtAddr + cb <= pSeg->s_base + pSeg->s_size, ("virtAddr=%p cb=%llu s_base=%p s_size=%llu\n", virtAddr,
+                                                                    cb, pSeg->s_base, pSeg->s_size));
+    size_t cbPageOffset = pData->cbPageSize - 1;
+    AssertRelease(!(cb & cbPageOffset));
+    AssertRelease(!((uintptr_t)virtAddr & cbPageOffset));
+
+    if (   virtAddr != pSeg->s_base
+        || cb       != pSeg->s_size)
     {
-        panic("rtRt0SegVBoxSolUnmap");
+        return ENOTSUP;
     }
-
-    if (virtAddr != pSeg->s_base || cb != pSeg->s_size)
-        return ENOTSUP;
 
     hat_unload(pSeg->s_as->a_hat, virtAddr, cb, HAT_UNLOAD_UNMAP | HAT_UNLOAD_UNLOCK);
@@ -138 +160 @@
      * We would demand fault if the (u)read() path would SEGOP_FAULT() on buffers mapped in via our
      * segment driver i.e. prefaults before DMA. Don't fail in such case where we're called directly,
-     * see #5047.
+     * see @bugref{5047}.
      */
     return 0;
@@ -176 +198 @@
 static size_t rtR0SegVBoxSolInCore(seg_t *pSeg, caddr_t virtAddr, size_t cb, char *pVec)
 {
-    size_t cbLen = (cb + PAGEOFFSET) & PAGEMASK;
-    for (virtAddr = 0; cbLen != 0; cbLen -= PAGESIZE, virtAddr += PAGESIZE)
+    PSEGVBOX_DATA pData = pSeg->s_data;
+    AssertRelease(pData);
+    size_t uPageOffset  = pData->cbPageSize - 1;
+    size_t uPageMask    = ~uPageOffset;
+    size_t cbLen        = (cb + uPageOffset) & uPageMask;
+    for (virtAddr = 0; cbLen != 0; cbLen -= pData->cbPageSize, virtAddr += pData->cbPageSize)
         *pVec++ = 1;
     return cbLen;
@@ -295 +321 @@
 #endif /* !___r0drv_solaris_memobj_r0drv_solaris_h */
 
-