[src/trunk]: src/sys/arch/xen/xen use UVM_FLAG_UNMAP instead of unmapping sep...

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5b8cb2966008
branches:  trunk
changeset: 354607:5b8cb2966008
user:      chs <chs%NetBSD.org@localhost>
date:      Thu Jun 22 22:36:50 2017 +0000

description:
use UVM_FLAG_UNMAP instead of unmapping separately.

diffstat:

 sys/arch/xen/xen/privcmd.c |  26 ++++++--------------------
 1 files changed, 6 insertions(+), 20 deletions(-)

diffs (57 lines):

diff -r fa05f0f69612 -r 5b8cb2966008 sys/arch/xen/xen/privcmd.c
--- a/sys/arch/xen/xen/privcmd.c        Thu Jun 22 20:11:17 2017 +0000
+++ b/sys/arch/xen/xen/privcmd.c        Thu Jun 22 22:36:50 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: privcmd.c,v 1.50 2017/06/01 02:45:08 chs Exp $ */
+/* $NetBSD: privcmd.c,v 1.51 2017/06/22 22:36:50 chs Exp $ */
 
 /*-
  * Copyright (c) 2004 Christian Limpach.
@@ -27,7 +27,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: privcmd.c,v 1.50 2017/06/01 02:45:08 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: privcmd.c,v 1.51 2017/06/22 22:36:50 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -546,34 +546,20 @@
                return EINVAL;
        }
        vm_map_unlock_read(map);
-       /* remove current entries */
-       uvm_unmap1(map, start, start + size, 0);
 
        obj = kmem_alloc(sizeof(*obj), KM_SLEEP);
        privcmd_nobjects++;
        uvm_obj_init(&obj->uobj, &privpgops, true, 1);
-       mutex_enter(obj->uobj.vmobjlock);
        obj->maddr = maddr;
        obj->npages = npages;
        obj->domid = domid;
-       mutex_exit(obj->uobj.vmobjlock);
        uvmflag = UVM_MAPFLAG(prot, prot, UVM_INH_NONE, UVM_ADV_NORMAL,
-           UVM_FLAG_FIXED | UVM_FLAG_NOMERGE);
+           UVM_FLAG_FIXED | UVM_FLAG_UNMAP | UVM_FLAG_NOMERGE);
        error = uvm_map(map, &newstart, size, &obj->uobj, 0, 0, uvmflag);
 
-       if (error) {
-               if (obj)
-                       obj->uobj.pgops->pgo_detach(&obj->uobj);
-               return error;
-       }
-       if (newstart != start) {
-               printf("uvm_map didn't give us back our vm space\n");
-               uvm_unmap1(map, newstart, newstart + size, 0);
-               if (obj)
-                       obj->uobj.pgops->pgo_detach(&obj->uobj);
-               return EINVAL;
-       }
-       return 0;
+       if (error)
+               obj->uobj.pgops->pgo_detach(&obj->uobj);
+       return error;
 }
 
 static const struct kernfs_fileop privcmd_fileops[] = {