Re: [RFC 3/4] drm/xe/multi_queue: Handle VF recovery in CGP_SYNC and queue registration paths

[Matthew Brost <matthew.brost@intel.com>]

On Wed, Apr 22, 2026 at 07:49:55PM -0700, Niranjana Vishwanathapura wrote:
> In xe_guc_exec_queue_group_cgp_sync(), add vf_recovery(guc) as a wake
> condition on the wait_event_timeout() so VF migration does not cause a
> spurious timeout. Adjust the error check to only treat a timeout as an
> error when VF recovery is not in progress.
> 
> Assisted-by: GitHub Copilot:claude-sonnet-4.6
> Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>

Reviewed-by: Matthew Brost <matthew.brost@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_guc_submit.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
> index 4171eff4e8ad..0e857ef06611 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -827,13 +827,12 @@ static void xe_guc_exec_queue_group_cgp_sync(struct xe_guc *guc,
>  	 * Hence, no locking is required here.
>  	 * Wait for any pending CGP_SYNC_DONE response before updating the
>  	 * CGP page and sending CGP_SYNC message.
> -	 *
> -	 * FIXME: Support VF migration
>  	 */
>  	ret = wait_event_timeout(guc->ct.wq,
>  				 !READ_ONCE(group->sync_pending) ||
> -				 xe_guc_read_stopped(guc), HZ);
> -	if (!ret || xe_guc_read_stopped(guc)) {
> +				 xe_guc_read_stopped(guc) ||
> +				 vf_recovery(guc), HZ);
> +	if ((!ret && !vf_recovery(guc)) || xe_guc_read_stopped(guc)) {
>  		/* CGP_SYNC failed. Reset gt, cleanup the group */
>  		xe_gt_warn(guc_to_gt(guc), "Wait for CGP_SYNC_DONE response failed!\n");
>  		set_exec_queue_group_banned(q);
> -- 
> 2.43.0
>