Re: [PATCH] drm/xe: Call invalidation_fence_fini for PT inval fences in error state

[Nirmoy Das <nirmoy.das@linux.intel.com>]

On 12/6/2024 2:50 AM, Daniele Ceraolo Spurio wrote:
> Invalidation_fence_init takes a PM reference, which is released in its
> _fini counterpart, so we need to make sure that the latter is called,
> even if the fence is in an error state.
>
> Since we already have a function that calls _fini() and signals the
> fence in the tlb inval code, we can expose that and call it from the PT
> code.
>
> Fixes: f002702290fc ("drm/xe: Hold a PM ref when GT TLB invalidations are inflight")

Cc: <stable@vger.kernel.org> # v6.11+

> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Matthew Brost <matthew.brost@intel.com>
> Cc: Nirmoy Das <nirmoy.das@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>

LGTM

Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 8 ++++++++
>  drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 1 +
>  drivers/gpu/drm/xe/xe_pt.c                  | 3 +--
>  3 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
> index 4e9f89392160..665927b80e9e 100644
> --- a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
> +++ b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
> @@ -65,6 +65,14 @@ invalidation_fence_signal(struct xe_device *xe, struct xe_gt_tlb_invalidation_fe
>  	__invalidation_fence_signal(xe, fence);
>  }
>  
> +void xe_gt_tlb_invalidation_fence_signal(struct xe_gt_tlb_invalidation_fence *fence)
> +{
> +	if (WARN_ON_ONCE(!fence->gt))
> +		return;
> +
> +	__invalidation_fence_signal(gt_to_xe(fence->gt), fence);
> +}
> +
>  static void xe_gt_tlb_fence_timeout(struct work_struct *work)
>  {
>  	struct xe_gt *gt = container_of(work, struct xe_gt,
> diff --git a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h
> index f430d5797af7..00b1c6c01e8d 100644
> --- a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h
> +++ b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h
> @@ -28,6 +28,7 @@ int xe_guc_tlb_invalidation_done_handler(struct xe_guc *guc, u32 *msg, u32 len);
>  void xe_gt_tlb_invalidation_fence_init(struct xe_gt *gt,
>  				       struct xe_gt_tlb_invalidation_fence *fence,
>  				       bool stack);
> +void xe_gt_tlb_invalidation_fence_signal(struct xe_gt_tlb_invalidation_fence *fence);
>  
>  static inline void
>  xe_gt_tlb_invalidation_fence_wait(struct xe_gt_tlb_invalidation_fence *fence)
> diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
> index 684dc075deac..65c3c1688710 100644
> --- a/drivers/gpu/drm/xe/xe_pt.c
> +++ b/drivers/gpu/drm/xe/xe_pt.c
> @@ -1334,8 +1334,7 @@ static void invalidation_fence_cb(struct dma_fence *fence,
>  		queue_work(system_wq, &ifence->work);
>  	} else {
>  		ifence->base.base.error = ifence->fence->error;
> -		dma_fence_signal(&ifence->base.base);
> -		dma_fence_put(&ifence->base.base);
> +		xe_gt_tlb_invalidation_fence_signal(&ifence->base);
>  	}
>  	dma_fence_put(ifence->fence);
>  }