All of lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-xe] [PATCH v10 1/9] drm/xe: don't allocate under ct->lock
@ 2023-05-24 17:56 Matthew Auld
  2023-05-24 17:56 ` [Intel-xe] [PATCH v10 2/9] drm/xe: keep pulling mem_access_get further back Matthew Auld
                   ` (11 more replies)
  0 siblings, 12 replies; 16+ messages in thread
From: Matthew Auld @ 2023-05-24 17:56 UTC (permalink / raw)
  To: intel-xe; +Cc: Rodrigo Vivi

Seems to be a sensitive lock, where ct->lock looks to be primed with
fs_reclaim, so holding that and then allocating memory will cause
lockdep to complain. We need to change the ordering wrt to grabbing the
ct->lock and potentially grabbing the runtime_pm, since some of the
runtime_pm routines can allocate memory (or at least that's what lockdep
seems to suggest).

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_gt_tlb_invalidation.c |  4 ++++
 drivers/gpu/drm/xe/xe_guc_ct.c              | 13 +++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
index c815a42e2cdb..20f8f0aae6b4 100644
--- a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
+++ b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
@@ -5,6 +5,7 @@
 
 #include "xe_gt_tlb_invalidation.h"
 
+#include "xe_device.h"
 #include "xe_gt.h"
 #include "xe_guc.h"
 #include "xe_guc_ct.h"
@@ -112,6 +113,8 @@ static int send_tlb_invalidation(struct xe_guc *guc,
 	 * in order which they currently are, if that changes the algorithm will
 	 * need to be updated.
 	 */
+
+	xe_device_mem_access_get(gt->xe);
 	mutex_lock(&guc->ct.lock);
 	seqno = gt->tlb_invalidation.seqno;
 	if (fence) {
@@ -140,6 +143,7 @@ static int send_tlb_invalidation(struct xe_guc *guc,
 	if (ret < 0 && fence)
 		invalidation_fence_signal(fence);
 	mutex_unlock(&guc->ct.lock);
+	xe_device_mem_access_put(gt->xe);
 
 	return ret;
 }
diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
index e8c2edb1359d..9dc906f2651a 100644
--- a/drivers/gpu/drm/xe/xe_guc_ct.c
+++ b/drivers/gpu/drm/xe/xe_guc_ct.c
@@ -498,26 +498,22 @@ static int __guc_ct_send_locked(struct xe_guc_ct *ct, const u32 *action,
 		}
 	}
 
-	xe_device_mem_access_get(ct_to_xe(ct));
 retry:
 	ret = has_room(ct, len + GUC_CTB_HDR_LEN, g2h_len);
 	if (unlikely(ret))
-		goto put_wa;
+		goto out;
 
 	ret = h2g_write(ct, action, len, g2h_fence ? g2h_fence->seqno : 0,
 			!!g2h_fence);
 	if (unlikely(ret)) {
 		if (ret == -EAGAIN)
 			goto retry;
-		goto put_wa;
+		goto out;
 	}
 
 	g2h_reserve_space(ct, g2h_len, num_g2h);
 	xe_guc_notify(ct_to_guc(ct));
-put_wa:
-	xe_device_mem_access_put(ct_to_xe(ct));
 out:
-
 	return ret;
 }
 
@@ -539,6 +535,7 @@ static int guc_ct_send_locked(struct xe_guc_ct *ct, const u32 *action, u32 len,
 
 	XE_BUG_ON(g2h_len && g2h_fence);
 	lockdep_assert_held(&ct->lock);
+	xe_device_assert_mem_access(ct_to_xe(ct));
 
 try_again:
 	ret = __guc_ct_send_locked(ct, action, len, g2h_len, num_g2h,
@@ -608,10 +605,14 @@ static int guc_ct_send(struct xe_guc_ct *ct, const u32 *action, u32 len,
 
 	XE_BUG_ON(g2h_len && g2h_fence);
 
+	xe_device_mem_access_get(ct_to_xe(ct));
+
 	mutex_lock(&ct->lock);
 	ret = guc_ct_send_locked(ct, action, len, g2h_len, num_g2h, g2h_fence);
 	mutex_unlock(&ct->lock);
 
+	xe_device_mem_access_put(ct_to_xe(ct));
+
 	return ret;
 }
 
-- 
2.40.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread
end of thread, other threads:[~2023-05-24 19:34 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [Intel-xe] [PATCH v10 4/9] drm/xe/ggtt: prime ggtt->lock against FS_RECLAIM Matthew Auld
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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.