import Workstation 15.5.5 module sources

vmmon-only/Makefile

@@ -136,6 +136,9 @@ ifdef VMX86_DEBUG
 CC_OPTS += -DVMX86_DEBUG
 endif
 
+# Add Spectre options when available
+CC_OPTS += $(call vm_check_gcc,-mindirect-branch=thunk -mindirect-branch-register,)
+
 include $(SRCROOT)/Makefile.kernel
 
 else

vmmon-only/Makefile.kernel

@@ -31,7 +31,7 @@ $(DRIVER)-y := $(subst $(SRCROOT)/, , $(patsubst %.c, %.o, \
 		$(SRCROOT)/bootstrap/*.c)))
 
 clean:
-	rm -rf $(wildcard $(DRIVER).mod.c $(DRIVER).ko .tmp_versions .cache.mk \
+	rm -rf $(wildcard $(DRIVER).mod.c $(DRIVER).ko .tmp_versions \
 		Module.symvers Modules.symvers Module.markers modules.order \
 		$(foreach dir,linux/ common/ vmcore/ bootstrap/ \
 		./,$(addprefix $(dir),.*.cmd .*.o.flags *.o)))

vmmon-only/common/task.c

@@ -2307,23 +2307,12 @@ TaskSwitchToMonitor(VMCrossPage *crosspage)
    {
       uint64 raxGetsWiped, rcxGetsWiped;
 
-#ifdef CALL_NOSPEC
-      __asm__ __volatile__(CALL_NOSPEC
-                           : "=a" (raxGetsWiped),
-                             "=c" (rcxGetsWiped)
-                           : "0" (codePtr),
-                             "1" (crosspage),
-                             THUNK_TARGET(codePtr)
-                           : "rdx", "r8", "r9", "r10", "r11", "cc", "memory");
-#else
       __asm__ __volatile__("call *%%rax"
                            : "=a" (raxGetsWiped),
                              "=c" (rcxGetsWiped)
                            : "0" (codePtr),
                              "1" (crosspage)
                            : "rdx", "r8", "r9", "r10", "r11", "cc", "memory");
-#endif
-
    }
 #elif defined(_MSC_VER)
    /*

vmmon-only/include/compat_poll.h

@@ -1,30 +0,0 @@
-#ifndef __COMPAT_POLL_H__
-#define __COMPAT_POLL_H__
-
-#include <linux/poll.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0))
-
-#ifndef __poll_t
-typedef unsigned int __poll_t;
-#endif
-
-static inline __poll_t compat_vfs_poll(struct file *file,
-				       struct poll_table_struct *pt)
-{
-	if (unlikely(!file->f_op->poll))
-		return DEFAULT_POLLMASK;
-	return file->f_op->poll(file, pt);
-}
-
-#else
-
-static inline __poll_t compat_vfs_poll(struct file *file,
-				       struct poll_table_struct *pt)
-{
-	return vfs_poll(file, pt);
-}
-
-#endif
-
-#endif /* __COMPAT_POLL_H__ */

vmmon-only/include/vm_assert.h

@@ -67,7 +67,6 @@ extern "C" {
 #if defined (VMKPANIC) 
 #include "vmk_assert.h"
 #else /* !VMKPANIC */
-#include <linux/kernel.h>
 #define _ASSERT_PANIC(name) \
            Panic(_##name##Fmt "\n", __FILE__, __LINE__)
 #define _ASSERT_PANIC_BUG(bug, name) \
@@ -108,7 +107,7 @@ NORETURN void Panic_NoSave(const char *fmt, ...) PRINTF_DECL(1, 2);
 } while(0)
 
 #else
-#define Panic panic
+NORETURN void Panic(const char *fmt, ...) PRINTF_DECL(1, 2);
 #endif
 
 void LogThrottled(uint32 *count, const char *fmt, ...) PRINTF_DECL(2, 3);

vmmon-only/include/x86_basic_defs.h

@@ -35,8 +35,6 @@
 #define INCLUDE_ALLOW_VMCORE
 #include "includeCheck.h"
 
-#include <asm/processor-flags.h>
-
 #define X86_MAX_INSTR_LEN  15   /* Max byte length of an x86 instruction. */
 
 #define NUM_IDT_VECTORS 256
@@ -77,9 +75,7 @@
 #define CR3_PDB_MASK   0xfffff000
 #define CR3_IGNORE     0xFFF
 #define PAE_CR3_IGNORE 0x1F
-#ifndef CR3_PCID_MASK
 #define CR3_PCID_MASK  0xFFF
-#endif
 #define CR3_NO_FLUSH   (1ULL << 63)
 
 #define CR4_VME        0x00000001

vmmon-only/include/x86msr.h

@@ -24,7 +24,6 @@
 
 #ifndef _X86MSR_H_
 #define _X86MSR_H_
-#include <asm/msr-index.h>
 #define INCLUDE_ALLOW_USERLEVEL
 #define INCLUDE_ALLOW_VMX
 
@@ -138,9 +137,7 @@ MSRQuery;
 #define MSR_TSX_CTRL_RTM_DISABLE                  (1ULL << 0)
 #define MSR_TSX_CTRL_CPUID_CLEAR                  (1ULL << 1)
 
-#ifndef MSR_MISC_FEATURES_ENABLES
 #define MSR_MISC_FEATURES_ENABLES            0x140
-#endif
 
 /* Intel Core Architecture and later: use only architected counters. */
 #define IA32_MSR_PERF_CAPABILITIES                   0x345
@@ -475,9 +472,7 @@ MSRQuery;
 #define MSR_K7_HWCR_SSEDIS         0x00008000ULL // Disable SSE bit
 #define MSR_K7_HWCR_MONMWAITUSEREN 0x00000400ULL // Enable MONITOR/MWAIT CPL>0
 #define MSR_K7_HWCR_TLBFFDIS       0x00000040ULL // Disable TLB Flush Filter
-#ifndef MSR_K7_HWCR_SMMLOCK
 #define MSR_K7_HWCR_SMMLOCK        0x00000001ULL // Lock SMM environment
-#endif
 
 #ifndef MSR_K8_SYSCFG
 #define MSR_K8_SYSCFG        0xc0010010
@@ -638,9 +633,7 @@ MSRQuery;
 #define MSR_HYPERV_GUESTOSID_OS_WINNT_DERIVATIVE 4ULL
 
 /* MSR for forcing RTM abort to recover PMC3 (see PR 2333817) */
-#ifndef MSR_TSX_FORCE_ABORT
 #define MSR_TSX_FORCE_ABORT                      0x0000010f
-#endif
 #define MSR_TSX_FORCE_ABORT_RTM_BIT_INDEX        0
 
 /*
@@ -694,11 +687,7 @@ typedef unsigned char MTRRType;
 /*
  * MISC_FEATURES_ENABLES bits
  */
-#ifdef MSR_MISC_FEATURES_ENABLES_CPUID_FAULT
-#define MSR_MISC_FEATURES_ENABLES_CPUID_FAULTING MSR_MISC_FEATURES_ENABLES_CPUID_FAULT
-#else
 #define MSR_MISC_FEATURES_ENABLES_CPUID_FAULTING 1
-#endif
 
 
 

vmmon-only/linux/driver.c

@@ -664,7 +664,7 @@ LinuxDriverReadTSC(void *data,   // OUT: TSC values
  *-----------------------------------------------------------------------------
  */
 
-__always_inline static Bool
+__attribute__((always_inline)) static Bool
 LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
 {
    TSCDelta tscDelta;
@@ -1227,7 +1227,7 @@ LinuxDriver_Ioctl(struct file *filp,    // IN:
       }
 
    case IOCTL_VMX86_WRITE_PAGE: {
-#ifdef VMX86_DEVEL
+#if VMX86_DEVEL
          VMMReadWritePage req;
 
          retval = HostIF_CopyFromUser(&req, ioarg, sizeof req);

vmmon-only/linux/hostif.c

@@ -47,16 +47,13 @@
 #include <asm/asm.h>
 #include <asm/io.h>
 #include <asm/page.h>
-#include <asm/tlbflush.h>
 #include <asm/uaccess.h>
-#include <asm/irq_vectors.h>
 #include <linux/capability.h>
 #include <linux/kthread.h>
 #include <linux/wait.h>
 #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"
@@ -78,7 +75,6 @@
 
 #include "pgtbl.h"
 #include "versioned_atomic.h"
-#include "compat_poll.h"
 
 #if !defined(CONFIG_HIGH_RES_TIMERS)
 #error CONFIG_HIGH_RES_TIMERS required for acceptable performance
@@ -618,15 +614,6 @@ HostIF_FastClockUnlock(int callerID) // IN
    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
 
 /*
  *----------------------------------------------------------------------
@@ -647,29 +634,7 @@ static int crosspage_set_exec(pte_t *pte, unsigned long addr, void *data)
 static void *
 MapCrossPage(struct page *p)  // IN:
 {
-#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. */
-   if (apply_to_page_range(current->mm, (unsigned long)addr, PAGE_SIZE,
-			   crosspage_set_exec, p)) {
-      vunmap(addr);
-      return NULL;
-   }
-
-   preempt_disable();
-   __flush_tlb_all();
-   preempt_enable();
-
-   return addr;
-#endif
 }
 
 
@@ -1773,11 +1738,8 @@ HostIF_EstimateLockedPageLimit(const VMDriver* vm,                // IN
 #else
    lockedPages += global_page_state(NR_PAGETABLE);
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-   /* NR_SLAB_* converted to byte counters in 5.9 */
-   lockedPages += global_node_page_state_pages(NR_SLAB_UNRECLAIMABLE_B);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0)
    /* NR_SLAB_* moved from zone to node in 4.13. */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0)
    lockedPages += global_node_page_state(NR_SLAB_UNRECLAIMABLE);
 #else
    lockedPages += global_page_state(NR_SLAB_UNRECLAIMABLE);
@@ -2408,27 +2370,6 @@ HostIF_VMLockIsHeld(VMDriver *vm) // IN
 
 #if defined(CONFIG_SMP) || defined(CONFIG_X86_UP_IOAPIC) || \
     defined(CONFIG_X86_UP_APIC) || defined(CONFIG_X86_LOCAL_APIC)
-
-#if COMPAT_LINUX_VERSION_CHECK_LT(5, 8, 0)
-static long compat_copy_from_kernel_nofault(void *dst, VA src, size_t size)
-{
-   mm_segment_t old_fs;
-   long ret;
-
-   old_fs = get_fs();
-   set_fs(KERNEL_DS);
-   ret = HostIF_CopyFromUser(dst, src, size);
-   set_fs(old_fs);
-
-   return ret;
-}
-#else
-static long compat_copy_from_kernel_nofault(void *dst, VA src, size_t size)
-{
-   return copy_from_kernel_nofault(dst, (const void *)src, size);
-}
-#endif
-
 /*
  *----------------------------------------------------------------------
  *
@@ -2448,11 +2389,15 @@ static long compat_copy_from_kernel_nofault(void *dst, VA src, size_t size)
 static Bool
 isVAReadable(VA r)  // IN:
 {
+   mm_segment_t old_fs;
    uint32 dummy;
-   long ret;
+   int ret;
 
+   old_fs = get_fs();
+   set_fs(KERNEL_DS);
    r = APICR_TO_ADDR(r, APICR_VERSION);
-   ret = compat_copy_from_kernel_nofault(&dummy, r, sizeof(dummy));
+   ret = HostIF_CopyFromUser(&dummy, r, sizeof dummy);
+   set_fs(old_fs);
 
    return ret == 0;
 }
@@ -2608,12 +2553,11 @@ HostIF_SemaphoreWait(VMDriver *vm,   // IN:
                      uint64 *args)   // IN:
 {
    struct file *file;
+   mm_segment_t old_fs;
    int res;
    int waitFD = args[0];
    int timeoutms = args[2];
    uint64 value;
-   struct poll_wqueues table;
-   unsigned int mask;
 
    ASSERT(vcpuid < vm->numVCPUs);
 
@@ -2622,29 +2566,33 @@ HostIF_SemaphoreWait(VMDriver *vm,   // IN:
       return MX_WAITERROR;
    }
 
-   poll_initwait(&table);
-   current->state = TASK_INTERRUPTIBLE;
-   mask = compat_vfs_poll(file, &table.pt);
-   if (!(mask & (POLLIN | POLLERR | POLLHUP))) {
-      vm->vmhost->vcpuSemaTask[vcpuid] = current;
-      schedule_timeout(timeoutms * HZ / 1000);  // convert to Hz
-      vm->vmhost->vcpuSemaTask[vcpuid] = NULL;
+   old_fs = get_fs();
+   set_fs(KERNEL_DS);
+
+   {
+      struct poll_wqueues table;
+      unsigned int mask;
+
+      poll_initwait(&table);
+      current->state = TASK_INTERRUPTIBLE;
+      mask = file->f_op->poll(file, &table.pt);
+      if (!(mask & (POLLIN | POLLERR | POLLHUP))) {
+         vm->vmhost->vcpuSemaTask[vcpuid] = current;
+         schedule_timeout(timeoutms * HZ / 1000);  // convert to Hz
+         vm->vmhost->vcpuSemaTask[vcpuid] = NULL;
+      }
+      current->state = TASK_RUNNING;
+      poll_freewait(&table);
    }
-   current->state = TASK_RUNNING;
-   poll_freewait(&table);
 
    /*
     * Userland only writes in multiples of sizeof(uint64). This will allow
     * 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).
-    *
-    * Upstream Linux changed the function parameter types/ordering in 4.14.0.
     */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
-   res = kernel_read(file, file->f_pos, (char *)&value, sizeof value);
-#else
-   res = kernel_read(file, &value, sizeof value, &file->f_pos);
-#endif
+
+   res = file->f_op->read(file, (char *) &value, sizeof value, &file->f_pos);
+
    if (res == sizeof value) {
       res = MX_WAITNORMAL;
    } else {
@@ -2653,6 +2601,7 @@ HostIF_SemaphoreWait(VMDriver *vm,   // IN:
       }
    }
 
+   set_fs(old_fs);
    fput(file);
 
    /*
@@ -2739,8 +2688,8 @@ HostIF_SemaphoreForceWakeup(VMDriver *vm,       // IN:
 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
@@ -2750,34 +2699,22 @@ HostIF_SemaphoreSignal(uint64 *args)  // IN:
       return MX_WAITERROR;
    }
 
-   /*
-    * 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;
-   }
+   old_fs = get_fs();
+   set_fs(KERNEL_DS);
 
    /*
     * Always write sizeof(uint64) bytes. This works fine for eventfd and
     * pipes. The data written is formatted to make an eventfd happy should
     * it be present.
-    *
-    * Upstream Linux changed the function parameter types/ordering in 4.14.0.
     */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
-   res = kernel_write(file, (char *)&value, sizeof value, file->f_pos);
-#else
-   res = kernel_write(file, &value, sizeof value, &file->f_pos);
-#endif
+
+   res = file->f_op->write(file, (char *) &value, sizeof value, &file->f_pos);
 
    if (res == sizeof value) {
       res = MX_WAITNORMAL;
    }
 
+   set_fs(old_fs);
    fput(file);
 
    /*
@@ -3324,9 +3261,12 @@ 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) {
@@ -3349,6 +3289,8 @@ HostIFFastClockThread(void *unused)  // IN:
    }
 
  out:
+   set_fs(oldFS);
+
    /*
     * Do not exit thread until we are told to do so.
     */

vmnet-only/Makefile

@@ -136,6 +136,9 @@ ifdef VMX86_DEBUG
 CC_OPTS += -DVMX86_DEBUG
 endif
 
+# Add Spectre options when available
+CC_OPTS += $(call vm_check_gcc,-mindirect-branch=thunk -mindirect-branch-register,)
+
 include $(SRCROOT)/Makefile.kernel
 
 else

vmnet-only/Makefile.kernel

@@ -32,6 +32,6 @@ $(DRIVER)-y := driver.o hub.o userif.o netif.o bridge.o procfs.o smac_compat.o \
 ####
 
 clean:
-	rm -rf $(DRIVER).o $(DRIVER).mod.o $(DRIVER).mod.c $(DRIVER).ko .cache.mk \
+	rm -rf $(DRIVER).o $(DRIVER).mod.o $(DRIVER).mod.c $(DRIVER).ko \
 	       .tmp_versions Module.symvers Modules.symvers Module.markers \
 	       modules.order $($(DRIVER)-y) .*.cmd .*.o.flags

vmnet-only/bridge.c

@@ -66,7 +66,7 @@
 #endif
 
 #if LOGLEVEL >= 4
-static u64 vnetTime;
+static struct timeval vnetTime;
 #endif
 
 typedef struct VNetBridge VNetBridge;
@@ -693,7 +693,7 @@ VNetBridgeReceiveFromVNet(VNetJack        *this, // IN: jack
 
 	 netif_rx_ni(clone);
 #	 if LOGLEVEL >= 4
-	 vnetTime = ktime_get_ns();
+	 do_gettimeofday(&vnetTime);
 #	 endif
       }
    }
@@ -1490,11 +1490,12 @@ VNetBridgeReceiveFromDev(struct sk_buff *skb,         // IN: packet to receive
 
 #  if LOGLEVEL >= 4
    {
-      u64 now;
-
-      now = ktime_get_ns();
+      struct timeval now;
+      do_gettimeofday(&now);
       LOG(3, (KERN_DEBUG "bridge-%s: time %d\n",
-	      bridge->name, (int)((now - vnetTime) / NSEC_PER_USEC)));
+	      bridge->name,
+	      (int)((now.tv_sec * 1000000 + now.tv_usec)
+                    - (vnetTime.tv_sec * 1000000 + vnetTime.tv_usec))));
    }
 #  endif
 

vmnet-only/userif.c

@@ -81,30 +81,10 @@ extern unsigned int  vnet_max_qlen;
 #   define skb_frag_page(frag) (frag)->page
 #   define skb_frag_size(frag) (frag)->size
 #endif
-#if COMPAT_LINUX_VERSION_CHECK_LT(5, 4, 0) && \
-    !(defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15 && \
-      defined(CONFIG_SUSE_PATCHLEVEL) && CONFIG_SUSE_PATCHLEVEL >= 2)
+#if COMPAT_LINUX_VERSION_CHECK_LT(5, 4, 0)
 #   define skb_frag_off(frag) (frag)->page_offset
 #endif
 
-#if COMPAT_LINUX_VERSION_CHECK_LT(5, 10, 0)
-static inline
-__wsum compat_csum_and_copy_to_user(const void *src, void __user *dst, int len)
-{
-	int err;
-	__wsum ret;
-
-	ret = csum_and_copy_to_user(src, dst, len, 0, &err);
-	return err ? 0 : ret;
-}
-#else
-static inline
-__wsum compat_csum_and_copy_to_user(const void *src, void __user *dst, int len)
-{
-	return csum_and_copy_to_user(src, dst, len);
-}
-#endif
-
 /*
  *-----------------------------------------------------------------------------
  *
@@ -566,6 +546,7 @@ VNetCsumCopyDatagram(const struct sk_buff *skb,	// IN: skb to copy
 		     char *buf)			// OUT: where to copy data
 {
    unsigned int csum;
+   int err = 0;
    int len = skb_headlen(skb) - offset;
    char *curr = buf;
    const skb_frag_t *frag;
@@ -578,9 +559,10 @@ VNetCsumCopyDatagram(const struct sk_buff *skb,	// IN: skb to copy
       return -EINVAL;
    }
 
-   csum = compat_csum_and_copy_to_user(skb->data + offset, curr, len);
-   if (!csum)
-	   return -EFAULT;
+   csum = csum_and_copy_to_user(skb->data + offset, curr, len, 0, &err);
+   if (err) {
+      return err;
+   }
    curr += len;
 
    for (frag = skb_shinfo(skb)->frags;
@@ -591,12 +573,13 @@ VNetCsumCopyDatagram(const struct sk_buff *skb,	// IN: skb to copy
 	 const void *vaddr;
 
 	 vaddr = kmap(skb_frag_page(frag));
-	 tmpCsum = compat_csum_and_copy_to_user(vaddr + skb_frag_off(frag),
-						curr, skb_frag_size(frag));
+	 tmpCsum = csum_and_copy_to_user(vaddr + skb_frag_off(frag),
+					 curr, skb_frag_size(frag), 0, &err);
 	 kunmap(skb_frag_page(frag));
 
-	 if (!tmpCsum)
-		 return -EFAULT;
+	 if (err) {
+	    return err;
+	 }
 	 csum = csum_block_add(csum, tmpCsum, curr - buf);
 	 curr += skb_frag_size(frag);
       }

vmnet-only/vm_device_version.h

@@ -35,8 +35,6 @@
 #endif
 #endif
 
-#include <linux/pci_ids.h>
-
 /* LSILogic 53C1030 Parallel SCSI controller
  * LSILogic SAS1068 SAS controller
  */
@@ -55,10 +53,7 @@
  *    VMware HD Audio codec
  *    VMware HD Audio controller
  */
-#ifndef PCI_VENDOR_ID_VMWARE
 #define PCI_VENDOR_ID_VMWARE                    0x15AD
-#endif
-
 #define PCI_DEVICE_ID_VMWARE_SVGA3              0x0406
 #define PCI_DEVICE_ID_VMWARE_SVGA2              0x0405
 #define PCI_DEVICE_ID_VMWARE_SVGA               0x0710
@@ -76,11 +71,7 @@
 #define PCI_DEVICE_ID_VMWARE_1394               0x0780
 #define PCI_DEVICE_ID_VMWARE_BRIDGE             0x0790
 #define PCI_DEVICE_ID_VMWARE_ROOTPORT           0x07A0
-
-#ifndef PCI_DEVICE_ID_VMWARE_VMXNET3
 #define PCI_DEVICE_ID_VMWARE_VMXNET3            0x07B0
-#endif
-
 #define PCI_DEVICE_ID_VMWARE_PVSCSI             0x07C0
 #define PCI_DEVICE_ID_VMWARE_82574              0x07D0
 #define PCI_DEVICE_ID_VMWARE_AHCI               0x07E0