1 files changed, 35 insertions, 8 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
index a365ea2383d1..e55508b39496 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
@@ -178,12 +178,18 @@ void amdgpu_mn_unlock(struct amdgpu_mn *mn)
  *
  * @amn: our notifier
  */
-static void amdgpu_mn_read_lock(struct amdgpu_mn *amn)
+static int amdgpu_mn_read_lock(struct amdgpu_mn *amn, bool blockable)
 {
-        mutex_lock(&amn->read_lock);
+        if (blockable)
+                mutex_lock(&amn->read_lock);
+        else if (!mutex_trylock(&amn->read_lock))
+                return -EAGAIN;
+
         if (atomic_inc_return(&amn->recursion) == 1)
                 down_read_non_owner(&amn->lock);
         mutex_unlock(&amn->read_lock);
+
+        return 0;
 }
 
 /**
@@ -239,10 +245,11 @@ static void amdgpu_mn_invalidate_node(struct amdgpu_mn_node *node,
  * Block for operations on BOs to finish and mark pages as accessed and
  * potentially dirty.
  */
-static void amdgpu_mn_invalidate_range_start_gfx(struct mmu_notifier *mn,
+static int amdgpu_mn_invalidate_range_start_gfx(struct mmu_notifier *mn,
                                                  struct mm_struct *mm,
                                                  unsigned long start,
-                                                 unsigned long end)
+                                                 unsigned long end,
+                                                 bool blockable)
 {
         struct amdgpu_mn *amn = container_of(mn, struct amdgpu_mn, mn);
         struct interval_tree_node *it;
@@ -250,17 +257,28 @@ static void amdgpu_mn_invalidate_range_start_gfx(struct mmu_notifier *mn,
         /* notification is exclusive, but interval is inclusive */
         end -= 1;
 
-        amdgpu_mn_read_lock(amn);
+        /* TODO we should be able to split locking for interval tree and
+         * amdgpu_mn_invalidate_node
+         */
+        if (amdgpu_mn_read_lock(amn, blockable))
+                return -EAGAIN;
 
         it = interval_tree_iter_first(&amn->objects, start, end);
         while (it) {
                 struct amdgpu_mn_node *node;
 
+                if (!blockable) {
+                        amdgpu_mn_read_unlock(amn);
+                        return -EAGAIN;
+                }
+
                 node = container_of(it, struct amdgpu_mn_node, it);
                 it = interval_tree_iter_next(it, start, end);
 
                 amdgpu_mn_invalidate_node(node, start, end);
         }
+
+        return 0;
 }
 
 /**
@@ -275,10 +293,11 @@ static void amdgpu_mn_invalidate_range_start_gfx(struct mmu_notifier *mn,
  * necessitates evicting all user-mode queues of the process. The BOs
  * are restorted in amdgpu_mn_invalidate_range_end_hsa.
  */
-static void amdgpu_mn_invalidate_range_start_hsa(struct mmu_notifier *mn,
+static int amdgpu_mn_invalidate_range_start_hsa(struct mmu_notifier *mn,
                                                  struct mm_struct *mm,
                                                  unsigned long start,
-                                                 unsigned long end)
+                                                 unsigned long end,
+                                                 bool blockable)
 {
         struct amdgpu_mn *amn = container_of(mn, struct amdgpu_mn, mn);
         struct interval_tree_node *it;
@@ -286,13 +305,19 @@ static void amdgpu_mn_invalidate_range_start_hsa(struct mmu_notifier *mn,
         /* notification is exclusive, but interval is inclusive */
         end -= 1;
 
-        amdgpu_mn_read_lock(amn);
+        if (amdgpu_mn_read_lock(amn, blockable))
+                return -EAGAIN;
 
         it = interval_tree_iter_first(&amn->objects, start, end);
         while (it) {
                 struct amdgpu_mn_node *node;
                 struct amdgpu_bo *bo;
 
+                if (!blockable) {
+                        amdgpu_mn_read_unlock(amn);
+                        return -EAGAIN;
+                }
+
                 node = container_of(it, struct amdgpu_mn_node, it);
                 it = interval_tree_iter_next(it, start, end);
 
@@ -304,6 +329,8 @@ static void amdgpu_mn_invalidate_range_start_hsa(struct mmu_notifier *mn,
                                 amdgpu_amdkfd_evict_userptr(mem, mm);
                 }
         }
+
+        return 0;
 }
 
 /**