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.

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
 
@@ -113,9 +112,7 @@ MSRQuery;
 #define MSR_TSC_AUX           0xc0000103
 #define MSR_BD_TSC_RATIO      0xc0000104
 
-#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
@@ -615,11 +612,7 @@ typedef enum {
 /*
  * 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/hostif.c

@@ -1516,35 +1516,18 @@ HostIF_EstimateLockedPageLimit(const VMDriver* vm,                // IN
    unsigned int reservedPages = MEMDEFAULTS_MIN_HOST_PAGES;
    unsigned int hugePages = (vm == NULL) ? 0 :
       BYTES_2_PAGES(vm->memInfo.hugePageBytes);
-   unsigned int lockedPages = hugePages + reservedPages;
-   unsigned int anonPages;
+   unsigned int lockedPages = global_page_state(NR_PAGETABLE) +
+                              global_page_state(NR_SLAB_UNRECLAIMABLE) +
+                              global_page_state(NR_UNEVICTABLE) +
+                              hugePages + reservedPages;
+   unsigned int anonPages =
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+      global_page_state(NR_ANON_MAPPED);
+#else
+      global_page_state(NR_ANON_PAGES);
+#endif
    unsigned int swapPages = BYTES_2_PAGES(linuxState.swapSize);
 
-   /* global_page_state is global_zone_page_state in 4.14. */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-   lockedPages += global_zone_page_state(NR_PAGETABLE);
-#else
-   lockedPages += global_page_state(NR_PAGETABLE);
-#endif
-   /* 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);
-#endif
-   /* NR_UNEVICTABLE moved from global to node in 4.8. */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-   lockedPages += global_node_page_state(NR_UNEVICTABLE);
-#else
-   lockedPages += global_page_state(NR_UNEVICTABLE);
-#endif
-   /* NR_ANON_MAPPED moved & changed name in 4.8. */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-   anonPages = global_node_page_state(NR_ANON_MAPPED);
-#else
-   anonPages = global_page_state(NR_ANON_PAGES);
-#endif
-
    if (anonPages > swapPages) {
       lockedPages += anonPages - swapPages;
    }

vmnet-only/Makefile.kernel

@@ -20,7 +20,6 @@
 INCLUDE := -I$(SRCROOT)
 
 EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netif_trans_update.c,-DVMW_NETIF_TRANS_UPDATE, )
 
 obj-m += $(DRIVER).o
 

vmnet-only/compat_netdevice.h

@@ -337,7 +337,9 @@ typedef netdev_features_t compat_netdev_features_t;
 typedef u32 compat_netdev_features_t;
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) || defined(VMW_NETIF_TRANS_UPDATE)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) || \
+    (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE >= 0x0704) || \
+    (defined(CONFIG_SUSE_KERNEL) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 73))
 #define compat_netif_trans_update(d) netif_trans_update(d)
 #else
 #define compat_netif_trans_update(d) do { (d)->trans_start = jiffies; } while (0)

vmnet-only/netif_trans_update.c

@@ -1,39 +0,0 @@
-/*********************************************************
- * Copyright (C) 2017 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
- * Free Software Foundation version 2 and no later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- *
- *********************************************************/
-
-
-/*
- * Detect whether there is netif_trans_update, which got introduced from 4.7.0
- * Older kernels may have this function backported by vendors.
- */
-
-#include "compat_version.h"
-#include "compat_autoconf.h"
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)
-#   error This compile test intentionally fails.
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
-#include <linux/netdevice.h>
-
-void test_netif_trans_update(struct net_device *dev)
-{
-   netif_trans_update(dev);
-}
-
-#endif
-