[src/trunk]: src/sys/external/bsd/drm2/ttm Simplify uvmfault_unlockall use in...

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

details:   https://anonhg.NetBSD.org/src/rev/fba3953c6b76
branches:  trunk
changeset: 333481:fba3953c6b76
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Nov 05 14:47:16 2014 +0000

description:
Simplify uvmfault_unlockall use in ttm_bo_uvm_fault.

Pass NULL for uobj instead of locking uobj->vmobjlock before calling
uvmfault_unlockall.

Should fix lockdebug unlocking-unlocked-mutex crash in
ttm_bo_uvm_fault_idle.

XXX pullup to netbsd-7

diffstat:

 sys/external/bsd/drm2/ttm/ttm_bo_vm.c |  17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diffs (64 lines):

diff -r 30ea42705670 -r fba3953c6b76 sys/external/bsd/drm2/ttm/ttm_bo_vm.c
--- a/sys/external/bsd/drm2/ttm/ttm_bo_vm.c     Wed Nov 05 14:30:00 2014 +0000
+++ b/sys/external/bsd/drm2/ttm/ttm_bo_vm.c     Wed Nov 05 14:47:16 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ttm_bo_vm.c,v 1.5 2014/09/10 18:24:16 riastradh Exp $  */
+/*     $NetBSD: ttm_bo_vm.c,v 1.6 2014/11/05 14:47:16 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.5 2014/09/10 18:24:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.6 2014/11/05 14:47:16 riastradh Exp $");
 
 #include <sys/types.h>
 
@@ -45,7 +45,7 @@
 #include <ttm/ttm_bo_driver.h>
 
 static int     ttm_bo_uvm_fault_idle(struct ttm_buffer_object *,
-                   struct uvm_faultinfo *, struct uvm_object *);
+                   struct uvm_faultinfo *);
 static int     ttm_bo_uvm_lookup(struct ttm_bo_device *, unsigned long,
                    unsigned long, struct ttm_buffer_object **);
 
@@ -111,8 +111,7 @@
                 * relocking uobj's vmobjlock first), wait for it, and
                 * start over.
                 */
-               mutex_enter(uobj->vmobjlock);
-               uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
+               uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, NULL);
                (void)ttm_bo_wait_unreserved(bo);
                return -ERESTART;
        }
@@ -204,15 +203,13 @@
 out3:  pmap_update(ufi->orig_map->pmap);
 out2:  ttm_mem_io_unlock(man);
 out1:  ttm_bo_unreserve(bo);
-out0:  mutex_enter(uobj->vmobjlock);
-       uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
+out0:  uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, NULL);
        /* XXX errno Linux->NetBSD */
        return -ret;
 }
 
 static int
-ttm_bo_uvm_fault_idle(struct ttm_buffer_object *bo, struct uvm_faultinfo *ufi,
-    struct uvm_object *uobj)
+ttm_bo_uvm_fault_idle(struct ttm_buffer_object *bo, struct uvm_faultinfo *ufi)
 {
        struct ttm_bo_device *const bdev = bo->bdev;
        int ret = 0;
@@ -224,7 +221,7 @@
        if (ttm_bo_wait(bo, false, false, true) == 0)
                goto out;
 
-       uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
+       uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, NULL);
        (void)ttm_bo_wait(bo, false, true, false);
        ret = -ERESTART;