Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xen: support 52 bit physical addresses in pv guests

Physical addresses on processors supporting 5 level paging can be up to
52 bits wide. For a Xen pv guest running on such a machine those
physical addresses have to be supported in order to be able to use any
memory on the machine even if the guest itself does not support 5 level
paging.

So when reading/writing a MFN from/to a pte don't use the kernel's
PTE_PFN_MASK but a new XEN_PTE_MFN_MASK allowing full 40 bit wide MFNs.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

authored by

Juergen Gross and committed by
Boris Ostrovsky
6f0e8bf1 5eee149a

+12 -3
+10 -1
arch/x86/include/asm/xen/page.h
··· 26 26 phys_addr_t paddr; 27 27 } xpaddr_t; 28 28 29 + #ifdef CONFIG_X86_64 30 + #define XEN_PHYSICAL_MASK __sme_clr((1UL << 52) - 1) 31 + #else 32 + #define XEN_PHYSICAL_MASK __PHYSICAL_MASK 33 + #endif 34 + 35 + #define XEN_PTE_MFN_MASK ((pteval_t)(((signed long)PAGE_MASK) & \ 36 + XEN_PHYSICAL_MASK)) 37 + 29 38 #define XMADDR(x) ((xmaddr_t) { .maddr = (x) }) 30 39 #define XPADDR(x) ((xpaddr_t) { .paddr = (x) }) 31 40 ··· 286 277 287 278 static inline unsigned long pte_mfn(pte_t pte) 288 279 { 289 - return (pte.pte & PTE_PFN_MASK) >> PAGE_SHIFT; 280 + return (pte.pte & XEN_PTE_MFN_MASK) >> PAGE_SHIFT; 290 281 } 291 282 292 283 static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot)
+2 -2
arch/x86/xen/mmu_pv.c
··· 315 315 static pteval_t pte_mfn_to_pfn(pteval_t val) 316 316 { 317 317 if (val & _PAGE_PRESENT) { 318 - unsigned long mfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT; 318 + unsigned long mfn = (val & XEN_PTE_MFN_MASK) >> PAGE_SHIFT; 319 319 unsigned long pfn = mfn_to_pfn(mfn); 320 320 321 321 pteval_t flags = val & PTE_FLAGS_MASK; ··· 1735 1735 { 1736 1736 phys_addr_t paddr; 1737 1737 1738 - maddr &= PTE_PFN_MASK; 1738 + maddr &= XEN_PTE_MFN_MASK; 1739 1739 paddr = mfn_to_pfn(maddr >> PAGE_SHIFT) << PAGE_SHIFT; 1740 1740 1741 1741 return paddr;