All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <christian.koenig@amd.com>
To: Liu01 Tong <Tong.Liu01@amd.com>, dri-devel@lists.freedesktop.org
Cc: phasta@kernel.org, dakr@kernel.org, matthew.brost@intel.com,
	gang.ba@amd.com, matthew.schwartz@linux.dev, lin.cao@amd.com,
	"Lin . Cao" <lincao12@amd.com>
Subject: Re: [PATCH] drm/amdgpu: fix task hang from failed job submission during process kill
Date: Mon, 11 Aug 2025 10:25:14 +0200	[thread overview]
Message-ID: <b2e02500-0d50-4d84-8ec5-fb8cb753c91a@amd.com> (raw)
In-Reply-To: <20250811072050.3838241-1-Tong.Liu01@amd.com>

On 11.08.25 09:20, Liu01 Tong wrote:
> During process kill, drm_sched_entity_flush() will kill the vm
> entities. The following job submissions of this process will fail

Well when the process is killed how can it still make job submissions?

Regards,
Christian.

>, and
> the resources of these jobs have not been released, nor have the fences
> been signalled, causing tasks to hang.
> 
> Fix by not doing job init when the entity is stopped. And when the job
> is already submitted, free the job resource if the entity is stopped.
> 
> Signed-off-by: Liu01 Tong <Tong.Liu01@amd.com>
> Signed-off-by: Lin.Cao <lincao12@amd.com>
> ---
>  drivers/gpu/drm/scheduler/sched_entity.c | 13 +++++++------
>  drivers/gpu/drm/scheduler/sched_main.c   |  5 +++++
>  2 files changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c
> index ac678de7fe5e..1e744b2eb2db 100644
> --- a/drivers/gpu/drm/scheduler/sched_entity.c
> +++ b/drivers/gpu/drm/scheduler/sched_entity.c
> @@ -570,6 +570,13 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job)
>  	bool first;
>  	ktime_t submit_ts;
>  
> +	if (entity->stopped) {
> +		DRM_ERROR("Trying to push job to a killed entity\n");
> +		INIT_WORK(&sched_job->work, drm_sched_entity_kill_jobs_work);
> +		schedule_work(&sched_job->work);
> +		return;
> +	}
> +
>  	trace_drm_sched_job(sched_job, entity);
>  	atomic_inc(entity->rq->sched->score);
>  	WRITE_ONCE(entity->last_user, current->group_leader);
> @@ -589,12 +596,6 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job)
>  
>  		/* Add the entity to the run queue */
>  		spin_lock(&entity->lock);
> -		if (entity->stopped) {
> -			spin_unlock(&entity->lock);
> -
> -			DRM_ERROR("Trying to push to a killed entity\n");
> -			return;
> -		}
>  
>  		rq = entity->rq;
>  		sched = rq->sched;
> diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
> index bfea608a7106..c15b17d9ffe3 100644
> --- a/drivers/gpu/drm/scheduler/sched_main.c
> +++ b/drivers/gpu/drm/scheduler/sched_main.c
> @@ -795,6 +795,11 @@ int drm_sched_job_init(struct drm_sched_job *job,
>  		return -ENOENT;
>  	}
>  
> +	if (unlikely(entity->stopped)) {
> +		pr_err("*ERROR* %s: entity is stopped!\n", __func__);
> +		return -EINVAL;
> +	}
> +
>  	if (unlikely(!credits)) {
>  		pr_err("*ERROR* %s: credits cannot be 0!\n", __func__);
>  		return -EINVAL;


  parent reply	other threads:[~2025-08-11  8:25 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-11  7:20 [PATCH] drm/amdgpu: fix task hang from failed job submission during process kill Liu01 Tong
2025-08-11  8:18 ` Philipp Stanner
2025-08-11  8:20   ` Philipp Stanner
2025-08-11  8:25 ` Christian König [this message]
2025-08-11  9:05   ` Liu01, Tong (Esther)
2025-08-11 12:16     ` Christian König
2025-08-12  6:37       ` Liu01, Tong (Esther)
2025-08-12  6:58         ` Christian König
2025-08-12 12:52           ` Philipp Stanner
2025-08-12 13:00             ` Christian König
  -- strict thread matches above, loose matches on Subject: below --
2025-08-12  8:00 Liu01 Tong
2025-08-12  8:07 ` Christian König

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b2e02500-0d50-4d84-8ec5-fb8cb753c91a@amd.com \
    --to=christian.koenig@amd.com \
    --cc=Tong.Liu01@amd.com \
    --cc=dakr@kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=gang.ba@amd.com \
    --cc=lin.cao@amd.com \
    --cc=lincao12@amd.com \
    --cc=matthew.brost@intel.com \
    --cc=matthew.schwartz@linux.dev \
    --cc=phasta@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.