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
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
|
--- a/vmmon/Makefile
+++ b/vmmon/Makefile
@@ -43,7 +43,11 @@
endif
+ifdef KVERSION
+VM_UNAME = $(KVERSION)
+else
VM_UNAME = $(shell uname -r)
+endif
# Header directory for the running kernel
ifdef LINUXINCLUDE
--- a/vmmon/common/task.c
+++ b/vmmon/common/task.c
@@ -544,7 +544,7 @@
*-----------------------------------------------------------------------------
*/
-Selector
+static Selector
TaskGetFlatWriteableDataSegment(void)
{
DTR hostGDTR;
--- a/vmmon/common/vmx86.c
+++ b/vmmon/common/vmx86.c
@@ -53,7 +53,11 @@
#include "x86svm.h"
#include "x86cpuid_asm.h"
#if defined(__linux__)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0)
#include <asm/timex.h>
+#else
+#include <linux/timex.h>
+#endif
#endif
#include "perfctr.h"
#include "x86vtinstr.h"
@@ -699,7 +699,7 @@
*-----------------------------------------------------------------------------
*/
-void
+static void
Vmx86FreeVMDriver(VMDriver *vm)
{
Vmx86_Free(vm->ptRootMpns);
@@ -732,7 +732,7 @@
*-----------------------------------------------------------------------------
*/
-VMDriver *
+static VMDriver *
Vmx86AllocVMDriver(uint32 numVCPUs)
{
VMDriver *vm = Vmx86_Calloc(1, sizeof *vm, TRUE);
--- a/vmmon/include/pgtbl.h
+++ b/vmmon/include/pgtbl.h
@@ -91,7 +91,11 @@
} else {
pte_t *pte;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,5,0)
+ pte = pte_offset_kernel(pmd, addr);
+#else
pte = pte_offset_map(pmd, addr);
+#endif
if (pte_present(*pte) == 0) {
pte_unmap(pte);
return INVALID_MPN;
--- a/vmmon/include/vm_assert.h
+++ b/vmmon/include/vm_assert.h
@@ -40,7 +40,11 @@
// XXX not necessary except some places include vm_assert.h improperly
#include "vm_basic_types.h"
+
+/* No stdarg.h on Linux kernels 5.15+ */
+#ifndef KBUILD_MODNAME
#include <stdarg.h>
+#endif
#ifdef __cplusplus
extern "C" {
--- a/vmmon/include/vm_basic_defs.h
+++ b/vmmon/include/vm_basic_defs.h
@@ -50,7 +50,10 @@
* References:
* C90 7.17, C99 7.19, C11 7.19
*/
-#if !defined(VMKERNEL)
+/* Use linux/stddef.h when building Linux kernel modules. */
+#ifdef KBUILD_MODNAME
+# include <linux/stddef.h>
+#elif !defined(VMKERNEL)
# include <stddef.h>
#else
/*
--- a/vmmon/linux/driver.c
+++ b/vmmon/linux/driver.c
@@ -256,7 +256,7 @@
/*
*----------------------------------------------------------------------
*
- * init_module --
+ * LinuxDriverInit --
*
* linux module entry point. Called by /sbin/insmod command
*
@@ -267,8 +267,8 @@
*----------------------------------------------------------------------
*/
-int
-init_module(void)
+static int
+LinuxDriverInit(void)
{
int retval;
@@ -328,7 +328,7 @@
/*
*----------------------------------------------------------------------
*
- * cleanup_module --
+ * LinuxDriverExit --
*
* Called by /sbin/rmmod
*
@@ -336,8 +336,8 @@
*----------------------------------------------------------------------
*/
-void
-cleanup_module(void)
+static void
+LinuxDriverExit(void)
{
/*
* XXX smp race?
@@ -1450,3 +1450,5 @@
* by default (i.e., neither mkinitrd nor modprobe will accept it).
*/
MODULE_INFO(supported, "external");
+module_init(LinuxDriverInit);
+module_exit(LinuxDriverExit);
--- a/vmmon/linux/hostif.c
+++ b/vmmon/linux/hostif.c
@@ -2356,7 +2332,11 @@
int ret;
r = APICR_TO_ADDR(r, APICR_VERSION);
-#ifdef HAVE_GET_KERNEL_NOFAULT
+#if defined(HAVE_GET_KERNEL_NOFAULT) || LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)
+ /*
+ * Exists from 5.10, first indicated by HAVE_GET_KERNEL_NOFAULT,
+ * and from post-5.17 just existing everywhere.
+ */
ret = get_kernel_nofault(dummy, (void *)r);
#else
{
@@ -2940,7 +2944,7 @@
*-----------------------------------------------------------------------------
*/
-Bool
+static Bool
HostIFCheckTrackedMPN(VMDriver *vm, // IN: The VM instance
MPN mpn) // IN: The MPN
{
@@ -3060,7 +3064,7 @@
*----------------------------------------------------------------------
*/
-int
+static int
HostIFWritePhysicalWork(MA ma, // MA to be written to
VA64 addr, // src data to write
Bool kernelBuffer, // is the buffer in kernel space?
@@ -3219,7 +3223,7 @@
*----------------------------------------------------------------------
*/
-int
+static int
HostIFStartTimer(Bool rateChanged, //IN: Did rate change?
unsigned int rate) //IN: current clock rate
{
From 4c2a103fd2d71f2084f1fe7ceacb816b9832ffa2 Mon Sep 17 00:00:00 2001
From: Michal Kubecek <mkubecek@suse.cz>
Date: Sun, 22 Oct 2023 23:24:05 +0200
Subject: [PATCH] vmmon: use get_user_pages to get page PFN
As a side effect of mainline commit 0d940a9b270b ("mm/pgtable: allow
pte_offset_map[_lock]() to fail") in 6.5-rc1, __pte_offset_map(), called by
pte_offset_map(), is no longer exported. WMware developers decided to hack
around this by replacing pte_offset_map() by pte_offset_kernel() which does
not seem to be a good idea and apparently may trigger warn checks in RCU
code on some systems as mentioned in the discussion on issue #223.
Therefore let's use the same solution as we had for 17.0.2 and older
versions as it does not show these problems.
Based on an upstream IRC discussion and the hva_to_pfn_*() family of
functions in KVM code, what PgtblVa2MPNLocked() does seems to be an
incomplete and partial open coded logic of get_user_pages() and as it is
only used to get PFN from a virtual address, it can be easily implemented
using get_user_pages() family.
Without knowledge what exactly are the PFNs used for in VMware, it is hard
to guess the right flags, these seem to work and have been tested by
multiple users over last few weeks.
We could likely use get_user_pages() also on older kernels and it might be
actually cleaner and more reliable as existing open coded implementation
does not seem to handle some corner cases but without knowledge of VMware
internals, it will be safer to stick to existing code where possible.
---
vmmon-only/include/pgtbl.h | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/vmmon-only/include/pgtbl.h b/vmmon-only/include/pgtbl.h
index 3f43c62..7eaa49a 100644
--- a/vmmon-only/include/pgtbl.h
+++ b/vmmon-only/include/pgtbl.h
@@ -25,6 +25,7 @@
#include "compat_pgtable.h"
#include "compat_spinlock.h"
#include "compat_page.h"
+#include "compat_version.h"
/*
@@ -45,6 +46,7 @@
*-----------------------------------------------------------------------------
*/
+#if COMPAT_LINUX_VERSION_CHECK_LT(6, 5, 0) // only used by PgtblVa2MPN() below
static INLINE MPN
PgtblVa2MPNLocked(struct mm_struct *mm, // IN: Mm structure of a process
VA addr) // IN: Address in the virtual address
@@ -110,6 +112,7 @@ PgtblVa2MPNLocked(struct mm_struct *mm, // IN: Mm structure of a process
}
return mpn;
}
+#endif
/*
@@ -129,6 +132,8 @@ PgtblVa2MPNLocked(struct mm_struct *mm, // IN: Mm structure of a process
*-----------------------------------------------------------------------------
*/
+#if COMPAT_LINUX_VERSION_CHECK_LT(6, 5, 0)
+
static INLINE MPN
PgtblVa2MPN(VA addr) // IN
{
@@ -143,4 +148,24 @@ PgtblVa2MPN(VA addr) // IN
return mpn;
}
+#else /* COMPAT_LINUX_VERSION_CHECK_LT(6, 5, 0) */
+
+static INLINE MPN
+PgtblVa2MPN(VA addr) // IN
+{
+ struct page *page;
+ int npages;
+ MPN mpn;
+
+ npages = get_user_pages_unlocked(addr, 1, &page, FOLL_HWPOISON);
+ if (npages != 1)
+ return INVALID_MPN;
+ mpn = page_to_pfn(page);
+ put_page(page);
+
+ return mpn;
+}
+
+#endif /* COMPAT_LINUX_VERSION_CHECK_LT(6, 5, 0) */
+
#endif /* __PGTBL_H__ */
|