Differential D28871 Diff 84858 emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_memobj-r0drv-freebsd.c

Changeset View

Standalone View

View Options

emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_memobj-r0drv-freebsd.c

--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig 2020-07-09 16:57:38 UTC		--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig 2020-10-16 16:38:10 UTC
+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c		+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
@@ -105,6 +105,7 @@ static vm_map_t rtR0MemObjFreeBSDGetMap(PRTR0MEMOBJINT		@@ -129,6 +129,7 @@ static vm_map_t rtR0MemObjFreeBSDGetMap(PRTR0MEMOBJINT

DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)		DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
{		{
+ IPRT_FREEBSD_SAVE_EFL_AC();		+ IPRT_FREEBSD_SAVE_EFL_AC();
PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)pMem;		PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)pMem;
int rc;		int rc;

@@ -121,16 +122,15 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)		@@ -145,16 +146,15 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)

case RTR0MEMOBJTYPE_LOCK:		case RTR0MEMOBJTYPE_LOCK:
{		{
- vm_map_t pMap = kernel_map;		- vm_map_t pMap = kernel_map;
+ if (pMemFreeBSD->Core.u.Lock.R0Process != NIL_RTR0PROCESS) {		+ if (pMemFreeBSD->Core.u.Lock.R0Process != NIL_RTR0PROCESS) {
+ vm_map_t pMap = &((struct proc *)pMemFreeBSD->Core.u.Lock.R0Process)->p_vmspace->vm_map;		+ vm_map_t pMap = &((struct proc *)pMemFreeBSD->Core.u.Lock.R0Process)->p_vmspace->vm_map;

- if (pMemFreeBSD->Core.u.Lock.R0Process != NIL_RTR0PROCESS)		- if (pMemFreeBSD->Core.u.Lock.R0Process != NIL_RTR0PROCESS)
- pMap = &((struct proc *)pMemFreeBSD->Core.u.Lock.R0Process)->p_vmspace->vm_map;		- pMap = &((struct proc *)pMemFreeBSD->Core.u.Lock.R0Process)->p_vmspace->vm_map;
-		-
- rc = vm_map_unwire(pMap,		- rc = vm_map_unwire(pMap,
+ rc = vm_map_unwire(pMap,		+ rc = vm_map_unwire(pMap,
(vm_offset_t)pMemFreeBSD->Core.pv,		(vm_offset_t)pMemFreeBSD->Core.pv,
(vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb,		(vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb,
VM_MAP_WIRE_SYSTEM \| VM_MAP_WIRE_NOHOLES);		VM_MAP_WIRE_SYSTEM \| VM_MAP_WIRE_NOHOLES);
- AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));		- AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
+ AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));		+ AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
+ }		+ }
break;		break;
}		}

@@ -194,6 +194,7 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)		@@ -210,6 +210,7 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
return VERR_INTERNAL_ERROR;		return VERR_INTERNAL_ERROR;
}		}

+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VINF_SUCCESS;		return VINF_SUCCESS;
}		}

@@ -224,18 +225,23 @@ static vm_page_t rtR0MemObjFreeBSDContigPhysAllocHelpe		@@ -320,7 +321,8 @@ static int rtR0MemObjFreeBSDAllocHelper(PRTR0MEMOBJFRE
#else
VM_OBJECT_UNLOCK(pObject);
#endif
- if (pPages)
+ if (pPages \|\| cTries >= 1)
break;
+#if __FreeBSD_version >= 1100092
+ if (!vm_page_reclaim_contig(fFlags, cPages, 0, VmPhysAddrHigh, uAlignment, 0))
+ break;
+#elif __FreeBSD_version >= 1000015
vm_pageout_grow_cache(cTries, 0, VmPhysAddrHigh);
+#else
+ vm_contig_grow_cache(cTries, 0, VmPhysAddrHigh);
+#endif
cTries++;
}
-
- return pPages;
#else
- while (cTries <= 1)
+ while (1)
{
pPages = vm_phys_alloc_contig(cPages, 0, VmPhysAddrHigh, uAlignment, 0);
- if (pPages)
+ if (pPages \|\| cTries >= 1)
break;
vm_contig_grow_cache(cTries, 0, VmPhysAddrHigh);
cTries++;
@@ -243,11 +249,8 @@ static vm_page_t rtR0MemObjFreeBSDContigPhysAllocHelpe

if (!pPages)
return pPages;
-#if __FreeBSD_version >= 1000030
- VM_OBJECT_WLOCK(pObject);
-#else
+
VM_OBJECT_LOCK(pObject);
-#endif
for (vm_pindex_t iPage = 0; iPage < cPages; iPage++)
{
vm_page_t pPage = pPages + iPage;
@@ -259,13 +262,9 @@ static vm_page_t rtR0MemObjFreeBSDContigPhysAllocHelpe
atomic_add_int(&cnt.v_wire_count, 1);
}
}
-#if __FreeBSD_version >= 1000030
- VM_OBJECT_WUNLOCK(pObject);
-#else
VM_OBJECT_UNLOCK(pObject);
#endif
return pPages;
-#endif
}

