Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:08:46 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c
Log Message:
i915: Release vmobjlock on fault.
We need to take this later, but it's not helpful for uvm_fault to
have taken it immediately prior to calling pgo_fault -- still not
clear on why uvm_fault does that.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.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/dist/drm/i915/gem/i915_gem_mman.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.16 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.17
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.16 Sun Dec 19 12:08:36 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c Sun Dec 19 12:08:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_mman.c,v 1.16 2021/12/19 12:08:36 riastradh Exp $ */
+/* $NetBSD: i915_gem_mman.c,v 1.17 2021/12/19 12:08:46 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.16 2021/12/19 12:08:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.17 2021/12/19 12:08:46 riastradh Exp $");
#include <linux/anon_inodes.h>
#include <linux/mman.h>
@@ -567,6 +567,13 @@ i915_gem_fault(struct uvm_faultinfo *ufi
KASSERT(i915_gem_object_type_has(obj,
I915_GEM_OBJECT_HAS_STRUCT_PAGE));
+ /*
+ * The lock isn't actually helpful for us and the caller in
+ * uvm_fault only just acquired it anyway so no important
+ * invariants are implied by it.
+ */
+ rw_exit(obj->base.filp->vmobjlock);
+
KASSERT(ufi->entry->start <= vaddr);
KASSERT((ufi->entry->offset & (PAGE_SIZE - 1)) == 0);
uoffset = ufi->entry->offset + (vaddr - ufi->entry->start);
@@ -630,7 +637,7 @@ i915_gem_fault(struct uvm_faultinfo *ufi
out: if (pinned)
i915_gem_object_unpin_pages(obj);
- uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
+ uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, NULL);
/*
* Remap EINTR to success, so that we return to userland.
