SVM ranges are created for unregistered memory, triggered
by page faults. These ranges are migrated/mapped to
GPU VRAM memory.
Signed-off-by: Alex Sierra <alex.sie...@amd.com>
---
drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 85 +++++++++++++++++++++++++++-
1 file changed, 82 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index 45dd055118eb..4cbbfba01cae 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -2179,6 +2179,79 @@ svm_range_best_restore_location(struct svm_range *prange,
return -1;
}
+static int
+svm_range_get_range_boundaries(struct kfd_process *p, int64_t addr,
+ unsigned long *start, unsigned long *end)
+{
+ struct vm_area_struct *vma;
+ unsigned long start_limit, end_limit;
+
+ vma = find_vma(p->mm, addr);
+ if (!vma) {
+ pr_debug("VMA does not exist in address [0x%llx]\n", addr);
+ return -1;
+ }
+ start_limit = max(vma->vm_start,
+ (unsigned long)ALIGN_DOWN(addr, 2UL << 20)) >>
PAGE_SHIFT;
+ addr >>= PAGE_SHIFT;
+ *start = addr;
+
+ while (*start > start_limit &&
+ !interval_tree_iter_first(&p->svms.objects, *start - 1, *start
- 1))
+ *start -= 1;
+
+ end_limit = min(vma->vm_end >> PAGE_SHIFT,
+ (*start + 0x200)) - 1;
+
+ *end = addr;
+
+ while (*end < end_limit &&
+ !interval_tree_iter_first(&p->svms.objects, *end + 1, *end + 1))
+ *end += 1;
+ pr_debug("vma start: %lx start: %lx vma end: %lx end: %lx\n",
+ vma->vm_start >> PAGE_SHIFT, *start,
+ vma->vm_end >> PAGE_SHIFT, *end);
+
+ return 0;
+
+}
+static struct
+svm_range *svm_range_create_unregistered_range(struct amdgpu_device *adev,
+ struct kfd_process *p,
+ struct mm_struct *mm,
+ int64_t addr)
+{
+ struct svm_range *prange = NULL;
+ struct svm_range_list *svms;
+ unsigned long start, end;
+ uint32_t gpuid, gpuidx;
+
+ if (svm_range_get_range_boundaries(p, addr << PAGE_SHIFT,
+ &start, &end))
+ return NULL;
+
+ svms = &p->svms;
+ prange = svm_range_new(&p->svms, start, end);
+ if (!prange) {
+ pr_debug("Failed to create prange in address [0x%llx]\\n",
addr);
+ goto out;
+ }
+ if (kfd_process_gpuid_from_kgd(p, adev, &gpuid, &gpuidx)) {
+ pr_debug("failed to get gpuid from kgd\n");
+ svm_range_free(prange);
+ prange = NULL;
+ goto out;
+ }
+ prange->preferred_loc = gpuid;
+ prange->actual_loc = 0;
+ /* Gurantee prange is migrate it */
+ prange->validate_timestamp -= AMDGPU_SVM_RANGE_RETRY_FAULT_PENDING;
+ svm_range_add_to_svms(prange);
+ svm_range_add_notifier_locked(mm, prange);
+
+out:
+ return prange;
+}
/* svm_range_skip_recover - decide if prange can be recovered
* @prange: svm range structure
@@ -2250,15 +2323,21 @@ svm_range_restore_pages(struct amdgpu_device *adev,
unsigned int pasid,
goto out;
}
- mmap_read_lock(mm);
+ mmap_write_lock(mm);
mutex_lock(&svms->lock);
prange = svm_range_from_addr(svms, addr, NULL);
if (!prange) {
pr_debug("failed to find prange svms 0x%p address [0x%llx]\n",
svms, addr);
- r = -EFAULT;
- goto out_unlock_svms;
+ prange = svm_range_create_unregistered_range(adev, p, mm, addr);
+ if (!prange) {
+ pr_debug("failed to create unregisterd range svms 0x%p
address [0x%llx]\n",
+ svms, addr);
+ mmap_write_downgrade(mm);
+ goto out_unlock_svms;
+ }
}
+ mmap_write_downgrade(mm);
mutex_lock(&prange->migrate_mutex);
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
