Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46b1063f authored by Chris Wilson's avatar Chris Wilson
Browse files

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: 8b293eb5 ("drm/i915: Track the last-active inside the i915_vma")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105600#c39


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180719072206.16015-1-chris@chris-wilson.co.uk
parent 209b7955

drivers/gpu/drm/i915/i915_vma.c

+8 −0
Original line number Diff line number Diff line
@@ -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);