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.
vmnet: use standard definition of PCI_VENDOR_ID_VMWARE if available
2017-09-30 21:06:36 +02:00 · 2017-09-30 21:06:36 +02:00 · 2017-09-30 21:05:11 +02:00 · 2017-06-23 09:12:56 +02:00 · 2017-05-31 10:17:49 +02:00 · 2017-05-31 09:36:09 +02:00
4 changed files with 10 additions and 48 deletions
@@ -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);
@@ -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
@@ -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



@@ -79,37 +79,6 @@
 #error CONFIG_HIGH_RES_TIMERS required for acceptable performance
 #endif

-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
-#   define global_zone_page_state global_page_state
-#endif
-
-static unsigned long get_nr_slab_unreclaimable(void)
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0)
-   return global_node_page_state(NR_SLAB_UNRECLAIMABLE);
-#else
-   return global_page_state(NR_SLAB_UNRECLAIMABLE);
-#endif
-}
-
-static unsigned long get_nr_unevictable(void)
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-   return global_node_page_state(NR_UNEVICTABLE);
-#else
-   return global_page_state(NR_UNEVICTABLE);
-#endif
-}
-
-static unsigned long get_nr_anon_mapped(void)
-{
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-   return global_node_page_state(NR_ANON_MAPPED);
- #else
-   return global_page_state(NR_ANON_PAGES);
- #endif
-}
-
 /*
 * Although this is not really related to kernel-compatibility, I put this
 * helper macro here for now for a lack of better place --hpreg
@@ -1547,11 +1516,16 @@ 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 = global_zone_page_state(NR_PAGETABLE) +
-                              get_nr_slab_unreclaimable() +
-                              get_nr_unevictable() +
+   unsigned int lockedPages = global_page_state(NR_PAGETABLE) +
+                              global_page_state(NR_SLAB_UNRECLAIMABLE) +
+                              global_page_state(NR_UNEVICTABLE) +
                              hugePages + reservedPages;
-   unsigned int anonPages = get_nr_anon_mapped();
+   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);

   if (anonPages > swapPages) {
Author	SHA1	Message	Date
Michal Kubecek	7cb0c3beb4	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.	2017-09-30 21:06:36 +02:00
Michal Kubecek	4d80590924	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.	2017-09-30 21:06:36 +02:00
Michal Kubecek	e4df7e3461	import Workstation 14.0.0 module sources	2017-09-30 21:05:11 +02:00
Michal Kubecek	2bd541e265	import Workstation 12.5.7 module sources	2017-06-23 09:12:56 +02:00
Michal Kubecek	2a214307b9	import Workstation 12.5.6 module sources	2017-05-31 10:17:49 +02:00
Michal Kubecek	755b521dd1	import Workstation 12.5.5 module sources	2017-05-31 09:36:09 +02:00