debug lk

hc

2024-02-20 e636c8d336489bf3eed5878299e6cc045bbad077

 kernel/include/xen/arm/page.h
..
..
@@ -3,11 +3,11 @@
3
3
 #define _ASM_ARM_XEN_PAGE_H
4
4
 
5
5
 #include <asm/page.h>
6
-#include <asm/pgtable.h>
7
6
 
8
7
 #include <linux/pfn.h>
9
8
 #include <linux/types.h>
10
9
 #include <linux/dma-mapping.h>
10
+#include <linux/pgtable.h>
11
11
 
12
12
 #include <xen/xen.h>
13
13
 #include <xen/interface/grant_table.h>
..
..
@@ -76,9 +76,16 @@
76
76
 #define bfn_to_local_pfn(bfn)	bfn_to_pfn(bfn)
77
77
 
78
78
 /* VIRT <-> GUEST conversion */
79
-#define virt_to_gfn(v)		(pfn_to_gfn(virt_to_phys(v) >> XEN_PAGE_SHIFT))
79
+#define virt_to_gfn(v)                                                         \
80
+	({                                                                     \
81
+		WARN_ON_ONCE(!virt_addr_valid(v));                              \
82
+		pfn_to_gfn(virt_to_phys(v) >> XEN_PAGE_SHIFT);                 \
83
+	})
80
84
 #define gfn_to_virt(m)		(__va(gfn_to_pfn(m) << XEN_PAGE_SHIFT))
81
85
 
86
+#define percpu_to_gfn(v)	\
87
+	(pfn_to_gfn(per_cpu_ptr_to_phys(v) >> XEN_PAGE_SHIFT))
88
+
82
89
 /* Only used in PV code. But ARM guests are always HVM. */
83
90
 static inline xmaddr_t arbitrary_virt_to_machine(void *vaddr)
84
91
 {