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

Commit e060e7af authored by Stefano Stabellini's avatar Stefano Stabellini Committed by Jeremy Fitzhardinge
Browse files

xen: set vma flag VM_PFNMAP in the privcmd mmap file_op 



Set VM_PFNMAP in the privcmd mmap file_op, rather than later in
xen_remap_domain_mfn_range when it is too late because
vma_wants_writenotify has already been called and vm_page_prot has
already been modified.

Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
parent 313e7441

arch/x86/xen/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -2299,7 +2299,8 @@ int xen_remap_domain_mfn_range(struct vm_area_struct *vma, 


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



	vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;

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

				(VM_PFNMAP | VM_RESERVED | VM_IO)));



	rmd.mfn = mfn;

	rmd.prot = prot;

drivers/xen/xenfs/privcmd.c

+3 −2
Original line number Diff line number Diff line
@@ -380,8 +380,9 @@ static int privcmd_mmap(struct file *file, struct vm_area_struct *vma) 
	if (xen_feature(XENFEAT_auto_translated_physmap))

		return -ENOSYS;



	/* DONTCOPY is essential for Xen as copy_page_range is broken. */

	vma->vm_flags |= VM_RESERVED | VM_IO | VM_DONTCOPY;

	/* DONTCOPY is essential for Xen because copy_page_range doesn't know

	 * how to recreate these mappings */

	vma->vm_flags |= VM_RESERVED | VM_IO | VM_DONTCOPY | VM_PFNMAP;

	vma->vm_ops = &privcmd_vm_ops;

	vma->vm_private_data = NULL;