vmmon: rename GDT_SIZE macro to avoid collision

When building against kernel 4.12 and newer, macro name GDT_SIZE used in
(vmmon) include/segs.h collides with macro defined in (kernel source)
arch/x86/include/asm/segment.h, resulting in its redefinition.

To prevent potential problems, rename vmmon's GDT_SIZE to VMMON_GDT_SIZE
and GDT_LIMIT to VMMON_GDT_LIMIT. (There is no GDT_LIMIT in mainline kernel
source but let's be consistent.)

vmmon-only/common/crosspage.c

@@ -47,9 +47,11 @@
 
 #ifdef __linux__
 #   include "driver-config.h"
-#   if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
-#      include <linux/objtool.h>
-#   elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
+/*
+ * linux/frame.h dates back to 4.6-rc1, we need the STACK_FRAME_NON_STANDARD
+ * definition from it which is there from the start.
+ */
+#   if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
 #      include <linux/frame.h>
 #   endif
 #endif
@@ -139,7 +141,7 @@ CPDATA const VMCrossPageData cpDataTemplate = {
 
    .monTask.IOMapBase = sizeof(Task64),
 
-   .monGDTR.limit  = GDT_LIMIT,
+   .monGDTR.limit  = VMMON_GDT_LIMIT,
    .monGDTR.offset = GDT_START_VA,
 
    .shadowDR[6].ureg64 = DR6_DEFAULT,

vmmon-only/common/hostif.h

@@ -110,7 +110,7 @@ EXTERN int   HostIF_SemaphoreWait(VMDriver *vm,
                                   Vcpuid vcpuid,
                                   uint64 *args);
 
-EXTERN int   HostIF_SemaphoreSignal(VMDriver *vm, uint64 *args);
+EXTERN int   HostIF_SemaphoreSignal(uint64 *args);
 
 EXTERN void  HostIF_SemaphoreForceWakeup(VMDriver *vm, const VCPUSet *vcs);
 EXTERN void  HostIF_IPI(VMDriver *vm, const VCPUSet *vcs);

vmmon-only/include/iocontrols.h

@@ -148,7 +148,7 @@ PtrToVA64(void const *ptr) // IN
  * the NT specific VMX86_DRIVER_VERSION.
  */
 
-#define VMMON_VERSION           (401 << 16 | 0)
+#define VMMON_VERSION           (398 << 16 | 0)
 #define VMMON_VERSION_MAJOR(v)  ((uint32) (v) >> 16)
 #define VMMON_VERSION_MINOR(v)  ((uint16) (v))
 
@@ -533,8 +533,6 @@ typedef struct IPIVectors {
  */
 typedef struct VMCreateBlock {
    VA64               bsBlob;        // IN: User VA of the VMM bootstrap blob.
-   VA64               vmmonData;     // IN: User VA of a userlevel scratch area
-                                     //     required by the Linux vmmon
    uint32             bsBlobSize;    // IN: Size of VMM bootstrap blob.
    uint32             numVCPUs;      // IN: Number of VCPUs.
    uint16             vmid;          // OUT: VM ID for the created VM.

vmmon-only/include/modulecall.h

@@ -421,7 +421,9 @@ VMCrossPageData;
 
 #define MX_WAITINTERRUPTED     3
 #define MX_WAITTIMEDOUT        2
-#define MX_WAITNORMAL          1
-#define MX_WAITERROR           0
+#define MX_WAITNORMAL          1  // Must equal one; see linux module code.
+#define MX_WAITERROR           0  // Use MX_ISWAITERROR() to test for error.
 
+// Any zero or negative value denotes error.
+#define MX_ISWAITERROR(e)      ((e) <= MX_WAITERROR)
 #endif

vmmon-only/include/segs.h

@@ -51,14 +51,14 @@
  * it can use a single cross GDT).
  */
 
-#define GDT_SIZE              (sizeof(Descriptor) * NUM_VALID_SEGMENTS)
-#define GDT_LIMIT             (GDT_SIZE - 1)
+#define VMMON_GDT_SIZE        (sizeof(Descriptor) * NUM_VALID_SEGMENTS)
+#define VMMON_GDT_LIMIT       (VMMON_GDT_SIZE - 1)
 
 #define IRB_SIZE              32 /* Interrupt redirection bitmap. */
 #define TSS_SIZE              (sizeof(Task64) + IRB_SIZE)
 
 #define GDT_START_VA          (VPN_2_VA(GDT_AND_TASK_START))
-#define TASK_START_VA         (VPN_2_VA(GDT_AND_TASK_START) + GDT_SIZE)
+#define TASK_START_VA         (VPN_2_VA(GDT_AND_TASK_START) + VMMON_GDT_SIZE)
 
 /*
  * vmkBoot uses some of the lower-numbered segments, as do host kernels on

vmmon-only/include/vcpuset.h

@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2002-2020 VMware, Inc. All rights reserved.
+ * Copyright (C) 2002-2019 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -44,11 +44,10 @@
 #   include "str.h"     /* Str_Snprintf */
 #   define VCS_SNPRINTF Str_Snprintf
 #elif defined MONITOR_APP
+#   include <stdio.h>   /* libc snprintf */
 #   if defined WIN32
-#      include "str.h"     /* Str_Snprintf */
-#      define VCS_SNPRINTF Str_Snprintf
+#      define VCS_SNPRINTF _snprintf
 #   else
-#      include <stdio.h>   /* libc snprintf */
 #      define VCS_SNPRINTF snprintf
 #   endif
 #elif defined VMM || defined VMKERNEL

vmmon-only/linux/driver.c

@@ -799,7 +799,6 @@ LinuxDriver_Ioctl(struct file *filp,    // IN:
       } else {
          device->vm = vm;
          args.vmid = vm->userID;
-         vm->vmhost->vmmonData = (void *__user)args.vmmonData;
          retval = HostIF_CopyToUser((VA64)ioarg, &args, sizeof args);
       }
       break;
@@ -1257,7 +1256,7 @@ LinuxDriver_Ioctl(struct file *filp,    // IN:
       }
 
    case IOCTL_VMX86_WRITE_PAGE: {
-#if VMX86_DEVEL
+#ifdef VMX86_DEVEL
          VMMReadWritePage req;
 
          retval = HostIF_CopyFromUser(&req, ioarg, sizeof req);

vmmon-only/linux/hostif.c

@@ -2347,23 +2347,16 @@ HostIF_VMLockIsHeld(VMDriver *vm) // IN
 static Bool
 isVAReadable(VA r)  // IN:
 {
+   mm_segment_t old_fs;
    uint32 dummy;
    int ret;
 
-   r = APICR_TO_ADDR(r, APICR_VERSION);
-#ifdef HAVE_GET_KERNEL_NOFAULT
-   ret = get_kernel_nofault(dummy, (void *)r);
-#else
-   {
-   mm_segment_t old_fs;
-
    old_fs = get_fs();
    set_fs(KERNEL_DS);
-
+   r = APICR_TO_ADDR(r, APICR_VERSION);
    ret = HostIF_CopyFromUser(&dummy, r, sizeof dummy);
    set_fs(old_fs);
-   }
-#endif
+
    return ret == 0;
 }
 #endif
@@ -2529,10 +2522,8 @@ HostIF_GetPerfCtrVector(void)
  *    Perform the semaphore wait (P) operation, possibly blocking.
  *
  * Result:
- *      On success: MX_WAITINTERRUPTED (3) if interrupted by a Unix signal.
- *                  MX_WAITTIMEDOUT (2) if the timeout occurred.
- *                  MX_WAITNORMAL (1) if the event was raised.
- *      On error: MX_WAITERROR (0) on generic error.
+ *    1 (which equals MX_WAITNORMAL) if success,
+ *    negated error code otherwise.
  *
  * Side-effects:
  *    None
@@ -2559,11 +2550,6 @@ HostIF_SemaphoreWait(VMDriver *vm,   // IN:
    if (file == NULL) {
       return MX_WAITERROR;
    }
-   if (file->f_op->poll == NULL) {
-      fput(file);
-      Warning("%s: File poll operation is NULL\n", __func__);
-      return MX_WAITERROR;
-   }
 
    poll_initwait(&table);
    current->state = TASK_INTERRUPTIBLE;
@@ -2588,17 +2574,18 @@ HostIF_SemaphoreWait(VMDriver *vm,   // IN:
 #else
    res = kernel_read(file, &value, sizeof value, &file->f_pos);
 #endif
+   if (res == sizeof value) {
+      res = MX_WAITNORMAL;
+   } else {
+      if (res == 0) {
+         res = -EBADF;
+      }
+   }
+
    fput(file);
 
-   if (res == sizeof value) {
-      return MX_WAITNORMAL;
-   }
-   if (res == 0) {
-      res = -EBADF;
-   }
-
    /*
-    * Handle various errors:
+    * Handle benign errors:
     * EAGAIN is MX_WAITTIMEDOUT.
     * The signal-related errors are all mapped into MX_WAITINTERRUPTED.
     */
@@ -2617,10 +2604,6 @@ HostIF_SemaphoreWait(VMDriver *vm,   // IN:
    case -EBADF:
       res = MX_WAITERROR;
       break;
-   default:
-      Warning("Unexpected error: %s err=%d\n", __FUNCTION__, res);
-      res = MX_WAITERROR;
-      break;
    }
    return res;
 }
@@ -2674,6 +2657,7 @@ HostIF_SemaphoreForceWakeup(VMDriver *vm,       // IN:
  *      On error: MX_WAITINTERRUPTED (3) if interrupted by a Unix signal (we
  *                   can block on a preemptive kernel).
  *                MX_WAITERROR (0) on generic error.
+ *                Negated system error (< 0).
  *
  * Side-effects:
  *      None
@@ -2682,64 +2666,57 @@ HostIF_SemaphoreForceWakeup(VMDriver *vm,       // IN:
  */
 
 int
-HostIF_SemaphoreSignal(VMDriver *vm,  // IN:
-                       uint64 *args)  // IN:
+HostIF_SemaphoreSignal(uint64 *args)  // IN:
 {
+   struct file *file;
    int res;
    int signalFD = args[1];
-   struct file *file;
+   uint64 value = 1;  // make an eventfd happy should it be there
 
    file = vmware_fget(signalFD);
-   if (file == NULL) {
-      return FALSE;
+   if (!file) {
+      return MX_WAITERROR;
    }
 
    /*
     * 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 (file->f_op->write != NULL) {
-      /*
-       * PR2650348 - The kernel_write function signature changed in the vanilla
-       * kernel in 4.14.0 and the signature update was backported before that
-       * point in a kernel used by OpenSUSE 15.1 so call the function directly
-       * instead of via the wrapper.
-       *
-       * Kernel 5.10 removed the set_fs functionality which means a user pointer
-       * must be passed into the write function or a -EFAULT will be returned.
-       */
-      res = file->f_op->write(file, vm->vmhost->vmmonData, sizeof (uint64),
-                              &file->f_pos);
-   } else {
-      Warning("%s: File write operation is NULL\n", __func__);
-      res = -ENOTSUPP;
+#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
+
+   if (res == sizeof value) {
+      res = MX_WAITNORMAL;
    }
+
    fput(file);
 
-   if (res == sizeof (uint64)) {
-      return MX_WAITNORMAL;
-   }
-
    /*
-    * Handle various errors:
+    * Handle benign errors:
     * EAGAIN is MX_WAITTIMEDOUT.
     * The signal-related errors are all mapped into MX_WAITINTERRUPTED.
     */
+
    switch (res) {
    case -EAGAIN:
-      /* The pipe is full, so it is already signalled. Success. */
-      return MX_WAITNORMAL;
+      // The pipe is full, so it is already signalled. Success.
+      res = MX_WAITNORMAL;
+      break;
    case -EINTR:
    case -ERESTART:
    case -ERESTARTSYS:
    case -ERESTARTNOINTR:
    case -ERESTARTNOHAND:
-      return MX_WAITINTERRUPTED;
-   default:
-      Warning("Unexpected error: %s err=%d\n", __FUNCTION__, res);
-      return MX_WAITERROR;
+      res = MX_WAITINTERRUPTED;
+      break;
    }
+   return res;
 }
 
 
@@ -3264,9 +3241,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) {
@@ -3289,6 +3269,8 @@ HostIFFastClockThread(void *unused)  // IN:
    }
 
  out:
+   set_fs(oldFS);
+
    /*
     * Do not exit thread until we are told to do so.
     */

vmmon-only/linux/vmhost.h

@@ -92,11 +92,6 @@ typedef struct VMHost {
     * as pages for "AWE" guest memory.
     */
    struct PhysTracker  *AWEPages;
-   /*
-    * Pointer to a userlevel 64-bit area containing the value 1.
-    * This is used for HostIF_SemaphoreSignal.
-    */
-   void *__user vmmonData;
 } VMHost;
 
 #endif

vmmon-only/vmcore/moduleloop.c

@@ -180,7 +180,7 @@ skipTaskSwitch:;
       }
 
       case MODULECALL_SEMASIGNAL: {
-         retval = HostIF_SemaphoreSignal(vm, crosspage->args);
+         retval = HostIF_SemaphoreSignal(crosspage->args);
 
          if (retval == MX_WAITINTERRUPTED) {
              crosspage->moduleCallInterrupted = TRUE;
@@ -362,13 +362,7 @@ skipTaskSwitch:;
       default:
          Warning("ModuleCall %d not supported\n", crosspage->moduleCallType);
       }
-
-      if (retval != (uint64)((uint32)retval)) {
-         Warning("Unexpected error in modulecall %u (%llu)\n",
-                 crosspage->moduleCallType, retval);
-         bailValue = USERCALL_SWITCHERR;
-         goto bailOut;
-      }
+      ASSERT(retval == (uint64)((uint32)retval));
       crosspage->retval = (uint32)retval;
 #if defined(__linux__)
       cond_resched(); // Other kernels are preemptible

vmnet-only/smac.c

@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2002,2018,2020 VMware, Inc. All rights reserved.
+ * Copyright (C) 2002,2018 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -4327,7 +4327,7 @@ LookupTypeClass(unsigned short typeValue) // IN: ethernet type
  *----------------------------------------------------------------------
  */
 
-#ifdef _WIN32
+#if _WIN32
 _Use_decl_annotations_
 #endif
 void

vmnet-only/userif.c

@@ -561,12 +561,7 @@ VNetCsumCopyDatagram(const struct sk_buff *skb,	// IN: skb to copy
       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;
    }
@@ -580,14 +575,8 @@ VNetCsumCopyDatagram(const struct sk_buff *skb,	// IN: skb to copy
 	 const void *vaddr;
 
 	 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) {

vmnet-only/vm_device_version.h

@@ -35,6 +35,8 @@
 #endif
 #endif
 
+#include <linux/pci_ids.h>
+
 /* LSILogic 53C1030 Parallel SCSI controller
  * LSILogic SAS1068 SAS controller
  */
@@ -53,7 +55,10 @@
  *    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
@@ -71,7 +76,11 @@
 #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