diff options
| author | Chris Wilson | 2018-07-19 09:22:06 +0200 |
|---|---|---|
| committer | Chris Wilson | 2018-07-19 13:27:46 +0200 |
| commit | 46b1063f91e5680eff2a6b9fe432f6aae3bef54e (patch) | |
| tree | daf50db29b5d08e593ef226c396d1c4155431ab2 /drivers/gpu/drm/i915 | |
| parent | drm/i915/guc: Keep guc submission permanently engaged (diff) | |
| download | kernel-qcow2-linux-46b1063f91e5680eff2a6b9fe432f6aae3bef54e.tar.gz kernel-qcow2-linux-46b1063f91e5680eff2a6b9fe432f6aae3bef54e.tar.xz kernel-qcow2-linux-46b1063f91e5680eff2a6b9fe432f6aae3bef54e.zip | |
drm/i915: Handle recursive shrinker for vma->last_active allocation
If we call into the shrinker for direct relcaim inside kmalloc, it will
retire the requests. If we retire the vma->last_active while processing a
new i915_vma_move_to_active() we can upset the delicate bookkeeping
required for the cache. After the possible invocation of the shrinker, we
need to double check the vma->last_active is still valid.
Fixes: 8b293eb53a7d ("drm/i915: Track the last-active inside the i915_vma")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105600#c39
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/20180719072206.16015-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_vma.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index ed4e0fb558f7..11d834f94220 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -942,6 +942,14 @@ static struct i915_gem_active *active_instance(struct i915_vma *vma, u64 idx) } active = kmalloc(sizeof(*active), GFP_KERNEL); + + /* kmalloc may retire the vma->last_active request (thanks shrinker)! */ + if (unlikely(!i915_gem_active_raw(&vma->last_active, + &vma->vm->i915->drm.struct_mutex))) { + kfree(active); + goto out; + } + if (unlikely(!active)) return ERR_PTR(-ENOMEM); |