From: Matthew Auld <matthew.auld@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [Intel-xe] [PATCH v5 5/7] drm/xe/ggtt: prime ggtt->lock against FS_RECLAIM
Date: Wed, 17 May 2023 16:22:42 +0100 [thread overview]
Message-ID: <20230517152244.348171-5-matthew.auld@intel.com> (raw)
In-Reply-To: <20230517152244.348171-1-matthew.auld@intel.com>
Increase the sensitivity of the ggtt->lock by priming it against
FS_RECLAIM, such that allocating memory while holding will result in
lockdep splats.
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/xe/xe_ggtt.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c
index f986e8218820..e25eb70d44f6 100644
--- a/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@ -90,6 +90,16 @@ static void ggtt_fini_noalloc(struct drm_device *drm, void *arg)
xe_bo_unpin_map_no_vm(ggtt->scratch);
}
+static void primelockdep(struct xe_ggtt *ggtt)
+{
+ if (!IS_ENABLED(CONFIG_LOCKDEP))
+ return;
+
+ fs_reclaim_acquire(GFP_KERNEL);
+ might_lock(&ggtt->lock);
+ fs_reclaim_release(GFP_KERNEL);
+}
+
int xe_ggtt_init_noalloc(struct xe_gt *gt, struct xe_ggtt *ggtt)
{
struct xe_device *xe = gt_to_xe(gt);
@@ -132,6 +142,7 @@ int xe_ggtt_init_noalloc(struct xe_gt *gt, struct xe_ggtt *ggtt)
drm_mm_init(&ggtt->mm, xe_wopcm_size(xe),
ggtt->size - xe_wopcm_size(xe));
mutex_init(&ggtt->lock);
+ primelockdep(ggtt);
return drmm_add_action_or_reset(&xe->drm, ggtt_fini_noalloc, ggtt);
}
--
2.40.1
next prev parent reply other threads:[~2023-05-17 15:23 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-17 15:22 [Intel-xe] [PATCH v5 1/7] drm: fix drmm_mutex_init() Matthew Auld
2023-05-17 15:22 ` [Intel-xe] [PATCH v5 2/7] Revert "drm/xe: Use atomic instead of mutex for xe_device_mem_access_ongoing" Matthew Auld
2023-05-17 15:22 ` [Intel-xe] [PATCH v5 3/7] drm/xe: don't allocate under ct->lock Matthew Auld
2023-05-17 15:50 ` Rodrigo Vivi
2023-05-17 15:22 ` [Intel-xe] [PATCH v5 4/7] drm/xe: keep pulling mem_access_get further back Matthew Auld
2023-05-17 15:53 ` Rodrigo Vivi
2023-05-17 15:22 ` Matthew Auld [this message]
2023-05-17 15:48 ` [Intel-xe] [PATCH v5 5/7] drm/xe/ggtt: prime ggtt->lock against FS_RECLAIM Rodrigo Vivi
2023-05-17 16:21 ` Matthew Auld
2023-05-17 15:22 ` [Intel-xe] [PATCH v5 6/7] drm/xe: fix xe_device_mem_access_get() races Matthew Auld
2023-05-19 20:25 ` Rodrigo Vivi
2023-05-22 9:49 ` Matthew Auld
2023-05-17 15:22 ` [Intel-xe] [PATCH v5 7/7] drm/xe: Use atomic for mem_access.ref Matthew Auld
2023-05-17 15:25 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [v5,1/7] drm: fix drmm_mutex_init() Patchwork
2023-05-17 15:27 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-05-17 15:31 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-05-17 15:49 ` [Intel-xe] ○ CI.BAT: info " Patchwork
2023-05-17 16:05 ` [Intel-xe] [PATCH v5 1/7] " Stanislaw Gruszka
2023-05-17 16:29 ` Matthew Auld
2023-05-17 17:03 ` Thomas Hellström
2023-05-17 17:47 ` Thomas Zimmermann
2023-05-17 16:21 ` Thomas Zimmermann
2023-05-17 17:04 ` Matthew Auld
2023-05-17 17:43 ` Thomas Zimmermann
2023-05-18 9:51 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [v5,1/7] drm: fix drmm_mutex_init() (rev2) Patchwork
2023-05-18 9:52 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-05-18 9:56 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-05-18 10:16 ` [Intel-xe] ○ CI.BAT: info " Patchwork
2023-05-19 15:49 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [v5,1/7] drm: fix drmm_mutex_init() (rev3) Patchwork
2023-05-19 15:50 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-05-19 15:54 ` [Intel-xe] ✓ CI.Build: " 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=20230517152244.348171-5-matthew.auld@intel.com \
--to=matthew.auld@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
/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