From: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
To: phasta@kernel.org, "Lyude Paul" <lyude@redhat.com>,
"Danilo Krummrich" <dakr@kernel.org>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Matthew Brost" <matthew.brost@intel.com>,
"Christian König" <ckoenig.leichtzumerken@gmail.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>
Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 6/6] drm/sched: Port unit tests to new cleanup design
Date: Thu, 8 May 2025 13:51:42 +0100 [thread overview]
Message-ID: <a1c9c680-2927-428c-95e9-2e79d14cec58@igalia.com> (raw)
In-Reply-To: <894cf4cdb7e14b2a21dcf87bfeac4776cb695395.camel@mailbox.org>
Hi Philipp,
On 08/05/2025 12:03, Philipp Stanner wrote:
> On Thu, 2025-04-24 at 11:55 +0200, Philipp Stanner wrote:
>> The unit tests so far took care manually of avoiding memory leaks
>> that
>> might have occurred when calling drm_sched_fini().
>>
>> The scheduler now takes care by itself of avoiding memory leaks if
>> the
>> driver provides the callback
>> drm_sched_backend_ops.kill_fence_context().
>>
>> Implement that callback for the unit tests. Remove the manual cleanup
>> code.
>
> @Tvrtko: On a scale from 1-10, how much do you love this patch? :)
Specific patch aside, it is the series as a whole I would like to be
sure there isn't a more elegant way to achieve the same end result.
Like that sketch of a counter proposal I sent for the reasons listed
with it. Which were, AFAIR, to avoid needing to add more state machine,
to avoid mandating drivers have to keep an internal list, and to align
better with the existing prototypes in the sched ops table (where
everything operates on jobs).
Regards,
Tvrtko
>> Signed-off-by: Philipp Stanner <phasta@kernel.org>
>> ---
>> .../gpu/drm/scheduler/tests/mock_scheduler.c | 34 ++++++++++++-----
>> --
>> 1 file changed, 21 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/scheduler/tests/mock_scheduler.c
>> b/drivers/gpu/drm/scheduler/tests/mock_scheduler.c
>> index f999c8859cf7..a72d26ca8262 100644
>> --- a/drivers/gpu/drm/scheduler/tests/mock_scheduler.c
>> +++ b/drivers/gpu/drm/scheduler/tests/mock_scheduler.c
>> @@ -228,10 +228,30 @@ static void mock_sched_free_job(struct
>> drm_sched_job *sched_job)
>> /* Mock job itself is freed by the kunit framework. */
>> }
>>
>> +static void mock_sched_fence_context_kill(struct drm_gpu_scheduler
>> *gpu_sched)
>> +{
>> + struct drm_mock_scheduler *sched =
>> drm_sched_to_mock_sched(gpu_sched);
>> + struct drm_mock_sched_job *job;
>> + unsigned long flags;
>> +
>> + spin_lock_irqsave(&sched->lock, flags);
>> + list_for_each_entry(job, &sched->job_list, link) {
>> + spin_lock(&job->lock);
>> + if (!dma_fence_is_signaled_locked(&job->hw_fence)) {
>> + dma_fence_set_error(&job->hw_fence, -
>> ECANCELED);
>> + dma_fence_signal_locked(&job->hw_fence);
>> + }
>> + complete(&job->done);
>> + spin_unlock(&job->lock);
>> + }
>> + spin_unlock_irqrestore(&sched->lock, flags);
>> +}
>> +
>> static const struct drm_sched_backend_ops drm_mock_scheduler_ops = {
>> .run_job = mock_sched_run_job,
>> .timedout_job = mock_sched_timedout_job,
>> - .free_job = mock_sched_free_job
>> + .free_job = mock_sched_free_job,
>> + .kill_fence_context = mock_sched_fence_context_kill,
>> };
>>
>> /**
>> @@ -300,18 +320,6 @@ void drm_mock_sched_fini(struct
>> drm_mock_scheduler *sched)
>> 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);
>> }
>>
>
next prev parent reply other threads:[~2025-05-08 12:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-24 9:55 [PATCH v2 0/6] drm/sched: Fix memory leaks in drm_sched_fini() Philipp Stanner
2025-04-24 9:55 ` [PATCH v2 1/6] drm/sched: Fix teardown leaks with waitqueue Philipp Stanner
2025-05-16 9:19 ` Tvrtko Ursulin
2025-04-24 9:55 ` [PATCH v2 2/6] drm/sched: Prevent teardown waitque from blocking too long Philipp Stanner
2025-05-16 9:33 ` Tvrtko Ursulin
2025-05-16 9:53 ` Danilo Krummrich
2025-05-16 10:19 ` Tvrtko Ursulin
2025-05-16 10:54 ` Danilo Krummrich
2025-05-16 11:35 ` Tvrtko Ursulin
2025-05-16 12:00 ` Danilo Krummrich
2025-05-16 15:48 ` Tvrtko Ursulin
2025-05-16 9:54 ` Philipp Stanner
2025-05-16 10:34 ` Tvrtko Ursulin
2025-04-24 9:55 ` [PATCH v2 3/6] drm/sched: Warn if pending list is not empty Philipp Stanner
2025-05-16 9:40 ` Tvrtko Ursulin
2025-04-24 9:55 ` [PATCH v2 4/6] drm/nouveau: Add new callback for scheduler teardown Philipp Stanner
2025-04-24 9:55 ` [PATCH v2 5/6] drm/nouveau: Remove waitque for sched teardown Philipp Stanner
2025-04-24 9:55 ` [PATCH v2 6/6] drm/sched: Port unit tests to new cleanup design Philipp Stanner
2025-05-08 11:03 ` Philipp Stanner
2025-05-08 12:51 ` Tvrtko Ursulin [this message]
2025-05-12 8:00 ` Philipp Stanner
2025-05-14 8:30 ` Tvrtko Ursulin
2025-05-14 9:19 ` Philipp Stanner
2025-05-16 9:00 ` Tvrtko Ursulin
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=a1c9c680-2927-428c-95e9-2e79d14cec58@igalia.com \
--to=tvrtko.ursulin@igalia.com \
--cc=airlied@gmail.com \
--cc=ckoenig.leichtzumerken@gmail.com \
--cc=dakr@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lyude@redhat.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=matthew.brost@intel.com \
--cc=mripard@kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=phasta@kernel.org \
--cc=simona@ffwll.ch \
--cc=tzimmermann@suse.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®