static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages,
@@ -292,16 +291,17 @@ static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_
#else
VM_OBJECT_LOCK(pObject);
#endif
+
while (iPage-- > 0)
{
pPage = vm_page_lookup(pObject, iPage);
-#if __FreeBSD_version < 1000000
+#if __FreeBSD_version < 900000
vm_page_lock_queues();
#endif
if (fWire)
vm_page_unwire(pPage, 0);
vm_page_free(pPage);
-#if __FreeBSD_version < 1000000
+#if __FreeBSD_version < 900000
vm_page_unlock_queues();
#endif
}
@@ -323,7 +323,8 @@ static int rtR0MemObjFreeBSDAllocHelper(PRTR0MEMOBJFRE
size_t cPages = atop(pMemFreeBSD->Core.cb);		size_t cPages = atop(pMemFreeBSD->Core.cb);
int rc;		int rc;

- pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, cPages);		- pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, cPages);
+ pMemFreeBSD->pObject = vm_pager_allocate(OBJT_PHYS, NULL,		+ pMemFreeBSD->pObject = vm_pager_allocate(OBJT_PHYS, NULL,
+ pMemFreeBSD->Core.cb, VM_PROT_ALL, 0, curthread->td_ucred);		+ pMemFreeBSD->Core.cb, VM_PROT_ALL, 0, curthread->td_ucred);

/* No additional object reference for auto-deallocation upon unmapping. */		/* No additional object reference for auto-deallocation upon unmapping. */
#if __FreeBSD_version >= 1000055		#if __FreeBSD_version >= 1000055
@@ -364,58 +365,77 @@ static int rtR0MemObjFreeBSDAllocHelper(PRTR0MEMOBJFRE		@@ -361,58 +363,77 @@ static int rtR0MemObjFreeBSDAllocHelper(PRTR0MEMOBJFRE
}		}
DECLHIDDEN(int) rtR0MemObjNativeAllocPage(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable)		DECLHIDDEN(int) rtR0MemObjNativeAllocPage(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable)
{		{
+ IPRT_FREEBSD_SAVE_EFL_AC();		+ IPRT_FREEBSD_SAVE_EFL_AC();
PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD),		PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD),
RTR0MEMOBJTYPE_PAGE, NULL, cb);		RTR0MEMOBJTYPE_PAGE, NULL, cb);
if (!pMemFreeBSD)		if (!pMemFreeBSD)
+ {		+ {
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines	+ IPRT_FREEBSD_RESTORE_EFL_AC();
}		}

pMemFreeBSD->Core.u.Cont.Phys = vtophys(pMemFreeBSD->Core.pv);		pMemFreeBSD->Core.u.Cont.Phys = vtophys(pMemFreeBSD->Core.pv);
*ppMem = &pMemFreeBSD->Core;		*ppMem = &pMemFreeBSD->Core;
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return rc;		return rc;
}		}

