* [PATCH v4] drm/sched: Create a fake device for KUnit tests
@ 2026-09-08 5:59 oushixiong1025
2026-09-08 12:29 ` Philipp Stanner
0 siblings, 1 reply; 2+ messages in thread
From: oushixiong1025 @ 2026-09-08 5:59 UTC (permalink / raw)
To: Matthew Brost
Cc: Danilo Krummrich, Philipp Stanner, Christian König,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Simona Vetter, dri-devel, linux-kernel,
Shixiong Ou, stable
From: Shixiong Ou <oushixiong@kylinos.cn>
The DRM scheduler KUnit tests pass NULL for the dev field in
drm_sched_init_args, which NULL-pointer dereferences in the drm_sched_job
trace event via dev_name() on sched->dev.
Give the mock scheduler a device with kunit_device_register(), which is
also cleaned up at test exit. A per-function counter keeps the device
names unique, since some tests create several mock schedulers.
Fixes: 5a99350794fe ("drm/sched: Add scheduler unit testing infrastructure and some basic tests")
Cc: stable@vger.kernel.org
Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn>
Acked-by: Maxime Ripard <mripard@kernel.org>
---
v3->v4:
- Initialize the instance counter explicitly
v2->v3:
- Start the mock scheduler device numbering at 0, using
instance++ instead of ++instance
v1->v2:
- Switch from faux_device_create() to kunit_device_register(), which also
cleans the device up automatically at test exit (Maxime Ripard)
- Build the device name on top of args.name (Philipp Stanner)
- Make the instance counter a static unsigned int local to
drm_mock_sched_new() (Philipp Stanner)
- Add a Fixes: tag and Cc: stable for the NULL dev dereference
drivers/gpu/drm/scheduler/tests/mock_scheduler.c | 11 ++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/scheduler/tests/mock_scheduler.c b/drivers/gpu/drm/scheduler/tests/mock_scheduler.c
index 8e9ae7d980eb..12dc61f56192 100644
--- a/drivers/gpu/drm/scheduler/tests/mock_scheduler.c
+++ b/drivers/gpu/drm/scheduler/tests/mock_scheduler.c
@@ -1,6 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2025 Valve Corporation */
+#include <kunit/device.h>
+
#include "sched_tests.h"
/*
@@ -288,6 +290,7 @@ static const struct drm_sched_backend_ops drm_mock_scheduler_ops = {
*/
struct drm_mock_scheduler *drm_mock_sched_new(struct kunit *test, long timeout)
{
+ static unsigned int instance = 0;
struct drm_sched_init_args args = {
.ops = &drm_mock_scheduler_ops,
.num_rqs = DRM_SCHED_PRIORITY_COUNT,
@@ -297,11 +300,19 @@ struct drm_mock_scheduler *drm_mock_sched_new(struct kunit *test, long timeout)
.name = "drm-mock-scheduler",
};
struct drm_mock_scheduler *sched;
+ struct device *dev;
+ char name[64];
int ret;
sched = kunit_kzalloc(test, sizeof(*sched), GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, sched);
+ snprintf(name, sizeof(name), "%s-%u", args.name, instance++);
+ dev = kunit_device_register(test, name);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
+
+ args.dev = dev;
+
ret = drm_sched_init(&sched->base, &args);
KUNIT_ASSERT_EQ(test, ret, 0);
--
2.43.0
No virus found
Checked by Hillstone Network AntiVirus
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v4] drm/sched: Create a fake device for KUnit tests
2026-09-08 5:59 [PATCH v4] drm/sched: Create a fake device for KUnit tests oushixiong1025
@ 2026-09-08 12:29 ` Philipp Stanner
0 siblings, 0 replies; 2+ messages in thread
From: Philipp Stanner @ 2026-09-08 12:29 UTC (permalink / raw)
To: oushixiong1025, Matthew Brost
Cc: Danilo Krummrich, Philipp Stanner, Christian König,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Simona Vetter, dri-devel, linux-kernel,
Shixiong Ou, stable
On Tue, 2026-09-08 at 13:59 +0800, oushixiong1025@163.com wrote:
> From: Shixiong Ou <oushixiong@kylinos.cn>
>
> The DRM scheduler KUnit tests pass NULL for the dev field in
> drm_sched_init_args, which NULL-pointer dereferences in the drm_sched_job
> trace event via dev_name() on sched->dev.
>
> Give the mock scheduler a device with kunit_device_register(), which is
> also cleaned up at test exit. A per-function counter keeps the device
> names unique, since some tests create several mock schedulers.
>
> Fixes: 5a99350794fe ("drm/sched: Add scheduler unit testing infrastructure and some basic tests")
> Cc: stable@vger.kernel.org
> Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn>
> Acked-by: Maxime Ripard <mripard@kernel.org>
>
> ---
> v3->v4:
> - Initialize the instance counter explicitly
You learn something new every day – apparently that must not be done,
according to the DRM rules.
My bad.
I reverted it locally and pushed to drm-misc-fixes
Thx Shixiong.
P.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-09-08 12:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-08 5:59 [PATCH v4] drm/sched: Create a fake device for KUnit tests oushixiong1025
2026-09-08 12:29 ` Philipp Stanner
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®