jengelh/virtualbox
SHA256
1
0
Fork 1
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 824915 from home:lwfinger:branches:Virtualization

Browse Source 
- Apply Oracle changes for kernel 5.8.

OBS-URL: https://build.opensuse.org/request/show/824915
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=565
This commit is contained in:
Larry Finger 2020-08-08 01:07:30 +00:00 committed by Git OBS Bridge
parent e16969cc83
commit 855292ac55
3 changed files with 438 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
debug_USB_passthru.patch Normal file
View File

@ -0,0 +1,73 @@
Index: VirtualBox-6.1.12/src/VBox/Main/src-server/HostImpl.cpp
===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Main/src-server/HostImpl.cpp
+++ VirtualBox-6.1.12/src/VBox/Main/src-server/HostImpl.cpp
@@ -3189,13 +3189,14 @@ HRESULT Host::i_checkUSBProxyService()
{
/* disable the USB controller completely to avoid assertions if the
* USB proxy service could not start. */
-
+ LogRel(("USB proxy could not start\n"));
switch (m->pUSBProxyService->getLastError())
{
case VERR_FILE_NOT_FOUND: /** @todo what does this mean? */
return setWarning(E_FAIL,
tr("Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND). The service might not be installed on the host computer"));
case VERR_VUSB_USB_DEVICE_PERMISSION:
+ LogRel(("m->pUSBProxyService->getLastError() is VERR_VUSB_USB_DEVICE_PERMISSION\n"));
return setWarning(E_FAIL,
tr("VirtualBox is not currently allowed to access USB devices. You can change this by adding your user to the 'vboxusers' group. Please see the user manual for a more detailed explanation"));
case VERR_VUSB_USBFS_PERMISSION:
Index: VirtualBox-6.1.12/src/VBox/Main/src-server/USBProxyBackend.cpp
===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Main/src-server/USBProxyBackend.cpp
+++ VirtualBox-6.1.12/src/VBox/Main/src-server/USBProxyBackend.cpp
@@ -282,8 +282,10 @@ int USBProxyBackend::start(void)
AssertRC(rc);
if (RT_SUCCESS(rc))
LogFlowThisFunc(("started mThread=%RTthrd\n", mThread));
- else
+ else {
+ LogRel(("USB proxy failed to start\n"));
mThread = NIL_RTTHREAD;
+ }
}
}
else
Index: VirtualBox-6.1.12/src/VBox/Runtime/common/misc/thread.cpp
===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Runtime/common/misc/thread.cpp
+++ VirtualBox-6.1.12/src/VBox/Runtime/common/misc/thread.cpp
@@ -772,20 +772,24 @@ RTDECL(int) RTThreadCreate(PRTTHREAD pTh
if (!VALID_PTR(pThread) && pThread)
{
Assert(VALID_PTR(pThread));
+ LogRel(("pThread is invalid\n"));
return VERR_INVALID_PARAMETER;
}
if (!VALID_PTR(pfnThread))
{
Assert(VALID_PTR(pfnThread));
+ LogRel(("pfnThread is invalid\n"));
return VERR_INVALID_PARAMETER;
}
if (!pszName || !*pszName || strlen(pszName) >= RTTHREAD_NAME_LEN)
{
+ LogRel(("pszName=%s (max len is %d because of logging)\n", pszName, RTTHREAD_NAME_LEN - 1));
AssertMsgFailed(("pszName=%s (max len is %d because of logging)\n", pszName, RTTHREAD_NAME_LEN - 1));
return VERR_INVALID_PARAMETER;
}
if (fFlags & ~RTTHREADFLAGS_MASK)
{
+ LogRel(("fFlags=%#x\n", fFlags));
AssertMsgFailed(("fFlags=%#x\n", fFlags));
return VERR_INVALID_PARAMETER;
}
@@ -819,6 +823,7 @@ RTDECL(int) RTThreadCreate(PRTTHREAD pTh
else
rc = VERR_NO_TMP_MEMORY;
LogFlow(("RTThreadCreate: Failed to create thread, rc=%Rrc\n", rc));
+ LogRel(("RTThreadCreate: Failed to create thread, rc=%Rrc\n", rc));
AssertReleaseRC(rc);
return rc;
}

496
fixes_for_5.8.patch
View File

@ -11,172 +11,336 @@ Fixes needed to build vboxdrv with kernel 5.8. The changes handle the following
code builds but gets missing globals on loading. For testing, the kernel is modified. code builds but gets missing globals on loading. For testing, the kernel is modified.
This change cannot be permanent, but it can be temporary. This change cannot be permanent, but it can be temporary.
Index: VirtualBox-6.1.10/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c Index: VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c --- VirtualBox-6.1.12.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+++ VirtualBox-6.1.10/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +++ VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
@@ -222,9 +222,17 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P @@ -1,4 +1,4 @@
-/* $Id: memobj-r0drv-linux.c $ */
+/* $Id: memobj-r0drv-linux.c 85516 2020-07-29 10:47:38Z vboxsync $ */
/** @file
* IPRT - Ring-0 Memory Objects, Linux.
*/
@@ -52,6 +52,14 @@
# define PAGE_READONLY_EXEC PAGE_READONLY
#endif
+/** @def IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
+ * Whether we use alloc_vm_area (3.2+) for executable memory.
+ * This is a must for 5.8+, but we enable it all the way back to 3.2.x for
+ * better W^R compliance (fExecutable flag). */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) || defined(DOXYGEN_RUNNING)
+# define IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
+#endif
+
/*
* 2.6.29+ kernels don't work with remap_pfn_range() anymore because
* track_pfn_vma_new() is apparently not defined for non-RAM pages.
@@ -72,12 +80,27 @@
# define gfp_t unsigned
#endif
+/*
+ * Wrappers around mmap_lock/mmap_sem difference.
+ */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
+# define LNX_MM_DOWN_READ(a_pMm) down_read(&(a_pMm)->mmap_lock)
+# define LNX_MM_UP_READ(a_pMm) up_read(&(a_pMm)->mmap_lock)
+# define LNX_MM_DOWN_WRITE(a_pMm) down_write(&(a_pMm)->mmap_lock)
+# define LNX_MM_UP_WRITE(a_pMm) up_write(&(a_pMm)->mmap_lock)
+#else
+# define LNX_MM_DOWN_READ(a_pMm) down_read(&(a_pMm)->mmap_sem)
+# define LNX_MM_UP_READ(a_pMm) up_read(&(a_pMm)->mmap_sem)
+# define LNX_MM_DOWN_WRITE(a_pMm) down_write(&(a_pMm)->mmap_sem)
+# define LNX_MM_UP_WRITE(a_pMm) up_write(&(a_pMm)->mmap_sem)
+#endif
+
/*********************************************************************************************************************************
* Structures and Typedefs *
*********************************************************************************************************************************/
/**
- * The Darwin version of the memory object structure.
+ * The Linux version of the memory object structure.
*/
typedef struct RTR0MEMOBJLNX
{
@@ -90,11 +113,20 @@ typedef struct RTR0MEMOBJLNX
bool fExecutable;
/** Set if we've vmap'ed the memory into ring-0. */
bool fMappedToRing0;
+#ifdef IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
+ /** Return from alloc_vm_area() that we now need to use for executable
+ * memory. */
+ struct vm_struct *pArea;
+ /** PTE array that goes along with pArea (must be freed). */
+ pte_t **papPtesForArea;
+#endif
/** The pages in the apPages array. */
size_t cPages;
/** Array of struct page pointers. (variable size) */
struct page *apPages[1];
-} RTR0MEMOBJLNX, *PRTR0MEMOBJLNX;
+} RTR0MEMOBJLNX;
+/** Pointer to the linux memory object. */
+typedef RTR0MEMOBJLNX *PRTR0MEMOBJLNX;
static void rtR0MemObjLinuxFreePages(PRTR0MEMOBJLNX pMemLnx);
@@ -182,7 +214,7 @@ static pgprot_t rtR0MemObjLinuxConvertPr
* Worker for rtR0MemObjNativeReserveUser and rtR0MemObjNativerMapUser that creates
* an empty user space mapping.
*
- * We acquire the mmap_sem of the task!
+ * We acquire the mmap_sem/mmap_lock of the task!
*
* @returns Pointer to the mapping.
* (void *)-1 on failure.
@@ -222,9 +254,9 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
ulAddr = vm_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0); ulAddr = vm_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0);
#else #else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - down_write(&pTask->mm->mmap_sem);
down_write(&pTask->mm->mmap_sem); + LNX_MM_DOWN_WRITE(pTask->mm);
+#else
+ down_write(&pTask->mm->mmap_lock);
+#endif
ulAddr = do_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0); ulAddr = do_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - up_write(&pTask->mm->mmap_sem);
up_write(&pTask->mm->mmap_sem); + LNX_MM_UP_WRITE(pTask->mm);
+#else
+ up_write(&pTask->mm->mmap_lock);
+#endif
#endif #endif
} }
else else
@@ -232,9 +240,17 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P @@ -232,9 +264,9 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
ulAddr = vm_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0); ulAddr = vm_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0);
#else #else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - down_write(&pTask->mm->mmap_sem);
down_write(&pTask->mm->mmap_sem); + LNX_MM_DOWN_WRITE(pTask->mm);
+#else
+ down_write(&pTask->mm->mmap_lock);
+#endif
ulAddr = do_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0); ulAddr = do_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - up_write(&pTask->mm->mmap_sem);
up_write(&pTask->mm->mmap_sem); + LNX_MM_UP_WRITE(pTask->mm);
+#else
+ up_write(&pTask->mm->mmap_lock);
+#endif
#endif #endif
if ( !(ulAddr & ~PAGE_MASK) if ( !(ulAddr & ~PAGE_MASK)
&& (ulAddr & (uAlignment - 1))) && (ulAddr & (uAlignment - 1)))
@@ -269,13 +285,29 @@ static void rtR0MemObjLinuxDoMunmap(void @@ -257,7 +289,7 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P
* Worker that destroys a user space mapping.
* Undoes what rtR0MemObjLinuxDoMmap did.
*
- * We acquire the mmap_sem of the task!
+ * We acquire the mmap_sem/mmap_lock of the task!
*
* @param pv The ring-3 mapping.
* @param cb The size of the mapping.
@@ -269,13 +301,13 @@ static void rtR0MemObjLinuxDoMunmap(void
Assert(pTask == current); RT_NOREF_PV(pTask); Assert(pTask == current); RT_NOREF_PV(pTask);
vm_munmap((unsigned long)pv, cb); vm_munmap((unsigned long)pv, cb);
#elif defined(USE_RHEL4_MUNMAP) #elif defined(USE_RHEL4_MUNMAP)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - down_write(&pTask->mm->mmap_sem);
down_write(&pTask->mm->mmap_sem); + LNX_MM_DOWN_WRITE(pTask->mm);
+#else
+ down_write(&pTask->mm->mmap_lock);
+#endif
do_munmap(pTask->mm, (unsigned long)pv, cb, 0); /* should it be 1 or 0? */ do_munmap(pTask->mm, (unsigned long)pv, cb, 0); /* should it be 1 or 0? */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - up_write(&pTask->mm->mmap_sem);
up_write(&pTask->mm->mmap_sem); + LNX_MM_UP_WRITE(pTask->mm);
#else #else
+ up_write(&pTask->mm->mmap_lock); - down_write(&pTask->mm->mmap_sem);
+#endif + LNX_MM_DOWN_WRITE(pTask->mm);
+#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
down_write(&pTask->mm->mmap_sem);
+#else
+ down_write(&pTask->mm->mmap_lock);
+#endif
do_munmap(pTask->mm, (unsigned long)pv, cb); do_munmap(pTask->mm, (unsigned long)pv, cb);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - up_write(&pTask->mm->mmap_sem);
up_write(&pTask->mm->mmap_sem); + LNX_MM_UP_WRITE(pTask->mm);
+#else
+ up_write(&pTask->mm->mmap_lock);
+#endif
#endif #endif
} }
@@ -593,7 +625,11 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR @@ -520,15 +552,49 @@ static int rtR0MemObjLinuxVMap(PRTR0MEMO
pgprot_val(fPg) |= _PAGE_NX;
# endif
+# ifdef IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
+ if (fExecutable)
+ {
+ pte_t **papPtes = (pte_t **)kmalloc_array(pMemLnx->cPages, sizeof(papPtes[0]), GFP_KERNEL);
+ if (papPtes)
+ {
+ pMemLnx->pArea = alloc_vm_area(pMemLnx->Core.cb, papPtes); /* Note! pArea->nr_pages is not set. */
+ if (pMemLnx->pArea)
+ {
+ size_t i;
+ Assert(pMemLnx->pArea->size >= pMemLnx->Core.cb); /* Note! includes guard page. */
+ Assert(pMemLnx->pArea->addr);
+# ifdef _PAGE_NX
+ pgprot_val(fPg) |= _PAGE_NX; /* Uses RTR0MemObjProtect to clear NX when memory ready, W^X fashion. */
+# endif
+ pMemLnx->papPtesForArea = papPtes;
+ for (i = 0; i < pMemLnx->cPages; i++)
+ *papPtes[i] = mk_pte(pMemLnx->apPages[i], fPg);
+ pMemLnx->Core.pv = pMemLnx->pArea->addr;
+ pMemLnx->fMappedToRing0 = true;
+ }
+ else
+ {
+ kfree(papPtes);
+ rc = VERR_MAP_FAILED;
+ }
+ }
+ else
+ rc = VERR_MAP_FAILED;
+ }
+ else
+# endif
+ {
# ifdef VM_MAP
- pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg);
+ pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg);
# else
- pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_ALLOC, fPg);
+ pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_ALLOC, fPg);
# endif
- if (pMemLnx->Core.pv)
- pMemLnx->fMappedToRing0 = true;
- else
- rc = VERR_MAP_FAILED;
+ if (pMemLnx->Core.pv)
+ pMemLnx->fMappedToRing0 = true;
+ else
+ rc = VERR_MAP_FAILED;
+ }
#else /* < 2.4.22 */
rc = VERR_NOT_SUPPORTED;
#endif
@@ -554,6 +620,22 @@ static int rtR0MemObjLinuxVMap(PRTR0MEMO
static void rtR0MemObjLinuxVUnmap(PRTR0MEMOBJLNX pMemLnx)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 22)
+# ifdef IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
+ if (pMemLnx->pArea)
+ {
+# if 0
+ pte_t **papPtes = pMemLnx->papPtesForArea;
+ size_t i;
+ for (i = 0; i < pMemLnx->cPages; i++)
+ *papPtes[i] = 0;
+# endif
+ free_vm_area(pMemLnx->pArea);
+ kfree(pMemLnx->papPtesForArea);
+ pMemLnx->pArea = NULL;
+ pMemLnx->papPtesForArea = NULL;
+ }
+ else
+# endif
if (pMemLnx->fMappedToRing0)
{
Assert(pMemLnx->Core.pv);
@@ -593,7 +675,7 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR
size_t iPage; size_t iPage;
Assert(pTask); Assert(pTask);
if (pTask && pTask->mm) if (pTask && pTask->mm)
- down_read(&pTask->mm->mmap_sem); - down_read(&pTask->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + LNX_MM_DOWN_READ(pTask->mm);
+ down_read(&pTask->mm->mmap_sem);
+#else
+ down_read(&pTask->mm->mmap_lock);
+#endif
iPage = pMemLnx->cPages; iPage = pMemLnx->cPages;
while (iPage-- > 0) while (iPage-- > 0)
@@ -608,7 +644,11 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR @@ -608,7 +690,7 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR
} }
if (pTask && pTask->mm) if (pTask && pTask->mm)
- up_read(&pTask->mm->mmap_sem); - up_read(&pTask->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + LNX_MM_UP_READ(pTask->mm);
+ up_read(&pTask->mm->mmap_sem);
+#else
+ up_read(&pTask->mm->mmap_lock);
+#endif
} }
/* else: kernel memory - nothing to do here. */ /* else: kernel memory - nothing to do here. */
break; break;
@@ -1076,7 +1116,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser @@ -1076,7 +1158,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
papVMAs = (struct vm_area_struct **)RTMemAlloc(sizeof(*papVMAs) * cPages); papVMAs = (struct vm_area_struct **)RTMemAlloc(sizeof(*papVMAs) * cPages);
if (papVMAs) if (papVMAs)
{ {
- down_read(&pTask->mm->mmap_sem); - down_read(&pTask->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + LNX_MM_DOWN_READ(pTask->mm);
+ down_read(&pTask->mm->mmap_sem);
+#else
+ down_read(&pTask->mm->mmap_lock);
+#endif
/* /*
* Get user pages. * Get user pages.
@@ -1162,7 +1206,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser @@ -1162,7 +1244,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED; papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
} }
- up_read(&pTask->mm->mmap_sem); - up_read(&pTask->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + LNX_MM_UP_READ(pTask->mm);
+ up_read(&pTask->mm->mmap_sem);
+#else
+ up_read(&pTask->mm->mmap_lock);
+#endif
RTMemFree(papVMAs); RTMemFree(papVMAs);
@@ -1189,7 +1237,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser @@ -1189,7 +1271,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
#endif #endif
} }
- up_read(&pTask->mm->mmap_sem); - up_read(&pTask->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + LNX_MM_UP_READ(pTask->mm);
+ up_read(&pTask->mm->mmap_sem);
+#else
+ up_read(&pTask->mm->mmap_lock);
+#endif
RTMemFree(papVMAs); RTMemFree(papVMAs);
rc = VERR_LOCK_FAILED; rc = VERR_LOCK_FAILED;
@@ -1604,7 +1656,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser( @@ -1422,6 +1504,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKerne
* Use vmap - 2.4.22 and later.
*/
pgprot_t fPg = rtR0MemObjLinuxConvertProt(fProt, true /* kernel */);
+ /** @todo We don't really care too much for EXEC here... 5.8 always adds NX. */
Assert(((offSub + cbSub) >> PAGE_SHIFT) <= pMemLnxToMap->cPages);
# ifdef VM_MAP
pMemLnx->Core.pv = vmap(&pMemLnxToMap->apPages[offSub >> PAGE_SHIFT], cbSub >> PAGE_SHIFT, VM_MAP, fPg);
@@ -1469,7 +1552,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKerne
pMemLnx->Core.pv = pMemLnxToMap->Core.u.Phys.uCachePolicy == RTMEM_CACHE_POLICY_MMIO
? ioremap(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub)
: ioremap_cache(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub);
-#else
+#else /* KERNEL_VERSION < 2.6.25 */
pMemLnx->Core.pv = pMemLnxToMap->Core.u.Phys.uCachePolicy == RTMEM_CACHE_POLICY_MMIO
? ioremap_nocache(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub)
: ioremap(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub);
@@ -1604,7 +1687,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(
const size_t cPages = (offSub + cbSub) >> PAGE_SHIFT; const size_t cPages = (offSub + cbSub) >> PAGE_SHIFT;
size_t iPage; size_t iPage;
- down_write(&pTask->mm->mmap_sem); - down_write(&pTask->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + LNX_MM_DOWN_WRITE(pTask->mm);
+ down_write(&pTask->mm->mmap_sem);
+#else
+ down_write(&pTask->mm->mmap_lock);
+#endif
rc = VINF_SUCCESS; rc = VINF_SUCCESS;
if (pMemLnxToMap->cPages) if (pMemLnxToMap->cPages)
@@ -1721,7 +1777,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser( @@ -1721,7 +1804,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(
} }
#endif /* CONFIG_NUMA_BALANCING */ #endif /* CONFIG_NUMA_BALANCING */
- up_write(&pTask->mm->mmap_sem); - up_write(&pTask->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + LNX_MM_UP_WRITE(pTask->mm);
+ up_write(&pTask->mm->mmap_sem);
+#else
+ up_write(&pTask->mm->mmap_lock);
+#endif
if (RT_SUCCESS(rc)) if (RT_SUCCESS(rc))
{ {
Index: VirtualBox-6.1.10/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c @@ -1753,6 +1836,29 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(
DECLHIDDEN(int) rtR0MemObjNativeProtect(PRTR0MEMOBJINTERNAL pMem, size_t offSub, size_t cbSub, uint32_t fProt)
{
+# ifdef IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
+ /*
+ * Currently only supported when we've got addresses PTEs from the kernel.
+ */
+ PRTR0MEMOBJLNX pMemLnx = (PRTR0MEMOBJLNX)pMem;
+ if (pMemLnx->pArea && pMemLnx->papPtesForArea)
+ {
+ pgprot_t const fPg = rtR0MemObjLinuxConvertProt(fProt, true /*fKernel*/);
+ size_t const cPages = (offSub + cbSub) >> PAGE_SHIFT;
+ pte_t **papPtes = pMemLnx->papPtesForArea;
+ size_t i;
+
+ for (i = offSub >> PAGE_SHIFT; i < cPages; i++)
+ {
+ set_pte(papPtes[i], mk_pte(pMemLnx->apPages[i], fPg));
+ }
+ preempt_disable();
+ __flush_tlb_all();
+ preempt_enable();
+ return VINF_SUCCESS;
+ }
+# endif
+
NOREF(pMem);
NOREF(offSub);
NOREF(cbSub);
Index: VirtualBox-6.1.12/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c --- VirtualBox-6.1.12.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+++ VirtualBox-6.1.10/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +++ VirtualBox-6.1.12/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
@@ -757,12 +757,19 @@ EXPORT_SYMBOL(SUPDrvLinuxIDC); @@ -763,12 +763,19 @@ EXPORT_SYMBOL(SUPDrvLinuxIDC);
RTCCUINTREG VBOXCALL supdrvOSChangeCR4(RTCCUINTREG fOrMask, RTCCUINTREG fAndMask) RTCCUINTREG VBOXCALL supdrvOSChangeCR4(RTCCUINTREG fOrMask, RTCCUINTREG fAndMask)
{ {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
@ -196,54 +360,114 @@ Index: VirtualBox-6.1.10/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
} }
#else #else
RTCCUINTREG uOld = ASMGetCR4(); RTCCUINTREG uOld = ASMGetCR4();
Index: VirtualBox-6.1.10/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c Index: VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c --- VirtualBox-6.1.12.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+++ VirtualBox-6.1.10/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +++ VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
@@ -168,7 +168,12 @@ static PRTMEMHDR rtR0MemAllocExecVmArea( @@ -38,7 +38,7 @@
struct vm_struct *pVmArea; #include <linux/kmemleak.h>
size_t iPage;
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP)
+// pVmArea = __get_vm_area_caller(cbAlloc, VM_ALLOC, MODULES_VADDR, MODULES_END, -# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23)
+// __builtin_return_address(0)); +# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+#else /**
pVmArea = __get_vm_area(cbAlloc, VM_ALLOC, MODULES_VADDR, MODULES_END); * Starting with 2.6.23 we can use __get_vm_area and map_vm_area to allocate
+#endif * memory in the moduel range. This is preferrable to the exec heap below.
if (!pVmArea) Index: VirtualBox-6.1.12/src/VBox/Additions/linux/sharedfolders/vfsmod.c
return NULL;
pVmArea->nr_pages = 0; /* paranoia? */
@@ -201,6 +206,12 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(
# endif
pVmArea->nr_pages = cPages;
pVmArea->pages = papPages;
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
+ unsigned long start = (unsigned long)pVmArea->addr;
+// unsigned long size = get_vm_area_size(pVmArea);
+
+// if (!map_kernel_range(start, size, PAGE_KERNEL_EXEC, papPages))
+#else
if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC,
# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
&papPagesIterator
@@ -208,6 +219,7 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(
papPages
# endif
))
+#endif
{
PRTMEMLNXHDREX pHdrEx = (PRTMEMLNXHDREX)pVmArea->addr;
pHdrEx->pVmArea = pVmArea;
Index: VirtualBox-6.1.10/src/VBox/Additions/linux/sharedfolders/vfsmod.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.c --- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+++ VirtualBox-6.1.10/src/VBox/Additions/linux/sharedfolders/vfsmod.c +++ VirtualBox-6.1.12/src/VBox/Additions/linux/sharedfolders/vfsmod.c
@@ -53,7 +53,7 @@ @@ -52,7 +52,7 @@
#endif
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/vfs.h> #include <linux/vfs.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62) -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62)
-# include <linux/vermagic.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+//# include <linux/vermagic.h> # include <linux/vermagic.h>
#endif #endif
#include <VBox/err.h> #include <VBox/err.h>
#include <iprt/path.h> Index: VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -1,4 +1,4 @@
-/* $Id: the-linux-kernel.h $ */
+/* $Id: the-linux-kernel.h 85518 2020-07-29 11:01:45Z vboxsync $ */
/** @file
* IPRT - Include all necessary headers for the Linux kernel.
*/
@@ -176,6 +176,11 @@
# include <asm/set_memory.h>
#endif
+/* for __flush_tlb_all() */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86))
+# include <asm/tlbflush.h>
+#endif
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
# include <asm/smap.h>
#else
Index: VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
+++ VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
@@ -1,4 +1,4 @@
-/* $Id: time-r0drv-linux.c $ */
+/* $Id: time-r0drv-linux.c 85208 2020-07-10 23:58:39Z vboxsync $ */
/** @file
* IPRT - Time, Ring-0 Driver, Linux.
*/
@@ -31,6 +31,12 @@
#define LOG_GROUP RTLOGGROUP_TIME
#include "the-linux-kernel.h"
#include "internal/iprt.h"
+/* Make sure we have the setting functions we need for RTTimeNow: */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16)
+# define RTTIME_INCL_TIMEVAL
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
+# define RTTIME_INCL_TIMESPEC
+#endif
#include <iprt/time.h>
#include <iprt/asm.h>
@@ -45,6 +51,7 @@ DECLINLINE(uint64_t) rtTimeGetSystemNano
*/
uint64_t u64;
struct timespec64 Ts = { 0, 0 };
+
ktime_get_ts64(&Ts);
u64 = Ts.tv_sec * RT_NS_1SEC_64 + Ts.tv_nsec;
return u64;
@@ -181,22 +188,19 @@ RT_EXPORT_SYMBOL(RTTimeSystemMilliTS);
RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime)
{
IPRT_LINUX_SAVE_EFL_AC();
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
-/* On Linux 4.20, time.h includes time64.h and we have to use 64-bit times. */
-# ifdef _LINUX_TIME64_H
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
struct timespec64 Ts;
- ktime_get_real_ts64(&Ts);
-# else
- struct timespec Ts;
- ktime_get_real_ts(&Ts);
-# endif
+ ktime_get_real_ts64(&Ts); /* ktime_get_real_ts64 was added as a macro in 3.17, function since 4.18. */
IPRT_LINUX_RESTORE_EFL_AC();
-# ifdef _LINUX_TIME64_H
return RTTimeSpecSetTimespec64(pTime, &Ts);
-# else
+
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
+ struct timespec Ts;
+ ktime_get_real_ts(&Ts); /* ktime_get_real_ts was removed in Linux 4.20. */
+ IPRT_LINUX_RESTORE_EFL_AC();
return RTTimeSpecSetTimespec(pTime, &Ts);
-# endif
-#else /* < 2.6.16 */
+
+#else /* < 2.6.16 */
struct timeval Tv;
do_gettimeofday(&Tv);
IPRT_LINUX_RESTORE_EFL_AC();

5
virtualbox.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Aug 7 22:19:20 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>
- Apply Oracle changes for kernel 5.8.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 18:52:28 UTC 2020 - Larry Finger <Larry.Finger@gmail.com> Wed Jul 15 18:52:28 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>