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.)
vmnet: use standard definition of PCI_VENDOR_ID_VMWARE_VMXNET3 if available
2020-09-15 21:59:56 +02:00 · 2020-09-15 21:59:56 +02:00 · 2020-09-15 21:59:56 +02:00 · 2020-09-15 21:59:56 +02:00 · 2020-09-15 17:11:01 +02:00
4 changed files with 17 additions and 8 deletions
@@ -48,10 +48,10 @@
 #ifdef __linux__
 #   include "driver-config.h"
 /*
- * linux/frame.h dates back to 4.5-rc5, we need the ANNOTATE_INTRA_FUNCTION_CALL
- * definition from it which came in with 5.7.
+ * 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(5, 7, 0)
+#   if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
 #      include <linux/frame.h>
 #   endif
 #endif
@@ -141,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,
@@ -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
@@ -1256,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);
@@ -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
Author	SHA1	Message	Date
Michal Kubecek	2b7ad432a3	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.)	2020-09-15 21:59:56 +02:00
Michal Kubecek	fb7cb68b3c	vmnet: use standard definition of PCI_VENDOR_ID_VMWARE_VMXNET3 if available The PCI_DEVICE_ID_VMWARE_VMXNET3 macro is defined in mainline pci_ids.h since commit b1226c7db1d9 ("vmxnet3: Move PCI Id to pci_ids.h") in v4.10-rc1.	2020-09-15 21:59:56 +02:00
Michal Kubecek	29cfea0504	vmnet: use standard definition of PCI_VENDOR_ID_VMWARE if available The PCI_VENDOR_ID_VMWARE macro is defined in mainline pci_ids.h since commit 94e57fea6202 ("PCI: Move PCI_VENDOR_ID_VMWARE to pci_ids.h") in v3.18-rc1.	2020-09-15 21:59:56 +02:00
Michal Kubecek	b4610316f5	vmmon: fix version check for <linux/frame.h> include Both the version check for include of <linux/frame.h> in common/crosspage.c and the comment explaining it are wrong for multiple reasons: 1. <linux/frame.h> was introduced in v4.6-rc1, not v4.5-rc5 2. ANNOTATE_INTRA_FUNCTION_CALL was introduced in v5.8-rc1, not v5.7 3. Even if it were, the check should use ">=", not ">" 4. Most important, the code in fact needs STACK_FRAME_NON_STANDARD Without the definition of STACK_FRAME_NON_STANDARD, build against vanilla 5.7 kernel fails on objtool error (but succeeds against 5.7.1, because of the mistake from point 3). Change the check from "> 5.7" to ">= 4.6" to get STACK_FRAME_NON_STANDARD whenever available and update the explaining comment.	2020-09-15 21:59:56 +02:00
Michal Kubecek	572c0ba586	vmmon: fix wrong VMX86_DEVEL test If VMX86_DEVEL macro is not defined, preprocessor warns when it is tested with "#if" in vmmon-only/linux/driver.c. As VMX86_DEVEL is tested with "#ifdef" everywhere else, change this one test to match the rest.	2020-09-15 17:11:01 +02:00