From: Matthew Auld <matthew.auld@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [Intel-xe] [PATCH v10 4/9] drm/xe/ggtt: prime ggtt->lock against FS_RECLAIM
Date: Wed, 24 May 2023 18:56:56 +0100 [thread overview]
Message-ID: <20230524175701.320653-4-matthew.auld@intel.com> (raw)
In-Reply-To: <20230524175701.320653-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>
Reviewed-by: 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-24 17:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 17:56 [Intel-xe] [PATCH v10 1/9] drm/xe: don't allocate under ct->lock Matthew Auld
2023-05-24 17:56 ` [Intel-xe] [PATCH v10 2/9] drm/xe: keep pulling mem_access_get further back Matthew Auld
2023-05-24 17:56 ` [Intel-xe] [PATCH v10 3/9] drm/xe: drop xe_device_mem_access_get() from guc_ct_send Matthew Auld
2023-05-24 19:33 ` Rodrigo Vivi
2023-05-24 17:56 ` Matthew Auld [this message]
2023-05-24 17:56 ` [Intel-xe] [PATCH v10 5/9] drm/xe: drop xe_device_mem_access_get() from invalidation_vma Matthew Auld
2023-05-24 17:56 ` [Intel-xe] [PATCH v10 6/9] drm/xe: fix xe_device_mem_access_get() races Matthew Auld
2023-05-24 17:56 ` [Intel-xe] [PATCH v10 7/9] drm/xe/vm: tidy up xe_runtime_pm usage Matthew Auld
2023-05-24 19:30 ` Rodrigo Vivi
2023-05-24 17:57 ` [Intel-xe] [PATCH v10 8/9] drm/xe: add lockdep annotation for xe_device_mem_access_get() Matthew Auld
2023-05-24 17:57 ` [Intel-xe] [PATCH v10 9/9] drm/xe/debugfs: grab mem_access around forcewake Matthew Auld
2023-05-24 19:32 ` Rodrigo Vivi
2023-05-24 18:33 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [v10,1/9] drm/xe: don't allocate under ct->lock Patchwork
2023-05-24 18:34 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-05-24 18:38 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-05-24 19:14 ` [Intel-xe] ○ CI.BAT: info " 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=20230524175701.320653-4-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