drm/amdkfd: Fix svm_range_is_same_attrs

The existing function doesn't compare the access bitmaps and flags.
This can result in failure to update those attributes in existing
ranges when all other attributes remained unchanged.

Because the access and flags attributes modify only some bits in the
respective bitmaps, we cannot compare them directly. Instead we need to
check whether applying the attributes to a particular range would
change the bitmaps.

A PREFETCH_LOC attribute must always trigger a migration, even if the
attribute value remains unchanged. E.g. if some pages were migrated due
to a CPU page fault, a prefetch must still be executed to migrate pages
back to VRAM.

Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Philip Yang <Philip.Yang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index e9489ffe0e0914586dda049365805cb8cac36de1..07342630740e648cd9689c4ab378d0a1717c101e 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -704,6 +704,61 @@ svm_range_apply_attrs(struct kfd_process *p, struct svm_range *prange,
        }
 }
 
+static bool
+svm_range_is_same_attrs(struct kfd_process *p, struct svm_range *prange,
+                       uint32_t nattr, struct kfd_ioctl_svm_attribute *attrs)
+{
+       uint32_t i;
+       int gpuidx;
+
+       for (i = 0; i < nattr; i++) {
+               switch (attrs[i].type) {
+               case KFD_IOCTL_SVM_ATTR_PREFERRED_LOC:
+                       if (prange->preferred_loc != attrs[i].value)
+                               return false;
+                       break;
+               case KFD_IOCTL_SVM_ATTR_PREFETCH_LOC:
+                       /* Prefetch should always trigger a migration even
+                        * if the value of the attribute didn't change.
+                        */
+                       return false;
+               case KFD_IOCTL_SVM_ATTR_ACCESS:
+               case KFD_IOCTL_SVM_ATTR_ACCESS_IN_PLACE:
+               case KFD_IOCTL_SVM_ATTR_NO_ACCESS:
+                       gpuidx = kfd_process_gpuidx_from_gpuid(p,
+                                                              attrs[i].value);
+                       if (attrs[i].type == KFD_IOCTL_SVM_ATTR_NO_ACCESS) {
+                               if (test_bit(gpuidx, prange->bitmap_access) ||
+                                   test_bit(gpuidx, prange->bitmap_aip))
+                                       return false;
+                       } else if (attrs[i].type == KFD_IOCTL_SVM_ATTR_ACCESS) {
+                               if (!test_bit(gpuidx, prange->bitmap_access))
+                                       return false;
+                       } else {
+                               if (!test_bit(gpuidx, prange->bitmap_aip))
+                                       return false;
+                       }
+                       break;
+               case KFD_IOCTL_SVM_ATTR_SET_FLAGS:
+                       if ((prange->flags & attrs[i].value) != attrs[i].value)
+                               return false;
+                       break;
+               case KFD_IOCTL_SVM_ATTR_CLR_FLAGS:
+                       if ((prange->flags & attrs[i].value) != 0)
+                               return false;
+                       break;
+               case KFD_IOCTL_SVM_ATTR_GRANULARITY:
+                       if (prange->granularity != attrs[i].value)
+                               return false;
+                       break;
+               default:
+                       WARN_ONCE(1, "svm_range_check_attrs wasn't called?");
+               }
+       }
+
+       return true;
+}
+
 /**
  * svm_range_debug_dump - print all range information from svms
  * @svms: svm range list header
@@ -741,14 +796,6 @@ static void svm_range_debug_dump(struct svm_range_list *svms)
        }
 }
 
-static bool
-svm_range_is_same_attrs(struct svm_range *old, struct svm_range *new)
-{
-       return (old->prefetch_loc == new->prefetch_loc &&
-               old->flags == new->flags &&
-               old->granularity == new->granularity);
-}
-
 static int
 svm_range_split_array(void *ppnew, void *ppold, size_t size,
                      uint64_t old_start, uint64_t old_n,
@@ -1795,7 +1842,6 @@ svm_range_add(struct kfd_process *p, uint64_t start, uint64_t size,
        unsigned long last = start + size - 1UL;
        struct svm_range_list *svms = &p->svms;
        struct interval_tree_node *node;
-       struct svm_range new = {0};
        struct svm_range *prange;
        struct svm_range *tmp;
        int r = 0;
@@ -1805,7 +1851,6 @@ svm_range_add(struct kfd_process *p, uint64_t start, uint64_t size,
        INIT_LIST_HEAD(update_list);
        INIT_LIST_HEAD(insert_list);
        INIT_LIST_HEAD(remove_list);
-       svm_range_apply_attrs(p, &new, nattr, attrs);
 
        node = interval_tree_iter_first(&svms->objects, start, last);
        while (node) {
@@ -1852,7 +1897,7 @@ svm_range_add(struct kfd_process *p, uint64_t start, uint64_t size,
                        prange = old;
                }
 
-               if (!svm_range_is_same_attrs(prange, &new))
+               if (!svm_range_is_same_attrs(p, prange, nattr, attrs))
                        list_add(&prange->update_list, update_list);
 
                /* insert a new node if needed */