From nobody Sun Dec 14 12:17:01 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2997D254AF4 for ; Thu, 22 May 2025 08:28:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747902482; cv=none; b=k2QcEpjazG8IYKpOK6Mxk23Yj5H57FDPWO1nk0qcnMeH4qlSCEQRhe2jjtpNY2b4MGgKpB04Wic3YeiqSt33VOY3fMb3h+3c7aAoAbi6jjbn6QsbkqUhrN36IexJAVlhV6t2OMF6PWmhMPayYjv5kfVsUCpNOEhCwhS3Vqv8yFw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747902482; c=relaxed/simple; bh=ahvti4lB1vGKzp0hQUqmh5YeVWP+d1OAfbpLmpRYjEA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kS4ZZ1AhjCYZFOWlN+s6fIHRiIvB/0I1JmHDwSj93lLAkz/IS1kctVwToejWF0Czinzv0M5ce+8cDNz9y7EvTs3pTg0uXoP10OkxsUWNkszaC/0O3tz+vFpDQAdGzUB3cAz4gyQUhDb+JZXlOqlKOZUxsB1GCHDKjMQMUYCRyX8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bI2xdyGR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bI2xdyGR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01368C4CEEF; Thu, 22 May 2025 08:27:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747902481; bh=ahvti4lB1vGKzp0hQUqmh5YeVWP+d1OAfbpLmpRYjEA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bI2xdyGRJyE1FL4SAcXT5+5ni7gjaoeLBHTla4O1lHLCHZwcfxVY+vKy7u7ZuAyQJ QbP01ehYS7xZsrYbKRssEeGIqkg90B2m8l52L4SxVzgwAPAGKAdiWTBv/alTVYT+dT aMObXlC6G6GH3cMJ64PSXL357sH+WazaEjj5LD825ixABm6Og1AnYB7O0Exlm59WyR Mkq5ZvzNmEP+5chR45fuvkRLakJ5YsRxcZxyoobY8gxsi2JA78MExX08lOYXeqqVI8 G82CcQdHNSSrSL2ZtcYZFzQSl7X0qVGmEpsg1GGIn9wuQiz8YnqfLEqcb2cBXXnStk mF9XG5N5e45OA== From: Philipp Stanner To: Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Matthew Brost , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Tvrtko Ursulin Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Philipp Stanner Subject: [PATCH v3 1/5] drm/sched: Fix teardown leaks with waitqueue Date: Thu, 22 May 2025 10:27:39 +0200 Message-ID: <20250522082742.148191-3-phasta@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250522082742.148191-2-phasta@kernel.org> References: <20250522082742.148191-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Philipp Stanner The GPU scheduler currently does not ensure that its pending_list is empty before performing various other teardown tasks in drm_sched_fini(). If there are still jobs in the pending_list, this is problematic because after scheduler teardown, no one will call backend_ops.free_job() anymore. This would, consequently, result in memory leaks. One way to solve this is to implement a waitqueue that drm_sched_fini() blocks on until the pending_list has become empty. That waitqueue must obviously not block for a significant time. Thus, it's necessary to only wait if it's guaranteed that all fences will get signaled quickly. This can be ensured by having the driver implement a new backend ops, cancel_pending_fences(), in which the driver shall signal all unsignaled, in-flight fences with an error. Add a waitqueue to struct drm_gpu_scheduler. Wake up waiters once the pending_list becomes empty. Wait in drm_sched_fini() for that to happen if cancel_pending_fences() is implemented. Signed-off-by: Philipp Stanner --- drivers/gpu/drm/scheduler/sched_main.c | 105 ++++++++++++++++++++----- include/drm/gpu_scheduler.h | 19 +++++ 2 files changed, 105 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/sched= uler/sched_main.c index f7118497e47a..406572f5168e 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -367,7 +367,7 @@ static void drm_sched_run_job_queue(struct drm_gpu_sche= duler *sched) */ static void __drm_sched_run_free_queue(struct drm_gpu_scheduler *sched) { - if (!READ_ONCE(sched->pause_submit)) + if (!READ_ONCE(sched->pause_free)) queue_work(sched->submit_wq, &sched->work_free_job); } =20 @@ -1121,6 +1121,12 @@ drm_sched_get_finished_job(struct drm_gpu_scheduler = *sched) /* remove job from pending_list */ list_del_init(&job->list); =20 + /* + * Inform tasks blocking in drm_sched_fini() that it's now safe to proce= ed. + */ + if (list_empty(&sched->pending_list)) + wake_up(&sched->pending_list_waitque); + /* cancel this job's TO timer */ cancel_delayed_work(&sched->work_tdr); /* make the scheduled timestamp more accurate */ @@ -1326,6 +1332,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched, c= onst struct drm_sched_init_ init_waitqueue_head(&sched->job_scheduled); INIT_LIST_HEAD(&sched->pending_list); spin_lock_init(&sched->job_list_lock); + init_waitqueue_head(&sched->pending_list_waitque); atomic_set(&sched->credit_count, 0); INIT_DELAYED_WORK(&sched->work_tdr, drm_sched_job_timedout); INIT_WORK(&sched->work_run_job, drm_sched_run_job_work); @@ -1333,6 +1340,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched, c= onst struct drm_sched_init_ atomic_set(&sched->_score, 0); atomic64_set(&sched->job_id_count, 0); sched->pause_submit =3D false; + sched->pause_free =3D false; =20 sched->ready =3D true; return 0; @@ -1350,33 +1358,90 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,= const struct drm_sched_init_ } EXPORT_SYMBOL(drm_sched_init); =20 +/** + * drm_sched_submission_and_timeout_stop - stop everything except for free= _job + * @sched: scheduler instance + * + * Helper for tearing down the scheduler in drm_sched_fini(). + */ +static void +drm_sched_submission_and_timeout_stop(struct drm_gpu_scheduler *sched) +{ + WRITE_ONCE(sched->pause_submit, true); + cancel_work_sync(&sched->work_run_job); + cancel_delayed_work_sync(&sched->work_tdr); +} + +/** + * drm_sched_free_stop - stop free_job + * @sched: scheduler instance + * + * Helper for tearing down the scheduler in drm_sched_fini(). + */ +static void drm_sched_free_stop(struct drm_gpu_scheduler *sched) +{ + WRITE_ONCE(sched->pause_free, true); + cancel_work_sync(&sched->work_free_job); +} + +/** + * drm_sched_no_jobs_pending - check whether jobs are pending + * @sched: scheduler instance + * + * Checks if jobs are pending for @sched. + * + * Return: true if jobs are pending, false otherwise. + */ +static bool drm_sched_no_jobs_pending(struct drm_gpu_scheduler *sched) +{ + bool empty; + + spin_lock(&sched->job_list_lock); + empty =3D list_empty(&sched->pending_list); + spin_unlock(&sched->job_list_lock); + + return empty; +} + +/** + * drm_sched_cancel_jobs_and_wait - trigger freeing of all pending jobs + * @sched: scheduler instance + * + * Must only be called if &struct drm_sched_backend_ops.cancel_pending_fen= ces is + * implemented. + * + * Instructs the driver to kill the fence context associated with this sch= eduler, + * thereby signaling all pending fences. This, in turn, will trigger + * &struct drm_sched_backend_ops.free_job to be called for all pending job= s. + * The function then blocks until all pending jobs have been freed. + */ +static void drm_sched_cancel_jobs_and_wait(struct drm_gpu_scheduler *sched) +{ + sched->ops->cancel_pending_fences(sched); + wait_event(sched->pending_list_waitque, drm_sched_no_jobs_pending(sched)); +} + /** * drm_sched_fini - Destroy a gpu scheduler * * @sched: scheduler instance * - * Tears down and cleans up the scheduler. - * - * This stops submission of new jobs to the hardware through - * drm_sched_backend_ops.run_job(). Consequently, drm_sched_backend_ops.fr= ee_job() - * will not be called for all jobs still in drm_gpu_scheduler.pending_list. - * There is no solution for this currently. Thus, it is up to the driver t= o make - * sure that: - * - * a) drm_sched_fini() is only called after for all submitted jobs - * drm_sched_backend_ops.free_job() has been called or that - * b) the jobs for which drm_sched_backend_ops.free_job() has not been ca= lled - * after drm_sched_fini() ran are freed manually. - * - * FIXME: Take care of the above problem and prevent this function from le= aking - * the jobs in drm_gpu_scheduler.pending_list under any circumstances. + * Tears down and cleans up the scheduler. Might leak memory if + * &struct drm_sched_backend_ops.cancel_pending_fences is not implemented. */ void drm_sched_fini(struct drm_gpu_scheduler *sched) { struct drm_sched_entity *s_entity; int i; =20 - drm_sched_wqueue_stop(sched); + if (sched->ops->cancel_pending_fences) { + drm_sched_submission_and_timeout_stop(sched); + drm_sched_cancel_jobs_and_wait(sched); + drm_sched_free_stop(sched); + } else { + /* We're in "legacy free-mode" and ignore potential mem leaks */ + drm_sched_wqueue_stop(sched); + } =20 for (i =3D DRM_SCHED_PRIORITY_KERNEL; i < sched->num_rqs; i++) { struct drm_sched_rq *rq =3D sched->sched_rq[i]; @@ -1464,7 +1529,7 @@ bool drm_sched_wqueue_ready(struct drm_gpu_scheduler = *sched) EXPORT_SYMBOL(drm_sched_wqueue_ready); =20 /** - * drm_sched_wqueue_stop - stop scheduler submission + * drm_sched_wqueue_stop - stop scheduler submission and freeing * @sched: scheduler instance * * Stops the scheduler from pulling new jobs from entities. It also stops @@ -1473,13 +1538,14 @@ EXPORT_SYMBOL(drm_sched_wqueue_ready); void drm_sched_wqueue_stop(struct drm_gpu_scheduler *sched) { WRITE_ONCE(sched->pause_submit, true); + WRITE_ONCE(sched->pause_free, true); cancel_work_sync(&sched->work_run_job); cancel_work_sync(&sched->work_free_job); } EXPORT_SYMBOL(drm_sched_wqueue_stop); =20 /** - * drm_sched_wqueue_start - start scheduler submission + * drm_sched_wqueue_start - start scheduler submission and freeing * @sched: scheduler instance * * Restarts the scheduler after drm_sched_wqueue_stop() has stopped it. @@ -1490,6 +1556,7 @@ EXPORT_SYMBOL(drm_sched_wqueue_stop); void drm_sched_wqueue_start(struct drm_gpu_scheduler *sched) { WRITE_ONCE(sched->pause_submit, false); + WRITE_ONCE(sched->pause_free, false); queue_work(sched->submit_wq, &sched->work_run_job); queue_work(sched->submit_wq, &sched->work_free_job); } diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index d860db087ea5..d8bd5b605336 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -29,6 +29,7 @@ #include #include #include +#include =20 #define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000) =20 @@ -508,6 +509,19 @@ struct drm_sched_backend_ops { * and it's time to clean it up. */ void (*free_job)(struct drm_sched_job *sched_job); + + /** + * @cancel_pending_fences: cancel all unsignaled hardware fences + * + * This callback must signal all unsignaled hardware fences associated + * with @sched with an appropriate error code (e.g., -ECANCELED). This + * ensures that all jobs will get freed by the scheduler before + * teardown. + * + * This callback is optional, but it is highly recommended to implement + * it to avoid memory leaks. + */ + void (*cancel_pending_fences)(struct drm_gpu_scheduler *sched); }; =20 /** @@ -533,6 +547,8 @@ struct drm_sched_backend_ops { * timeout interval is over. * @pending_list: the list of jobs which are currently in the job queue. * @job_list_lock: lock to protect the pending_list. + * @pending_list_waitque: a waitqueue for drm_sched_fini() to block on unt= il all + * pending jobs have been finished. * @hang_limit: once the hangs by a job crosses this limit then it is mark= ed * guilty and it will no longer be considered for scheduling. * @score: score to help loadbalancer pick a idle sched @@ -540,6 +556,7 @@ struct drm_sched_backend_ops { * @ready: marks if the underlying HW is ready to work * @free_guilty: A hit to time out handler to free the guilty job. * @pause_submit: pause queuing of @work_run_job on @submit_wq + * @pause_free: pause queueing of @work_free_job on @submit_wq * @own_submit_wq: scheduler owns allocation of @submit_wq * @dev: system &struct device * @@ -562,12 +579,14 @@ struct drm_gpu_scheduler { struct delayed_work work_tdr; struct list_head pending_list; spinlock_t job_list_lock; + wait_queue_head_t pending_list_waitque; int hang_limit; atomic_t *score; atomic_t _score; bool ready; bool free_guilty; bool pause_submit; + bool pause_free; bool own_submit_wq; struct device *dev; }; --=20 2.49.0 From nobody Sun Dec 14 12:17:01 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5FA5268FEC for ; Thu, 22 May 2025 08:28:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747902485; cv=none; b=Sw7lZk1gy2morTdUGD/vTkyStkADUjMtE/Tsh14v6n7CBCfXqXlegOTjdTh9zticH6j5J3vDgyclEsAwdvFk4xjXyJr/ksLuCIWa2V9vz50m/fwxF26g0ZV+Qg6LuCdiyy6szIPxax8RqPSXqFuKARJ8wdSR5MtpFYOhF9J9I58= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747902485; c=relaxed/simple; bh=jFU8/A6NJwGZ/BP41pnQQfuF2n1Rywy2oJ8IYo9L+Ec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lPaWcuS/kNtbu2k0Pv4dLBVyjeU/wmt+oLUFxBjYqIUKSleF/Wbc6WV83A4k1SXLvFwJqvHTdCKVZKhLXdxw3INa/4U2GG5/Vzncc3uY1A6juTqPZUgvq0AzuVS6mp0GojNN9gedcQtxABOYe6hZhVYBgP+uPDHNLCFTZktekwo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=juD1CJ2F; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="juD1CJ2F" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00F7DC4CEE4; Thu, 22 May 2025 08:28:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747902485; bh=jFU8/A6NJwGZ/BP41pnQQfuF2n1Rywy2oJ8IYo9L+Ec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=juD1CJ2Frz+bKzxe1t1CtKdTWoMfE2EZzmmDJNRmTarVYlNQvO45eyS/D00DB9+HZ LGIfne9VnQVocNKL8Xx7uUsTwxG7zAR92/42IbsKWC9lLQkyQfwewyQIzYVu/Ohoyp hG+yoW6p6rJH6zpQU+yYXU9v2xDHswrfJptvt2FwaGWxo71Ay1NC4lzdkgygllVQ9w vQu/tvmtVzlKad6zQBP9fAQ3vriytVC7Di3w9WmgAP/3xnmpUHCP5+4fAkfTizUU+1 pbsRqtj9LDP6NDMpVTObuoIfLwNw+W8tTh1t+ZEZdblLXeU3NgO+bkyYU1pJC/61sp 7BaVDMUj4CgmA== From: Philipp Stanner To: Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Matthew Brost , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Tvrtko Ursulin Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/5] drm/sched/tests: Port tests to new cleanup method Date: Thu, 22 May 2025 10:27:40 +0200 Message-ID: <20250522082742.148191-4-phasta@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250522082742.148191-2-phasta@kernel.org> References: <20250522082742.148191-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The drm_gpu_scheduler now supports a callback to help drm_sched_fini() avoid memory leaks. This callback instructs the driver to signal all pending hardware fences. Implement the new callback drm_sched_backend_ops.cancel_pending_fences(). Have the callback use drm_mock_sched_job_complete() with a new error field for the fence error. Keep the job status as DRM_MOCK_SCHED_JOB_DONE for now, since there is no party for which checking for a CANCELED status would be useful currently. Signed-off-by: Philipp Stanner --- .../gpu/drm/scheduler/tests/mock_scheduler.c | 67 +++++++------------ drivers/gpu/drm/scheduler/tests/sched_tests.h | 4 +- 2 files changed, 25 insertions(+), 46 deletions(-) diff --git a/drivers/gpu/drm/scheduler/tests/mock_scheduler.c b/drivers/gpu= /drm/scheduler/tests/mock_scheduler.c index f999c8859cf7..eca47f0395bc 100644 --- a/drivers/gpu/drm/scheduler/tests/mock_scheduler.c +++ b/drivers/gpu/drm/scheduler/tests/mock_scheduler.c @@ -55,7 +55,7 @@ void drm_mock_sched_entity_free(struct drm_mock_sched_ent= ity *entity) drm_sched_entity_destroy(&entity->base); } =20 -static void drm_mock_sched_job_complete(struct drm_mock_sched_job *job) +static void drm_mock_sched_job_complete(struct drm_mock_sched_job *job, in= t err) { struct drm_mock_scheduler *sched =3D drm_sched_to_mock_sched(job->base.sched); @@ -63,7 +63,9 @@ static void drm_mock_sched_job_complete(struct drm_mock_s= ched_job *job) lockdep_assert_held(&sched->lock); =20 job->flags |=3D DRM_MOCK_SCHED_JOB_DONE; - list_move_tail(&job->link, &sched->done_list); + list_del(&job->link); + if (err) + dma_fence_set_error(&job->hw_fence, err); dma_fence_signal(&job->hw_fence); complete(&job->done); } @@ -89,7 +91,7 @@ drm_mock_sched_job_signal_timer(struct hrtimer *hrtimer) break; =20 sched->hw_timeline.cur_seqno =3D job->hw_fence.seqno; - drm_mock_sched_job_complete(job); + drm_mock_sched_job_complete(job, 0); } spin_unlock_irqrestore(&sched->lock, flags); =20 @@ -212,26 +214,33 @@ mock_sched_timedout_job(struct drm_sched_job *sched_j= ob) =20 static void mock_sched_free_job(struct drm_sched_job *sched_job) { - struct drm_mock_scheduler *sched =3D - drm_sched_to_mock_sched(sched_job->sched); struct drm_mock_sched_job *job =3D drm_sched_job_to_mock_job(sched_job); - unsigned long flags; =20 - /* Remove from the scheduler done list. */ - spin_lock_irqsave(&sched->lock, flags); - list_del(&job->link); - spin_unlock_irqrestore(&sched->lock, flags); dma_fence_put(&job->hw_fence); - drm_sched_job_cleanup(sched_job); =20 /* Mock job itself is freed by the kunit framework. */ } =20 +static void mock_sched_cancel_pending_fences(struct drm_gpu_scheduler *gsc= hed) +{ + struct drm_mock_sched_job *job, *next; + struct drm_mock_scheduler *sched; + unsigned long flags; + + sched =3D container_of(gsched, struct drm_mock_scheduler, base); + + spin_lock_irqsave(&sched->lock, flags); + list_for_each_entry_safe(job, next, &sched->job_list, link) + drm_mock_sched_job_complete(job, -ECANCELED); + spin_unlock_irqrestore(&sched->lock, flags); +} + static const struct drm_sched_backend_ops drm_mock_scheduler_ops =3D { .run_job =3D mock_sched_run_job, .timedout_job =3D mock_sched_timedout_job, - .free_job =3D mock_sched_free_job + .free_job =3D mock_sched_free_job, + .cancel_pending_fences =3D mock_sched_cancel_pending_fences, }; =20 /** @@ -265,7 +274,6 @@ struct drm_mock_scheduler *drm_mock_sched_new(struct ku= nit *test, long timeout) sched->hw_timeline.context =3D dma_fence_context_alloc(1); atomic_set(&sched->hw_timeline.next_seqno, 0); INIT_LIST_HEAD(&sched->job_list); - INIT_LIST_HEAD(&sched->done_list); spin_lock_init(&sched->lock); =20 return sched; @@ -280,38 +288,11 @@ struct drm_mock_scheduler *drm_mock_sched_new(struct = kunit *test, long timeout) */ void drm_mock_sched_fini(struct drm_mock_scheduler *sched) { - struct drm_mock_sched_job *job, *next; - unsigned long flags; - LIST_HEAD(list); + struct drm_mock_sched_job *job; =20 - drm_sched_wqueue_stop(&sched->base); - - /* Force complete all unfinished jobs. */ - spin_lock_irqsave(&sched->lock, flags); - list_for_each_entry_safe(job, next, &sched->job_list, link) - list_move_tail(&job->link, &list); - spin_unlock_irqrestore(&sched->lock, flags); - - list_for_each_entry(job, &list, link) + list_for_each_entry(job, &sched->job_list, link) hrtimer_cancel(&job->timer); =20 - spin_lock_irqsave(&sched->lock, flags); - list_for_each_entry_safe(job, next, &list, link) - drm_mock_sched_job_complete(job); - spin_unlock_irqrestore(&sched->lock, flags); - - /* - * Free completed jobs and jobs not yet processed by the DRM scheduler - * free worker. - */ - spin_lock_irqsave(&sched->lock, flags); - list_for_each_entry_safe(job, next, &sched->done_list, link) - list_move_tail(&job->link, &list); - spin_unlock_irqrestore(&sched->lock, flags); - - list_for_each_entry_safe(job, next, &list, link) - mock_sched_free_job(&job->base); - drm_sched_fini(&sched->base); } =20 @@ -346,7 +327,7 @@ unsigned int drm_mock_sched_advance(struct drm_mock_sch= eduler *sched, if (sched->hw_timeline.cur_seqno < job->hw_fence.seqno) break; =20 - drm_mock_sched_job_complete(job); + drm_mock_sched_job_complete(job, 0); found++; } unlock: diff --git a/drivers/gpu/drm/scheduler/tests/sched_tests.h b/drivers/gpu/dr= m/scheduler/tests/sched_tests.h index 27caf8285fb7..22e530d87791 100644 --- a/drivers/gpu/drm/scheduler/tests/sched_tests.h +++ b/drivers/gpu/drm/scheduler/tests/sched_tests.h @@ -32,9 +32,8 @@ * * @base: DRM scheduler base class * @test: Backpointer to owning the kunit test case - * @lock: Lock to protect the simulated @hw_timeline, @job_list and @done_= list + * @lock: Lock to protect the simulated @hw_timeline and @job_list * @job_list: List of jobs submitted to the mock GPU - * @done_list: List of jobs completed by the mock GPU * @hw_timeline: Simulated hardware timeline has a @context, @next_seqno a= nd * @cur_seqno for implementing a struct dma_fence signaling the * simulated job completion. @@ -49,7 +48,6 @@ struct drm_mock_scheduler { =20 spinlock_t lock; struct list_head job_list; - struct list_head done_list; =20 struct { u64 context; --=20 2.49.0 From nobody Sun Dec 14 12:17:01 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E293267F61 for ; Thu, 22 May 2025 08:28:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747902489; cv=none; b=ewU4C+VkQC3N17bkZl3v/oB7vHNAZf09nqBXggBCYCup+xssHvLQ/RNmI6SHqiAdUfUYZQiB1UBYnqaf42lQVOvnhi1pYJYohex0iiQ3l5Bd1APONICFiqAO4MJPLkD8gjcS3aNQCnxzKylc//C4Wuglk3OQzB3xhkW6xWOfQrc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747902489; c=relaxed/simple; bh=kPkZtalTn6TC4lN3oTaHdbFRHY6GMTw8m4m6qeCssVE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dsbs4jNi20AupKK2KV0fx6KHqaP78Y+mX3ivq66Jsg9dylSU5iJ9sPyrb10yXJ+SisZYnemuBmAZwRH9GA5mua9n4QB9XZpU5nepkPMxWnW6vLomxPr2tCQ3Qb+ByXQvU4Shooetc5xA4phJ2iibNi9Ijfz4werHzlyYDjR7teM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gs7uON+v; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gs7uON+v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C19ECC4CEEA; Thu, 22 May 2025 08:28:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747902489; bh=kPkZtalTn6TC4lN3oTaHdbFRHY6GMTw8m4m6qeCssVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gs7uON+vEZevuf6v5yijtPIS7j7PNy7jlcgbPd8KXZq0ze6r2+7ne7pDGCOZl2O0n pJAZ16/qTBMbGYph06hWZAgz0daBvWqMrlwHxGJtMXJ1kA61nn44WDc4DBcCBliXYs FFoA3fVr4iAAITcHTmXQ6gu7OAErMYg75lqvcKGckMEwXQWnF9H2M2PtEG9SN67gIB 5q7uZfrW4XWR01YfkHMKULygV8TLPGzo/IdtmE7rQVVEnrjUWyBEoKyJ73hxQUKC0f Gsbo0mHcwhviSUDSFryfRkL5wRIUkPGlnCOS1YqFYGDlAtK6zS8A3YlHVsueE76NgP egLFobbliUAeA== From: Philipp Stanner To: Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Matthew Brost , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Tvrtko Ursulin Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/5] drm/sched: Warn if pending list is not empty Date: Thu, 22 May 2025 10:27:41 +0200 Message-ID: <20250522082742.148191-5-phasta@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250522082742.148191-2-phasta@kernel.org> References: <20250522082742.148191-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" drm_sched_fini() can leak jobs under certain circumstances. Warn if that happens. Signed-off-by: Philipp Stanner --- drivers/gpu/drm/scheduler/sched_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/sched= uler/sched_main.c index 406572f5168e..48f07e6cfe2b 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -1469,6 +1469,9 @@ void drm_sched_fini(struct drm_gpu_scheduler *sched) sched->ready =3D false; kfree(sched->sched_rq); sched->sched_rq =3D NULL; + + if (!list_empty(&sched->pending_list)) + dev_err(sched->dev, "Tearing down scheduler while jobs are pending!\n"); } EXPORT_SYMBOL(drm_sched_fini); =20 --=20 2.49.0 From nobody Sun Dec 14 12:17:01 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78B6C26AA9B for ; Thu, 22 May 2025 08:28:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747902493; cv=none; b=a0xpjjprPfB69mGOA7inH9ZMHs3bXRT94C45D6e12odhLhkTbUnh/HmkT9RgAeXlE8rBZ/u3XZgT3BerSX1DJ1INmLfcg+FizGX+DBodtdD+CFXouZbxCDGbEE+QdblVXWOgFBbnremtlrmarcRm9Mwjuohh6G03hMLCdVRYd8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747902493; c=relaxed/simple; bh=rnC+iWAxQZV8/eK2peQIVBFSEZ98f6paoI2fDz9f89c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cbUr3nAnP1gMoyTcg1UBqPDQHXHx1kO4RMBcbjf+o+nk4kIshdSPuZAkrb010x/zONsLI8eDTA8ASv7XB1v22K61ZmS6gLTl+cO4ohPsOwBzjuLg5SM6cyILE2nxKLob3FwMsmqpwbj9O/skhZfGkdhtB1KzcEe5I5SwxKxD1c8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LlchIuSb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LlchIuSb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A58D2C4CEE4; Thu, 22 May 2025 08:28:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747902492; bh=rnC+iWAxQZV8/eK2peQIVBFSEZ98f6paoI2fDz9f89c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LlchIuSb/NZKPyb7dDLFNILVoWbpFPmX3gFZntv51aTAO9HiODmiZA8tQeS4S2bNm My6P4S++7Q+/cM/is10fs8/Z8qp0ES9k1mq0DwdhccoUUxis7a72EZU4VUhV9JV8t7 irpbVNH0ZyJCuRJJQkIvB785B8tua/2Xhk2JqgYZeOxBA15er8+2DsODxo2Dwt6c2V E0+090oBJIvL79SvMei5u7lHKKU2l5e+k6+Hi2xUBr2f/F6VVvuDPRwwTHt4YTOoLr igpPXG6k+nrwsF5zKuSw4bVsslJlrYplENEXBJ90hmcNoYhPI5G7VFKtXYQ0+yn8xe NBl9FnnqqyQIQ== From: Philipp Stanner To: Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Matthew Brost , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Tvrtko Ursulin Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/5] drm/nouveau: Add new callback for scheduler teardown Date: Thu, 22 May 2025 10:27:42 +0200 Message-ID: <20250522082742.148191-6-phasta@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250522082742.148191-2-phasta@kernel.org> References: <20250522082742.148191-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is a new callback for always tearing the scheduler down in a leak-free, deadlock-free manner. Port Nouveau as its first user by providing the scheduler with a callback that ensures the fence context gets killed in drm_sched_fini(). Signed-off-by: Philipp Stanner --- drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_sched.c | 19 +++++++++++++++++-- drivers/gpu/drm/nouveau/nouveau_sched.h | 3 +++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouv= eau/nouveau_abi16.c index 2a0617e5fe2a..53b8a85a8adb 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c @@ -415,8 +415,8 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) * The client lock is already acquired by nouveau_abi16_get(). */ if (nouveau_cli_uvmm(cli)) { - ret =3D nouveau_sched_create(&chan->sched, drm, drm->sched_wq, - chan->chan->dma.ib_max); + ret =3D nouveau_sched_create(&chan->sched, drm, chan->chan, + drm->sched_wq, chan->chan->dma.ib_max); if (ret) goto done; } diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouvea= u/nouveau_drm.c index c69139701056..2a2b319dca5f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -313,7 +313,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *s= name, * locks which indirectly or directly are held for allocations * elsewhere. */ - ret =3D nouveau_sched_create(&cli->sched, drm, NULL, 1); + ret =3D nouveau_sched_create(&cli->sched, drm, NULL, NULL, 1); if (ret) goto done; =20 diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.c b/drivers/gpu/drm/nouv= eau/nouveau_sched.c index d326e55d2d24..de14883ee4c8 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sched.c +++ b/drivers/gpu/drm/nouveau/nouveau_sched.c @@ -11,6 +11,7 @@ #include "nouveau_exec.h" #include "nouveau_abi16.h" #include "nouveau_sched.h" +#include "nouveau_chan.h" =20 #define NOUVEAU_SCHED_JOB_TIMEOUT_MS 10000 =20 @@ -392,10 +393,22 @@ nouveau_sched_free_job(struct drm_sched_job *sched_jo= b) nouveau_job_fini(job); } =20 +static void +nouveau_sched_fence_context_kill(struct drm_gpu_scheduler *sched) +{ + struct nouveau_sched *nsched; + + nsched =3D container_of(sched, struct nouveau_sched, base); + + if (nsched->chan) + nouveau_channel_kill(nsched->chan); +} + static const struct drm_sched_backend_ops nouveau_sched_ops =3D { .run_job =3D nouveau_sched_run_job, .timedout_job =3D nouveau_sched_timedout_job, .free_job =3D nouveau_sched_free_job, + .cancel_pending_fences =3D nouveau_sched_fence_context_kill, }; =20 static int @@ -461,7 +474,8 @@ nouveau_sched_init(struct nouveau_sched *sched, struct = nouveau_drm *drm, =20 int nouveau_sched_create(struct nouveau_sched **psched, struct nouveau_drm *dr= m, - struct workqueue_struct *wq, u32 credit_limit) + struct nouveau_channel *chan, struct workqueue_struct *wq, + u32 credit_limit) { struct nouveau_sched *sched; int ret; @@ -470,6 +484,8 @@ nouveau_sched_create(struct nouveau_sched **psched, str= uct nouveau_drm *drm, if (!sched) return -ENOMEM; =20 + sched->chan =3D chan; + ret =3D nouveau_sched_init(sched, drm, wq, credit_limit); if (ret) { kfree(sched); @@ -481,7 +497,6 @@ nouveau_sched_create(struct nouveau_sched **psched, str= uct nouveau_drm *drm, return 0; } =20 - static void nouveau_sched_fini(struct nouveau_sched *sched) { diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.h b/drivers/gpu/drm/nouv= eau/nouveau_sched.h index 20cd1da8db73..e6e2016a3569 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sched.h +++ b/drivers/gpu/drm/nouveau/nouveau_sched.h @@ -9,6 +9,7 @@ #include =20 #include "nouveau_drv.h" +#include "nouveau_chan.h" =20 #define to_nouveau_job(sched_job) \ container_of((sched_job), struct nouveau_job, base) @@ -101,6 +102,7 @@ struct nouveau_sched { struct drm_sched_entity entity; struct workqueue_struct *wq; struct mutex mutex; + struct nouveau_channel *chan; =20 struct { struct { @@ -112,6 +114,7 @@ struct nouveau_sched { }; =20 int nouveau_sched_create(struct nouveau_sched **psched, struct nouveau_drm= *drm, + struct nouveau_channel *chan, struct workqueue_struct *wq, u32 credit_limit); void nouveau_sched_destroy(struct nouveau_sched **psched); =20 --=20 2.49.0 From nobody Sun Dec 14 12:17:01 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 537BA26AAB8 for ; Thu, 22 May 2025 08:28:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747902498; cv=none; b=amooJUsbQM+pMYqbflIsORaqxRFvFrog0p/ztnps78It1Mmm+v1rM0D/S2LXr9pgorVQ2H8iBbE/HcJrU2a50nI9FU2WePP6Vtp8eCrdm6nKBkSQF0RWjqrqr+vWxvq5EEo/XmbQdsfiWS6f6vkUDgd1DHpGEiIWim1urbkNHds= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747902498; c=relaxed/simple; bh=oVd9hezeKD9JYZAVRcvRis9wn/HXrxU2i+cl3HLnwy4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BQg1BEt2gIXVetSHEq0jlZp3R/3t4GGnM6aRY4KS9LWBjJYvu8kQoTmfQZJTRDneWvhcLKb4mI30gz7uspo+Abk7KhNSKANTJUYFGp6pD0Hh0rynlOlydCwxDWrhfUnFl6IyBzH1lBiURNytuDLuS880HxjCkeFKgw5IeN2K/is= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UWEWDjUg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UWEWDjUg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 736FDC4CEEF; Thu, 22 May 2025 08:28:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747902496; bh=oVd9hezeKD9JYZAVRcvRis9wn/HXrxU2i+cl3HLnwy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UWEWDjUgVvsNwv1iaZoEsyNFeJ5OI03+23IyHcMi76QsHGfCRLS8Qu5Z+vJMUADwg yd4vdTHXD3Z7MVCpBxdB+yAsYM91nrteHEGqthrDg0NscyYLQjOj7q7jWvVlHdYox8 TteTSmopgOus7DQbrHANFqTl5uvWKZUShmrFyGXpTaOuDphyg2npXL1SLnZEwgcY4i OgKOro7W+BItzLaSYPUDIqCrevN8GzyHQLabyVCFC8GL8nUVphj4YZRVE+/ukz7fmu fcBZtfekpagqkTnekzhd6igj6mYLcRD0HCO5tpwSCzpaXRVdonKuydAAiA0lttv7i6 h55gAqYaVsCJQ== From: Philipp Stanner To: Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Matthew Brost , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Tvrtko Ursulin Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/5] drm/nouveau: Remove waitque for sched teardown Date: Thu, 22 May 2025 10:27:43 +0200 Message-ID: <20250522082742.148191-7-phasta@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250522082742.148191-2-phasta@kernel.org> References: <20250522082742.148191-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" struct nouveau_sched contains a waitque needed to prevent drm_sched_fini() from being called while there are still jobs pending. Doing so so far would have caused memory leaks. With the new memleak-free mode of operation switched on in drm_sched_fini() by providing the callback nouveau_sched_fence_context_kill() the waitque is not necessary anymore. Remove the waitque. Signed-off-by: Philipp Stanner --- drivers/gpu/drm/nouveau/nouveau_sched.c | 20 +++++++------------- drivers/gpu/drm/nouveau/nouveau_sched.h | 9 +++------ drivers/gpu/drm/nouveau/nouveau_uvmm.c | 8 ++++---- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.c b/drivers/gpu/drm/nouv= eau/nouveau_sched.c index de14883ee4c8..1d300b382b32 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sched.c +++ b/drivers/gpu/drm/nouveau/nouveau_sched.c @@ -121,11 +121,9 @@ nouveau_job_done(struct nouveau_job *job) { struct nouveau_sched *sched =3D job->sched; =20 - spin_lock(&sched->job.list.lock); + spin_lock(&sched->job_list.lock); list_del(&job->entry); - spin_unlock(&sched->job.list.lock); - - wake_up(&sched->job.wq); + spin_unlock(&sched->job_list.lock); } =20 void @@ -306,9 +304,9 @@ nouveau_job_submit(struct nouveau_job *job) } =20 /* Submit was successful; add the job to the schedulers job list. */ - spin_lock(&sched->job.list.lock); - list_add(&job->entry, &sched->job.list.head); - spin_unlock(&sched->job.list.lock); + spin_lock(&sched->job_list.lock); + list_add(&job->entry, &sched->job_list.head); + spin_unlock(&sched->job_list.lock); =20 drm_sched_job_arm(&job->base); job->done_fence =3D dma_fence_get(&job->base.s_fence->finished); @@ -458,9 +456,8 @@ nouveau_sched_init(struct nouveau_sched *sched, struct = nouveau_drm *drm, goto fail_sched; =20 mutex_init(&sched->mutex); - spin_lock_init(&sched->job.list.lock); - INIT_LIST_HEAD(&sched->job.list.head); - init_waitqueue_head(&sched->job.wq); + spin_lock_init(&sched->job_list.lock); + INIT_LIST_HEAD(&sched->job_list.head); =20 return 0; =20 @@ -503,9 +500,6 @@ nouveau_sched_fini(struct nouveau_sched *sched) struct drm_gpu_scheduler *drm_sched =3D &sched->base; struct drm_sched_entity *entity =3D &sched->entity; =20 - rmb(); /* for list_empty to work without lock */ - wait_event(sched->job.wq, list_empty(&sched->job.list.head)); - drm_sched_entity_fini(entity); drm_sched_fini(drm_sched); =20 diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.h b/drivers/gpu/drm/nouv= eau/nouveau_sched.h index e6e2016a3569..339a14563fbb 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sched.h +++ b/drivers/gpu/drm/nouveau/nouveau_sched.h @@ -105,12 +105,9 @@ struct nouveau_sched { struct nouveau_channel *chan; =20 struct { - struct { - struct list_head head; - spinlock_t lock; - } list; - struct wait_queue_head wq; - } job; + struct list_head head; + spinlock_t lock; + } job_list; }; =20 int nouveau_sched_create(struct nouveau_sched **psched, struct nouveau_drm= *drm, diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.c b/drivers/gpu/drm/nouve= au/nouveau_uvmm.c index 48f105239f42..ddfc46bc1b3e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_uvmm.c +++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.c @@ -1019,8 +1019,8 @@ bind_validate_map_sparse(struct nouveau_job *job, u64= addr, u64 range) u64 end =3D addr + range; =20 again: - spin_lock(&sched->job.list.lock); - list_for_each_entry(__job, &sched->job.list.head, entry) { + spin_lock(&sched->job_list.lock); + list_for_each_entry(__job, &sched->job_list.head, entry) { struct nouveau_uvmm_bind_job *bind_job =3D to_uvmm_bind_job(__job); =20 list_for_each_op(op, &bind_job->ops) { @@ -1030,7 +1030,7 @@ bind_validate_map_sparse(struct nouveau_job *job, u64= addr, u64 range) =20 if (!(end <=3D op_addr || addr >=3D op_end)) { nouveau_uvmm_bind_job_get(bind_job); - spin_unlock(&sched->job.list.lock); + spin_unlock(&sched->job_list.lock); wait_for_completion(&bind_job->complete); nouveau_uvmm_bind_job_put(bind_job); goto again; @@ -1038,7 +1038,7 @@ bind_validate_map_sparse(struct nouveau_job *job, u64= addr, u64 range) } } } - spin_unlock(&sched->job.list.lock); + spin_unlock(&sched->job_list.lock); } =20 static int --=20 2.49.0