svn commit: r309875 - in head/emulators: virtualbox-ose-kmod-legacy virtualbox-ose-kmod-legacy/files virtualbox-ose-legacy virtualbox-ose-legacy/files
Bernhard Froehlich
decke at FreeBSD.org
Thu Jan 3 13:37:14 UTC 2013
Author: decke
Date: Thu Jan 3 13:37:12 2013
New Revision: 309875
URL: http://svnweb.freebsd.org/changeset/ports/309875
Log:
- Update to 4.1.24
- Fix building with libxslt newer than 1.1.26
Obtained from: https://www.virtualbox.org/ticket/10940
Added:
head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-Makefile (contents, props changed)
head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c (contents, props changed)
head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c (contents, props changed)
head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-semfastmutex-r0drv-freebsd.c (contents, props changed)
head/emulators/virtualbox-ose-legacy/files/patch-include-iprt-types.h (contents, props changed)
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-PC-vbox.dsl (contents, props changed)
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp (contents, props changed)
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostServices-auth-pam-VBoxAuthPAM.c (contents, props changed)
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-src-server-MachineImpl.cpp (contents, props changed)
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-src-server-freebsd-NetIf-freebsd.cpp (contents, props changed)
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-webservice-websrv-wsdl.xsl (contents, props changed)
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c (contents, props changed)
head/emulators/virtualbox-ose-legacy/files/patch-src-recompiler-Sun-testmath.c (contents, props changed)
Deleted:
head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-mp-r0drv-freebsd.c
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxHeadless-FramebufferVNC.cpp
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.c
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-VMM-Makefile.kmk
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-VMM-VMMR3-CPUM.cpp
head/emulators/virtualbox-ose-legacy/files/patch-src-recompiler-target-i386-cpu.h
Modified:
head/emulators/virtualbox-ose-kmod-legacy/Makefile
head/emulators/virtualbox-ose-kmod-legacy/distinfo (contents, props changed)
head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c (contents, props changed)
head/emulators/virtualbox-ose-kmod-legacy/pkg-plist (contents, props changed)
head/emulators/virtualbox-ose-legacy/Makefile
head/emulators/virtualbox-ose-legacy/distinfo (contents, props changed)
head/emulators/virtualbox-ose-legacy/files/patch-configure (contents, props changed)
head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop (contents, props changed)
head/emulators/virtualbox-ose-legacy/pkg-plist (contents, props changed)
Modified: head/emulators/virtualbox-ose-kmod-legacy/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-kmod-legacy/Makefile Thu Jan 3 13:34:24 2013 (r309874)
+++ head/emulators/virtualbox-ose-kmod-legacy/Makefile Thu Jan 3 13:37:12 2013 (r309875)
@@ -1,12 +1,8 @@
-# New ports collection makefile for: virtualbox-ose-kmod-legacy
-# Date created: 2009-09-21
-# Whom: Bernhard Froehlich <decke at bluelife.at>
-#
+# Created by: Bernhard Froehlich <decke at bluelife.at>
# $FreeBSD$
-#
PORTNAME= virtualbox-ose
-DISTVERSION= 4.0.16
+DISTVERSION= 4.1.24
CATEGORIES= emulators kld
MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
http://tmp.chruetertee.ch/ \
@@ -25,9 +21,10 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/ya
kmk:${PORTSDIR}/devel/kBuild
UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}_OSE
+WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
USE_RC_SUBR= vboxnet
ONLY_FOR_ARCHS= i386 amd64
+FETCH_ARGS= -pRr
USE_BZIP2= yes
HAS_CONFIGURE= yes
@@ -37,7 +34,6 @@ CONFIGURE_ARGS+=--with-gcc="${CC}" --wit
--build-headless
CONFLICTS= bcc-[0-9]*
-CONFLICTS_BUILD= kBuild-devel-[0-9]*
CONFLICTS_INSTALL= virtualbox-ose-kmod-[3,4]* virtualbox-ose-kmod-devel-[3,4]*
OPTIONS_DEFINE= DEBUG VIMAGE
@@ -56,9 +52,15 @@ KMK_BUILDTYPE= release
KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
KMK_FLAGS= HostDrivers-src vboxdrv-mod VBoxNetFlt-src VBoxNetAdp-src
+MAKE_FLAGS= SYSDIR=${SRC_BASE}/sys
+
.if ${PORT_OPTIONS:MDEBUG}
KMK_FLAGS+= BUILD_TYPE=debug
KMK_BUILDTYPE= debug
+MAKE_FLAGS+= DEBUG_FLAGS="-O1 -g"
+PLIST_SUB+= WITH_DEBUG=""
+.else
+PLIST_SUB+= WITH_DEBUG="@comment "
.endif
.if ${ARCH} == i386
@@ -73,6 +75,10 @@ IGNORE= requires kernel sources
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 802000
+BROKEN= Does not compile on FreeBSD < 8.2
+.endif
+
.if ${OSVERSION} < 800500 && !empty(PORT_OPTIONS:MVIMAGE)
IGNORE= newer kernel is required to build with VIMAGE
.endif
@@ -96,13 +102,18 @@ pre-build:
do-build:
cd ${WRKSRC} && ${SH} env.sh && cd ${WRKSRC}/src/VBox/HostDrivers && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}
- cd ${VBOX_BIN} && make SYSDIR=${SRC_BASE}/sys
+ cd ${VBOX_BIN} && make ${MAKE_FLAGS}
do-install:
${MKDIR} ${KMODDIR}
${INSTALL_KLD} ${VBOX_BIN}/vboxdrv/vboxdrv.ko ${KMODDIR}
${INSTALL_KLD} ${VBOX_BIN}/vboxnetadp/vboxnetadp.ko ${KMODDIR}
${INSTALL_KLD} ${VBOX_BIN}/vboxnetflt/vboxnetflt.ko ${KMODDIR}
+.if ${PORT_OPTIONS:MDEBUG}
+ ${INSTALL_KLD} ${VBOX_BIN}/vboxdrv/vboxdrv.ko.symbols ${KMODDIR}
+ ${INSTALL_KLD} ${VBOX_BIN}/vboxnetadp/vboxnetadp.ko.symbols ${KMODDIR}
+ ${INSTALL_KLD} ${VBOX_BIN}/vboxnetflt/vboxnetflt.ko.symbols ${KMODDIR}
+.endif
@/usr/sbin/kldxref ${KMODDIR}
.include <bsd.port.post.mk>
Modified: head/emulators/virtualbox-ose-kmod-legacy/distinfo
==============================================================================
--- head/emulators/virtualbox-ose-kmod-legacy/distinfo Thu Jan 3 13:34:24 2013 (r309874)
+++ head/emulators/virtualbox-ose-kmod-legacy/distinfo Thu Jan 3 13:37:12 2013 (r309875)
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.0.16.tar.bz2) = d6c165cc41063cb8eb8283606b712904cae180000171fb1f833b7eaada633c77
-SIZE (VirtualBox-4.0.16.tar.bz2) = 70042175
+SHA256 (VirtualBox-4.1.24.tar.bz2) = 74008b8e8942045668c1b7d06b0a4bb5fe8464066e343e3a2e1ba30b94ce8a7f
+SIZE (VirtualBox-4.1.24.tar.bz2) = 74612732
Added: head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-Makefile Thu Jan 3 13:37:12 2013 (r309875)
@@ -0,0 +1,16 @@
+This patch adds support for VIMAGE to VBoxNetAdp and thus
+also fixes that panic.
+
+Submitted by: Mikolaj Golub <trociny at freebsd.org>
+--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile 2012-03-13 15:15:44.000000000 +0200
++++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile 2012-04-01 13:27:16.000000000 +0300
+@@ -18,7 +18,7 @@
+
+ KMOD = vboxnetadp
+
+-CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING
++CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVIMAGE
+
+ .if (${MACHINE_ARCH} == "i386")
+ CFLAGS += -DRT_ARCH_X86
+diff -rpu VirtualBox-4.1.10.orig/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c VirtualBox-4.1.10/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c
Added: head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c Thu Jan 3 13:37:12 2013 (r309875)
@@ -0,0 +1,54 @@
+This patch adds support for VIMAGE to VBoxNetAdp and thus
+also fixes that panic.
+
+Submitted by: Mikolaj Golub <trociny at freebsd.org>
+--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2012-06-20 15:17:03.000000000 +0200
++++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2012-07-25 18:30:13.695891353 +0200
+@@ -68,6 +68,22 @@
+ #define VBOXNETADP_OS_SPECFIC 1
+ #include "../VBoxNetAdpInternal.h"
+
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 800500
++# include <sys/jail.h>
++# include <net/vnet.h>
++
++# define VBOXCURVNET_SET(arg) CURVNET_SET_QUIET(arg)
++# define VBOXCURVNET_SET_FROM_UCRED() VBOXCURVNET_SET(CRED_TO_VNET(curthread->td_ucred))
++# define VBOXCURVNET_RESTORE() CURVNET_RESTORE()
++
++#else /* !defined(__FreeBSD_version) || __FreeBSD_version < 800500 */
++
++# define VBOXCURVNET_SET(arg)
++# define VBOXCURVNET_SET_FROM_UCRED()
++# define VBOXCURVNET_RESTORE()
++
++#endif /* !defined(__FreeBSD_version) || __FreeBSD_version < 800500 */
++
+ static int VBoxNetAdpFreeBSDCtrlioctl(struct cdev *, u_long, caddr_t, int flags,
+ struct thread *);
+ static struct cdevsw vboxnetadp_cdevsw =
+@@ -260,6 +276,7 @@
+ {
+ struct ifnet *ifp;
+
++ VBOXCURVNET_SET_FROM_UCRED();
+ ifp = if_alloc(IFT_ETHER);
+ if (ifp == NULL)
+ return VERR_NO_MEMORY;
+@@ -279,6 +296,7 @@
+
+ strncpy(pThis->szName, ifp->if_xname, VBOXNETADP_MAX_NAME_LEN);
+ pThis->u.s.ifp = ifp;
++ VBOXCURVNET_RESTORE();
+ return 0;
+ }
+
+@@ -287,6 +305,8 @@
+ struct ifnet *ifp;
+
+ ifp = pThis->u.s.ifp;
++ VBOXCURVNET_SET(ifp->if_vnet);
+ ether_ifdetach(ifp);
+ if_free(ifp);
++ VBOXCURVNET_RESTORE();
+ }
Added: head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c Thu Jan 3 13:37:12 2013 (r309875)
@@ -0,0 +1,31 @@
+The attached patch fixes a kernel crash on FreeBSD 10-CURRENT hosts
+with VIMAGE enabled when a VM is powered off.
+
+Submitted by: Mikolaj Golub <trociny at freebsd.org>
+--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c 2012-03-13 15:15:44.000000000 +0200
++++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c 2012-04-01 13:43:02.000000000 +0300
+@@ -651,13 +651,13 @@ bool vboxNetFltOsMaybeRediscovered(PVBOX
+ ng_rmnode_self(pThis->u.s.node);
+ pThis->u.s.node = NULL;
+ }
++ VBOXCURVNET_RESTORE();
+
+ if (ifp0 != NULL)
+ {
+ vboxNetFltOsDeleteInstance(pThis);
+ vboxNetFltOsInitInstance(pThis, NULL);
+ }
+- VBOXCURVNET_RESTORE();
+
+ return !ASMAtomicUoReadBool(&pThis->fDisconnectedFromHost);
+ }
+@@ -671,8 +671,10 @@ void vboxNetFltOsDeleteInstance(PVBOXNET
+ mtx_destroy(&pThis->u.s.inq.ifq_mtx);
+ mtx_destroy(&pThis->u.s.outq.ifq_mtx);
+
++ VBOXCURVNET_SET_FROM_UCRED();
+ if (pThis->u.s.node != NULL)
+ ng_rmnode_self(pThis->u.s.node);
++ VBOXCURVNET_RESTORE();
+ pThis->u.s.node = NULL;
+ }
Modified: head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
==============================================================================
--- head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c Thu Jan 3 13:34:24 2013 (r309874)
+++ head/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c Thu Jan 3 13:37:12 2013 (r309875)
@@ -1,64 +1,893 @@
-Remove explicit initialization of m->flags and m->oflags because per
-default vm_phys_alloc_contig() already initializes the page as unmanaged.
-Chase move of PG_UNMANAGED flag from m->flags to m->oflags and renaming
-to VPO_UNMANAGED for an additional assert.
-
-Reviewed by: kib
-See: http://svnweb.freebsd.org/base?view=revision&revision=224746
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig 2011-11-04 07:19:54.000000000 -0400
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c 2011-11-29 18:13:32.000000000 -0500
-@@ -391,12 +391,18 @@
-
- static void rtR0MemObjFreeBSDPhysPageInit(vm_page_t pPage, vm_pindex_t iPage)
- {
-+#if __FreeBSD_version <= 1000000
- pPage->wire_count = 1;
- pPage->pindex = iPage;
- pPage->act_count = 0;
-- pPage->oflags = 0;
-- pPage->flags = PG_UNMANAGED;
- atomic_add_int(&cnt.v_wire_count, 1);
+--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig 2012-12-19 20:51:59.000000000 +0100
++++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c 2012-12-20 11:57:20.999850739 +0100
+@@ -5,6 +5,7 @@
+
+ /*
+ * Copyright (c) 2007 knut st. osmundsen <bird-src-spam at anduin.net>
++ * Copyright (c) 2011 Andriy Gapon <avg at FreeBSD.org>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+@@ -54,23 +55,8 @@
+ /** The core structure. */
+ RTR0MEMOBJINTERNAL Core;
+ /** Type dependent data */
+- union
+- {
+- /** Non physical memory allocations */
+- struct
+- {
+- /** The VM object associated with the allocation. */
+- vm_object_t pObject;
+- } NonPhys;
+- /** Physical memory allocations */
+- struct
+- {
+- /** Number of pages */
+- uint32_t cPages;
+- /** Array of pages - variable */
+- vm_page_t apPages[1];
+- } Phys;
+- } u;
++ /** The VM object associated with the allocation. */
++ vm_object_t pObject;
+ } RTR0MEMOBJFREEBSD, *PRTR0MEMOBJFREEBSD;
+
+
+@@ -125,25 +111,14 @@
+
+ switch (pMemFreeBSD->Core.enmType)
+ {
+- case RTR0MEMOBJTYPE_CONT:
+- contigfree(pMemFreeBSD->Core.pv, pMemFreeBSD->Core.cb, M_IPRTMOBJ);
+- break;
+-
+ case RTR0MEMOBJTYPE_PAGE:
++ case RTR0MEMOBJTYPE_LOW:
++ case RTR0MEMOBJTYPE_CONT:
+ {
+ rc = vm_map_remove(kernel_map,
+ (vm_offset_t)pMemFreeBSD->Core.pv,
+ (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb);
+ AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
+-
+- vm_page_lock_queues();
+- for (uint32_t iPage = 0; iPage < pMemFreeBSD->u.Phys.cPages; iPage++)
+- {
+- vm_page_t pPage = pMemFreeBSD->u.Phys.apPages[iPage];
+- vm_page_unwire(pPage, 0);
+- vm_page_free(pPage);
+- }
+- vm_page_unlock_queues();
+ break;
+ }
+
+@@ -165,8 +140,8 @@
+ case RTR0MEMOBJTYPE_RES_VIRT:
+ {
+ vm_map_t pMap = kernel_map;
+- if (pMemFreeBSD->Core.u.Lock.R0Process != NIL_RTR0PROCESS)
+- pMap = &((struct proc *)pMemFreeBSD->Core.u.Lock.R0Process)->p_vmspace->vm_map;
++ if (pMemFreeBSD->Core.u.ResVirt.R0Process != NIL_RTR0PROCESS)
++ pMap = &((struct proc *)pMemFreeBSD->Core.u.ResVirt.R0Process)->p_vmspace->vm_map;
+ rc = vm_map_remove(pMap,
+ (vm_offset_t)pMemFreeBSD->Core.pv,
+ (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb);
+@@ -180,7 +155,6 @@
+
+ if (pMemFreeBSD->Core.u.Mapping.R0Process != NIL_RTR0PROCESS)
+ pMap = &((struct proc *)pMemFreeBSD->Core.u.Mapping.R0Process)->p_vmspace->vm_map;
+-
+ rc = vm_map_remove(pMap,
+ (vm_offset_t)pMemFreeBSD->Core.pv,
+ (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb);
+@@ -191,26 +165,24 @@
+ case RTR0MEMOBJTYPE_PHYS:
+ case RTR0MEMOBJTYPE_PHYS_NC:
+ {
++ VM_OBJECT_LOCK(pMemFreeBSD->pObject);
++ vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
++#if __FreeBSD_version < 900000
++ /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */
+ vm_page_lock_queues();
+- for (uint32_t iPage = 0; iPage < pMemFreeBSD->u.Phys.cPages; iPage++)
++#endif
++ for (vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
++ pPage != NULL;
++ pPage = vm_page_next(pPage))
+ {
+- vm_page_t pPage = pMemFreeBSD->u.Phys.apPages[iPage];
+ vm_page_unwire(pPage, 0);
+- vm_page_free(pPage);
+ }
+ vm_page_unlock_queues();
++ VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
++ vm_object_deallocate(pMemFreeBSD->pObject);
+ break;
+ }
+
+-#ifdef USE_KMEM_ALLOC_ATTR
+- case RTR0MEMOBJTYPE_LOW:
+- {
+- kmem_free(kernel_map, (vm_offset_t)pMemFreeBSD->Core.pv, pMemFreeBSD->Core.cb);
+- break;
+- }
+-#else
+- case RTR0MEMOBJTYPE_LOW: /* unused */
+-#endif
+ default:
+ AssertMsgFailed(("enmType=%d\n", pMemFreeBSD->Core.enmType));
+ return VERR_INTERNAL_ERROR;
+@@ -220,183 +192,185 @@
+ }
+
+
+-DECLHIDDEN(int) rtR0MemObjNativeAllocPage(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable)
+-{
+- int rc;
+- size_t cPages = cb >> PAGE_SHIFT;
+-
+- /* create the object. */
+- PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(RT_OFFSETOF(RTR0MEMOBJFREEBSD, u.Phys.apPages[cPages]),
+- RTR0MEMOBJTYPE_PAGE, NULL, cb);
+- if (!pMemFreeBSD)
+- return VERR_NO_MEMORY;
+-
+- pMemFreeBSD->u.Phys.cPages = cPages;
++static vm_page_t FreeBSDContigPhysAllocHelper(vm_object_t pObject, vm_pindex_t iPIndex,
++ u_long cPages, vm_paddr_t VmPhysAddrHigh,
++ u_long uAlignment, bool fWire)
++{
++ vm_page_t pPages;
++ int tries = 0;
++#if __FreeBSD_version > 1000000
++ int flags = VM_ALLOC_INTERRUPT | VM_ALLOC_NOBUSY;
+
-+#if __FreeBSD_version >= 900040
-+ Assert(pPage->oflags & VPO_UNMANAGED != 0);
++ if (fWire)
++ flags |= VM_ALLOC_WIRED;
++ while (1)
++ {
++ VM_OBJECT_LOCK(pObject);
++ pPages = vm_page_alloc_contig(pObject, iPIndex, flags, cPages, 0, VmPhysAddrHigh, uAlignment, 0, VM_MEMATTR_DEFAULT);
++ VM_OBJECT_UNLOCK(pObject);
++ if (pPages || tries >= 1)
++ break;
++ vm_pageout_grow_cache(tries, 0, VmPhysAddrHigh);
++ tries++;
++ }
++ return pPages;
+#else
-+ Assert(pPage->flags & PG_UNMANAGED != 0);
+
+- vm_offset_t MapAddress = vm_map_min(kernel_map);
+- rc = vm_map_find(kernel_map, /* map */
+- NULL, /* object */
+- 0, /* offset */
+- &MapAddress, /* addr (IN/OUT) */
+- cb, /* length */
+- TRUE, /* find_space */
+- fExecutable /* protection */
+- ? VM_PROT_ALL
+- : VM_PROT_RW,
+- VM_PROT_ALL, /* max(_prot) */
+- 0); /* cow (copy-on-write) */
+- if (rc == KERN_SUCCESS)
++ while (1)
+ {
+- rc = VINF_SUCCESS;
+-
+- for (size_t iPage = 0; iPage < cPages; iPage++)
++ pPages = vm_phys_alloc_contig(cPages, 0, VmPhysAddrHigh, uAlignment, 0);
++ if (pPages || tries >= 1)
++ break;
++ vm_contig_grow_cache(tries, 0, VmPhysAddrHigh);
++ tries++;
++ }
++ if (!pPages)
++ return pPages;
++ VM_OBJECT_LOCK(pObject);
++ for (vm_pindex_t iPage = 0; iPage < cPages; iPage++)
++ {
++ vm_page_t pPage = pPages + iPage;
++ vm_page_insert(pPage, pObject, iPIndex + iPage);
++ pPage->valid = VM_PAGE_BITS_ALL;
++ if (fWire)
+ {
+- vm_page_t pPage;
++ pPage->wire_count = 1;
++ atomic_add_int(&cnt.v_wire_count, 1);
++ }
++ }
++ VM_OBJECT_UNLOCK(pObject);
++ return pPages;
+#endif
++}
+
+- pPage = vm_page_alloc(NULL, iPage,
+- VM_ALLOC_SYSTEM |
+- VM_ALLOC_WIRED | VM_ALLOC_NOOBJ);
++static int FreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages,
++ vm_paddr_t VmPhysAddrHigh, u_long uAlignment,
++ bool fContiguous, bool fWire)
++{
++ if (fContiguous)
++ {
++ if (FreeBSDContigPhysAllocHelper(pObject, 0, cPages, VmPhysAddrHigh, uAlignment, fWire) != NULL)
++ return VINF_SUCCESS;
++ else
++ return VERR_NO_MEMORY;
++ }
+
+- if (!pPage)
++ for (vm_pindex_t iPage = 0; iPage < cPages; iPage++)
++ {
++ vm_page_t pPage = FreeBSDContigPhysAllocHelper(pObject, iPage, 1, VmPhysAddrHigh, uAlignment, fWire);
++ if (!pPage)
++ {
++ /* Free all allocated pages */
++ VM_OBJECT_LOCK(pObject);
++ while (iPage-- > 0)
+ {
+- /*
+- * Out of pages
+- * Remove already allocated pages
+- */
+- while (iPage-- > 0)
+- {
+- pPage = pMemFreeBSD->u.Phys.apPages[iPage];
+- vm_page_lock_queues();
++ pPage = vm_page_lookup(pObject, iPage);
++#if __FreeBSD_version < 900000
++ vm_page_lock_queues();
+#endif
++ if (fWire)
+ vm_page_unwire(pPage, 0);
+- vm_page_free(pPage);
+- vm_page_unlock_queues();
+- }
+- rc = VERR_NO_MEMORY;
+- break;
++ vm_page_free(pPage);
++ vm_page_unlock_queues();
+ }
+-
+- pPage->valid = VM_PAGE_BITS_ALL;
+- pMemFreeBSD->u.Phys.apPages[iPage] = pPage;
++ VM_OBJECT_UNLOCK(pObject);
++ return VERR_NO_MEMORY;
+ }
++ }
++ return VINF_SUCCESS;
++}
+
+- if (rc == VINF_SUCCESS)
+- {
+- vm_offset_t AddressDst = MapAddress;
++static int FreeBSDAllocHelper(PRTR0MEMOBJFREEBSD pMemFreeBSD, bool fExecutable,
++ vm_paddr_t VmPhysAddrHigh, bool fContiguous)
++{
++ int rc;
++ size_t cPages = atop(pMemFreeBSD->Core.cb);
+
+- for (size_t iPage = 0; iPage < cPages; iPage++)
+- {
+- vm_page_t pPage = pMemFreeBSD->u.Phys.apPages[iPage];
++ pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, cPages);
++ vm_offset_t MapAddress = vm_map_min(kernel_map);
+
+- MY_PMAP_ENTER(kernel_map->pmap, AddressDst, pPage,
+- fExecutable
+- ? VM_PROT_ALL
+- : VM_PROT_RW,
+- TRUE);
++ // no additional object reference for auto-deallocation upon unmapping
++ rc = vm_map_find(kernel_map, pMemFreeBSD->pObject, 0,
++ &MapAddress, pMemFreeBSD->Core.cb, VMFS_ANY_SPACE,
++ fExecutable ? VM_PROT_ALL : VM_PROT_RW, VM_PROT_ALL, 0);
+
+- AddressDst += PAGE_SIZE;
+- }
++ if (rc == KERN_SUCCESS)
++ {
++ rc = FreeBSDPhysAllocHelper(pMemFreeBSD->pObject, cPages, VmPhysAddrHigh, PAGE_SIZE, fContiguous, false);
++ if (RT_SUCCESS(rc))
++ {
++ vm_map_wire(kernel_map, MapAddress, MapAddress + pMemFreeBSD->Core.cb, VM_MAP_WIRE_SYSTEM|VM_MAP_WIRE_NOHOLES);
+
+ /* Store start address */
+ pMemFreeBSD->Core.pv = (void *)MapAddress;
+- *ppMem = &pMemFreeBSD->Core;
+ return VINF_SUCCESS;
+ }
+- }
+- rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */
+
+- rtR0MemObjDelete(&pMemFreeBSD->Core);
++ vm_map_remove(kernel_map, MapAddress, MapAddress + pMemFreeBSD->Core.cb);
++ }
++ else
++ {
++ rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */
++ vm_object_deallocate(pMemFreeBSD->pObject);
++ }
+ return rc;
+ }
+
+-
+-DECLHIDDEN(int) rtR0MemObjNativeAllocLow(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable)
++DECLHIDDEN(int) rtR0MemObjNativeAllocPage(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable)
+ {
+-#ifdef USE_KMEM_ALLOC_ATTR
+- /*
+- * Use kmem_alloc_attr, fExectuable is not needed because the
+- * memory will be executable by default
+- */
+- NOREF(fExecutable);
+-
+- /* create the object. */
+- PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_LOW, NULL, cb);
++ PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD),
++ RTR0MEMOBJTYPE_PAGE, NULL, cb);
+ if (!pMemFreeBSD)
+ return VERR_NO_MEMORY;
+
+- pMemFreeBSD->Core.pv = (void *)kmem_alloc_attr(kernel_map, /* Kernel */
+- cb, /* Amount */
+- M_ZERO, /* Zero memory */
+- 0, /* Low physical address */
+- _4G - PAGE_SIZE, /* Highest physical address */
+- VM_MEMATTR_DEFAULT); /* Default memory attributes */
+- if (!pMemFreeBSD->Core.pv)
+- return VERR_NO_MEMORY;
+-
+- *ppMem = &pMemFreeBSD->Core;
+-
+- return VINF_SUCCESS;
+-#else
+- /*
+- * Try a Alloc first and see if we get luck, if not try contigmalloc.
+- * Might wish to try find our own pages or something later if this
+- * turns into a problemspot on AMD64 boxes.
+- */
+- int rc = rtR0MemObjNativeAllocPage(ppMem, cb, fExecutable);
+- if (RT_SUCCESS(rc))
++ int rc = FreeBSDAllocHelper(pMemFreeBSD, fExecutable, ~(vm_paddr_t)0, false);
++ if (RT_FAILURE(rc))
+ {
+- size_t iPage = cb >> PAGE_SHIFT;
+- while (iPage-- > 0)
+- if (rtR0MemObjNativeGetPagePhysAddr(*ppMem, iPage) > (_4G - PAGE_SIZE))
+- {
+- RTR0MemObjFree(*ppMem, false);
+- *ppMem = NULL;
+- rc = VERR_NO_MEMORY;
+- break;
+- }
++ rtR0MemObjDelete(&pMemFreeBSD->Core);
++ return rc;
+ }
+- if (RT_FAILURE(rc))
+- rc = rtR0MemObjNativeAllocCont(ppMem, cb, fExecutable);
++
++ *ppMem = &pMemFreeBSD->Core;
+ return rc;
+-#endif
}
-@@ -408,6 +414,9 @@
- int rc = VINF_SUCCESS;
- uint32_t cPages = cb >> PAGE_SHIFT;
+-DECLHIDDEN(int) rtR0MemObjNativeAllocCont(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable)
++DECLHIDDEN(int) rtR0MemObjNativeAllocLow(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable)
+ {
+- /* create the object. */
+- PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_CONT, NULL, cb);
++ PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD),
++ RTR0MEMOBJTYPE_LOW, NULL, cb);
+ if (!pMemFreeBSD)
+ return VERR_NO_MEMORY;
+
+- /* do the allocation. */
+- pMemFreeBSD->Core.pv = contigmalloc(cb, /* size */
+- M_IPRTMOBJ, /* type */
+- M_NOWAIT | M_ZERO, /* flags */
+- 0, /* lowest physical address*/
+- _4G-1, /* highest physical address */
+- PAGE_SIZE, /* alignment. */
+- 0); /* boundary */
+- if (pMemFreeBSD->Core.pv)
++ int rc = FreeBSDAllocHelper(pMemFreeBSD, fExecutable, _4G - 1, false);
++ if (RT_FAILURE(rc))
+ {
+- pMemFreeBSD->Core.u.Cont.Phys = vtophys(pMemFreeBSD->Core.pv);
+- *ppMem = &pMemFreeBSD->Core;
+- return VINF_SUCCESS;
++ rtR0MemObjDelete(&pMemFreeBSD->Core);
++ return rc;
+ }
+
+- NOREF(fExecutable);
+- rtR0MemObjDelete(&pMemFreeBSD->Core);
+- return VERR_NO_MEMORY;
++ *ppMem = &pMemFreeBSD->Core;
++ return rc;
+ }
+
+
+-static void rtR0MemObjFreeBSDPhysPageInit(vm_page_t pPage, vm_pindex_t iPage)
++DECLHIDDEN(int) rtR0MemObjNativeAllocCont(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable)
+ {
+- pPage->wire_count = 1;
+- pPage->pindex = iPage;
+- pPage->act_count = 0;
+- pPage->oflags = 0;
+- pPage->flags = PG_UNMANAGED;
+- atomic_add_int(&cnt.v_wire_count, 1);
++ PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD),
++ RTR0MEMOBJTYPE_CONT, NULL, cb);
++ if (!pMemFreeBSD)
++ return VERR_NO_MEMORY;
++
++ int rc = FreeBSDAllocHelper(pMemFreeBSD, fExecutable, _4G - 1, true);
++ if (RT_FAILURE(rc))
++ {
++ rtR0MemObjDelete(&pMemFreeBSD->Core);
++ return rc;
++ }
++
++ pMemFreeBSD->Core.u.Cont.Phys = vtophys(pMemFreeBSD->Core.pv);
++ *ppMem = &pMemFreeBSD->Core;
++ return rc;
+ }
+
+
+@@ -405,69 +379,36 @@
+ RTHCPHYS PhysHighest, size_t uAlignment,
+ bool fContiguous)
+ {
+- int rc = VINF_SUCCESS;
+- uint32_t cPages = cb >> PAGE_SHIFT;
++ uint32_t cPages = atop(cb);
vm_paddr_t VmPhysAddrHigh;
-+#if __FreeBSD_version >= 1000001
-+ int pFlags = VM_ALLOC_INTERRUPT | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED;
-+#endif
/* create the object. */
- PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(RT_OFFSETOF(RTR0MEMOBJFREEBSD, u.Phys.apPages[cPages]),
-@@ -424,7 +433,11 @@
+- PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(RT_OFFSETOF(RTR0MEMOBJFREEBSD, u.Phys.apPages[cPages]),
++ PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD),
+ enmType, NULL, cb);
+ if (!pMemFreeBSD)
+ return VERR_NO_MEMORY;
+
+- pMemFreeBSD->u.Phys.cPages = cPages;
++ pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, atop(cb));
+
+ if (PhysHighest != NIL_RTHCPHYS)
+ VmPhysAddrHigh = PhysHighest;
+ else
+ VmPhysAddrHigh = ~(vm_paddr_t)0;
- if (fContiguous)
+- if (fContiguous)
+- {
+- vm_page_t pPage = vm_phys_alloc_contig(cPages, 0, VmPhysAddrHigh, uAlignment, 0);
+-
+- if (pPage)
+- for (uint32_t iPage = 0; iPage < cPages; iPage++)
+- {
+- rtR0MemObjFreeBSDPhysPageInit(&pPage[iPage], iPage);
+- pMemFreeBSD->u.Phys.apPages[iPage] = &pPage[iPage];
+- }
+- else
+- rc = VERR_NO_MEMORY;
+- }
+- else
+- {
+- /* Allocate page by page */
+- for (uint32_t iPage = 0; iPage < cPages; iPage++)
+- {
+- vm_page_t pPage = vm_phys_alloc_contig(1, 0, VmPhysAddrHigh, uAlignment, 0);
+-
+- if (!pPage)
+- {
+- /* Free all allocated pages */
+- while (iPage-- > 0)
+- {
+- pPage = pMemFreeBSD->u.Phys.apPages[iPage];
+- vm_page_lock_queues();
+- vm_page_unwire(pPage, 0);
+- vm_page_free(pPage);
+- vm_page_unlock_queues();
+- }
+- rc = VERR_NO_MEMORY;
+- break;
+- }
+- rtR0MemObjFreeBSDPhysPageInit(pPage, iPage);
+- pMemFreeBSD->u.Phys.apPages[iPage] = pPage;
+- }
+- }
++ int rc = FreeBSDPhysAllocHelper(pMemFreeBSD->pObject, cPages, VmPhysAddrHigh, uAlignment, fContiguous, true);
+
+- if (RT_FAILURE(rc))
++ if (RT_FAILURE(rc)) {
++ vm_object_deallocate(pMemFreeBSD->pObject);
+ rtR0MemObjDelete(&pMemFreeBSD->Core);
++ }
+ else
{
-+#if __FreeBSD_version >= 1000001
-+ vm_page_t pPage = vm_page_alloc_contig(NULL, 0, pFlags, cPages, 0, VmPhysAddrHigh, uAlignment, 0, VM_MEMATTR_DEFAULT);
-+#else
- vm_page_t pPage = vm_phys_alloc_contig(cPages, 0, VmPhysAddrHigh, uAlignment, 0);
-+#endif
+- if (enmType == RTR0MEMOBJTYPE_PHYS)
++ if (fContiguous)
+ {
+- pMemFreeBSD->Core.u.Phys.PhysBase = VM_PAGE_TO_PHYS(pMemFreeBSD->u.Phys.apPages[0]);
++ Assert(enmType == RTR0MEMOBJTYPE_PHYS);
++ VM_OBJECT_LOCK(pMemFreeBSD->pObject);
++ pMemFreeBSD->Core.u.Phys.PhysBase = VM_PAGE_TO_PHYS(vm_page_find_least(pMemFreeBSD->pObject, 0));
++ VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
+ pMemFreeBSD->Core.u.Phys.fAllocated = true;
+ }
+
+@@ -480,42 +421,13 @@
+
+ DECLHIDDEN(int) rtR0MemObjNativeAllocPhys(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest, size_t uAlignment)
+ {
+-#if 1
+ return rtR0MemObjFreeBSDAllocPhysPages(ppMem, RTR0MEMOBJTYPE_PHYS, cb, PhysHighest, uAlignment, true);
+-#else
+- /* create the object. */
+- PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_CONT, NULL, cb);
+- if (!pMemFreeBSD)
+- return VERR_NO_MEMORY;
+-
+- /* do the allocation. */
+- pMemFreeBSD->Core.pv = contigmalloc(cb, /* size */
+- M_IPRTMOBJ, /* type */
+- M_NOWAIT | M_ZERO, /* flags */
+- 0, /* lowest physical address*/
+- _4G-1, /* highest physical address */
+- uAlignment, /* alignment. */
+- 0); /* boundary */
+- if (pMemFreeBSD->Core.pv)
+- {
+- pMemFreeBSD->Core.u.Cont.Phys = vtophys(pMemFreeBSD->Core.pv);
+- *ppMem = &pMemFreeBSD->Core;
+- return VINF_SUCCESS;
+- }
+-
+- rtR0MemObjDelete(&pMemFreeBSD->Core);
+- return VERR_NO_MEMORY;
+-#endif
+ }
+
+
+ DECLHIDDEN(int) rtR0MemObjNativeAllocPhysNC(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest)
+ {
+-#if 1
+ return rtR0MemObjFreeBSDAllocPhysPages(ppMem, RTR0MEMOBJTYPE_PHYS_NC, cb, PhysHighest, PAGE_SIZE, false);
+-#else
+- return VERR_NOT_SUPPORTED;
+-#endif
+ }
+
+
+@@ -625,49 +537,41 @@
+ if (!pMemFreeBSD)
+ return VERR_NO_MEMORY;
- if (pPage)
- for (uint32_t iPage = 0; iPage < cPages; iPage++)
-@@ -440,7 +453,11 @@
- /* Allocate page by page */
- for (uint32_t iPage = 0; iPage < cPages; iPage++)
+- /*
+- * Allocate an empty VM object and map it into the requested map.
+- */
+- pMemFreeBSD->u.NonPhys.pObject = vm_object_allocate(OBJT_DEFAULT, cb >> PAGE_SHIFT);
+- if (pMemFreeBSD->u.NonPhys.pObject)
++ vm_offset_t MapAddress = pvFixed != (void *)-1
++ ? (vm_offset_t)pvFixed
++ : vm_map_min(pMap);
++ if (pvFixed != (void *)-1)
++ vm_map_remove(pMap,
++ MapAddress,
++ MapAddress + cb);
++
++ rc = vm_map_find(pMap, /* map */
++ NULL, /* object */
++ 0, /* offset */
++ &MapAddress, /* addr (IN/OUT) */
++ cb, /* length */
++ pvFixed == (void *)-1 ? VMFS_ANY_SPACE : VMFS_NO_SPACE,
++ /* find_space */
++ VM_PROT_NONE, /* protection */
++ VM_PROT_ALL, /* max(_prot) ?? */
++ 0); /* cow (copy-on-write) */
++ if (rc == KERN_SUCCESS)
+ {
+- vm_offset_t MapAddress = pvFixed != (void *)-1
+- ? (vm_offset_t)pvFixed
+- : vm_map_min(pMap);
+- if (pvFixed != (void *)-1)
+- vm_map_remove(pMap,
+- MapAddress,
+- MapAddress + cb);
+-
+- rc = vm_map_find(pMap, /* map */
+- pMemFreeBSD->u.NonPhys.pObject, /* object */
+- 0, /* offset */
+- &MapAddress, /* addr (IN/OUT) */
+- cb, /* length */
+- pvFixed == (void *)-1, /* find_space */
+- VM_PROT_NONE, /* protection */
+- VM_PROT_ALL, /* max(_prot) ?? */
+- 0); /* cow (copy-on-write) */
+- if (rc == KERN_SUCCESS)
++ if (R0Process != NIL_RTR0PROCESS)
{
-+#if __FreeBSD_version >= 1000001
-+ vm_page_t pPage = vm_page_alloc_contig(NULL, iPage, pFlags, 1, 0, VmPhysAddrHigh, uAlignment, 0, VM_MEMATTR_DEFAULT);
-+#else
- vm_page_t pPage = vm_phys_alloc_contig(1, 0, VmPhysAddrHigh, uAlignment, 0);
-+#endif
+- if (R0Process != NIL_RTR0PROCESS)
+- {
+- rc = vm_map_inherit(pMap,
+- MapAddress,
+- MapAddress + cb,
+- VM_INHERIT_SHARE);
+- AssertMsg(rc == KERN_SUCCESS, ("%#x\n", rc));
+- }
+- pMemFreeBSD->Core.pv = (void *)MapAddress;
+- pMemFreeBSD->Core.u.ResVirt.R0Process = R0Process;
+- *ppMem = &pMemFreeBSD->Core;
+- return VINF_SUCCESS;
++ rc = vm_map_inherit(pMap,
++ MapAddress,
++ MapAddress + cb,
++ VM_INHERIT_SHARE);
++ AssertMsg(rc == KERN_SUCCESS, ("%#x\n", rc));
+ }
+- vm_object_deallocate(pMemFreeBSD->u.NonPhys.pObject);
+- rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */
++ pMemFreeBSD->Core.pv = (void *)MapAddress;
++ pMemFreeBSD->Core.u.ResVirt.R0Process = R0Process;
++ *ppMem = &pMemFreeBSD->Core;
++ return VINF_SUCCESS;
+ }
+- else
+- rc = VERR_NO_MEMORY;
++
++ rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */
+ rtR0MemObjDelete(&pMemFreeBSD->Core);
+ return rc;
+
+@@ -690,7 +594,7 @@
+ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, void *pvFixed, size_t uAlignment,
+ unsigned fProt, size_t offSub, size_t cbSub)
+ {
+- 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);
+
+ /*
+@@ -699,21 +603,68 @@
+ if (uAlignment > PAGE_SIZE)
+ return VERR_NOT_SUPPORTED;
+
+-/* Phys: see pmap_mapdev in i386/i386/pmap.c (http://fxr.watson.org/fxr/source/i386/i386/pmap.c?v=RELENG62#L2860) */
+-/** @todo finish the implementation. */
++ int rc;
++ PRTR0MEMOBJFREEBSD pMemToMapFreeBSD = (PRTR0MEMOBJFREEBSD)pMemToMap;
+
+- return VERR_NOT_SUPPORTED;
++ /* calc protection */
++ vm_prot_t ProtectionFlags = 0;
++ if ((fProt & RTMEM_PROT_NONE) == RTMEM_PROT_NONE)
++ ProtectionFlags = VM_PROT_NONE;
++ if ((fProt & RTMEM_PROT_READ) == RTMEM_PROT_READ)
++ ProtectionFlags |= VM_PROT_READ;
++ if ((fProt & RTMEM_PROT_WRITE) == RTMEM_PROT_WRITE)
++ ProtectionFlags |= VM_PROT_WRITE;
++ if ((fProt & RTMEM_PROT_EXEC) == RTMEM_PROT_EXEC)
++ ProtectionFlags |= VM_PROT_EXECUTE;
++
++ vm_offset_t Addr = vm_map_min(kernel_map);
++ if (cbSub == 0)
++ cbSub = pMemToMap->cb - offSub;
++
++ vm_object_reference(pMemToMapFreeBSD->pObject);
++ rc = vm_map_find(kernel_map, /* Map to insert the object in */
++ pMemToMapFreeBSD->pObject, /* Object to map */
++ offSub, /* Start offset in the object */
++ &Addr, /* Start address IN/OUT */
++ cbSub, /* Size of the mapping */
++ VMFS_ANY_SPACE, /* Whether a suitable address should be searched for first */
++ ProtectionFlags, /* protection flags */
++ VM_PROT_ALL, /* Maximum protection flags */
++ 0); /* copy-on-write and similar flags */
++
++ if (rc == KERN_SUCCESS)
++ {
++ rc = vm_map_wire(kernel_map, Addr, Addr + cbSub, VM_MAP_WIRE_SYSTEM|VM_MAP_WIRE_NOHOLES);
++ AssertMsg(rc == KERN_SUCCESS, ("%#x\n", rc));
++
++ PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(RTR0MEMOBJFREEBSD),
++ RTR0MEMOBJTYPE_MAPPING,
++ (void *)Addr,
++ cbSub);
++ if (pMemFreeBSD)
++ {
++ Assert((vm_offset_t)pMemFreeBSD->Core.pv == Addr);
++ pMemFreeBSD->Core.u.Mapping.R0Process = NIL_RTR0PROCESS;
++ *ppMem = &pMemFreeBSD->Core;
++ return VINF_SUCCESS;
++ }
++ rc = vm_map_remove(kernel_map, Addr, Addr + cbSub);
++ AssertMsg(rc == KERN_SUCCESS, ("Deleting mapping failed\n"));
++ }
++ else
++ vm_object_deallocate(pMemToMapFreeBSD->pObject);
++
++ return VERR_NO_MEMORY;
+ }
+
+
+-/* see http://markmail.org/message/udhq33tefgtyfozs */
+-DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process)
++DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment,
++ unsigned fProt, RTR0PROCESS R0Process)
+ {
+ /*
+ * Check for unsupported stuff.
+ */
+ AssertMsgReturn(R0Process == RTR0ProcHandleSelf(), ("%p != %p\n", R0Process, RTR0ProcHandleSelf()), VERR_NOT_SUPPORTED);
+- AssertMsgReturn(R3PtrFixed == (RTR3PTR)-1, ("%p\n", R3PtrFixed), VERR_NOT_SUPPORTED);
+ if (uAlignment > PAGE_SIZE)
+ return VERR_NOT_SUPPORTED;
+
+@@ -734,62 +685,38 @@
+ ProtectionFlags |= VM_PROT_EXECUTE;
+
+ /* calc mapping address */
+- PROC_LOCK(pProc);
+- vm_offset_t AddrR3 = round_page((vm_offset_t)pProc->p_vmspace->vm_daddr + lim_max(pProc, RLIMIT_DATA));
+- PROC_UNLOCK(pProc);
++ vm_offset_t AddrR3;
++ if (R3PtrFixed == (RTR3PTR)-1)
++ {
++ // is this needed?
++ PROC_LOCK(pProc);
++ AddrR3 = round_page((vm_offset_t)pProc->p_vmspace->vm_daddr + lim_max(pProc, RLIMIT_DATA));
++ PROC_UNLOCK(pProc);
++ }
++ else
++ AddrR3 = (vm_offset_t)R3PtrFixed;
+
+- /* Insert the object in the map. */
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list