2016-11-11 17:43:54 +07:00
|
|
|
/*
|
|
|
|
* Copyright © 2016 Intel Corporation
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
* Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
|
|
* IN THE SOFTWARE.
|
|
|
|
*
|
|
|
|
*/
|
2018-06-28 20:22:06 +07:00
|
|
|
|
2019-07-03 16:17:19 +07:00
|
|
|
#include <linux/sched/mm.h>
|
2019-06-13 15:44:16 +07:00
|
|
|
#include <drm/drm_gem.h>
|
2019-04-25 00:48:39 +07:00
|
|
|
|
2019-06-13 15:44:16 +07:00
|
|
|
#include "display/intel_frontbuffer.h"
|
|
|
|
|
|
|
|
#include "gt/intel_engine.h"
|
2019-12-05 18:37:25 +07:00
|
|
|
#include "gt/intel_engine_heartbeat.h"
|
2019-06-21 14:08:01 +07:00
|
|
|
#include "gt/intel_gt.h"
|
2019-12-05 18:37:25 +07:00
|
|
|
#include "gt/intel_gt_requests.h"
|
2016-11-11 17:43:54 +07:00
|
|
|
|
|
|
|
#include "i915_drv.h"
|
2019-03-06 04:38:30 +07:00
|
|
|
#include "i915_globals.h"
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
#include "i915_sw_fence_work.h"
|
2019-08-06 17:07:28 +07:00
|
|
|
#include "i915_trace.h"
|
2019-06-13 15:44:16 +07:00
|
|
|
#include "i915_vma.h"
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2019-02-28 17:20:34 +07:00
|
|
|
static struct i915_global_vma {
|
2019-03-06 04:38:30 +07:00
|
|
|
struct i915_global base;
|
2019-02-28 17:20:34 +07:00
|
|
|
struct kmem_cache *slab_vmas;
|
|
|
|
} global;
|
|
|
|
|
|
|
|
struct i915_vma *i915_vma_alloc(void)
|
|
|
|
{
|
|
|
|
return kmem_cache_zalloc(global.slab_vmas, GFP_KERNEL);
|
|
|
|
}
|
|
|
|
|
|
|
|
void i915_vma_free(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
return kmem_cache_free(global.slab_vmas, vma);
|
|
|
|
}
|
|
|
|
|
2018-07-06 13:53:06 +07:00
|
|
|
#if IS_ENABLED(CONFIG_DRM_I915_ERRLOG_GEM) && IS_ENABLED(CONFIG_DRM_DEBUG_MM)
|
2018-06-28 20:22:06 +07:00
|
|
|
|
|
|
|
#include <linux/stackdepot.h>
|
|
|
|
|
|
|
|
static void vma_print_allocator(struct i915_vma *vma, const char *reason)
|
|
|
|
{
|
2019-04-25 16:45:09 +07:00
|
|
|
unsigned long *entries;
|
|
|
|
unsigned int nr_entries;
|
2018-06-28 20:22:06 +07:00
|
|
|
char buf[512];
|
|
|
|
|
|
|
|
if (!vma->node.stack) {
|
|
|
|
DRM_DEBUG_DRIVER("vma.node [%08llx + %08llx] %s: unknown owner\n",
|
|
|
|
vma->node.start, vma->node.size, reason);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-04-25 16:45:09 +07:00
|
|
|
nr_entries = stack_depot_fetch(vma->node.stack, &entries);
|
|
|
|
stack_trace_snprint(buf, sizeof(buf), entries, nr_entries, 0);
|
2018-06-28 20:22:06 +07:00
|
|
|
DRM_DEBUG_DRIVER("vma.node [%08llx + %08llx] %s: inserted at %s\n",
|
|
|
|
vma->node.start, vma->node.size, reason, buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
static void vma_print_allocator(struct i915_vma *vma, const char *reason)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2019-06-22 01:38:00 +07:00
|
|
|
static inline struct i915_vma *active_to_vma(struct i915_active *ref)
|
2016-11-11 17:43:54 +07:00
|
|
|
{
|
2019-06-22 01:38:00 +07:00
|
|
|
return container_of(ref, typeof(struct i915_vma), active);
|
|
|
|
}
|
2017-11-08 05:06:56 +07:00
|
|
|
|
2019-06-22 01:38:00 +07:00
|
|
|
static int __i915_vma_active(struct i915_active *ref)
|
|
|
|
{
|
2019-08-20 17:05:31 +07:00
|
|
|
return i915_vma_tryget(active_to_vma(ref)) ? 0 : -ENOENT;
|
2019-06-22 01:38:00 +07:00
|
|
|
}
|
|
|
|
|
2019-10-04 20:39:59 +07:00
|
|
|
__i915_active_call
|
2019-06-22 01:38:00 +07:00
|
|
|
static void __i915_vma_retire(struct i915_active *ref)
|
|
|
|
{
|
|
|
|
i915_vma_put(active_to_vma(ref));
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct i915_vma *
|
2017-01-16 22:21:30 +07:00
|
|
|
vma_create(struct drm_i915_gem_object *obj,
|
|
|
|
struct i915_address_space *vm,
|
|
|
|
const struct i915_ggtt_view *view)
|
2016-11-11 17:43:54 +07:00
|
|
|
{
|
|
|
|
struct i915_vma *vma;
|
|
|
|
struct rb_node *rb, **p;
|
|
|
|
|
2017-02-09 18:19:33 +07:00
|
|
|
/* The aliasing_ppgtt should never be used directly! */
|
2019-10-22 01:32:35 +07:00
|
|
|
GEM_BUG_ON(vm == &vm->gt->ggtt->alias->vm);
|
2017-02-09 18:19:33 +07:00
|
|
|
|
2019-02-28 17:20:34 +07:00
|
|
|
vma = i915_vma_alloc();
|
2016-11-11 17:43:54 +07:00
|
|
|
if (vma == NULL)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
2019-12-23 04:02:55 +07:00
|
|
|
kref_init(&vma->ref);
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
mutex_init(&vma->pages_mutex);
|
|
|
|
vma->vm = i915_vm_get(vm);
|
2018-06-07 22:40:46 +07:00
|
|
|
vma->ops = &vm->vma_ops;
|
2016-11-11 17:43:54 +07:00
|
|
|
vma->obj = obj;
|
2019-06-18 19:58:58 +07:00
|
|
|
vma->resv = obj->base.resv;
|
2016-11-11 17:43:54 +07:00
|
|
|
vma->size = obj->base.size;
|
2017-01-10 21:47:34 +07:00
|
|
|
vma->display_alignment = I915_GTT_MIN_ALIGNMENT;
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2019-10-04 20:40:00 +07:00
|
|
|
i915_active_init(&vma->active, __i915_vma_active, __i915_vma_retire);
|
2019-06-06 18:23:20 +07:00
|
|
|
|
2019-07-03 16:17:19 +07:00
|
|
|
/* Declare ourselves safe for use inside shrinkers */
|
|
|
|
if (IS_ENABLED(CONFIG_LOCKDEP)) {
|
|
|
|
fs_reclaim_acquire(GFP_KERNEL);
|
|
|
|
might_lock(&vma->active.mutex);
|
|
|
|
fs_reclaim_release(GFP_KERNEL);
|
|
|
|
}
|
|
|
|
|
2019-06-06 18:23:20 +07:00
|
|
|
INIT_LIST_HEAD(&vma->closed_link);
|
|
|
|
|
drm/i915: Pevent copying uninitialised garbage into vma->ggtt_view
Since tweaking i915_vma_compare() we allowed constructors to skip
clearing the ggtt_view believing that we didn't access the unused
members. That, as it turns out, was not entirely true. In particular,
i915_gem_fault() uses
ret = remap_io_mapping(area,
area->vm_start + (vma->ggtt_view.partial.offset << PAGE_SHIFT),
(ggtt->mappable_base + vma->node.start) >> PAGE_SHIFT,
min_t(u64, vma->size, area->vm_end - area->vm_start),
&ggtt->mappable);
i.e. the ggtt_view.partial for both normal and partial views. If we
allowed garbage into the normal vma->ggtt_view and then try userspace
tried to mmap it, we could explode in an unobvious fashion.
Fixes: 7b92c047bae2 ("drm/i915: Eliminate superfluous i915_ggtt_view_rotated")
Fixes: 3bf4d5751943 ("drm/i915: Stop clearing i915_ggtt_view")
Reported-by: Matthew Auld <matthew.william.auld@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170123145245.3972-1-chris@chris-wilson.co.uk
Tested-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
2017-01-23 21:52:45 +07:00
|
|
|
if (view && view->type != I915_GGTT_VIEW_NORMAL) {
|
2016-11-11 17:43:54 +07:00
|
|
|
vma->ggtt_view = *view;
|
|
|
|
if (view->type == I915_GGTT_VIEW_PARTIAL) {
|
2016-12-23 21:57:59 +07:00
|
|
|
GEM_BUG_ON(range_overflows_t(u64,
|
2017-01-14 07:28:25 +07:00
|
|
|
view->partial.offset,
|
|
|
|
view->partial.size,
|
2016-12-23 21:57:59 +07:00
|
|
|
obj->base.size >> PAGE_SHIFT));
|
2017-01-14 07:28:25 +07:00
|
|
|
vma->size = view->partial.size;
|
2016-11-11 17:43:54 +07:00
|
|
|
vma->size <<= PAGE_SHIFT;
|
2018-06-30 16:05:09 +07:00
|
|
|
GEM_BUG_ON(vma->size > obj->base.size);
|
2016-11-11 17:43:54 +07:00
|
|
|
} else if (view->type == I915_GGTT_VIEW_ROTATED) {
|
2017-01-14 07:28:25 +07:00
|
|
|
vma->size = intel_rotation_info_size(&view->rotated);
|
2016-11-11 17:43:54 +07:00
|
|
|
vma->size <<= PAGE_SHIFT;
|
2019-05-09 19:21:52 +07:00
|
|
|
} else if (view->type == I915_GGTT_VIEW_REMAPPED) {
|
|
|
|
vma->size = intel_remapped_info_size(&view->remapped);
|
|
|
|
vma->size <<= PAGE_SHIFT;
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-20 02:26:56 +07:00
|
|
|
if (unlikely(vma->size > vm->total))
|
|
|
|
goto err_vma;
|
|
|
|
|
2017-01-20 02:26:59 +07:00
|
|
|
GEM_BUG_ON(!IS_ALIGNED(vma->size, I915_GTT_PAGE_SIZE));
|
|
|
|
|
2020-04-22 14:28:05 +07:00
|
|
|
spin_lock(&obj->vma.lock);
|
|
|
|
|
2016-11-11 17:43:54 +07:00
|
|
|
if (i915_is_ggtt(vm)) {
|
2017-01-20 02:26:56 +07:00
|
|
|
if (unlikely(overflows_type(vma->size, u32)))
|
2020-04-22 14:28:05 +07:00
|
|
|
goto err_unlock;
|
2017-01-20 02:26:56 +07:00
|
|
|
|
2017-01-09 23:16:13 +07:00
|
|
|
vma->fence_size = i915_gem_fence_size(vm->i915, vma->size,
|
|
|
|
i915_gem_object_get_tiling(obj),
|
|
|
|
i915_gem_object_get_stride(obj));
|
2017-01-20 02:26:56 +07:00
|
|
|
if (unlikely(vma->fence_size < vma->size || /* overflow */
|
|
|
|
vma->fence_size > vm->total))
|
2020-04-22 14:28:05 +07:00
|
|
|
goto err_unlock;
|
2017-01-20 02:26:56 +07:00
|
|
|
|
2017-01-10 21:47:34 +07:00
|
|
|
GEM_BUG_ON(!IS_ALIGNED(vma->fence_size, I915_GTT_MIN_ALIGNMENT));
|
2017-01-09 23:16:11 +07:00
|
|
|
|
2017-01-09 23:16:13 +07:00
|
|
|
vma->fence_alignment = i915_gem_fence_alignment(vm->i915, vma->size,
|
|
|
|
i915_gem_object_get_tiling(obj),
|
|
|
|
i915_gem_object_get_stride(obj));
|
2017-01-09 23:16:11 +07:00
|
|
|
GEM_BUG_ON(!is_power_of_2(vma->fence_alignment));
|
|
|
|
|
2019-09-11 16:02:43 +07:00
|
|
|
__set_bit(I915_VMA_GGTT_BIT, __i915_vma_flags(vma));
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
rb = NULL;
|
2019-01-28 17:23:54 +07:00
|
|
|
p = &obj->vma.tree.rb_node;
|
2016-11-11 17:43:54 +07:00
|
|
|
while (*p) {
|
|
|
|
struct i915_vma *pos;
|
2019-01-28 17:23:54 +07:00
|
|
|
long cmp;
|
2016-11-11 17:43:54 +07:00
|
|
|
|
|
|
|
rb = *p;
|
|
|
|
pos = rb_entry(rb, struct i915_vma, obj_node);
|
2019-01-28 17:23:54 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the view already exists in the tree, another thread
|
|
|
|
* already created a matching vma, so return the older instance
|
|
|
|
* and dispose of ours.
|
|
|
|
*/
|
|
|
|
cmp = i915_vma_compare(pos, vm, view);
|
|
|
|
if (cmp == 0) {
|
|
|
|
spin_unlock(&obj->vma.lock);
|
2019-02-28 17:20:34 +07:00
|
|
|
i915_vma_free(vma);
|
2019-01-28 17:23:54 +07:00
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cmp < 0)
|
2016-11-11 17:43:54 +07:00
|
|
|
p = &rb->rb_right;
|
|
|
|
else
|
|
|
|
p = &rb->rb_left;
|
|
|
|
}
|
|
|
|
rb_link_node(&vma->obj_node, rb, p);
|
2019-01-28 17:23:54 +07:00
|
|
|
rb_insert_color(&vma->obj_node, &obj->vma.tree);
|
|
|
|
|
|
|
|
if (i915_vma_is_ggtt(vma))
|
|
|
|
/*
|
|
|
|
* We put the GGTT vma at the start of the vma-list, followed
|
|
|
|
* by the ppGGTT vma. This allows us to break early when
|
|
|
|
* iterating over only the GGTT vma for an object, see
|
|
|
|
* for_each_ggtt_vma()
|
|
|
|
*/
|
|
|
|
list_add(&vma->obj_link, &obj->vma.list);
|
|
|
|
else
|
|
|
|
list_add_tail(&vma->obj_link, &obj->vma.list);
|
|
|
|
|
|
|
|
spin_unlock(&obj->vma.lock);
|
2019-01-28 17:23:53 +07:00
|
|
|
|
2016-11-11 17:43:54 +07:00
|
|
|
return vma;
|
2017-01-20 02:26:56 +07:00
|
|
|
|
2020-04-22 14:28:05 +07:00
|
|
|
err_unlock:
|
|
|
|
spin_unlock(&obj->vma.lock);
|
2017-01-20 02:26:56 +07:00
|
|
|
err_vma:
|
2019-02-28 17:20:34 +07:00
|
|
|
i915_vma_free(vma);
|
2017-01-20 02:26:56 +07:00
|
|
|
return ERR_PTR(-E2BIG);
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
|
|
|
|
2017-01-16 22:21:31 +07:00
|
|
|
static struct i915_vma *
|
|
|
|
vma_lookup(struct drm_i915_gem_object *obj,
|
|
|
|
struct i915_address_space *vm,
|
|
|
|
const struct i915_ggtt_view *view)
|
2017-01-16 22:21:28 +07:00
|
|
|
{
|
|
|
|
struct rb_node *rb;
|
|
|
|
|
2019-01-28 17:23:54 +07:00
|
|
|
rb = obj->vma.tree.rb_node;
|
2017-01-16 22:21:28 +07:00
|
|
|
while (rb) {
|
|
|
|
struct i915_vma *vma = rb_entry(rb, struct i915_vma, obj_node);
|
|
|
|
long cmp;
|
|
|
|
|
|
|
|
cmp = i915_vma_compare(vma, vm, view);
|
|
|
|
if (cmp == 0)
|
|
|
|
return vma;
|
|
|
|
|
|
|
|
if (cmp < 0)
|
|
|
|
rb = rb->rb_right;
|
|
|
|
else
|
|
|
|
rb = rb->rb_left;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* i915_vma_instance - return the singleton instance of the VMA
|
|
|
|
* @obj: parent &struct drm_i915_gem_object to be mapped
|
|
|
|
* @vm: address space in which the mapping is located
|
|
|
|
* @view: additional mapping requirements
|
|
|
|
*
|
|
|
|
* i915_vma_instance() looks up an existing VMA of the @obj in the @vm with
|
|
|
|
* the same @view characteristics. If a match is not found, one is created.
|
|
|
|
* Once created, the VMA is kept until either the object is freed, or the
|
|
|
|
* address space is closed.
|
|
|
|
*
|
|
|
|
* Returns the vma, or an error pointer.
|
|
|
|
*/
|
|
|
|
struct i915_vma *
|
|
|
|
i915_vma_instance(struct drm_i915_gem_object *obj,
|
|
|
|
struct i915_address_space *vm,
|
|
|
|
const struct i915_ggtt_view *view)
|
|
|
|
{
|
|
|
|
struct i915_vma *vma;
|
|
|
|
|
|
|
|
GEM_BUG_ON(view && !i915_is_ggtt(vm));
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
GEM_BUG_ON(!atomic_read(&vm->open));
|
2017-01-16 22:21:28 +07:00
|
|
|
|
2019-01-28 17:23:54 +07:00
|
|
|
spin_lock(&obj->vma.lock);
|
2017-01-16 22:21:31 +07:00
|
|
|
vma = vma_lookup(obj, vm, view);
|
2019-01-28 17:23:54 +07:00
|
|
|
spin_unlock(&obj->vma.lock);
|
|
|
|
|
|
|
|
/* vma_create() will resolve the race if another creates the vma */
|
|
|
|
if (unlikely(!vma))
|
2017-01-16 22:21:30 +07:00
|
|
|
vma = vma_create(obj, vm, view);
|
2017-01-16 22:21:28 +07:00
|
|
|
|
2017-01-16 22:21:29 +07:00
|
|
|
GEM_BUG_ON(!IS_ERR(vma) && i915_vma_compare(vma, vm, view));
|
2017-01-16 22:21:28 +07:00
|
|
|
return vma;
|
|
|
|
}
|
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
struct i915_vma_work {
|
|
|
|
struct dma_fence_work base;
|
|
|
|
struct i915_vma *vma;
|
2019-12-16 23:17:16 +07:00
|
|
|
struct drm_i915_gem_object *pinned;
|
2020-01-31 01:17:10 +07:00
|
|
|
struct i915_sw_dma_fence_cb cb;
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
enum i915_cache_level cache_level;
|
|
|
|
unsigned int flags;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __vma_bind(struct dma_fence_work *work)
|
|
|
|
{
|
|
|
|
struct i915_vma_work *vw = container_of(work, typeof(*vw), base);
|
|
|
|
struct i915_vma *vma = vw->vma;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = vma->ops->bind_vma(vma, vw->cache_level, vw->flags);
|
|
|
|
if (err)
|
|
|
|
atomic_or(I915_VMA_ERROR, &vma->flags);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2019-12-16 23:17:16 +07:00
|
|
|
static void __vma_release(struct dma_fence_work *work)
|
|
|
|
{
|
|
|
|
struct i915_vma_work *vw = container_of(work, typeof(*vw), base);
|
|
|
|
|
|
|
|
if (vw->pinned)
|
|
|
|
__i915_gem_object_unpin_pages(vw->pinned);
|
|
|
|
}
|
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
static const struct dma_fence_work_ops bind_ops = {
|
|
|
|
.name = "bind",
|
|
|
|
.work = __vma_bind,
|
2019-12-16 23:17:16 +07:00
|
|
|
.release = __vma_release,
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
};
|
|
|
|
|
|
|
|
struct i915_vma_work *i915_vma_work(void)
|
|
|
|
{
|
|
|
|
struct i915_vma_work *vw;
|
|
|
|
|
|
|
|
vw = kzalloc(sizeof(*vw), GFP_KERNEL);
|
|
|
|
if (!vw)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
dma_fence_work_init(&vw->base, &bind_ops);
|
|
|
|
vw->base.dma.error = -EAGAIN; /* disable the worker by default */
|
|
|
|
|
|
|
|
return vw;
|
|
|
|
}
|
|
|
|
|
2020-01-31 01:17:10 +07:00
|
|
|
int i915_vma_wait_for_bind(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
if (rcu_access_pointer(vma->active.excl.fence)) {
|
|
|
|
struct dma_fence *fence;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
fence = dma_fence_get_rcu_safe(&vma->active.excl.fence);
|
|
|
|
rcu_read_unlock();
|
|
|
|
if (fence) {
|
|
|
|
err = dma_fence_wait(fence, MAX_SCHEDULE_TIMEOUT);
|
|
|
|
dma_fence_put(fence);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2016-11-11 17:43:54 +07:00
|
|
|
/**
|
|
|
|
* i915_vma_bind - Sets up PTEs for an VMA in it's corresponding address space.
|
|
|
|
* @vma: VMA to map
|
|
|
|
* @cache_level: mapping cache level
|
|
|
|
* @flags: flags like global or local mapping
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
* @work: preallocated worker for allocating and binding the PTE
|
2016-11-11 17:43:54 +07:00
|
|
|
*
|
|
|
|
* DMA addresses are taken from the scatter-gather table of this object (or of
|
|
|
|
* this VMA in case of non-default GGTT views) and PTE entries set up.
|
|
|
|
* Note that DMA addresses are also the only part of the SG table we care about.
|
|
|
|
*/
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
int i915_vma_bind(struct i915_vma *vma,
|
|
|
|
enum i915_cache_level cache_level,
|
|
|
|
u32 flags,
|
|
|
|
struct i915_vma_work *work)
|
2016-11-11 17:43:54 +07:00
|
|
|
{
|
|
|
|
u32 bind_flags;
|
|
|
|
u32 vma_flags;
|
|
|
|
int ret;
|
|
|
|
|
2017-02-26 01:11:21 +07:00
|
|
|
GEM_BUG_ON(!drm_mm_node_allocated(&vma->node));
|
|
|
|
GEM_BUG_ON(vma->size > vma->node.size);
|
|
|
|
|
2018-10-12 13:31:42 +07:00
|
|
|
if (GEM_DEBUG_WARN_ON(range_overflows(vma->node.start,
|
|
|
|
vma->node.size,
|
|
|
|
vma->vm->total)))
|
2017-02-26 01:11:21 +07:00
|
|
|
return -ENODEV;
|
|
|
|
|
2018-10-12 13:31:42 +07:00
|
|
|
if (GEM_DEBUG_WARN_ON(!flags))
|
2016-11-11 17:43:54 +07:00
|
|
|
return -EINVAL;
|
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
bind_flags = flags;
|
|
|
|
bind_flags &= I915_VMA_GLOBAL_BIND | I915_VMA_LOCAL_BIND;
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2019-09-11 16:02:43 +07:00
|
|
|
vma_flags = atomic_read(&vma->flags);
|
|
|
|
vma_flags &= I915_VMA_GLOBAL_BIND | I915_VMA_LOCAL_BIND;
|
2016-11-11 17:43:54 +07:00
|
|
|
if (flags & PIN_UPDATE)
|
|
|
|
bind_flags |= vma_flags;
|
|
|
|
else
|
|
|
|
bind_flags &= ~vma_flags;
|
|
|
|
if (bind_flags == 0)
|
|
|
|
return 0;
|
|
|
|
|
2017-10-07 05:18:19 +07:00
|
|
|
GEM_BUG_ON(!vma->pages);
|
|
|
|
|
2017-01-21 04:51:23 +07:00
|
|
|
trace_i915_vma_bind(vma, bind_flags);
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (work && (bind_flags & ~vma_flags) & vma->vm->bind_async_flags) {
|
2020-01-31 01:17:10 +07:00
|
|
|
struct dma_fence *prev;
|
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
work->vma = vma;
|
|
|
|
work->cache_level = cache_level;
|
|
|
|
work->flags = bind_flags | I915_VMA_ALLOC;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Note we only want to chain up to the migration fence on
|
|
|
|
* the pages (not the object itself). As we don't track that,
|
|
|
|
* yet, we have to use the exclusive fence instead.
|
|
|
|
*
|
|
|
|
* Also note that we do not want to track the async vma as
|
|
|
|
* part of the obj->resv->excl_fence as it only affects
|
|
|
|
* execution and not content or object's backing store lifetime.
|
|
|
|
*/
|
2020-01-31 01:17:10 +07:00
|
|
|
prev = i915_active_set_exclusive(&vma->active, &work->base.dma);
|
2020-02-03 16:41:47 +07:00
|
|
|
if (prev) {
|
2020-01-31 01:17:10 +07:00
|
|
|
__i915_sw_fence_await_dma_fence(&work->base.chain,
|
|
|
|
prev,
|
|
|
|
&work->cb);
|
2020-02-03 16:41:47 +07:00
|
|
|
dma_fence_put(prev);
|
|
|
|
}
|
2020-01-31 01:17:10 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
work->base.dma.error = 0; /* enable the queue_work() */
|
|
|
|
|
2019-12-16 23:17:16 +07:00
|
|
|
if (vma->obj) {
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
__i915_gem_object_pin_pages(vma->obj);
|
2019-12-16 23:17:16 +07:00
|
|
|
work->pinned = vma->obj;
|
|
|
|
}
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
} else {
|
|
|
|
ret = vma->ops->bind_vma(vma, cache_level, bind_flags);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2019-09-11 16:02:43 +07:00
|
|
|
atomic_or(bind_flags, &vma->flags);
|
2016-11-11 17:43:54 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __iomem *i915_vma_pin_iomap(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
void __iomem *ptr;
|
2017-10-09 15:43:55 +07:00
|
|
|
int err;
|
2016-11-11 17:43:54 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (GEM_WARN_ON(!i915_vma_is_map_and_fenceable(vma))) {
|
2017-10-09 15:43:55 +07:00
|
|
|
err = -ENODEV;
|
|
|
|
goto err;
|
|
|
|
}
|
2016-11-11 17:43:54 +07:00
|
|
|
|
|
|
|
GEM_BUG_ON(!i915_vma_is_ggtt(vma));
|
2019-09-11 16:02:43 +07:00
|
|
|
GEM_BUG_ON(!i915_vma_is_bound(vma, I915_VMA_GLOBAL_BIND));
|
2016-11-11 17:43:54 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
ptr = READ_ONCE(vma->iomap);
|
2016-11-11 17:43:54 +07:00
|
|
|
if (ptr == NULL) {
|
2017-12-11 22:18:20 +07:00
|
|
|
ptr = io_mapping_map_wc(&i915_vm_to_ggtt(vma->vm)->iomap,
|
2016-11-11 17:43:54 +07:00
|
|
|
vma->node.start,
|
|
|
|
vma->node.size);
|
2017-10-09 15:43:55 +07:00
|
|
|
if (ptr == NULL) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto err;
|
|
|
|
}
|
2016-11-11 17:43:54 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (unlikely(cmpxchg(&vma->iomap, NULL, ptr))) {
|
|
|
|
io_mapping_unmap(ptr);
|
|
|
|
ptr = vma->iomap;
|
|
|
|
}
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
__i915_vma_pin(vma);
|
2017-10-09 15:43:55 +07:00
|
|
|
|
2017-10-09 15:43:56 +07:00
|
|
|
err = i915_vma_pin_fence(vma);
|
2017-10-09 15:43:55 +07:00
|
|
|
if (err)
|
|
|
|
goto err_unpin;
|
|
|
|
|
2017-12-06 19:49:14 +07:00
|
|
|
i915_vma_set_ggtt_write(vma);
|
2020-01-08 22:35:50 +07:00
|
|
|
|
|
|
|
/* NB Access through the GTT requires the device to be awake. */
|
2016-11-11 17:43:54 +07:00
|
|
|
return ptr;
|
2017-10-09 15:43:55 +07:00
|
|
|
|
|
|
|
err_unpin:
|
|
|
|
__i915_vma_unpin(vma);
|
|
|
|
err:
|
|
|
|
return IO_ERR_PTR(err);
|
|
|
|
}
|
|
|
|
|
2017-12-06 19:49:14 +07:00
|
|
|
void i915_vma_flush_writes(struct i915_vma *vma)
|
|
|
|
{
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (i915_vma_unset_ggtt_write(vma))
|
|
|
|
intel_gt_flush_ggtt_writes(vma->vm->gt);
|
2017-12-06 19:49:14 +07:00
|
|
|
}
|
|
|
|
|
2017-10-09 15:43:55 +07:00
|
|
|
void i915_vma_unpin_iomap(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
GEM_BUG_ON(vma->iomap == NULL);
|
|
|
|
|
2017-12-06 19:49:14 +07:00
|
|
|
i915_vma_flush_writes(vma);
|
|
|
|
|
2017-10-09 15:43:55 +07:00
|
|
|
i915_vma_unpin_fence(vma);
|
|
|
|
i915_vma_unpin(vma);
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
|
|
|
|
2018-07-21 19:50:37 +07:00
|
|
|
void i915_vma_unpin_and_release(struct i915_vma **p_vma, unsigned int flags)
|
2016-11-11 17:43:54 +07:00
|
|
|
{
|
|
|
|
struct i915_vma *vma;
|
|
|
|
struct drm_i915_gem_object *obj;
|
|
|
|
|
|
|
|
vma = fetch_and_zero(p_vma);
|
|
|
|
if (!vma)
|
|
|
|
return;
|
|
|
|
|
|
|
|
obj = vma->obj;
|
2018-06-07 22:40:45 +07:00
|
|
|
GEM_BUG_ON(!obj);
|
2016-11-11 17:43:54 +07:00
|
|
|
|
|
|
|
i915_vma_unpin(vma);
|
|
|
|
|
2018-07-21 19:50:37 +07:00
|
|
|
if (flags & I915_VMA_RELEASE_MAP)
|
|
|
|
i915_gem_object_unpin_map(obj);
|
|
|
|
|
2019-05-28 16:29:56 +07:00
|
|
|
i915_gem_object_put(obj);
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
|
|
|
|
2017-02-14 00:15:46 +07:00
|
|
|
bool i915_vma_misplaced(const struct i915_vma *vma,
|
|
|
|
u64 size, u64 alignment, u64 flags)
|
2016-11-11 17:43:54 +07:00
|
|
|
{
|
|
|
|
if (!drm_mm_node_allocated(&vma->node))
|
|
|
|
return false;
|
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (test_bit(I915_VMA_ERROR_BIT, __i915_vma_flags(vma)))
|
|
|
|
return true;
|
|
|
|
|
2016-11-11 17:43:54 +07:00
|
|
|
if (vma->node.size < size)
|
|
|
|
return true;
|
|
|
|
|
2017-01-10 21:47:34 +07:00
|
|
|
GEM_BUG_ON(alignment && !is_power_of_2(alignment));
|
|
|
|
if (alignment && !IS_ALIGNED(vma->node.start, alignment))
|
2016-11-11 17:43:54 +07:00
|
|
|
return true;
|
|
|
|
|
|
|
|
if (flags & PIN_MAPPABLE && !i915_vma_is_map_and_fenceable(vma))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (flags & PIN_OFFSET_BIAS &&
|
|
|
|
vma->node.start < (flags & PIN_OFFSET_MASK))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (flags & PIN_OFFSET_FIXED &&
|
|
|
|
vma->node.start != (flags & PIN_OFFSET_MASK))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __i915_vma_set_map_and_fenceable(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
bool mappable, fenceable;
|
|
|
|
|
2017-01-09 23:16:11 +07:00
|
|
|
GEM_BUG_ON(!i915_vma_is_ggtt(vma));
|
|
|
|
GEM_BUG_ON(!vma->fence_size);
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2017-01-09 23:16:11 +07:00
|
|
|
fenceable = (vma->node.size >= vma->fence_size &&
|
2017-01-10 21:47:34 +07:00
|
|
|
IS_ALIGNED(vma->node.start, vma->fence_alignment));
|
2017-01-09 23:16:11 +07:00
|
|
|
|
|
|
|
mappable = vma->node.start + vma->fence_size <= i915_vm_to_ggtt(vma->vm)->mappable_end;
|
|
|
|
|
|
|
|
if (mappable && fenceable)
|
2019-09-11 16:02:43 +07:00
|
|
|
set_bit(I915_VMA_CAN_FENCE_BIT, __i915_vma_flags(vma));
|
2016-11-11 17:43:54 +07:00
|
|
|
else
|
2019-09-11 16:02:43 +07:00
|
|
|
clear_bit(I915_VMA_CAN_FENCE_BIT, __i915_vma_flags(vma));
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
|
|
|
|
2019-09-09 19:40:52 +07:00
|
|
|
bool i915_gem_valid_gtt_space(struct i915_vma *vma, unsigned long color)
|
2016-12-05 21:29:38 +07:00
|
|
|
{
|
|
|
|
struct drm_mm_node *node = &vma->node;
|
2016-11-11 17:43:54 +07:00
|
|
|
struct drm_mm_node *other;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* On some machines we have to be careful when putting differing types
|
|
|
|
* of snoopable memory together to avoid the prefetcher crossing memory
|
|
|
|
* domains and dying. During vm initialisation, we decide whether or not
|
|
|
|
* these constraints apply and set the drm_mm.color_adjust
|
|
|
|
* appropriately.
|
|
|
|
*/
|
2019-09-09 19:40:52 +07:00
|
|
|
if (!i915_vm_has_cache_coloring(vma->vm))
|
2016-11-11 17:43:54 +07:00
|
|
|
return true;
|
|
|
|
|
2016-12-05 21:29:38 +07:00
|
|
|
/* Only valid to be called on an already inserted vma */
|
|
|
|
GEM_BUG_ON(!drm_mm_node_allocated(node));
|
|
|
|
GEM_BUG_ON(list_empty(&node->node_list));
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2016-12-05 21:29:38 +07:00
|
|
|
other = list_prev_entry(node, node_list);
|
2019-09-09 19:40:52 +07:00
|
|
|
if (i915_node_color_differs(other, color) &&
|
2019-09-09 19:40:50 +07:00
|
|
|
!drm_mm_hole_follows(other))
|
2016-11-11 17:43:54 +07:00
|
|
|
return false;
|
|
|
|
|
2016-12-05 21:29:38 +07:00
|
|
|
other = list_next_entry(node, node_list);
|
2019-09-09 19:40:52 +07:00
|
|
|
if (i915_node_color_differs(other, color) &&
|
2019-09-09 19:40:50 +07:00
|
|
|
!drm_mm_hole_follows(node))
|
2016-11-11 17:43:54 +07:00
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* i915_vma_insert - finds a slot for the vma in its address space
|
|
|
|
* @vma: the vma
|
|
|
|
* @size: requested size in bytes (can be larger than the VMA)
|
|
|
|
* @alignment: required alignment
|
|
|
|
* @flags: mask of PIN_* flags to use
|
|
|
|
*
|
|
|
|
* First we try to allocate some free space that meets the requirements for
|
|
|
|
* the VMA. Failiing that, if the flags permit, it will evict an old VMA,
|
|
|
|
* preferrably the oldest idle entry to make room for the new VMA.
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* 0 on success, negative error code otherwise.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
i915_vma_insert(struct i915_vma *vma, u64 size, u64 alignment, u64 flags)
|
|
|
|
{
|
2019-09-09 19:40:52 +07:00
|
|
|
unsigned long color;
|
2016-11-11 17:43:54 +07:00
|
|
|
u64 start, end;
|
|
|
|
int ret;
|
|
|
|
|
2019-09-11 16:02:43 +07:00
|
|
|
GEM_BUG_ON(i915_vma_is_bound(vma, I915_VMA_GLOBAL_BIND | I915_VMA_LOCAL_BIND));
|
2016-11-11 17:43:54 +07:00
|
|
|
GEM_BUG_ON(drm_mm_node_allocated(&vma->node));
|
|
|
|
|
|
|
|
size = max(size, vma->size);
|
2017-01-09 23:16:11 +07:00
|
|
|
alignment = max(alignment, vma->display_alignment);
|
|
|
|
if (flags & PIN_MAPPABLE) {
|
|
|
|
size = max_t(typeof(size), size, vma->fence_size);
|
|
|
|
alignment = max_t(typeof(alignment),
|
|
|
|
alignment, vma->fence_alignment);
|
|
|
|
}
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2017-01-10 21:47:34 +07:00
|
|
|
GEM_BUG_ON(!IS_ALIGNED(size, I915_GTT_PAGE_SIZE));
|
|
|
|
GEM_BUG_ON(!IS_ALIGNED(alignment, I915_GTT_MIN_ALIGNMENT));
|
|
|
|
GEM_BUG_ON(!is_power_of_2(alignment));
|
|
|
|
|
2016-11-11 17:43:54 +07:00
|
|
|
start = flags & PIN_OFFSET_BIAS ? flags & PIN_OFFSET_MASK : 0;
|
2017-01-10 21:47:34 +07:00
|
|
|
GEM_BUG_ON(!IS_ALIGNED(start, I915_GTT_PAGE_SIZE));
|
2016-11-11 17:43:54 +07:00
|
|
|
|
|
|
|
end = vma->vm->total;
|
|
|
|
if (flags & PIN_MAPPABLE)
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
end = min_t(u64, end, i915_vm_to_ggtt(vma->vm)->mappable_end);
|
2016-11-11 17:43:54 +07:00
|
|
|
if (flags & PIN_ZONE_4G)
|
2017-01-10 21:47:34 +07:00
|
|
|
end = min_t(u64, end, (1ULL << 32) - I915_GTT_PAGE_SIZE);
|
|
|
|
GEM_BUG_ON(!IS_ALIGNED(end, I915_GTT_PAGE_SIZE));
|
2016-11-11 17:43:54 +07:00
|
|
|
|
|
|
|
/* If binding the object/GGTT view requires more space than the entire
|
|
|
|
* aperture has, reject it early before evicting everything in a vain
|
|
|
|
* attempt to find space.
|
|
|
|
*/
|
|
|
|
if (size > end) {
|
2018-06-07 22:40:45 +07:00
|
|
|
DRM_DEBUG("Attempting to bind an object larger than the aperture: request=%llu > %s aperture=%llu\n",
|
|
|
|
size, flags & PIN_MAPPABLE ? "mappable" : "total",
|
2016-11-11 17:43:54 +07:00
|
|
|
end);
|
drm/i915: Eliminate lots of iterations over the execobjects array
The major scaling bottleneck in execbuffer is the processing of the
execobjects. Creating an auxiliary list is inefficient when compared to
using the execobject array we already have allocated.
Reservation is then split into phases. As we lookup up the VMA, we
try and bind it back into active location. Only if that fails, do we add
it to the unbound list for phase 2. In phase 2, we try and add all those
objects that could not fit into their previous location, with fallback
to retrying all objects and evicting the VM in case of severe
fragmentation. (This is the same as before, except that phase 1 is now
done inline with looking up the VMA to avoid an iteration over the
execobject array. In the ideal case, we eliminate the separate reservation
phase). During the reservation phase, we only evict from the VM between
passes (rather than currently as we try to fit every new VMA). In
testing with Unreal Engine's Atlantis demo which stresses the eviction
logic on gen7 class hardware, this speed up the framerate by a factor of
2.
The second loop amalgamation is between move_to_gpu and move_to_active.
As we always submit the request, even if incomplete, we can use the
current request to track active VMA as we perform the flushes and
synchronisation required.
The next big advancement is to avoid copying back to the user any
execobjects and relocations that are not changed.
v2: Add a Theory of Operation spiel.
v3: Fall back to slow relocations in preparation for flushing userptrs.
v4: Document struct members, factor out eb_validate_vma(), add a few
more comments to explain some magic and hide other magic behind macros.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
2017-06-16 21:05:19 +07:00
|
|
|
return -ENOSPC;
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
|
|
|
|
2019-09-09 19:40:52 +07:00
|
|
|
color = 0;
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (vma->obj && i915_vm_has_cache_coloring(vma->vm))
|
|
|
|
color = vma->obj->cache_level;
|
2017-10-07 05:18:19 +07:00
|
|
|
|
2016-11-11 17:43:54 +07:00
|
|
|
if (flags & PIN_OFFSET_FIXED) {
|
|
|
|
u64 offset = flags & PIN_OFFSET_MASK;
|
2017-01-10 21:47:34 +07:00
|
|
|
if (!IS_ALIGNED(offset, alignment) ||
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
range_overflows(offset, size, end))
|
|
|
|
return -EINVAL;
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2017-01-11 18:23:11 +07:00
|
|
|
ret = i915_gem_gtt_reserve(vma->vm, &vma->node,
|
2019-09-09 19:40:52 +07:00
|
|
|
size, offset, color,
|
2017-01-11 18:23:11 +07:00
|
|
|
flags);
|
|
|
|
if (ret)
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
return ret;
|
2016-11-11 17:43:54 +07:00
|
|
|
} else {
|
2017-10-07 05:18:20 +07:00
|
|
|
/*
|
|
|
|
* We only support huge gtt pages through the 48b PPGTT,
|
|
|
|
* however we also don't want to force any alignment for
|
|
|
|
* objects which need to be tightly packed into the low 32bits.
|
|
|
|
*
|
|
|
|
* Note that we assume that GGTT are limited to 4GiB for the
|
|
|
|
* forseeable future. See also i915_ggtt_offset().
|
|
|
|
*/
|
|
|
|
if (upper_32_bits(end - 1) &&
|
|
|
|
vma->page_sizes.sg > I915_GTT_PAGE_SIZE) {
|
2017-10-07 05:18:21 +07:00
|
|
|
/*
|
|
|
|
* We can't mix 64K and 4K PTEs in the same page-table
|
|
|
|
* (2M block), and so to avoid the ugliness and
|
|
|
|
* complexity of coloring we opt for just aligning 64K
|
|
|
|
* objects to 2M.
|
|
|
|
*/
|
2017-10-07 05:18:20 +07:00
|
|
|
u64 page_alignment =
|
2017-10-07 05:18:21 +07:00
|
|
|
rounddown_pow_of_two(vma->page_sizes.sg |
|
|
|
|
I915_GTT_PAGE_SIZE_2M);
|
2017-10-07 05:18:20 +07:00
|
|
|
|
2017-10-09 16:20:19 +07:00
|
|
|
/*
|
|
|
|
* Check we don't expand for the limited Global GTT
|
|
|
|
* (mappable aperture is even more precious!). This
|
|
|
|
* also checks that we exclude the aliasing-ppgtt.
|
|
|
|
*/
|
|
|
|
GEM_BUG_ON(i915_vma_is_ggtt(vma));
|
|
|
|
|
2017-10-07 05:18:20 +07:00
|
|
|
alignment = max(alignment, page_alignment);
|
2017-10-07 05:18:21 +07:00
|
|
|
|
|
|
|
if (vma->page_sizes.sg & I915_GTT_PAGE_SIZE_64K)
|
|
|
|
size = round_up(size, I915_GTT_PAGE_SIZE_2M);
|
2017-10-07 05:18:20 +07:00
|
|
|
}
|
|
|
|
|
2017-01-11 18:23:10 +07:00
|
|
|
ret = i915_gem_gtt_insert(vma->vm, &vma->node,
|
2019-09-09 19:40:52 +07:00
|
|
|
size, alignment, color,
|
2017-01-11 18:23:10 +07:00
|
|
|
start, end, flags);
|
|
|
|
if (ret)
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
return ret;
|
2016-11-11 17:43:54 +07:00
|
|
|
|
|
|
|
GEM_BUG_ON(vma->node.start < start);
|
|
|
|
GEM_BUG_ON(vma->node.start + vma->node.size > end);
|
|
|
|
}
|
2017-01-20 02:26:58 +07:00
|
|
|
GEM_BUG_ON(!drm_mm_node_allocated(&vma->node));
|
2019-09-09 19:40:52 +07:00
|
|
|
GEM_BUG_ON(!i915_gem_valid_gtt_space(vma, color));
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2019-10-31 02:21:49 +07:00
|
|
|
list_add_tail(&vma->vm_link, &vma->vm->bound_list);
|
2016-11-11 17:43:54 +07:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-27 19:26:54 +07:00
|
|
|
static void
|
2019-10-31 02:21:49 +07:00
|
|
|
i915_vma_detach(struct i915_vma *vma)
|
2017-02-27 19:26:54 +07:00
|
|
|
{
|
|
|
|
GEM_BUG_ON(!drm_mm_node_allocated(&vma->node));
|
2019-09-11 16:02:43 +07:00
|
|
|
GEM_BUG_ON(i915_vma_is_bound(vma, I915_VMA_GLOBAL_BIND | I915_VMA_LOCAL_BIND));
|
2017-02-27 19:26:54 +07:00
|
|
|
|
2018-06-07 22:40:45 +07:00
|
|
|
/*
|
2019-10-31 02:21:49 +07:00
|
|
|
* And finally now the object is completely decoupled from this
|
|
|
|
* vma, we can drop its hold on the backing storage and allow
|
|
|
|
* it to be reaped by the shrinker.
|
2017-02-27 19:26:54 +07:00
|
|
|
*/
|
2019-10-31 02:21:49 +07:00
|
|
|
list_del(&vma->vm_link);
|
2017-02-27 19:26:54 +07:00
|
|
|
}
|
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
static bool try_qad_pin(struct i915_vma *vma, unsigned int flags)
|
2016-11-11 17:43:54 +07:00
|
|
|
{
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
unsigned int bound;
|
|
|
|
bool pinned = true;
|
2016-11-11 17:43:54 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
bound = atomic_read(&vma->flags);
|
|
|
|
do {
|
|
|
|
if (unlikely(flags & ~bound))
|
|
|
|
return false;
|
2016-11-11 17:43:54 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (unlikely(bound & (I915_VMA_OVERFLOW | I915_VMA_ERROR)))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!(bound & I915_VMA_PIN_MASK))
|
|
|
|
goto unpinned;
|
|
|
|
|
|
|
|
GEM_BUG_ON(((bound + 1) & I915_VMA_PIN_MASK) == 0);
|
|
|
|
} while (!atomic_try_cmpxchg(&vma->flags, &bound, bound + 1));
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
unpinned:
|
|
|
|
/*
|
|
|
|
* If pin_count==0, but we are bound, check under the lock to avoid
|
|
|
|
* racing with a concurrent i915_vma_unbind().
|
|
|
|
*/
|
|
|
|
mutex_lock(&vma->vm->mutex);
|
|
|
|
do {
|
|
|
|
if (unlikely(bound & (I915_VMA_OVERFLOW | I915_VMA_ERROR))) {
|
|
|
|
pinned = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unlikely(flags & ~bound)) {
|
|
|
|
pinned = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} while (!atomic_try_cmpxchg(&vma->flags, &bound, bound + 1));
|
|
|
|
mutex_unlock(&vma->vm->mutex);
|
|
|
|
|
|
|
|
return pinned;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int vma_get_pages(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
if (atomic_add_unless(&vma->pages_count, 1, 0))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Allocations ahoy! */
|
|
|
|
if (mutex_lock_interruptible(&vma->pages_mutex))
|
|
|
|
return -EINTR;
|
|
|
|
|
|
|
|
if (!atomic_read(&vma->pages_count)) {
|
|
|
|
if (vma->obj) {
|
|
|
|
err = i915_gem_object_pin_pages(vma->obj);
|
|
|
|
if (err)
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = vma->ops->set_pages(vma);
|
2019-10-15 16:39:15 +07:00
|
|
|
if (err) {
|
|
|
|
if (vma->obj)
|
|
|
|
i915_gem_object_unpin_pages(vma->obj);
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
goto unlock;
|
2019-10-15 16:39:15 +07:00
|
|
|
}
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
atomic_inc(&vma->pages_count);
|
2016-11-11 17:43:54 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
unlock:
|
|
|
|
mutex_unlock(&vma->pages_mutex);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __vma_put_pages(struct i915_vma *vma, unsigned int count)
|
|
|
|
{
|
|
|
|
/* We allocate under vma_get_pages, so beware the shrinker */
|
|
|
|
mutex_lock_nested(&vma->pages_mutex, SINGLE_DEPTH_NESTING);
|
|
|
|
GEM_BUG_ON(atomic_read(&vma->pages_count) < count);
|
|
|
|
if (atomic_sub_return(count, &vma->pages_count) == 0) {
|
|
|
|
vma->ops->clear_pages(vma);
|
|
|
|
GEM_BUG_ON(vma->pages);
|
|
|
|
if (vma->obj)
|
|
|
|
i915_gem_object_unpin_pages(vma->obj);
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
mutex_unlock(&vma->pages_mutex);
|
|
|
|
}
|
2016-11-11 17:43:54 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
static void vma_put_pages(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
if (atomic_add_unless(&vma->pages_count, -1, 1))
|
|
|
|
return;
|
|
|
|
|
|
|
|
__vma_put_pages(vma, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vma_unbind_pages(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
unsigned int count;
|
|
|
|
|
|
|
|
lockdep_assert_held(&vma->vm->mutex);
|
|
|
|
|
|
|
|
/* The upper portion of pages_count is the number of bindings */
|
|
|
|
count = atomic_read(&vma->pages_count);
|
|
|
|
count >>= I915_VMA_PAGES_BIAS;
|
|
|
|
GEM_BUG_ON(!count);
|
|
|
|
|
|
|
|
__vma_put_pages(vma, count | count << I915_VMA_PAGES_BIAS);
|
|
|
|
}
|
|
|
|
|
|
|
|
int i915_vma_pin(struct i915_vma *vma, u64 size, u64 alignment, u64 flags)
|
|
|
|
{
|
|
|
|
struct i915_vma_work *work = NULL;
|
2020-01-10 21:44:18 +07:00
|
|
|
intel_wakeref_t wakeref = 0;
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
unsigned int bound;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
BUILD_BUG_ON(PIN_GLOBAL != I915_VMA_GLOBAL_BIND);
|
|
|
|
BUILD_BUG_ON(PIN_USER != I915_VMA_LOCAL_BIND);
|
|
|
|
|
|
|
|
GEM_BUG_ON(flags & PIN_UPDATE);
|
|
|
|
GEM_BUG_ON(!(flags & (PIN_USER | PIN_GLOBAL)));
|
|
|
|
|
|
|
|
/* First try and grab the pin without rebinding the vma */
|
|
|
|
if (try_qad_pin(vma, flags & I915_VMA_BIND_MASK))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err = vma_get_pages(vma);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
if (flags & vma->vm->bind_async_flags) {
|
|
|
|
work = i915_vma_work();
|
|
|
|
if (!work) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto err_pages;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-10 21:44:18 +07:00
|
|
|
if (flags & PIN_GLOBAL)
|
|
|
|
wakeref = intel_runtime_pm_get(&vma->vm->i915->runtime_pm);
|
|
|
|
|
2020-03-26 21:27:27 +07:00
|
|
|
/*
|
|
|
|
* Differentiate between user/kernel vma inside the aliasing-ppgtt.
|
|
|
|
*
|
|
|
|
* We conflate the Global GTT with the user's vma when using the
|
|
|
|
* aliasing-ppgtt, but it is still vitally important to try and
|
|
|
|
* keep the use cases distinct. For example, userptr objects are
|
|
|
|
* not allowed inside the Global GTT as that will cause lock
|
|
|
|
* inversions when we have to evict them the mmu_notifier callbacks -
|
|
|
|
* but they are allowed to be part of the user ppGTT which can never
|
|
|
|
* be mapped. As such we try to give the distinct users of the same
|
|
|
|
* mutex, distinct lockclasses [equivalent to how we keep i915_ggtt
|
|
|
|
* and i915_ppgtt separate].
|
|
|
|
*
|
|
|
|
* NB this may cause us to mask real lock inversions -- while the
|
|
|
|
* code is safe today, lockdep may not be able to spot future
|
|
|
|
* transgressions.
|
|
|
|
*/
|
|
|
|
err = mutex_lock_interruptible_nested(&vma->vm->mutex,
|
|
|
|
!(flags & PIN_GLOBAL));
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (err)
|
|
|
|
goto err_fence;
|
|
|
|
|
2020-03-26 21:27:27 +07:00
|
|
|
/* No more allocations allowed now we hold vm->mutex */
|
|
|
|
|
2020-02-21 19:19:40 +07:00
|
|
|
if (unlikely(i915_vma_is_closed(vma))) {
|
|
|
|
err = -ENOENT;
|
|
|
|
goto err_unlock;
|
|
|
|
}
|
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
bound = atomic_read(&vma->flags);
|
|
|
|
if (unlikely(bound & I915_VMA_ERROR)) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto err_unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unlikely(!((bound + 1) & I915_VMA_PIN_MASK))) {
|
|
|
|
err = -EAGAIN; /* pins are meant to be fairly temporary */
|
|
|
|
goto err_unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unlikely(!(flags & ~bound & I915_VMA_BIND_MASK))) {
|
|
|
|
__i915_vma_pin(vma);
|
|
|
|
goto err_unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = i915_active_acquire(&vma->active);
|
|
|
|
if (err)
|
|
|
|
goto err_unlock;
|
|
|
|
|
|
|
|
if (!(bound & I915_VMA_BIND_MASK)) {
|
|
|
|
err = i915_vma_insert(vma, size, alignment, flags);
|
|
|
|
if (err)
|
|
|
|
goto err_active;
|
|
|
|
|
|
|
|
if (i915_is_ggtt(vma->vm))
|
|
|
|
__i915_vma_set_map_and_fenceable(vma);
|
|
|
|
}
|
2016-11-11 17:43:54 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
GEM_BUG_ON(!vma->pages);
|
|
|
|
err = i915_vma_bind(vma,
|
|
|
|
vma->obj ? vma->obj->cache_level : 0,
|
|
|
|
flags, work);
|
|
|
|
if (err)
|
|
|
|
goto err_remove;
|
2017-11-05 19:45:50 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
/* There should only be at most 2 active bindings (user, global) */
|
|
|
|
GEM_BUG_ON(bound + I915_VMA_PAGES_ACTIVE < bound);
|
|
|
|
atomic_add(I915_VMA_PAGES_ACTIVE, &vma->pages_count);
|
|
|
|
list_move_tail(&vma->vm_link, &vma->vm->bound_list);
|
2016-11-11 17:43:54 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
__i915_vma_pin(vma);
|
|
|
|
GEM_BUG_ON(!i915_vma_is_pinned(vma));
|
|
|
|
GEM_BUG_ON(!i915_vma_is_bound(vma, flags));
|
2016-11-11 17:43:54 +07:00
|
|
|
GEM_BUG_ON(i915_vma_misplaced(vma, size, alignment, flags));
|
|
|
|
|
2017-02-27 19:26:54 +07:00
|
|
|
err_remove:
|
2019-10-31 02:21:49 +07:00
|
|
|
if (!i915_vma_is_bound(vma, I915_VMA_BIND_MASK)) {
|
|
|
|
i915_vma_detach(vma);
|
|
|
|
drm_mm_remove_node(&vma->node);
|
|
|
|
}
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
err_active:
|
|
|
|
i915_active_release(&vma->active);
|
|
|
|
err_unlock:
|
|
|
|
mutex_unlock(&vma->vm->mutex);
|
|
|
|
err_fence:
|
|
|
|
if (work)
|
2020-03-25 19:02:27 +07:00
|
|
|
dma_fence_work_commit_imm(&work->base);
|
2020-01-10 21:44:18 +07:00
|
|
|
if (wakeref)
|
|
|
|
intel_runtime_pm_put(&vma->vm->i915->runtime_pm, wakeref);
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
err_pages:
|
|
|
|
vma_put_pages(vma);
|
|
|
|
return err;
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
|
|
|
|
2019-12-05 18:37:25 +07:00
|
|
|
static void flush_idle_contexts(struct intel_gt *gt)
|
|
|
|
{
|
|
|
|
struct intel_engine_cs *engine;
|
|
|
|
enum intel_engine_id id;
|
|
|
|
|
|
|
|
for_each_engine(engine, gt, id)
|
|
|
|
intel_engine_flush_barriers(engine);
|
|
|
|
|
|
|
|
intel_gt_wait_for_idle(gt, MAX_SCHEDULE_TIMEOUT);
|
|
|
|
}
|
|
|
|
|
|
|
|
int i915_ggtt_pin(struct i915_vma *vma, u32 align, unsigned int flags)
|
|
|
|
{
|
|
|
|
struct i915_address_space *vm = vma->vm;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
GEM_BUG_ON(!i915_vma_is_ggtt(vma));
|
|
|
|
|
|
|
|
do {
|
|
|
|
err = i915_vma_pin(vma, 0, align, flags | PIN_GLOBAL);
|
2020-01-31 01:17:10 +07:00
|
|
|
if (err != -ENOSPC) {
|
|
|
|
if (!err) {
|
|
|
|
err = i915_vma_wait_for_bind(vma);
|
|
|
|
if (err)
|
|
|
|
i915_vma_unpin(vma);
|
|
|
|
}
|
2019-12-05 18:37:25 +07:00
|
|
|
return err;
|
2020-01-31 01:17:10 +07:00
|
|
|
}
|
2019-12-05 18:37:25 +07:00
|
|
|
|
|
|
|
/* Unlike i915_vma_pin, we don't take no for an answer! */
|
|
|
|
flush_idle_contexts(vm->gt);
|
|
|
|
if (mutex_lock_interruptible(&vm->mutex) == 0) {
|
|
|
|
i915_gem_evict_vm(vm);
|
|
|
|
mutex_unlock(&vm->mutex);
|
|
|
|
}
|
|
|
|
} while (1);
|
|
|
|
}
|
|
|
|
|
2020-04-23 02:05:58 +07:00
|
|
|
static void __vma_close(struct i915_vma *vma, struct intel_gt *gt)
|
2018-05-04 02:51:14 +07:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* We defer actually closing, unbinding and destroying the VMA until
|
|
|
|
* the next idle point, or if the object is freed in the meantime. By
|
|
|
|
* postponing the unbind, we allow for it to be resurrected by the
|
|
|
|
* client, avoiding the work required to rebind the VMA. This is
|
|
|
|
* advantageous for DRI, where the client/server pass objects
|
|
|
|
* between themselves, temporarily opening a local VMA to the
|
|
|
|
* object, and then closing it again. The same object is then reused
|
|
|
|
* on the next frame (or two, depending on the depth of the swap queue)
|
|
|
|
* causing us to rebind the VMA once more. This ends up being a lot
|
|
|
|
* of wasted work for the steady state.
|
|
|
|
*/
|
2020-04-23 02:05:58 +07:00
|
|
|
GEM_BUG_ON(i915_vma_is_closed(vma));
|
2019-10-22 01:32:35 +07:00
|
|
|
list_add(&vma->closed_link, >->closed_vma);
|
2020-04-23 02:05:58 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
void i915_vma_close(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
struct intel_gt *gt = vma->vm->gt;
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
if (i915_vma_is_ggtt(vma))
|
|
|
|
return;
|
|
|
|
|
|
|
|
GEM_BUG_ON(!atomic_read(&vma->open_count));
|
|
|
|
if (atomic_dec_and_lock_irqsave(&vma->open_count,
|
|
|
|
>->closed_lock,
|
|
|
|
flags)) {
|
|
|
|
__vma_close(vma, gt);
|
|
|
|
spin_unlock_irqrestore(>->closed_lock, flags);
|
|
|
|
}
|
2018-05-04 02:51:14 +07:00
|
|
|
}
|
|
|
|
|
2019-06-06 18:23:20 +07:00
|
|
|
static void __i915_vma_remove_closed(struct i915_vma *vma)
|
2018-05-04 02:51:14 +07:00
|
|
|
{
|
2019-10-22 01:32:35 +07:00
|
|
|
struct intel_gt *gt = vma->vm->gt;
|
2018-05-04 02:51:14 +07:00
|
|
|
|
2019-10-22 01:32:35 +07:00
|
|
|
spin_lock_irq(>->closed_lock);
|
2019-06-06 18:23:20 +07:00
|
|
|
list_del_init(&vma->closed_link);
|
2019-10-22 01:32:35 +07:00
|
|
|
spin_unlock_irq(>->closed_lock);
|
2019-06-06 18:23:20 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
void i915_vma_reopen(struct i915_vma *vma)
|
|
|
|
{
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (i915_vma_is_closed(vma))
|
|
|
|
__i915_vma_remove_closed(vma);
|
2018-05-04 02:51:14 +07:00
|
|
|
}
|
|
|
|
|
2019-12-23 04:02:55 +07:00
|
|
|
void i915_vma_release(struct kref *ref)
|
2016-11-11 17:43:54 +07:00
|
|
|
{
|
2019-12-23 04:02:55 +07:00
|
|
|
struct i915_vma *vma = container_of(ref, typeof(*vma), ref);
|
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (drm_mm_node_allocated(&vma->node)) {
|
|
|
|
mutex_lock(&vma->vm->mutex);
|
|
|
|
atomic_and(~I915_VMA_PIN_MASK, &vma->flags);
|
|
|
|
WARN_ON(__i915_vma_unbind(vma));
|
|
|
|
mutex_unlock(&vma->vm->mutex);
|
|
|
|
GEM_BUG_ON(drm_mm_node_allocated(&vma->node));
|
|
|
|
}
|
|
|
|
GEM_BUG_ON(i915_vma_is_active(vma));
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2019-01-28 17:23:54 +07:00
|
|
|
if (vma->obj) {
|
|
|
|
struct drm_i915_gem_object *obj = vma->obj;
|
|
|
|
|
|
|
|
spin_lock(&obj->vma.lock);
|
|
|
|
list_del(&vma->obj_link);
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
rb_erase(&vma->obj_node, &obj->vma.tree);
|
2019-01-28 17:23:54 +07:00
|
|
|
spin_unlock(&obj->vma.lock);
|
|
|
|
}
|
2017-12-06 19:49:13 +07:00
|
|
|
|
2019-06-06 18:23:20 +07:00
|
|
|
__i915_vma_remove_closed(vma);
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
i915_vm_put(vma->vm);
|
2018-05-04 02:51:14 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
i915_active_fini(&vma->active);
|
|
|
|
i915_vma_free(vma);
|
2018-05-04 02:51:14 +07:00
|
|
|
}
|
|
|
|
|
2019-10-22 01:32:35 +07:00
|
|
|
void i915_vma_parked(struct intel_gt *gt)
|
2018-05-04 02:51:14 +07:00
|
|
|
{
|
|
|
|
struct i915_vma *vma, *next;
|
2020-03-23 16:28:35 +07:00
|
|
|
LIST_HEAD(closed);
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2019-10-22 01:32:35 +07:00
|
|
|
spin_lock_irq(>->closed_lock);
|
|
|
|
list_for_each_entry_safe(vma, next, >->closed_vma, closed_link) {
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
struct drm_i915_gem_object *obj = vma->obj;
|
|
|
|
struct i915_address_space *vm = vma->vm;
|
|
|
|
|
|
|
|
/* XXX All to avoid keeping a reference on i915_vma itself */
|
|
|
|
|
|
|
|
if (!kref_get_unless_zero(&obj->base.refcount))
|
|
|
|
continue;
|
|
|
|
|
2020-03-23 16:28:35 +07:00
|
|
|
if (!i915_vm_tryopen(vm)) {
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
i915_gem_object_put(obj);
|
2020-03-23 16:28:35 +07:00
|
|
|
continue;
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
}
|
|
|
|
|
2020-03-23 16:28:35 +07:00
|
|
|
list_move(&vma->closed_link, &closed);
|
|
|
|
}
|
|
|
|
spin_unlock_irq(>->closed_lock);
|
2019-06-06 18:23:20 +07:00
|
|
|
|
2020-03-23 16:28:35 +07:00
|
|
|
/* As the GT is held idle, no vma can be reopened as we destroy them */
|
|
|
|
list_for_each_entry_safe(vma, next, &closed, closed_link) {
|
|
|
|
struct drm_i915_gem_object *obj = vma->obj;
|
|
|
|
struct i915_address_space *vm = vma->vm;
|
2018-05-04 02:51:14 +07:00
|
|
|
|
2020-03-23 16:28:35 +07:00
|
|
|
INIT_LIST_HEAD(&vma->closed_link);
|
|
|
|
__i915_vma_put(vma);
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
|
2020-03-23 16:28:35 +07:00
|
|
|
i915_gem_object_put(obj);
|
|
|
|
i915_vm_close(vm);
|
2019-06-06 18:23:20 +07:00
|
|
|
}
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __i915_vma_iounmap(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
GEM_BUG_ON(i915_vma_is_pinned(vma));
|
|
|
|
|
|
|
|
if (vma->iomap == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
io_mapping_unmap(vma->iomap);
|
|
|
|
vma->iomap = NULL;
|
|
|
|
}
|
|
|
|
|
2017-10-09 15:43:57 +07:00
|
|
|
void i915_vma_revoke_mmap(struct i915_vma *vma)
|
|
|
|
{
|
2019-12-04 19:00:32 +07:00
|
|
|
struct drm_vma_offset_node *node;
|
2017-10-09 15:43:57 +07:00
|
|
|
u64 vma_offset;
|
|
|
|
|
|
|
|
if (!i915_vma_has_userfault(vma))
|
|
|
|
return;
|
|
|
|
|
|
|
|
GEM_BUG_ON(!i915_vma_is_map_and_fenceable(vma));
|
|
|
|
GEM_BUG_ON(!vma->obj->userfault_count);
|
|
|
|
|
2019-12-04 19:00:32 +07:00
|
|
|
node = &vma->mmo->vma_node;
|
2017-10-09 15:43:57 +07:00
|
|
|
vma_offset = vma->ggtt_view.partial.offset << PAGE_SHIFT;
|
|
|
|
unmap_mapping_range(vma->vm->i915->drm.anon_inode->i_mapping,
|
|
|
|
drm_vma_node_offset_addr(node) + vma_offset,
|
|
|
|
vma->size,
|
|
|
|
1);
|
|
|
|
|
|
|
|
i915_vma_unset_userfault(vma);
|
|
|
|
if (!--vma->obj->userfault_count)
|
|
|
|
list_del(&vma->obj->userfault_link);
|
|
|
|
}
|
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
int __i915_vma_move_to_active(struct i915_vma *vma, struct i915_request *rq)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
GEM_BUG_ON(!i915_vma_is_pinned(vma));
|
|
|
|
|
|
|
|
/* Wait for the vma to be bound before we start! */
|
2020-04-06 22:58:38 +07:00
|
|
|
err = i915_request_await_active(rq, &vma->active,
|
|
|
|
I915_ACTIVE_AWAIT_EXCL);
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
return i915_active_add_request(&vma->active, rq);
|
|
|
|
}
|
|
|
|
|
2018-07-06 17:39:45 +07:00
|
|
|
int i915_vma_move_to_active(struct i915_vma *vma,
|
|
|
|
struct i915_request *rq,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
struct drm_i915_gem_object *obj = vma->obj;
|
2019-06-22 01:37:59 +07:00
|
|
|
int err;
|
2018-07-06 17:39:45 +07:00
|
|
|
|
2019-05-28 16:29:51 +07:00
|
|
|
assert_object_held(obj);
|
2018-07-06 17:39:45 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
err = __i915_vma_move_to_active(vma, rq);
|
2019-06-22 01:37:59 +07:00
|
|
|
if (unlikely(err))
|
|
|
|
return err;
|
2018-07-06 17:39:45 +07:00
|
|
|
|
|
|
|
if (flags & EXEC_OBJECT_WRITE) {
|
2019-12-18 17:40:43 +07:00
|
|
|
struct intel_frontbuffer *front;
|
|
|
|
|
|
|
|
front = __intel_frontbuffer_get(obj);
|
|
|
|
if (unlikely(front)) {
|
|
|
|
if (intel_frontbuffer_invalidate(front, ORIGIN_CS))
|
|
|
|
i915_active_add_request(&front->write, rq);
|
|
|
|
intel_frontbuffer_put(front);
|
|
|
|
}
|
2018-07-06 17:39:45 +07:00
|
|
|
|
2019-08-22 12:47:35 +07:00
|
|
|
dma_resv_add_excl_fence(vma->resv, &rq->fence);
|
2019-07-31 03:58:05 +07:00
|
|
|
obj->write_domain = I915_GEM_DOMAIN_RENDER;
|
2018-07-06 17:39:45 +07:00
|
|
|
obj->read_domains = 0;
|
2019-07-31 03:58:05 +07:00
|
|
|
} else {
|
2019-08-22 12:47:35 +07:00
|
|
|
err = dma_resv_reserve_shared(vma->resv, 1);
|
2019-07-31 03:58:05 +07:00
|
|
|
if (unlikely(err))
|
|
|
|
return err;
|
|
|
|
|
2019-08-22 12:47:35 +07:00
|
|
|
dma_resv_add_shared_fence(vma->resv, &rq->fence);
|
2019-07-31 03:58:05 +07:00
|
|
|
obj->write_domain = 0;
|
2018-07-06 17:39:45 +07:00
|
|
|
}
|
2020-04-02 04:01:02 +07:00
|
|
|
|
|
|
|
if (flags & EXEC_OBJECT_NEEDS_FENCE && vma->fence)
|
|
|
|
i915_active_add_request(&vma->fence->active, rq);
|
|
|
|
|
2018-07-06 17:39:45 +07:00
|
|
|
obj->read_domains |= I915_GEM_GPU_DOMAINS;
|
2019-06-22 01:37:59 +07:00
|
|
|
obj->mm.dirty = true;
|
2018-07-06 17:39:45 +07:00
|
|
|
|
2019-06-22 01:37:59 +07:00
|
|
|
GEM_BUG_ON(!i915_vma_is_active(vma));
|
2018-07-06 17:39:45 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
int __i915_vma_unbind(struct i915_vma *vma)
|
2016-11-11 17:43:54 +07:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
lockdep_assert_held(&vma->vm->mutex);
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2018-06-28 20:22:06 +07:00
|
|
|
if (i915_vma_is_pinned(vma)) {
|
|
|
|
vma_print_allocator(vma, "is pinned");
|
2019-12-08 23:12:52 +07:00
|
|
|
return -EAGAIN;
|
2018-06-28 20:22:06 +07:00
|
|
|
}
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2020-01-24 05:44:58 +07:00
|
|
|
/*
|
|
|
|
* After confirming that no one else is pinning this vma, wait for
|
|
|
|
* any laggards who may have crept in during the wait (through
|
|
|
|
* a residual pin skipping the vm->mutex) to complete.
|
|
|
|
*/
|
|
|
|
ret = i915_vma_sync(vma);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2016-11-11 17:43:54 +07:00
|
|
|
if (!drm_mm_node_allocated(&vma->node))
|
2018-05-04 02:51:14 +07:00
|
|
|
return 0;
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2020-01-24 05:44:58 +07:00
|
|
|
GEM_BUG_ON(i915_vma_is_pinned(vma));
|
|
|
|
GEM_BUG_ON(i915_vma_is_active(vma));
|
|
|
|
|
2016-11-11 17:43:54 +07:00
|
|
|
if (i915_vma_is_map_and_fenceable(vma)) {
|
2020-04-03 23:09:51 +07:00
|
|
|
/* Force a pagefault for domain tracking on next user access */
|
|
|
|
i915_vma_revoke_mmap(vma);
|
|
|
|
|
2017-12-06 19:49:14 +07:00
|
|
|
/*
|
|
|
|
* Check that we have flushed all writes through the GGTT
|
|
|
|
* before the unbind, other due to non-strict nature of those
|
|
|
|
* indirect writes they may end up referencing the GGTT PTE
|
|
|
|
* after the unbind.
|
2020-01-22 05:24:41 +07:00
|
|
|
*
|
|
|
|
* Note that we may be concurrently poking at the GGTT_WRITE
|
|
|
|
* bit from set-domain, as we mark all GGTT vma associated
|
|
|
|
* with an object. We know this is for another vma, as we
|
|
|
|
* are currently unbinding this one -- so if this vma will be
|
|
|
|
* reused, it will be refaulted and have its dirty bit set
|
|
|
|
* before the next write.
|
2017-12-06 19:49:14 +07:00
|
|
|
*/
|
|
|
|
i915_vma_flush_writes(vma);
|
|
|
|
|
2016-11-11 17:43:54 +07:00
|
|
|
/* release the fence reg _after_ flushing */
|
2020-04-02 04:01:04 +07:00
|
|
|
i915_vma_revoke_fence(vma);
|
2016-11-11 17:43:54 +07:00
|
|
|
|
|
|
|
__i915_vma_iounmap(vma);
|
2019-09-11 16:02:43 +07:00
|
|
|
clear_bit(I915_VMA_CAN_FENCE_BIT, __i915_vma_flags(vma));
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
2017-10-09 15:43:57 +07:00
|
|
|
GEM_BUG_ON(vma->fence);
|
|
|
|
GEM_BUG_ON(i915_vma_has_userfault(vma));
|
2016-11-11 17:43:54 +07:00
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (likely(atomic_read(&vma->vm->open))) {
|
2016-11-11 17:43:54 +07:00
|
|
|
trace_i915_vma_unbind(vma);
|
2018-06-07 22:40:46 +07:00
|
|
|
vma->ops->unbind_vma(vma);
|
2016-11-11 17:43:54 +07:00
|
|
|
}
|
2020-01-22 05:24:41 +07:00
|
|
|
atomic_and(~(I915_VMA_BIND_MASK | I915_VMA_ERROR | I915_VMA_GGTT_WRITE),
|
|
|
|
&vma->flags);
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2019-10-31 02:21:49 +07:00
|
|
|
i915_vma_detach(vma);
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
vma_unbind_pages(vma);
|
2016-11-11 17:43:54 +07:00
|
|
|
|
2019-12-23 04:02:55 +07:00
|
|
|
drm_mm_remove_node(&vma->node); /* pairs with i915_vma_release() */
|
2016-11-11 17:43:54 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
int i915_vma_unbind(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
struct i915_address_space *vm = vma->vm;
|
2020-01-10 21:44:18 +07:00
|
|
|
intel_wakeref_t wakeref = 0;
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
int err;
|
|
|
|
|
2019-12-21 23:03:24 +07:00
|
|
|
if (!drm_mm_node_allocated(&vma->node))
|
|
|
|
return 0;
|
|
|
|
|
2020-01-24 05:44:59 +07:00
|
|
|
/* Optimistic wait before taking the mutex */
|
|
|
|
err = i915_vma_sync(vma);
|
|
|
|
if (err)
|
|
|
|
goto out_rpm;
|
|
|
|
|
2020-04-03 19:01:50 +07:00
|
|
|
if (i915_vma_is_pinned(vma)) {
|
|
|
|
vma_print_allocator(vma, "is pinned");
|
|
|
|
return -EAGAIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i915_vma_is_bound(vma, I915_VMA_GLOBAL_BIND))
|
|
|
|
/* XXX not always required: nop_clear_range */
|
|
|
|
wakeref = intel_runtime_pm_get(&vm->i915->runtime_pm);
|
|
|
|
|
2020-03-26 21:27:27 +07:00
|
|
|
err = mutex_lock_interruptible_nested(&vma->vm->mutex, !wakeref);
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
if (err)
|
2020-01-24 05:44:59 +07:00
|
|
|
goto out_rpm;
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
|
|
|
|
err = __i915_vma_unbind(vma);
|
|
|
|
mutex_unlock(&vm->mutex);
|
|
|
|
|
2020-01-24 05:44:59 +07:00
|
|
|
out_rpm:
|
2020-01-10 21:44:18 +07:00
|
|
|
if (wakeref)
|
|
|
|
intel_runtime_pm_put(&vm->i915->runtime_pm, wakeref);
|
drm/i915: Pull i915_vma_pin under the vm->mutex
Replace the struct_mutex requirement for pinning the i915_vma with the
local vm->mutex instead. Note that the vm->mutex is tainted by the
shrinker (we require unbinding from inside fs-reclaim) and so we cannot
allocate while holding that mutex. Instead we have to preallocate
workers to do allocate and apply the PTE updates after we have we
reserved their slot in the drm_mm (using fences to order the PTE writes
with the GPU work and with later unbind).
In adding the asynchronous vma binding, one subtle requirement is to
avoid coupling the binding fence into the backing object->resv. That is
the asynchronous binding only applies to the vma timeline itself and not
to the pages as that is a more global timeline (the binding of one vma
does not need to be ordered with another vma, nor does the implicit GEM
fencing depend on a vma, only on writes to the backing store). Keeping
the vma binding distinct from the backing store timelines is verified by
a number of async gem_exec_fence and gem_exec_schedule tests. The way we
do this is quite simple, we keep the fence for the vma binding separate
and only wait on it as required, and never add it to the obj->resv
itself.
Another consequence in reducing the locking around the vma is the
destruction of the vma is no longer globally serialised by struct_mutex.
A natural solution would be to add a kref to i915_vma, but that requires
decoupling the reference cycles, possibly by introducing a new
i915_mm_pages object that is own by both obj->mm and vma->pages.
However, we have not taken that route due to the overshadowing lmem/ttm
discussions, and instead play a series of complicated games with
trylocks to (hopefully) ensure that only one destruction path is called!
v2: Add some commentary, and some helpers to reduce patch churn.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-4-chris@chris-wilson.co.uk
2019-10-04 20:39:58 +07:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2019-08-03 04:21:36 +07:00
|
|
|
struct i915_vma *i915_vma_make_unshrinkable(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
i915_gem_object_make_unshrinkable(vma->obj);
|
|
|
|
return vma;
|
|
|
|
}
|
|
|
|
|
|
|
|
void i915_vma_make_shrinkable(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
i915_gem_object_make_shrinkable(vma->obj);
|
|
|
|
}
|
|
|
|
|
|
|
|
void i915_vma_make_purgeable(struct i915_vma *vma)
|
|
|
|
{
|
|
|
|
i915_gem_object_make_purgeable(vma->obj);
|
|
|
|
}
|
|
|
|
|
2017-02-14 00:15:45 +07:00
|
|
|
#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
|
|
|
|
#include "selftests/i915_vma.c"
|
|
|
|
#endif
|
2019-02-28 17:20:34 +07:00
|
|
|
|
2019-03-06 04:38:30 +07:00
|
|
|
static void i915_global_vma_shrink(void)
|
2019-02-28 17:20:34 +07:00
|
|
|
{
|
2019-03-06 04:38:30 +07:00
|
|
|
kmem_cache_shrink(global.slab_vmas);
|
2019-02-28 17:20:34 +07:00
|
|
|
}
|
|
|
|
|
2019-03-06 04:38:30 +07:00
|
|
|
static void i915_global_vma_exit(void)
|
2019-02-28 17:20:34 +07:00
|
|
|
{
|
2019-03-06 04:38:30 +07:00
|
|
|
kmem_cache_destroy(global.slab_vmas);
|
2019-02-28 17:20:34 +07:00
|
|
|
}
|
|
|
|
|
2019-03-06 04:38:30 +07:00
|
|
|
static struct i915_global_vma global = { {
|
|
|
|
.shrink = i915_global_vma_shrink,
|
|
|
|
.exit = i915_global_vma_exit,
|
|
|
|
} };
|
|
|
|
|
|
|
|
int __init i915_global_vma_init(void)
|
2019-02-28 17:20:34 +07:00
|
|
|
{
|
2019-03-06 04:38:30 +07:00
|
|
|
global.slab_vmas = KMEM_CACHE(i915_vma, SLAB_HWCACHE_ALIGN);
|
|
|
|
if (!global.slab_vmas)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
i915_global_register(&global.base);
|
|
|
|
return 0;
|
2019-02-28 17:20:34 +07:00
|
|
|
}
|