Module Name: src
Committed By: snj
Date: Thu Jul 30 15:29:25 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/ttm [netbsd-7]: ttm_bo_vm.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #894):
sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revisions 1.9, 1.10
Fix error branch: ttm_bo_unreserve on failure after ttm_bo_reserve.
Tiny chance this will fix PR kern/49862 by not leaking a ww_mutex
lock.
--
ttm_bo_unreserve in case of ttm_bo_uvm_fault_idle restart.
Better chance of fixing PR kern/49862 by avoiding leaking a buffer
ww_mutex lock.
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.5 -r1.2.4.6 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2.4.5 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2.4.6
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2.4.5 Fri Nov 14 14:22:41 2014
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Thu Jul 30 15:29:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.2.4.5 2014/11/14 14:22:41 martin Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.2.4.6 2015/07/30 15:29:25 snj 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.2.4.5 2014/11/14 14:22:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.2.4.6 2015/07/30 15:29:25 snj Exp $");
#include <sys/types.h>
@@ -118,7 +118,7 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
/* drm prime buffers are not mappable. XXX Catch this earlier? */
if (bo->ttm && ISSET(bo->ttm->page_flags, TTM_PAGE_FLAG_SG)) {
ret = -EINVAL;
- goto out0;
+ goto out1;
}
/* Notify the driver of a fault if it wants. */
@@ -127,14 +127,15 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
if (ret) {
if (ret == -ERESTART)
ret = -EIO;
- goto out0;
+ goto out1;
}
}
ret = ttm_bo_uvm_fault_idle(bo, ufi);
if (ret) {
- /* Unlocks if it restarts. */
KASSERT(ret == -ERESTART);
+ /* ttm_bo_uvm_fault_idle calls uvmfault_unlockall for us. */
+ ttm_bo_unreserve(bo);
/* XXX errno Linux->NetBSD */
return -ret;
}