@@ -425,6 +445,7 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB		@@ -422,6 +443,7 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB
RTHCPHYS PhysHighest, size_t uAlignment,		RTHCPHYS PhysHighest, size_t uAlignment,
bool fContiguous, int rcNoMem)		bool fContiguous, int rcNoMem)
{		{
+ IPRT_FREEBSD_SAVE_EFL_AC();		+ IPRT_FREEBSD_SAVE_EFL_AC();
uint32_t cPages = atop(cb);		uint32_t cPages = atop(cb);
vm_paddr_t VmPhysAddrHigh;		vm_paddr_t VmPhysAddrHigh;

@@ -432,9 +453,13 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB		@@ -429,9 +451,13 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB
PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD),		PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD),
enmType, NULL, cb);		enmType, NULL, cb);
if (!pMemFreeBSD)		if (!pMemFreeBSD)
+ {		+ {
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_NO_MEMORY;		return VERR_NO_MEMORY;
+ }		+ }

- pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, atop(cb));		- pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, atop(cb));
+ pMemFreeBSD->pObject = vm_pager_allocate(OBJT_PHYS, NULL,		+ pMemFreeBSD->pObject = vm_pager_allocate(OBJT_PHYS, NULL,
+ pMemFreeBSD->Core.cb, VM_PROT_ALL, 0, curthread->td_ucred);		+ pMemFreeBSD->Core.cb, VM_PROT_ALL, 0, curthread->td_ucred);

if (PhysHighest != NIL_RTHCPHYS)		if (PhysHighest != NIL_RTHCPHYS)
VmPhysAddrHigh = PhysHighest;		VmPhysAddrHigh = PhysHighest;
@@ -470,6 +495,7 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB		@@ -459,6 +485,7 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB
rtR0MemObjDelete(&pMemFreeBSD->Core);		rtR0MemObjDelete(&pMemFreeBSD->Core);
}		}

+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return rc;		return rc;
}		}

@@ -489,17 +515,22 @@ DECLHIDDEN(int) rtR0MemObjNativeAllocPhysNC(PPRTR0MEMO		@@ -478,17 +505,22 @@ DECLHIDDEN(int) rtR0MemObjNativeAllocPhysNC(PPRTR0MEMO
DECLHIDDEN(int) rtR0MemObjNativeEnterPhys(PPRTR0MEMOBJINTERNAL ppMem, RTHCPHYS Phys, size_t cb, uint32_t uCachePolicy)		DECLHIDDEN(int) rtR0MemObjNativeEnterPhys(PPRTR0MEMOBJINTERNAL ppMem, RTHCPHYS Phys, size_t cb, uint32_t uCachePolicy)
{		{
AssertReturn(uCachePolicy == RTMEM_CACHE_POLICY_DONT_CARE, VERR_NOT_SUPPORTED);		AssertReturn(uCachePolicy == RTMEM_CACHE_POLICY_DONT_CARE, VERR_NOT_SUPPORTED);
+ IPRT_FREEBSD_SAVE_EFL_AC();		+ IPRT_FREEBSD_SAVE_EFL_AC();

/* create the object. */		/* create the object. */
PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_PHYS, NULL, cb);		PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_PHYS, NULL, cb);
if (!pMemFreeBSD)		if (!pMemFreeBSD)
+ {		+ {
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_NO_MEMORY;		return VERR_NO_MEMORY;
+ }		+ }

/* there is no allocation here, it needs to be mapped somewhere first. */		/* there is no allocation here, it needs to be mapped somewhere first. */
pMemFreeBSD->Core.u.Phys.fAllocated = false;		pMemFreeBSD->Core.u.Phys.fAllocated = false;
pMemFreeBSD->Core.u.Phys.PhysBase = Phys;		pMemFreeBSD->Core.u.Phys.PhysBase = Phys;
pMemFreeBSD->Core.u.Phys.uCachePolicy = uCachePolicy;		pMemFreeBSD->Core.u.Phys.uCachePolicy = uCachePolicy;
*ppMem = &pMemFreeBSD->Core;		*ppMem = &pMemFreeBSD->Core;
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VINF_SUCCESS;		return VINF_SUCCESS;
}		}

@@ -511,6 +542,7 @@ static int rtR0MemObjNativeLockInMap(PPRTR0MEMOBJINTER		@@ -500,6 +532,7 @@ static int rtR0MemObjNativeLockInMap(PPRTR0MEMOBJINTER
vm_offset_t AddrStart, size_t cb, uint32_t fAccess,		vm_offset_t AddrStart, size_t cb, uint32_t fAccess,
RTR0PROCESS R0Process, int fFlags)		RTR0PROCESS R0Process, int fFlags)
{		{
+ IPRT_FREEBSD_SAVE_EFL_AC();		+ IPRT_FREEBSD_SAVE_EFL_AC();
int rc;		int rc;
NOREF(fAccess);		NOREF(fAccess);

@@ -519,21 +551,28 @@ static int rtR0MemObjNativeLockInMap(PPRTR0MEMOBJINTER		@@ -508,21 +541,28 @@ static int rtR0MemObjNativeLockInMap(PPRTR0MEMOBJINTER
if (!pMemFreeBSD)		if (!pMemFreeBSD)
return VERR_NO_MEMORY;		return VERR_NO_MEMORY;

- /*		- /*
- * We could've used vslock here, but we don't wish to be subject to		- * We could've used vslock here, but we don't wish to be subject to
- * resource usage restrictions, so we'll call vm_map_wire directly.		- * resource usage restrictions, so we'll call vm_map_wire directly.
- */		- */
- rc = vm_map_wire(pVmMap, /* the map */		- rc = vm_map_wire(pVmMap, /* the map */
Show All 20 Lines
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VINF_SUCCESS;		return VINF_SUCCESS;
}		}
rtR0MemObjDelete(&pMemFreeBSD->Core);		rtR0MemObjDelete(&pMemFreeBSD->Core);
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_NO_MEMORY;/** @todo fix mach -> vbox error conversion for freebsd. */		return VERR_NO_MEMORY;/** @todo fix mach -> vbox error conversion for freebsd. */
}		}

@@ -569,6 +608,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockKernel(PPRTR0MEMOB		@@ -558,6 +598,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockKernel(PPRTR0MEMOB
*/		*/
static int rtR0MemObjNativeReserveInMap(PPRTR0MEMOBJINTERNAL ppMem, void *pvFixed, size_t cb, size_t uAlignment, RTR0PROCESS R0Process, vm_map_t pMap)		static int rtR0MemObjNativeReserveInMap(PPRTR0MEMOBJINTERNAL ppMem, void *pvFixed, size_t cb, size_t uAlignment, RTR0PROCESS R0Process, vm_map_t pMap)
{		{
+ IPRT_FREEBSD_SAVE_EFL_AC();		+ IPRT_FREEBSD_SAVE_EFL_AC();
int rc;		int rc;

/*		/*
@@ -626,11 +666,13 @@ static int rtR0MemObjNativeReserveInMap(PPRTR0MEMOBJIN		@@ -615,11 +656,13 @@ static int rtR0MemObjNativeReserveInMap(PPRTR0MEMOBJIN
pMemFreeBSD->Core.pv = (void *)MapAddress;		pMemFreeBSD->Core.pv = (void *)MapAddress;
pMemFreeBSD->Core.u.ResVirt.R0Process = R0Process;		pMemFreeBSD->Core.u.ResVirt.R0Process = R0Process;
*ppMem = &pMemFreeBSD->Core;		*ppMem = &pMemFreeBSD->Core;
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VINF_SUCCESS;		return VINF_SUCCESS;
}		}

rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */		rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */
rtR0MemObjDelete(&pMemFreeBSD->Core);		rtR0MemObjDelete(&pMemFreeBSD->Core);
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return rc;		return rc;

}		}
@@ -652,6 +694,8 @@ DECLHIDDEN(int) rtR0MemObjNativeReserveUser(PPRTR0MEMO		@@ -641,6 +684,8 @@ DECLHIDDEN(int) rtR0MemObjNativeReserveUser(PPRTR0MEMO
DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, void *pvFixed, size_t uAlignment,		DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, void *pvFixed, size_t uAlignment,
unsigned fProt, size_t offSub, size_t cbSub)		unsigned fProt, size_t offSub, size_t cbSub)
{		{
+ IPRT_FREEBSD_SAVE_EFL_AC();		+ IPRT_FREEBSD_SAVE_EFL_AC();
+		+
// AssertMsgReturn(!offSub && !cbSub, ("%#x %#x\n", offSub, cbSub), VERR_NOT_SUPPORTED);		// AssertMsgReturn(!offSub && !cbSub, ("%#x %#x\n", offSub, cbSub), VERR_NOT_SUPPORTED);
AssertMsgReturn(pvFixed == (void *)-1, ("%p\n", pvFixed), VERR_NOT_SUPPORTED);		AssertMsgReturn(pvFixed == (void *)-1, ("%p\n", pvFixed), VERR_NOT_SUPPORTED);

@@ -707,6 +751,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJ		@@ -697,6 +742,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJ
Assert((vm_offset_t)pMemFreeBSD->Core.pv == Addr);		Assert((vm_offset_t)pMemFreeBSD->Core.pv == Addr);
pMemFreeBSD->Core.u.Mapping.R0Process = NIL_RTR0PROCESS;		pMemFreeBSD->Core.u.Mapping.R0Process = NIL_RTR0PROCESS;
*ppMem = &pMemFreeBSD->Core;		*ppMem = &pMemFreeBSD->Core;
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VINF_SUCCESS;		return VINF_SUCCESS;
}		}
rc = vm_map_remove(kernel_map, Addr, Addr + cbSub);		rc = vm_map_remove(kernel_map, Addr, Addr + cbSub);
@@ -715,6 +760,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJ		@@ -705,6 +751,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJ
else		else
vm_object_deallocate(pMemToMapFreeBSD->pObject);		vm_object_deallocate(pMemToMapFreeBSD->pObject);

+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_NO_MEMORY;		return VERR_NO_MEMORY;
}		}

@@ -722,6 +768,8 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJ		@@ -712,6 +759,8 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJ
DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment,		DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment,
unsigned fProt, RTR0PROCESS R0Process)		unsigned fProt, RTR0PROCESS R0Process, size_t offSub, size_t cbSub)
{		{
+ IPRT_FREEBSD_SAVE_EFL_AC();		+ IPRT_FREEBSD_SAVE_EFL_AC();
+		+
/*		/*
* Check for unsupported stuff.		* Check for unsupported stuff.
*/		*/
@@ -751,7 +799,12 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJIN		@@ -768,47 +817,53 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJIN
{
/** @todo is this needed?. */
PROC_LOCK(pProc);
- AddrR3 = round_page((vm_offset_t)pProc->p_vmspace->vm_daddr + lim_max(pProc, RLIMIT_DATA));
+ AddrR3 = round_page((vm_offset_t)pProc->p_vmspace->vm_daddr +
+#if __FreeBSD_version >= 1100077
+ lim_max_proc(pProc, RLIMIT_DATA));
+#else
+ lim_max(pProc, RLIMIT_DATA));
+#endif
PROC_UNLOCK(pProc);
}
else
@@ -774,10 +827,9 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJIN
0); /* copy-on-write and similar flags */		0); /* copy-on-write and similar flags */

