[Intel-gfx] [PATCH] drm/i915/selftests: Make the mman object busy everywhere

[Tvrtko Ursulin]

On 22/10/2019 11:17, Chris Wilson wrote:
> Loop over all engines, issuing a request for the object on each in order
> to make sure we leave no stone unturned when creating an active ref. The
> purpose is to make sure that we can reap a zombie object (one that is
> only alive due to an active reference on the GPU) no matter where that
> active reference emanates from.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> ---
>   .../drm/i915/gem/selftests/i915_gem_mman.c    | 28 +++++++++----------
>   1 file changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> index 65d4dbf91999..d45a93928ff5 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> @@ -515,20 +515,19 @@ static int make_obj_busy(struct drm_i915_gem_object *obj)
>   {
>   	struct drm_i915_private *i915 = to_i915(obj->base.dev);
>   	struct intel_engine_cs *engine;
> -	enum intel_engine_id id;
> -	struct i915_vma *vma;
> -	int err;
>   
> -	vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL);
> -	if (IS_ERR(vma))
> -		return PTR_ERR(vma);
> +	for_each_uabi_engine(engine, i915) {
> +		struct i915_request *rq;
> +		struct i915_vma *vma;
> +		int err;
>   
> -	err = i915_vma_pin(vma, 0, 0, PIN_USER);
> -	if (err)
> -		return err;
> +		vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL);
> +		if (IS_ERR(vma))
> +			return PTR_ERR(vma);
>   
> -	for_each_engine(engine, i915, id) {
> -		struct i915_request *rq;
> +		err = i915_vma_pin(vma, 0, 0, PIN_USER);
> +		if (err)
> +			return err;
>   
>   		rq = i915_request_create(engine->kernel_context);
>   		if (IS_ERR(rq)) {
> @@ -544,12 +543,13 @@ static int make_obj_busy(struct drm_i915_gem_object *obj)
>   		i915_vma_unlock(vma);
>   
>   		i915_request_add(rq);
> +		i915_vma_unpin(vma);
> +		if (err)
> +			return err;
>   	}
>   
> -	i915_vma_unpin(vma);
>   	i915_gem_object_put(obj); /* leave it only alive via its active ref */
> -
> -	return err;
> +	return 0;
>   }
>   
>   static bool assert_mmap_offset(struct drm_i915_private *i915,
> 

Yes that's better.

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko