From: Matthew Brost <matthew.brost@intel.com>
To: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Cc: tj@kernel.org, jiangshanlai@gmail.com, christian.koenig@amd.com,
ltuikov89@gmail.com, daniel@ffwll.ch
Subject: [RFC PATCH 2/3] drm/sched: Use drm sched lockdep map for submit_wq
Date: Tue, 30 Jul 2024 15:17:41 -0700 [thread overview]
Message-ID: <20240730221742.2248527-3-matthew.brost@intel.com> (raw)
In-Reply-To: <20240730221742.2248527-1-matthew.brost@intel.com>
Avoid leaking a lockdep map on each drm sched creation and destruction
by using a single lockdep map for all drm sched allocated submit_wq.
Cc: Luben Tuikov <ltuikov89@gmail.com>
Cc: Christian König <christian.koenig@amd.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
drivers/gpu/drm/scheduler/sched_main.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index ab53ab486fe6..9849fd64aff9 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -87,6 +87,12 @@
#define CREATE_TRACE_POINTS
#include "gpu_scheduler_trace.h"
+#ifdef CONFIG_LOCKDEP
+static struct lockdep_map drm_sched_lockdep_map = {
+ .name = "drm_sched_lockdep_map"
+};
+#endif
+
#define to_drm_sched_job(sched_job) \
container_of((sched_job), struct drm_sched_job, queue_node)
@@ -1272,9 +1278,13 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,
sched->submit_wq = submit_wq;
sched->own_submit_wq = false;
} else {
- sched->submit_wq = alloc_ordered_workqueue(name, 0);
+ sched->submit_wq = alloc_ordered_workqueue(name, WQ_USER_OWNED_LOCKDEP);
if (!sched->submit_wq)
return -ENOMEM;
+#ifdef CONFIG_LOCKDEP
+ wq_init_user_lockdep_map(sched->submit_wq,
+ &drm_sched_lockdep_map);
+#endif
sched->own_submit_wq = true;
}
--
2.34.1
next prev parent reply other threads:[~2024-07-30 22:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-30 22:17 [RFC PATCH 0/3] Use user-defined workqueue lockdep map for drm sched Matthew Brost
2024-07-30 22:17 ` [RFC PATCH 1/3] workqueue: Add interface for user-defined workqueue lockdep map Matthew Brost
2024-07-30 22:34 ` Tejun Heo
2024-07-30 22:53 ` Matthew Brost
2024-07-30 22:56 ` Tejun Heo
2024-07-30 22:56 ` Matthew Brost
2024-07-30 22:17 ` Matthew Brost [this message]
2024-07-30 22:17 ` [RFC PATCH 3/3] drm/xe: Drop GuC submit_wq pool Matthew Brost
2024-07-30 22:22 ` ✓ CI.Patch_applied: success for Use user-defined workqueue lockdep map for drm sched Patchwork
2024-07-30 22:22 ` ✓ CI.checkpatch: " Patchwork
2024-07-30 22:23 ` ✓ CI.KUnit: " Patchwork
2024-07-30 22:35 ` ✓ CI.Build: " Patchwork
2024-07-30 22:37 ` ✓ CI.Hooks: " Patchwork
2024-07-30 22:39 ` ✗ CI.checksparse: warning " Patchwork
2024-07-30 22:58 ` ✓ CI.BAT: success " Patchwork
2024-07-31 0:11 ` ✗ CI.FULL: failure " Patchwork
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=20240730221742.2248527-3-matthew.brost@intel.com \
--to=matthew.brost@intel.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jiangshanlai@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ltuikov89@gmail.com \
--cc=tj@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox