Skip to contentSkip to conversation

drm/xe: skip resv fence wait in xe_svm_invalidate if no ranges are bound

PATCH New aquiles 1 participant 1 message Jun 26

Subsystems (2)
lore
Share & tools
lore

aquiles

author
#0 lore raw

PATCH v2 2/2 drm/xe: skip resv fence wait in xe_svm_invalidate if no ranges are bound

xe_svm_invalidate() waited on the VM's reservation object fences before processing MMU notifier events, even when no range in the affected address region had active GPU bindings (tile_present == 0).

Add a pre-scan over the affected ranges and skip dma_resv_wait_timeout() when no range needs invalidation and all BOOKKEEP fences are already signaled. The fence check is necessary because tile_present is cleared when an unbind is submitted, not when the GPU job completes — skipping the wait without it risks unmapping DMA while an unbind is still in flight.

---
 drivers/gpu/drm/xe/xe_svm.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)
drivers/gpu/drm/xe/xe_svm.c +17 -5
index e1651e70c..447c5c965 100644
@@ -233,6 +233,7 @@ static void xe_svm_invalidate(struct drm_gpusvm *gpusvm,
 	ktime_t start = xe_gt_stats_ktime_get();
 	u64 adj_start = mmu_range->start, adj_end = mmu_range->end;
 	u8 tile_mask = 0, id;
+	bool needs_inval = false;
 	long err;
 
 	xe_svm_assert_in_notifier(vm);
@@ -258,11 +259,22 @@ static void xe_svm_invalidate(struct drm_gpusvm *gpusvm,
 	if (xe_vm_is_closed(vm))
 		goto range_notifier_event_end;
 
-	/*
-	 * XXX: Less than ideal to always wait on VM's resv slots if an
-	 * invalidation is not required. Could walk range list twice to figure
-	 * out if an invalidations is need, but also not ideal.
-	 */
+	/* Pre-scan: skip fence wait if no range has active GPU bindings. */
+
+	r = first;
+	drm_gpusvm_for_each_range(r, notifier, adj_start, adj_end) {
+		struct xe_svm_range *range = to_xe_range(r);
+
+		if (!range->base.pages.flags.unmapped && range->tile_present) {
+			needs_inval = true;
+			break;
+		}
+
+	}
+	if (!needs_inval &&
+	    dma_resv_test_signaled(xe_vm_resv(vm), DMA_RESV_USAGE_BOOKKEEP))
+		goto range_notifier_event_end;
+
 	err = dma_resv_wait_timeout(xe_vm_resv(vm),
 				    DMA_RESV_USAGE_BOOKKEEP,
 				    false, MAX_SCHEDULE_TIMEOUT);
Signature · 1 line
2.54.0