Module Name: src
Committed By: riastradh
Date: Tue Jul 28 01:25:00 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c
Log Message:
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.9 -r1.10 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.9 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.10
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.9 Mon Jul 27 22:26:50 2015
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Tue Jul 28 01:25:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.9 2015/07/27 22:26:50 riastradh Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.10 2015/07/28 01:25:00 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.9 2015/07/27 22:26:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.10 2015/07/28 01:25:00 riastradh Exp $");
#include <sys/types.h>
@@ -133,8 +133,9 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
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;
}
