Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus-5.9b-rc9-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fix from Juergen Gross:
"One fix for a regression when booting as a Xen guest on ARM64
introduced probably during the 5.9 cycle. It is very low risk as it is
modifying Xen specific code only.
The exact commit introducing the bug hasn't been identified yet, but
everything was fine in 5.8 and only in 5.9 some configurations started
to fail"
* tag 'for-linus-5.9b-rc9-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
arm/arm64: xen: Fix to convert percpu address to gfn correctly
+4
-1
+1
-1
arch/arm/xen/enlighten.c
+1
-1
arch/arm/xen/enlighten.c
···
150
150
pr_info("Xen: initializing cpu%d\n", cpu);
151
151
vcpup = per_cpu_ptr(xen_vcpu_info, cpu);
152
152
153
-
info.mfn = virt_to_gfn(vcpup);
153
+
info.mfn = percpu_to_gfn(vcpup);
154
154
info.offset = xen_offset_in_page(vcpup);
155
155
156
156
err = HYPERVISOR_vcpu_op(VCPUOP_register_vcpu_info, xen_vcpu_nr(cpu),
+3
include/xen/arm/page.h
+3
include/xen/arm/page.h
···
83
83
})
84
84
#define gfn_to_virt(m) (__va(gfn_to_pfn(m) << XEN_PAGE_SHIFT))
85
85
86
+
#define percpu_to_gfn(v) \
87
+
(pfn_to_gfn(per_cpu_ptr_to_phys(v) >> XEN_PAGE_SHIFT))
88
+
86
89
/* Only used in PV code. But ARM guests are always HVM. */
87
90
static inline xmaddr_t arbitrary_virt_to_machine(void *vaddr)
88
91
{