]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
xen: set vma flag VM_PFNMAP in the privcmd mmap file_op
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Thu, 11 Nov 2010 20:37:43 +0000 (12:37 -0800)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Thu, 11 Nov 2010 20:37:43 +0000 (12:37 -0800)
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: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
arch/x86/xen/mmu.c
drivers/xen/xenfs/privcmd.c

index f08ea045620fe17e4116bec59223d2f1662a31a0..792de4349c79c5b8e4078e8b0a2b31d823d6f995 100644 (file)
@@ -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;
index 2eb04c842511e2506cc468bc34e5f8d0228a9222..88474d460d82fdba45474d5c4b58706b61e047ae 100644 (file)
@@ -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;