[PATCH] drm/xe/guc/tlb: Flush g2h worker in case of tlb timeout

[Matthew Brost]

On Wed, Oct 23, 2024 at 05:13:43PM +0200, Nirmoy Das wrote:
> Flush the g2h worker explicitly if TLB timeout happens which is
> observed on LNL and that points recent scheduling issue with E-cores.
> This is similar to the recent fix:
> commit e51527233804 ("drm/xe/guc/ct: Flush g2h worker in case of g2h
> response timeout") and should be removed once there is E core
> scheduling fix.
> 
> Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2687
> Cc: Badal Nilawar <badal.nilawar at intel.com>
> Cc: Matthew Brost <matthew.brost at intel.com>
> Cc: Matthew Auld <matthew.auld at intel.com>
> Cc: John Harrison <John.C.Harrison at Intel.com>
> Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray at intel.com>
> Cc: Lucas De Marchi <lucas.demarchi at intel.com>
> Signed-off-by: Nirmoy Das <nirmoy.das at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
> index 773de1f08db9..2c327dccbd74 100644
> --- a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
> +++ b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
> @@ -72,6 +72,15 @@ static void xe_gt_tlb_fence_timeout(struct work_struct *work)
>  	struct xe_device *xe = gt_to_xe(gt);
>  	struct xe_gt_tlb_invalidation_fence *fence, *next;
>  
> +	/*
> +	 * This is analogous to e51527233804 ("drm/xe/guc/ct: Flush g2h worker
> +	 * in case of g2h response timeout")
> +	 *
> +	 * TODO: Drop this change once workqueue scheduling delay issue is
> +	 * fixed on LNL Hybrid CPU.
> +	 */
> +	flush_work(&gt->uc.guc.ct.g2h_worker);
> +

Same comments as last patch, probably get into 6.12 too.

With that:
Reviewed-by: Matthew Brost <matthew.brost at intel.com>

>  	spin_lock_irq(&gt->tlb_invalidation.pending_lock);
>  	list_for_each_entry_safe(fence, next,
>  				 &gt->tlb_invalidation.pending_fences, link) {
> -- 
> 2.46.0
>