[PATCH v3 2/3] drm/xe: Add infrastructure for delayed LRC capture

[Souza, Jose]

On Tue, 2024-02-27 at 14:12 +0100, Maarten Lankhorst wrote:
> Add a xe_guc_exec_queue_snapshot_capture_delayed and
> xe_lrc_snapshot_capture_delayed function to capture
> the contents of LRC in the next patch.
> 

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

Whole series LGTM and no warnings reproduced.

UMD usage: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27888


> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> ---
>  drivers/gpu/drm/xe/xe_devcoredump.c |  7 +++----
>  drivers/gpu/drm/xe/xe_guc_submit.c  | 19 +++++++++++++++++++
>  drivers/gpu/drm/xe/xe_guc_submit.h  |  2 ++
>  drivers/gpu/drm/xe/xe_lrc.c         |  8 ++++++++
>  drivers/gpu/drm/xe/xe_lrc.h         |  1 +
>  drivers/gpu/drm/xe/xe_vm.c          |  3 +++
>  6 files changed, 36 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_devcoredump.c b/drivers/gpu/drm/xe/xe_devcoredump.c
> index 68d3d623a05b..0fcd30680323 100644
> --- a/drivers/gpu/drm/xe/xe_devcoredump.c
> +++ b/drivers/gpu/drm/xe/xe_devcoredump.c
> @@ -65,8 +65,8 @@ static void xe_devcoredump_deferred_snap_work(struct work_struct *work)
>  	struct xe_devcoredump_snapshot *ss = container_of(work, typeof(*ss), work);
>  
>  	xe_force_wake_get(gt_to_fw(ss->gt), XE_FORCEWAKE_ALL);
> -	if (ss->vm)
> -		xe_vm_snapshot_capture_delayed(ss->vm);
> +	xe_vm_snapshot_capture_delayed(ss->vm);
> +	xe_guc_exec_queue_snapshot_capture_delayed(ss->ge);
>  	xe_force_wake_put(gt_to_fw(ss->gt), XE_FORCEWAKE_ALL);
>  }
>  
> @@ -196,8 +196,7 @@ static void devcoredump_snapshot(struct xe_devcoredump *coredump,
>  		coredump->snapshot.hwe[id] = xe_hw_engine_snapshot_capture(hwe);
>  	}
>  
> -	if (ss->vm)
> -		queue_work(system_unbound_wq, &ss->work);
> +	queue_work(system_unbound_wq, &ss->work);
>  
>  	xe_force_wake_put(gt_to_fw(q->gt), XE_FORCEWAKE_ALL);
>  	dma_fence_end_signalling(cookie);
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
> index 7348689ec5ae..d681672721a9 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -1859,6 +1859,25 @@ xe_guc_exec_queue_snapshot_capture(struct xe_sched_job *job)
>  	return snapshot;
>  }
>  
> +
> +/**
> + * xe_guc_exec_queue_snapshot_capture_delayed - Take delayed part of snapshot of the GuC Engine.
> + * @snapshot: Previously captured snapshot of job.
> + *
> + * This captures some data that requires taking some locks, so it cannot be done in signaling path.
> + */
> +void
> +xe_guc_exec_queue_snapshot_capture_delayed(struct xe_guc_submit_exec_queue_snapshot *snapshot)
> +{
> +	int i;
> +
> +	if (!snapshot || !snapshot->lrc)
> +		return;
> +
> +	for (i = 0; i < snapshot->width; ++i)
> +		xe_lrc_snapshot_capture_delayed(snapshot->lrc[i]);
> +}
> +
>  /**
>   * xe_guc_exec_queue_snapshot_print - Print out a given GuC Engine snapshot.
>   * @snapshot: GuC Submit Engine snapshot object.
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.h b/drivers/gpu/drm/xe/xe_guc_submit.h
> index 723dc2bd8df9..2f14dfd04722 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.h
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.h
> @@ -29,6 +29,8 @@ int xe_guc_exec_queue_reset_failure_handler(struct xe_guc *guc, u32 *msg, u32 le
>  struct xe_guc_submit_exec_queue_snapshot *
>  xe_guc_exec_queue_snapshot_capture(struct xe_sched_job *job);
>  void
> +xe_guc_exec_queue_snapshot_capture_delayed(struct xe_guc_submit_exec_queue_snapshot *snapshot);
> +void
>  xe_guc_exec_queue_snapshot_print(struct xe_guc_submit_exec_queue_snapshot *snapshot,
>  				 struct drm_printer *p);
>  void
> diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
> index 8233d4512fc6..993739a3efcc 100644
> --- a/drivers/gpu/drm/xe/xe_lrc.c
> +++ b/drivers/gpu/drm/xe/xe_lrc.c
> @@ -1328,6 +1328,14 @@ struct xe_lrc_snapshot *xe_lrc_snapshot_capture(struct xe_lrc *lrc)
>  	return snapshot;
>  }
>  
> +void xe_lrc_snapshot_capture_delayed(struct xe_lrc_snapshot *snapshot)
> +{
> +	if (!snapshot)
> +		return;
> +
> +	/* TODO: Copy status page */
> +}
> +
>  void xe_lrc_snapshot_print(struct xe_lrc_snapshot *snapshot, struct drm_printer *p)
>  {
>  	if (!snapshot)
> diff --git a/drivers/gpu/drm/xe/xe_lrc.h b/drivers/gpu/drm/xe/xe_lrc.h
> index d6dd4045d6d7..d32fa31faa2c 100644
> --- a/drivers/gpu/drm/xe/xe_lrc.h
> +++ b/drivers/gpu/drm/xe/xe_lrc.h
> @@ -56,6 +56,7 @@ void xe_lrc_dump_default(struct drm_printer *p,
>  void xe_lrc_emit_hwe_state_instructions(struct xe_exec_queue *q, struct xe_bb *bb);
>  
>  struct xe_lrc_snapshot *xe_lrc_snapshot_capture(struct xe_lrc *lrc);
> +void xe_lrc_snapshot_capture_delayed(struct xe_lrc_snapshot *snapshot);
>  void xe_lrc_snapshot_print(struct xe_lrc_snapshot *snapshot, struct drm_printer *p);
>  void xe_lrc_snapshot_free(struct xe_lrc_snapshot *snapshot);
>  
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index db3f049a47dc..2c30f6cc2380 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -3340,6 +3340,9 @@ struct xe_vm_snapshot *xe_vm_snapshot_capture(struct xe_vm *vm)
>  
>  void xe_vm_snapshot_capture_delayed(struct xe_vm_snapshot *snap)
>  {
> +	if (!snap)
> +		return;
> +
>  	for (int i = 0; i < snap->num_snaps; i++) {
>  		struct xe_bo *bo = snap->snap[i].bo;
>  		struct iosys_map src;