1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
--- vmmon-only/linux/hostif.c
+++ vmmon-only/linux/hostif.c
@@ -99,6 +99,37 @@
#include "vmmonInt.h"
#include "versioned_atomic.h"
+#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
+}
+
/*
* Determine if we can use high resolution timers.
*/
@@ -1594,16 +1625,11 @@ 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_page_state(NR_PAGETABLE) +
- global_page_state(NR_SLAB_UNRECLAIMABLE) +
- global_page_state(NR_UNEVICTABLE) +
+ unsigned int lockedPages = global_zone_page_state(NR_PAGETABLE) +
+ get_nr_slab_unreclaimable() +
+ get_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 anonPages = get_nr_anon_mapped();
unsigned int swapPages = BYTES_2_PAGES(linuxState.swapSize);
if (anonPages > swapPages) {
|