summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Marc Lenoir2020-12-12 23:00:45 +0100
committerJean-Marc Lenoir2020-12-12 23:00:45 +0100
commit0c64d5462436eb4a65dbaecef16d1d9bde161a3c (patch)
tree36d02fee4e2066bfda27b9a7b570c451307c813b
parentb97e34ef23ef13eed6ea3d377b37f2f62a37be55 (diff)
downloadaur-0c64d5462436eb4a65dbaecef16d1d9bde161a3c.tar.gz
Compatibility with Linux 5.10
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rw-r--r--vmmon.patch172
-rw-r--r--vmnet.patch41
4 files changed, 178 insertions, 49 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f52bd26bbb6..2c25720e731 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = vmware-workstation14
pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC.
pkgver = 14.1.7
- pkgrel = 9
+ pkgrel = 10
url = https://www.vmware.com/products/workstation-for-linux.html
install = vmware-workstation.install
arch = x86_64
@@ -82,8 +82,8 @@ pkgbase = vmware-workstation14
sha256sums = d7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d
sha256sums = 10562d11d50edab9abc2b29c8948714edcb9b084f99b3766d07ddd21259e372e
sha256sums = 273d4357599a3e54259c78cc49054fef8ecfd2c2eda35cbcde3a53a62777a5ac
- sha256sums = 7404a8862dc3d49af385209765cd793d13a37416f9282b3595de9bde7ae31eff
- sha256sums = e712332335fde4e4846f18c3fa8c933f173336a44546f87ea02b1e1a53f15911
+ sha256sums = 75346130fe8e42bf087b0cdaee98a1bde1f418e7db757e05fb7ecc877aa5ec79
+ sha256sums = 2cb7e37a807db07cff3e0eb833c05e306f3d4a8c198ddddf8e3f7492750c10bd
pkgname = vmware-workstation14
diff --git a/PKGBUILD b/PKGBUILD
index e04704c29f8..9b7753315a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ pkgname=vmware-workstation14
pkgver=14.1.7
_buildver=12989993
_pkgver=${pkgver}_${_buildver}
-pkgrel=9
+pkgrel=10
pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC.'
arch=(x86_64)
url='https://www.vmware.com/products/workstation-for-linux.html'
@@ -119,8 +119,8 @@ sha256sums=(
'10562d11d50edab9abc2b29c8948714edcb9b084f99b3766d07ddd21259e372e'
'273d4357599a3e54259c78cc49054fef8ecfd2c2eda35cbcde3a53a62777a5ac'
- '7404a8862dc3d49af385209765cd793d13a37416f9282b3595de9bde7ae31eff'
- 'e712332335fde4e4846f18c3fa8c933f173336a44546f87ea02b1e1a53f15911'
+ '75346130fe8e42bf087b0cdaee98a1bde1f418e7db757e05fb7ecc877aa5ec79'
+ '2cb7e37a807db07cff3e0eb833c05e306f3d4a8c198ddddf8e3f7492750c10bd'
)
options=(!strip emptydirs)
@@ -431,7 +431,7 @@ fi
-e "s/@PKGVER@/$_pkgver/g" \
-i "$dkms_dir/dkms.conf"
- for module in vmmon vmnet; do # vmblock vmci vsock
+ for module in vmmon vmnet; do
tar -xf "vmware-vmx/lib/modules/source/$module.tar" -C "$dkms_dir"
msg "Patching $module module for DKMS"
patch -p2 --read-only=ignore --directory="$dkms_dir/$module-only" < "$srcdir/$module.patch"
diff --git a/vmmon.patch b/vmmon.patch
index 1a7deb3c79c..6c6c3580c31 100644
--- a/vmmon.patch
+++ b/vmmon.patch
@@ -12,7 +12,7 @@
# Header directory for the running kernel
ifdef LINUXINCLUDE
-@@ -98,6 +98,13 @@ auto-build: $(DRIVER_KO)
+@@ -98,6 +102,13 @@ auto-build: $(DRIVER_KO)
$(DRIVER): $(DRIVER_KO)
if [ $< -nt $@ ] || [ ! -e $@ ] ; then cp -f $< $@; fi
@@ -26,7 +26,7 @@
#
# Define a setup target that gets built before the actual driver.
# This target may not be used at all, but if it is then it will be defined
-@@ -107,7 +114,7 @@ prebuild:: ;
+@@ -107,7 +118,7 @@ prebuild:: ;
postbuild:: ;
$(DRIVER_KO): prebuild
@@ -37,7 +37,7 @@
MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
--- a/vmmon/linux/driver.c
+++ b/vmmon/linux/driver.c
-@@ -96,7 +95,9 @@ long LinuxDriver_Ioctl(struct file *filp, u_int iocmd,
+@@ -96,7 +96,9 @@ long LinuxDriver_Ioctl(struct file *filp
unsigned long ioarg);
static int LinuxDriver_Close(struct inode *inode, struct file *filp);
@@ -48,7 +48,7 @@
static int LinuxDriverFault(struct vm_fault *fault);
#else
static int LinuxDriverFault(struct vm_area_struct *vma, struct vm_fault *fault);
-@@ -594,7 +596,12 @@ LinuxDriver_Close(struct inode *inode, // IN
+@@ -594,7 +596,12 @@ LinuxDriver_Close(struct inode *inode, /
*-----------------------------------------------------------------------------
*/
@@ -73,32 +73,61 @@
#include <asm/uaccess.h>
#include <linux/capability.h>
#include <linux/kthread.h>
-@@ -613,7 +615,24 @@ HostIF_FastClockUnlock(int callerID) // IN
+@@ -54,6 +56,7 @@
+ #include <linux/hrtimer.h>
+ #include <linux/signal.h>
+ #include <linux/taskstats_kern.h> // For linux/sched/signal.h without version check
++#include <linux/eventfd.h>
+
+ #include "vmware.h"
+ #include "x86apic.h"
+@@ -593,6 +596,15 @@ HostIF_FastClockUnlock(int callerID) //
+ MutexUnlock(&fastClockMutex, callerID);
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
++static int crosspage_set_exec(pte_t *pte, unsigned long addr, void *data)
++{
++ struct page *p = data;
++
++ set_pte(pte, mk_pte(p, VM_PAGE_KERNEL_EXEC));
++ return 0;
++}
++#endif
+
+ /*
+ *----------------------------------------------------------------------
+@@ -613,7 +625,29 @@ HostIF_FastClockUnlock(int callerID) //
static void *
MapCrossPage(struct page *p) // IN:
{
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++#if COMPAT_LINUX_VERSION_CHECK_LT(5, 8, 0)
return vmap(&p, 1, VM_MAP, VM_PAGE_KERNEL_EXEC);
+#else
++ void *addr;
++
++ addr = vmap(&p, 1, VM_MAP, VM_PAGE_KERNEL_EXEC);
++ if (!addr)
++ return NULL;
++
+ /* Starting with 5.8, vmap() always sets the NX bit, but the cross
+ * page needs to be executable. */
-+ pte_t *ptes[1];
-+ struct vm_struct *area = alloc_vm_area(1UL << PAGE_SHIFT, ptes);
-+ if (area == NULL)
++ if (apply_to_page_range(current->mm, (unsigned long)addr, PAGE_SIZE,
++ crosspage_set_exec, p)) {
++ vunmap(addr);
+ return NULL;
-+
-+ set_pte(ptes[0], mk_pte(p, VM_PAGE_KERNEL_EXEC));
++ }
+
+ preempt_disable();
+ __flush_tlb_all();
+ preempt_enable();
+
-+ return area->addr;
++ return addr;
+#endif
}
-@@ -1499,9 +1499,13 @@
+@@ -1499,9 +1533,13 @@ HostIF_EstimateLockedPageLimit(const VMD
* since at least 2.6.0.
*/
@@ -112,7 +141,7 @@
/*
* Use the memory information linux exports as of late for a more
-@@ -1527,7 +1550,10 @@ HostIF_EstimateLockedPageLimit(const VMDriver* vm, // IN
+@@ -1527,7 +1565,10 @@ HostIF_EstimateLockedPageLimit(const VMD
lockedPages += global_page_state(NR_PAGETABLE);
#endif
/* NR_SLAB_* moved from zone to node in 4.13. */
@@ -124,7 +153,7 @@
lockedPages += global_node_page_state(NR_SLAB_UNRECLAIMABLE);
#else
lockedPages += global_page_state(NR_SLAB_UNRECLAIMABLE);
-@@ -1602,6 +1606,49 @@
+@@ -1602,6 +1643,49 @@ HostIF_WaitForFreePages(unsigned int tim
/*
*----------------------------------------------------------------------
*
@@ -174,7 +203,7 @@
* HostIFReadUptimeWork --
*
* Reads the current uptime. The uptime is based on getimeofday,
-@@ -1630,7 +1677,6 @@
+@@ -1630,7 +1714,6 @@ HostIF_WaitForFreePages(unsigned int tim
static uint64
HostIFReadUptimeWork(unsigned long *j) // OUT: current jiffies
{
@@ -182,7 +211,7 @@
uint64 monotime, uptime, upBase, monoBase;
int64 diff;
uint32 version;
-@@ -1645,13 +1691,12 @@
+@@ -1645,13 +1728,12 @@ HostIFReadUptimeWork(unsigned long *j)
monoBase = uptimeState.monotimeBase;
} while (!VersionedAtomic_EndTryRead(&uptimeState.version, version));
@@ -197,7 +226,7 @@
uptime += upBase;
/*
-@@ -1756,13 +1801,11 @@
+@@ -1756,13 +1838,11 @@ HostIFUptimeResyncMono(struct timer_list
void
HostIF_InitUptime(void)
{
@@ -214,16 +243,33 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) && !defined(timer_setup)
init_timer(&uptimeState.timer);
-@@ -2164,7 +2207,7 @@ isVAReadable(VA r) // IN:
+@@ -2159,16 +2239,22 @@ HostIF_VMLockIsHeld(VMDriver *vm) // IN
+ static Bool
+ isVAReadable(VA r) // IN:
+ {
+- mm_segment_t old_fs;
+ uint32 dummy;
int ret;
++#ifdef HAVE_GET_KERNEL_NOFAULT
++ ret = get_kernel_nofault(dummy, (void *)r);
++#else
++ {
++ mm_segment_t old_fs;
++
old_fs = get_fs();
- set_fs(get_ds());
+ set_fs(KERNEL_DS);
r = APICR_TO_ADDR(r, APICR_VERSION);
ret = HostIF_CopyFromUser(&dummy, r, sizeof dummy);
set_fs(old_fs);
-@@ -2197,7 +2240,7 @@
+-
++ }
++#endif
+ return ret == 0;
+ }
+
+@@ -2197,7 +2283,7 @@ SetVMAPICAddr(VMDriver *vm, // IN/OUT: d
volatile void *hostapic;
ASSERT_ON_COMPILE(APICR_SIZE <= PAGE_SIZE);
@@ -232,16 +278,25 @@
if (hostapic) {
if ((APIC_VERSIONREG(hostapic) & 0xF0) == 0x10) {
vm->hostAPIC.base = (volatile uint32 (*)[4]) hostapic;
-@@ -2365,7 +2408,7 @@ HostIF_SemaphoreWait(VMDriver *vm, // IN:
+@@ -2353,7 +2439,6 @@ HostIF_SemaphoreWait(VMDriver *vm, //
+ uint64 *args) // IN:
+ {
+ struct file *file;
+- mm_segment_t old_fs;
+ int res;
+ int waitFD = args[0];
+ int timeoutms = args[2];
+@@ -2364,9 +2449,6 @@ HostIF_SemaphoreWait(VMDriver *vm, //
+ return MX_WAITERROR;
}
- old_fs = get_fs();
+- old_fs = get_fs();
- set_fs(get_ds());
-+ set_fs(KERNEL_DS);
-
+-
{
struct poll_wqueues table;
-@@ -2388,9 +2453,11 @@ HostIF_SemaphoreWait(VMDriver *vm, // IN:
+ unsigned int mask;
+@@ -2388,9 +2470,11 @@ HostIF_SemaphoreWait(VMDriver *vm, //
* the code to happily deal with a pipe or an eventfd. We only care about
* reading no bytes (EAGAIN - non blocking fd) or sizeof(uint64).
*/
@@ -256,16 +311,43 @@
if (res == sizeof value) {
res = MX_WAITNORMAL;
} else {
-@@ -2494,7 +2537,7 @@ HostIF_SemaphoreSignal(uint64 *args) // IN:
+@@ -2399,7 +2483,6 @@ HostIF_SemaphoreWait(VMDriver *vm, //
+ }
}
- old_fs = get_fs();
+- set_fs(old_fs);
+ fput(file);
+
+ /*
+@@ -2482,8 +2565,8 @@ HostIF_SemaphoreForceWakeup(VMDriver *vm
+ int
+ HostIF_SemaphoreSignal(uint64 *args) // IN:
+ {
++ struct eventfd_ctx *eventfd;
+ struct file *file;
+- mm_segment_t old_fs;
+ int res;
+ int signalFD = args[1];
+ uint64 value = 1; // make an eventfd happy should it be there
+@@ -2493,22 +2576,32 @@ HostIF_SemaphoreSignal(uint64 *args) //
+ return MX_WAITERROR;
+ }
+
+- old_fs = get_fs();
- set_fs(get_ds());
-+ set_fs(KERNEL_DS);
++ /*
++ * If it's eventfd, use specific eventfd interface as kernel writes
++ * to eventfd may not be allowed in kernel 5.10 and later.
++ */
++ eventfd = eventfd_ctx_fileget(file);
++ if (!IS_ERR(eventfd)) {
++ eventfd_signal(eventfd, 1);
++ fput(file);
++ return MX_WAITNORMAL;
++ }
/*
* Always write sizeof(uint64) bytes. This works fine for eventfd and
-@@ -2501,8 +2566,11 @@ HostIF_SemaphoreSignal(uint64 *args) // IN:
* pipes. The data written is formatted to make an eventfd happy should
* it be present.
*/
@@ -279,7 +361,35 @@
if (res == sizeof value) {
res = MX_WAITNORMAL;
-@@ -3154,7 +3202,6 @@ HostIF_SetFastClockRate(unsigned int rate) // IN: Frequency in Hz.
+ }
+
+- set_fs(old_fs);
+ fput(file);
+
+ /*
+@@ -3027,12 +3120,9 @@ static int
+ HostIFFastClockThread(void *unused) // IN:
+ {
+ int res;
+- mm_segment_t oldFS;
+ unsigned int rate = 0;
+ unsigned int prevRate = 0;
+
+- oldFS = get_fs();
+- set_fs(KERNEL_DS);
+ allow_signal(SIGKILL);
+
+ while ((rate = linuxState.fastClockRate) > MIN_RATE) {
+@@ -3055,8 +3145,6 @@ HostIFFastClockThread(void *unused) //
+ }
+
+ out:
+- set_fs(oldFS);
+-
+ /*
+ * Do not exit thread until we are told to do so.
+ */
+@@ -3154,7 +3242,6 @@ HostIF_SetFastClockRate(unsigned int rat
}
} else {
if (linuxState.fastClockThread) {
@@ -287,7 +397,7 @@
kthread_stop(linuxState.fastClockThread);
linuxState.fastClockThread = NULL;
-@@ -3200,7 +3243,12 @@
+@@ -3200,7 +3287,12 @@ HostIF_MapUserMem(VA addr,
ASSERT(handle);
diff --git a/vmnet.patch b/vmnet.patch
index 5f1159bc712..5c49010548b 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -12,7 +12,7 @@
# Header directory for the running kernel
ifdef LINUXINCLUDE
-@@ -98,6 +98,13 @@ auto-build: $(DRIVER_KO)
+@@ -98,6 +102,13 @@ auto-build: $(DRIVER_KO)
$(DRIVER): $(DRIVER_KO)
if [ $< -nt $@ ] || [ ! -e $@ ] ; then cp -f $< $@; fi
@@ -26,7 +26,7 @@
#
# Define a setup target that gets built before the actual driver.
# This target may not be used at all, but if it is then it will be defined
-@@ -107,7 +114,7 @@ prebuild:: ;
+@@ -107,7 +118,7 @@ prebuild:: ;
postbuild:: ;
$(DRIVER_KO): prebuild
@@ -37,7 +37,7 @@
MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
--- a/vmnet/procfs.c
+++ a/vmnet/procfs.c
-@@ -137,6 +137,7 @@
+@@ -137,6 +137,7 @@ VNetProcShow(struct seq_file *p, // IN:
}
@@ -45,7 +45,7 @@
/*
*----------------------------------------------------------------------
*
-@@ -168,6 +169,7 @@
+@@ -168,6 +169,7 @@ static struct file_operations fops = {
.release = single_release,
};
#endif
@@ -53,7 +53,7 @@
/*
-@@ -203,7 +205,12 @@
+@@ -203,7 +205,12 @@ VNetProcMakeEntryInt(VNetProcEntry *pa
} else {
ent->data = data;
ent->fn = fn;
@@ -68,7 +68,7 @@
*ret = ent;
--- a/vmnet/userif.c
+++ b/vmnet/userif.c
-@@ -78,11 +78,11 @@
+@@ -78,11 +78,11 @@ static int VNetUserIfSetUplinkState(VNe
extern unsigned int vnet_max_qlen;
#if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0)
@@ -85,7 +85,7 @@
#endif
/*
-@@ -137,16 +137,21 @@
+@@ -137,16 +137,21 @@ UserifLockPage(VA addr) // IN
*/
static INLINE int
@@ -111,7 +111,7 @@
*p = UserifLockPage(uAddr);
if (*p == NULL) {
-@@ -158,7 +163,7 @@
+@@ -158,7 +163,7 @@ VNetUserIfMapPtr(VA uAddr, // IN:
}
static INLINE int
@@ -120,7 +120,7 @@
struct page **p, // OUT: locked page
uint32 **ptr) // OUT: kernel mapped pointer
{
-@@ -201,7 +206,7 @@
+@@ -201,7 +206,7 @@ VNetUserIfSetupNotify(VNetUserIF *userIf
return -EBUSY;
}
@@ -129,7 +129,7 @@
&pollPtr)) < 0) {
return retval;
}
-@@ -213,7 +218,7 @@
+@@ -213,7 +218,7 @@ VNetUserIfSetupNotify(VNetUserIF *userIf
goto error_free;
}
@@ -138,7 +138,20 @@
&recvClusterPage,
&recvClusterCount)) < 0) {
goto error_free;
-@@ -559,20 +564,20 @@
+@@ -550,7 +555,12 @@ VNetCsumCopyDatagram(const struct sk_buf
+ return -EINVAL;
+ }
+
++#if COMPAT_LINUX_VERSION_CHECK_LT(5, 10, 0)
+ csum = csum_and_copy_to_user(skb->data + offset, curr, len, 0, &err);
++#else
++ csum = csum_and_copy_to_user(skb->data + offset, curr, len);
++ err = (csum == 0) ? -EFAULT : 0;
++#endif
+ if (err) {
+ return err;
+ }
+@@ -559,20 +569,26 @@ VNetCsumCopyDatagram(const struct sk_buf
for (frag = skb_shinfo(skb)->frags;
frag != skb_shinfo(skb)->frags + skb_shinfo(skb)->nr_frags;
frag++) {
@@ -152,8 +165,14 @@
- curr, frag->size, 0, &err);
- compat_kunmap(frag->page);
+ vaddr = kmap(skb_frag_page(frag));
++#if COMPAT_LINUX_VERSION_CHECK_LT(5, 10, 0)
+ tmpCsum = csum_and_copy_to_user(vaddr + skb_frag_off(frag),
+ curr, skb_frag_size(frag), 0, &err);
++#else
++ tmpCsum = csum_and_copy_to_user(vaddr + skb_frag_off(frag),
++ curr, skb_frag_size(frag));
++ err = (tmpCsum == 0) ? -EFAULT : 0;
++#endif
+ kunmap(skb_frag_page(frag));
if (err) {