diff mbox series

drm/i915/selftests: Flush fput after running selftests

Message ID 20191128155942.4137220-1-chris@chris-wilson.co.uk (mailing list archive)
State New, archived
Headers show
Series drm/i915/selftests: Flush fput after running selftests | expand

Commit Message

Chris Wilson Nov. 28, 2019, 3:59 p.m. UTC 
Use an rcu_barrier() to flush any mock files used by the selftests as
the deferred cleanup may be holding resources that we need to cleanup.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c            |  2 +-
 drivers/gpu/drm/i915/selftests/i915_selftest.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 6239a9adbf14..61a1582b9f9e 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2752,7 +2752,7 @@  static void ggtt_cleanup_hw(struct i915_ggtt *ggtt)
 	atomic_set(&ggtt->vm.open, 0);
 
 	rcu_barrier(); /* flush the RCU'ed__i915_vm_release */
-	flush_workqueue(ggtt->vm.i915->wq);
+	i915_gem_drain_workqueue(ggtt->vm.i915);
 
 	mutex_lock(&ggtt->vm.mutex);
 
diff --git a/drivers/gpu/drm/i915/selftests/i915_selftest.c b/drivers/gpu/drm/i915/selftests/i915_selftest.c
index d3bf9eefb682..e3a8110d79ba 100644
--- a/drivers/gpu/drm/i915/selftests/i915_selftest.c
+++ b/drivers/gpu/drm/i915/selftests/i915_selftest.c
@@ -152,8 +152,10 @@  static int __run_selftests(const char *name,
 			continue;
 
 		cond_resched();
-		if (signal_pending(current))
-			return -EINTR;
+		if (signal_pending(current)) {
+			err = -EINTR;
+			goto out;
+		}
 
 		pr_info(DRIVER_NAME ": Running %s\n", st->name);
 		if (data)
@@ -171,6 +173,10 @@  static int __run_selftests(const char *name,
 		 st->name, err))
 		err = -1;
 
+out:
+	rcu_barrier(); /* flush deferred fput() */
+	yield();
+	rcu_barrier(); /* and once more for anything freed from the files */
 	return err;
 }