if (rc == KERN_SUCCESS)		if (rc == KERN_SUCCESS)
- {		+ rc = vm_map_wire(pProcMap, AddrR3, AddrR3 + cbSub, VM_MAP_WIRE_USER\|VM_MAP_WIRE_NOHOLES);
rc = vm_map_wire(pProcMap, AddrR3, AddrR3 + pMemToMap->cb, VM_MAP_WIRE_USER\|VM_MAP_WIRE_NOHOLES);
- AssertMsg(rc == KERN_SUCCESS, ("%#x\n", rc));
-
+ if (rc == KERN_SUCCESS)		+ if (rc == KERN_SUCCESS)
+ {		{
rc = vm_map_inherit(pProcMap, AddrR3, AddrR3 + pMemToMap->cb, VM_INHERIT_SHARE);		- rc = vm_map_wire(pProcMap, AddrR3, AddrR3 + pMemToMap->cb, VM_MAP_WIRE_USER\|VM_MAP_WIRE_NOHOLES);
		+ rc = vm_map_inherit(pProcMap, AddrR3, AddrR3 + cbSub, VM_INHERIT_SHARE);
AssertMsg(rc == KERN_SUCCESS, ("%#x\n", rc));		AssertMsg(rc == KERN_SUCCESS, ("%#x\n", rc));

@@ -793,6 +845,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJIN		- rc = vm_map_inherit(pProcMap, AddrR3, AddrR3 + pMemToMap->cb, VM_INHERIT_SHARE);
		- AssertMsg(rc == KERN_SUCCESS, ("%#x\n", rc));
		-
		/*
		* Create a mapping object for it.
		*/
		PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(RTR0MEMOBJFREEBSD),
		RTR0MEMOBJTYPE_MAPPING,
		(void *)AddrR3,
		- pMemToMap->cb);
		+ cbSub);
		if (pMemFreeBSD)
		{
Assert((vm_offset_t)pMemFreeBSD->Core.pv == AddrR3);		Assert((vm_offset_t)pMemFreeBSD->Core.pv == AddrR3);
pMemFreeBSD->Core.u.Mapping.R0Process = R0Process;		pMemFreeBSD->Core.u.Mapping.R0Process = R0Process;
*ppMem = &pMemFreeBSD->Core;		*ppMem = &pMemFreeBSD->Core;
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VINF_SUCCESS;		return VINF_SUCCESS;
}		}

