xen: adjust early dom0 p2m handling to xen hypervisor behavior
Subsystems (2)
Juergen Gross
maintainerPATCH 1/1 xen: adjust early dom0 p2m handling to xen hypervisor behavior
When booted as pv-guest the p2m list presented by the Xen is already mapped to virtual addresses. In dom0 case the hypervisor might make use of 2M- or 1G-pages for this mapping. Unfortunately while being properly aligned in virtual and machine address space, those pages might not be aligned properly in guest physical address space.
So when trying to obtain the guest physical address of such a page pud_pfn() and pmd_pfn() must be avoided as those will mask away guest physical address bits not being zero in this special case.
--- arch/x86/xen/mmu_pv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/xen/mmu_pv.c +4 -3
@@ -2025,7 +2025,8 @@ static unsigned long __init xen_read_phys_ulong(phys_addr_t addr)/* * Translate a virtual address to a physical one without relying on mapped -* page tables. +* page tables. Don't rely on big pages being aligned in (guest) physical +* space! */ static phys_addr_t __init xen_early_virt_to_phys (unsigned long vaddr) {
@@ -2046,7 +2047,7 @@ static phys_addr_t __init xen_early_virt_to_phys(unsigned long vaddr) sizeof(pud)));if (!pud_present (pud))return 0 ; - pa =pud_pfn (pud) <<PAGE_SHIFT ; + pa =pud_val (pud) &PTE_PFN_MASK ;if (pud_large (pud))return pa + (vaddr & ~PUD_MASK );
@@ -2054,7 +2055,7 @@ static phys_addr_t __init xen_early_virt_to_phys(unsigned long vaddr) sizeof(pmd)));if (!pmd_present (pmd))return 0 ; - pa =pmd_pfn (pmd) <<PAGE_SHIFT ; + pa =pmd_val (pmd) &PTE_PFN_MASK ;if (pmd_large (pmd))return pa + (vaddr & ~PMD_MASK );
Signature · 1 line
2.12.0
Quoted 7 lines
Quoted 1 line
Quoted 1 line · On 10.05.17 at 06:08, <[email protected]> wrote:
When booted as pv-guest the p2m list presented by the Xen is already mapped to virtual addresses. In dom0 case the hypervisor might make use of 2M- or 1G-pages for this mapping. Unfortunately while being properly aligned in virtual and machine address space, those pages might not be aligned properly in guest physical address space.
Quoted 5 lines
So when trying to obtain the guest physical address of such a page
pud_pfn()andpmd_pfn()must be avoided as those will mask away guest physical address bits not being zero in this special case.Signed-off-by Juergen Gross <[email protected]>
Perhaps worth Cc-ing stable@ ?
Jan
Juergen Gross
maintainerQuoted 11 lines · Jan Beulich
Quoted 11 lines
Quoted 1 line
Quoted 1 line · On 10.05.17 at 06:08, <[email protected]> wrote:
When booted as pv-guest the p2m list presented by the Xen is already mapped to virtual addresses. In dom0 case the hypervisor might make use of 2M- or 1G-pages for this mapping. Unfortunately while being properly aligned in virtual and machine address space, those pages might not be aligned properly in guest physical address space.
So when trying to obtain the guest physical address of such a page
pud_pfn()andpmd_pfn()must be avoided as those will mask away guest physical address bits not being zero in this special case.
Quoted 5 lines
Quoted 1 line
Signed-off-by Juergen Gross <[email protected]>Reviewed-by Jan Beulich <[email protected]>Perhaps worth Cc-ing stable@ ?
Any backport needs to be done manually, as mmu_pv.c has been introduced in 4.12 only.
As soon as the patch is upstream I'm planning to do that (trivial) backport and send it to stable.
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
Juergen Gross
maintainerQuoted 11 lines · Jan Beulich
Quoted 11 lines
Quoted 1 line
Quoted 1 line · On 10.05.17 at 06:08, <[email protected]> wrote:
When booted as pv-guest the p2m list presented by the Xen is already mapped to virtual addresses. In dom0 case the hypervisor might make use of 2M- or 1G-pages for this mapping. Unfortunately while being properly aligned in virtual and machine address space, those pages might not be aligned properly in guest physical address space.
So when trying to obtain the guest physical address of such a page
pud_pfn()andpmd_pfn()must be avoided as those will mask away guest physical address bits not being zero in this special case.
Quoted 5 lines
Quoted 1 line
Signed-off-by Juergen Gross <[email protected]>Reviewed-by Jan Beulich <[email protected]>Perhaps worth Cc-ing stable@ ?
Any backport needs to be done manually, as mmu_pv.c has been introduced in 4.12 only.
As soon as the patch is upstream I'm planning to do that (trivial) backport and send it to stable.
Juergen
Quoted 7 lines
Quoted 1 line
Quoted 1 line · On 10.05.17 at 06:08, <[email protected]> wrote:
When booted as pv-guest the p2m list presented by the Xen is already mapped to virtual addresses. In dom0 case the hypervisor might make use of 2M- or 1G-pages for this mapping. Unfortunately while being properly aligned in virtual and machine address space, those pages might not be aligned properly in guest physical address space.
Quoted 5 lines
So when trying to obtain the guest physical address of such a page
pud_pfn()andpmd_pfn()must be avoided as those will mask away guest physical address bits not being zero in this special case.Signed-off-by Juergen Gross <[email protected]>
Perhaps worth Cc-ing stable@ ?
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
Boris Ostrovsky
reviewerQuoted 5 lines · Juergen Gross
When booted as pv-guest the p2m list presented by the Xen is already mapped to virtual addresses. In dom0 case the hypervisor might make use of 2M- or 1G-pages for this mapping. Unfortunately while being properly aligned in virtual and machine address space, those pages might not be aligned properly in guest physical address space.
Is this the only place where we shouldn't assume that large page is properly aligned (in pfn space)?
-boris
Quoted 34 lines
So when trying to obtain the guest physical address of such a page
pud_pfn()andpmd_pfn()must be avoided as those will mask away guest physical address bits not being zero in this special case.Signed-off-by Juergen Gross <[email protected]>--- arch/x86/xen/mmu_pv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)arch/x86/xen/mmu_pv.c +3
-2@@ -2025,7 +2025,8 @@ static unsigned long __init xen_read_phys_ulong(phys_addr_t addr)/* * Translate a virtual address to a physical one without relying on mapped -* page tables. +* page tables. Don't rely on big pages being aligned in (guest) physical +* space! */ static phys_addr_t __init xen_early_virt_to_phys (unsigned long vaddr) {@@ -2046,7 +2047,7 @@ static phys_addr_t __init xen_early_virt_to_phys(unsigned long vaddr) sizeof(pud)));if (!pud_present (pud))return 0 ; - pa =pud_pfn (pud) <<PAGE_SHIFT ; + pa =pud_val (pud) &PTE_PFN_MASK ;if (pud_large (pud))return pa + (vaddr & ~PUD_MASK );
arch/x86/xen/mmu_pv.c static phys_addr_t __init xen_early_virt_to_phys(unsigned long vaddr) · line 2061
Quoted 8 lines
arch/x86/xen/mmu_pv.c +1
-1@@ -2054,7 +2055,7 @@ static phys_addr_t __init xen_early_virt_to_phys(unsigned long vaddr) sizeof(pmd)));if (!pmd_present (pmd))return 0 ; - pa =pmd_pfn (pmd) <<PAGE_SHIFT ; + pa =pmd_val (pmd) &PTE_PFN_MASK ;if (pmd_large (pmd))return pa + (vaddr & ~PMD_MASK );
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
Boris Ostrovsky
reviewerQuoted 5 lines · Juergen Gross
When booted as pv-guest the p2m list presented by the Xen is already mapped to virtual addresses. In dom0 case the hypervisor might make use of 2M- or 1G-pages for this mapping. Unfortunately while being properly aligned in virtual and machine address space, those pages might not be aligned properly in guest physical address space.
Is this the only place where we shouldn't assume that large page is properly aligned (in pfn space)?
-boris
Quoted 42 lines
So when trying to obtain the guest physical address of such a page
pud_pfn()andpmd_pfn()must be avoided as those will mask away guest physical address bits not being zero in this special case.Signed-off-by Juergen Gross <[email protected]>--- arch/x86/xen/mmu_pv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)arch/x86/xen/mmu_pv.c +4
-3@@ -2025,7 +2025,8 @@ static unsigned long __init xen_read_phys_ulong(phys_addr_t addr)/* * Translate a virtual address to a physical one without relying on mapped -* page tables. +* page tables. Don't rely on big pages being aligned in (guest) physical +* space! */ static phys_addr_t __init xen_early_virt_to_phys (unsigned long vaddr) {@@ -2046,7 +2047,7 @@ static phys_addr_t __init xen_early_virt_to_phys(unsigned long vaddr) sizeof(pud)));if (!pud_present (pud))return 0 ; - pa =pud_pfn (pud) <<PAGE_SHIFT ; + pa =pud_val (pud) &PTE_PFN_MASK ;if (pud_large (pud))return pa + (vaddr & ~PUD_MASK );@@ -2054,7 +2055,7 @@ static phys_addr_t __init xen_early_virt_to_phys(unsigned long vaddr) sizeof(pmd)));if (!pmd_present (pmd))return 0 ; - pa =pmd_pfn (pmd) <<PAGE_SHIFT ; + pa =pmd_val (pmd) &PTE_PFN_MASK ;if (pmd_large (pmd))return pa + (vaddr & ~PMD_MASK );
Juergen Gross
maintainerQuoted 9 lines · Boris Ostrovsky
Quoted 5 lines · Juergen Gross
When booted as pv-guest the p2m list presented by the Xen is already mapped to virtual addresses. In dom0 case the hypervisor might make use of 2M- or 1G-pages for this mapping. Unfortunately while being properly aligned in virtual and machine address space, those pages might not be aligned properly in guest physical address space.
Is this the only place where we shouldn't assume that large page is properly aligned (in pfn space)?
It is the only case requiring a change. xen_cleanmfnmap_*() already does this correctly via the same mechanism I used in this patch.
I'm not aware of any other large pages set up by Xen for pv guests than the ones for the initial p2m list. And these large pages are freed (via xen_cleanmfnmap_*()) after setting up the final p2m list in kernel virtual space.
Juergen
Juergen Gross
maintainerQuoted 9 lines · Boris Ostrovsky
Quoted 5 lines · Juergen Gross
When booted as pv-guest the p2m list presented by the Xen is already mapped to virtual addresses. In dom0 case the hypervisor might make use of 2M- or 1G-pages for this mapping. Unfortunately while being properly aligned in virtual and machine address space, those pages might not be aligned properly in guest physical address space.
Is this the only place where we shouldn't assume that large page is properly aligned (in pfn space)?
It is the only case requiring a change. xen_cleanmfnmap_*() already does this correctly via the same mechanism I used in this patch.
I'm not aware of any other large pages set up by Xen for pv guests than the ones for the initial p2m list. And these large pages are freed (via xen_cleanmfnmap_*()) after setting up the final p2m list in kernel virtual space.
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel