Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f59c5145 authored by David Vrabel's avatar David Vrabel
Browse files

x86/xen: do not use _PAGE_IOMAP in xen_remap_domain_mfn_range() 



_PAGE_IOMAP is used in xen_remap_domain_mfn_range() to prevent the
pfn_pte() call in remap_area_mfn_pte_fn() from using the p2m to translate
the MFN.  If mfn_pte() is used instead, the p2m look up is avoided and
the use of _PAGE_IOMAP is no longer needed.

Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 25b884a8

arch/x86/xen/mmu.c

+1 −3
Original line number Diff line number Diff line
@@ -2522,7 +2522,7 @@ static int remap_area_mfn_pte_fn(pte_t *ptep, pgtable_t token, 
				 unsigned long addr, void *data)

{

	struct remap_data *rmd = data;

	pte_t pte = pte_mkspecial(pfn_pte(rmd->mfn++, rmd->prot));

	pte_t pte = pte_mkspecial(mfn_pte(rmd->mfn++, rmd->prot));



	rmd->mmu_update->ptr = virt_to_machine(ptep).maddr;

	rmd->mmu_update->val = pte_val_ma(pte);
@@ -2547,8 +2547,6 @@ int xen_remap_domain_mfn_range(struct vm_area_struct *vma, 
	if (xen_feature(XENFEAT_auto_translated_physmap))

		return -EINVAL;



	prot = __pgprot(pgprot_val(prot) | _PAGE_IOMAP);



	BUG_ON(!((vma->vm_flags & (VM_PFNMAP | VM_IO)) == (VM_PFNMAP | VM_IO)));



	rmd.mfn = mfn;