@@ -802,19 +855,25 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJIN		- rc = vm_map_remove(pProcMap, AddrR3, AddrR3 + pMemToMap->cb);
		+ rc = vm_map_remove(pProcMap, AddrR3, AddrR3 + cbSub /* XXX pMemToMap->cb*/ );
		AssertMsg(rc == KERN_SUCCESS, ("Deleting mapping failed\n"));
		}
else		else
vm_object_deallocate(pMemToMapFreeBSD->pObject);		vm_object_deallocate(pMemToMapFreeBSD->pObject);

+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_NO_MEMORY;		return VERR_NO_MEMORY;
}		}


Show All 9 Lines	+
if (!pVmMap)		if (!pVmMap)
+ {		+ {
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_NOT_SUPPORTED;		return VERR_NOT_SUPPORTED;
+ }		+ }

if ((fProt & RTMEM_PROT_NONE) == RTMEM_PROT_NONE)		if ((fProt & RTMEM_PROT_NONE) == RTMEM_PROT_NONE)
ProtectionFlags = VM_PROT_NONE;		ProtectionFlags = VM_PROT_NONE;
@@ -825,7 +884,12 @@ DECLHIDDEN(int) rtR0MemObjNativeProtect(PRTR0MEMOBJINT		@@ -819,7 +874,12 @@ DECLHIDDEN(int) rtR0MemObjNativeProtect(PRTR0MEMOBJINT
if ((fProt & RTMEM_PROT_EXEC) == RTMEM_PROT_EXEC)		if ((fProt & RTMEM_PROT_EXEC) == RTMEM_PROT_EXEC)
ProtectionFlags \|= VM_PROT_EXECUTE;		ProtectionFlags \|= VM_PROT_EXECUTE;

+#if __FreeBSD_version >= 1300135		+#if __FreeBSD_version >= 1300135
+ int krc = vm_map_protect(pVmMap, AddrStart, AddrEnd, ProtectionFlags, 0, VM_MAP_PROTECT_SET_PROT);		+ int krc = vm_map_protect(pVmMap, AddrStart, AddrEnd, ProtectionFlags, 0, VM_MAP_PROTECT_SET_PROT);
+#else		+#else
int krc = vm_map_protect(pVmMap, AddrStart, AddrEnd, ProtectionFlags, FALSE);		int krc = vm_map_protect(pVmMap, AddrStart, AddrEnd, ProtectionFlags, FALSE);
+#endif		+#endif
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
if (krc == KERN_SUCCESS)		if (krc == KERN_SUCCESS)
return VINF_SUCCESS;		return VINF_SUCCESS;

@@ -850,11 +914,19 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P		@@ -844,11 +904,19 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P

vm_offset_t pb = (vm_offset_t)pMemFreeBSD->Core.pv + ptoa(iPage);		vm_offset_t pb = (vm_offset_t)pMemFreeBSD->Core.pv + ptoa(iPage);

- struct proc pProc = (struct proc )pMemFreeBSD->Core.u.Lock.R0Process;		- struct proc pProc = (struct proc )pMemFreeBSD->Core.u.Lock.R0Process;
- struct vm_map *pProcMap = &pProc->p_vmspace->vm_map;		- struct vm_map *pProcMap = &pProc->p_vmspace->vm_map;
- pmap_t pPhysicalMap = vm_map_pmap(pProcMap);		- pmap_t pPhysicalMap = vm_map_pmap(pProcMap);
+ if (pMemFreeBSD->Core.u.Mapping.R0Process != NIL_RTR0PROCESS)		+ if (pMemFreeBSD->Core.u.Mapping.R0Process != NIL_RTR0PROCESS)
+ {		+ {
+ RTHCPHYS addr;		+ RTHCPHYS addr;
+ IPRT_FREEBSD_SAVE_EFL_AC();		+ IPRT_FREEBSD_SAVE_EFL_AC();
+ struct proc pProc = (struct proc )pMemFreeBSD->Core.u.Lock.R0Process;		+ struct proc pProc = (struct proc )pMemFreeBSD->Core.u.Lock.R0Process;
+ struct vm_map *pProcMap = &pProc->p_vmspace->vm_map;		+ struct vm_map *pProcMap = &pProc->p_vmspace->vm_map;
+ pmap_t pPhysicalMap = vm_map_pmap(pProcMap);		+ pmap_t pPhysicalMap = vm_map_pmap(pProcMap);

- return pmap_extract(pPhysicalMap, pb);		- return pmap_extract(pPhysicalMap, pb);
+ addr = pmap_extract(pPhysicalMap, pb);		+ addr = pmap_extract(pPhysicalMap, pb);
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
+ return addr;		+ return addr;
+ }		+ }
+ return vtophys(pb);		+ return vtophys(pb);
}		}

case RTR0MEMOBJTYPE_MAPPING:		case RTR0MEMOBJTYPE_MAPPING:
@@ -863,11 +935,15 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P		@@ -857,11 +925,15 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P

if (pMemFreeBSD->Core.u.Mapping.R0Process != NIL_RTR0PROCESS)		if (pMemFreeBSD->Core.u.Mapping.R0Process != NIL_RTR0PROCESS)
{		{
+ RTHCPHYS addr;		+ RTHCPHYS addr;
+ IPRT_FREEBSD_SAVE_EFL_AC();		+ IPRT_FREEBSD_SAVE_EFL_AC();
struct proc pProc = (struct proc )pMemFreeBSD->Core.u.Mapping.R0Process;		struct proc pProc = (struct proc )pMemFreeBSD->Core.u.Mapping.R0Process;
struct vm_map *pProcMap = &pProc->p_vmspace->vm_map;		struct vm_map *pProcMap = &pProc->p_vmspace->vm_map;
pmap_t pPhysicalMap = vm_map_pmap(pProcMap);		pmap_t pPhysicalMap = vm_map_pmap(pProcMap);

- return pmap_extract(pPhysicalMap, pb);		- return pmap_extract(pPhysicalMap, pb);
+ addr = pmap_extract(pPhysicalMap, pb);		+ addr = pmap_extract(pPhysicalMap, pb);
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
+ return addr;		+ return addr;
}		}
return vtophys(pb);		return vtophys(pb);
}		}
@@ -877,6 +953,7 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P		@@ -872,9 +944,11 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P
case RTR0MEMOBJTYPE_PHYS_NC:
{		{
RTHCPHYS addr;		RTHCPHYS addr;

+ IPRT_FREEBSD_SAVE_EFL_AC();		+ IPRT_FREEBSD_SAVE_EFL_AC();
#if __FreeBSD_version >= 1000030
VM_OBJECT_WLOCK(pMemFreeBSD->pObject);		VM_OBJECT_WLOCK(pMemFreeBSD->pObject);
#else		addr = VM_PAGE_TO_PHYS(vm_page_lookup(pMemFreeBSD->pObject, iPage));
@@ -888,6 +965,7 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P		VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
#else
VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
#endif
+ IPRT_FREEBSD_RESTORE_EFL_AC();		+ IPRT_FREEBSD_RESTORE_EFL_AC();
return addr;		return addr;
}		}