From: Oak Zeng <oak.zeng@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [CI v3 14/26] drm/svm: Migrate a range of hmmptr to vram
Date: Wed, 29 May 2024 20:47:20 -0400 [thread overview]
Message-ID: <20240530004732.84898-14-oak.zeng@intel.com> (raw)
In-Reply-To: <20240530004732.84898-1-oak.zeng@intel.com>
Introduce a helper function drm_svm_migrate_hmmptr_to_vram to migrate
any sub-range of a hmmptr to vram. The range has to be at page boundary.
This supposed to be called by driver to migrate a hmmptr to vram.
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Felix Kuehling <felix.kuehling@amd.com>
Cc: Brian Welty <brian.welty@intel.com>
Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Cc: <dri-devel@lists.freedesktop.org>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Oak Zeng <oak.zeng@intel.com>
---
drivers/gpu/drm/drm_svm.c | 122 ++++++++++++++++++++++++++++++++++++++
include/drm/drm_svm.h | 3 +
2 files changed, 125 insertions(+)
diff --git a/drivers/gpu/drm/drm_svm.c b/drivers/gpu/drm/drm_svm.c
index 024a071f0869..18a8fc7fd444 100644
--- a/drivers/gpu/drm/drm_svm.c
+++ b/drivers/gpu/drm/drm_svm.c
@@ -551,3 +551,125 @@ int drm_svm_register_mem_region(const struct drm_device *drm, struct drm_mem_reg
return 0;
}
EXPORT_SYMBOL_GPL(drm_svm_register_mem_region);
+
+static void __drm_svm_init_device_pages(unsigned long *pfn, unsigned long npages)
+{
+ struct page *page;
+ int i;
+
+ for(i = 0; i < npages; i++) {
+ page = pfn_to_page(pfn[i]);
+ zone_device_page_init(page);
+ pfn[i] = migrate_pfn(pfn[i]);
+ }
+}
+
+/**
+ * drm_svm_migrate_hmmptr_to_vram() - migrate a sub-range of a hmmptr to vram
+ * Must be called with mmap_read_lock held.
+ *
+ * @vm: the vm that the hmmptr belongs to
+ * @mr: the destination memory region we want to migrate to
+ * @hmmptr: the hmmptr to migrate.
+ * @start: start(virtual address, inclusive) of the range to migrate
+ * @end: end(virtual address, exclusive) of the range to migrate
+ *
+ * Returns: negative errno on faiure, 0 on success
+ */
+int drm_svm_migrate_hmmptr_to_vram(struct drm_gpuvm *vm,
+ struct drm_mem_region *mr,
+ struct drm_hmmptr *hmmptr, unsigned long start, unsigned long end)
+{
+ struct drm_device *drm = mr->mr_ops.drm_mem_region_get_device(mr);
+ struct drm_gpuva *gpuva = hmmptr->get_gpuva(hmmptr);
+ struct mm_struct *mm = vm->mm;
+ unsigned long npages = __npages_in_range(start, end);
+ struct vm_area_struct *vas;
+ struct migrate_vma migrate = {
+ .start = ALIGN_DOWN(start, PAGE_SIZE),
+ .end = ALIGN(end, PAGE_SIZE),
+ .pgmap_owner = mr->mr_ops.drm_mem_region_pagemap_owner(mr),
+ .flags = MIGRATE_VMA_SELECT_SYSTEM,
+ };
+ struct device *dev = drm->dev;
+ struct dma_fence *fence;
+ struct migrate_vec *src;
+ struct migrate_vec *dst;
+ int ret = 0;
+ void *buf;
+
+ mmap_assert_locked(mm);
+
+ BUG_ON(start < GPUVA_START(gpuva));
+ BUG_ON(end > GPUVA_END(gpuva));
+
+ vas = find_vma_intersection(mm, start, end);
+ if (!vas)
+ return -ENOENT;
+
+ migrate.vma = vas;
+ buf = kvcalloc(npages, 2* sizeof(*migrate.src), GFP_KERNEL);
+ if(!buf)
+ return -ENOMEM;
+
+ migrate.src = buf;
+ migrate.dst = migrate.src + npages;
+ ret = migrate_vma_setup(&migrate);
+ if (ret) {
+ drm_warn(drm, "vma setup returned %d for range [%lx - %lx]\n",
+ ret, start, end);
+ goto free_buf;
+ }
+
+ /**
+ * Partial migration is just normal. Print a message for now.
+ * Once this behavior is verified, delete this warning.
+ */
+ if (migrate.cpages != npages)
+ drm_warn(drm, "Partial migration for range [%lx - %lx], range is %ld pages, migrate only %ld pages\n",
+ start, end, npages, migrate.cpages);
+
+ ret = mr->mr_ops.drm_mem_region_alloc_pages(mr, migrate.cpages, migrate.dst);
+ if (ret) {
+ memset(migrate.dst, 0, sizeof(*migrate.dst));
+ goto migrate_pages;
+ }
+
+ __drm_svm_init_device_pages(migrate.dst, migrate.cpages);
+
+ src = __generate_migrate_vec_sram(dev, migrate.src, true, npages);
+ if (!src) {
+ ret = VM_FAULT_OOM;
+ goto free_device_pages;
+ }
+
+ dst = __generate_migrate_vec_vram(migrate.dst, false, migrate.cpages);
+ if (!dst) {
+ ret = VM_FAULT_OOM;
+ goto free_migrate_src;
+ }
+
+ fence = mr->mr_ops.drm_mem_region_migrate(src, dst);
+ if (IS_ERR(fence)) {
+ ret = VM_FAULT_SIGBUS;
+ goto free_migrate_dst;
+ }
+ dma_fence_wait(fence, false);
+ dma_fence_put(fence);
+
+free_migrate_dst:
+ __free_migrate_vec_vram(dst);
+free_migrate_src:
+ __free_migrate_vec_sram(dev, src, true);
+
+free_device_pages:
+ if (ret)
+ __drm_svm_free_pages(migrate.dst, migrate.cpages);
+migrate_pages:
+ migrate_vma_pages(&migrate);
+ migrate_vma_finalize(&migrate);
+free_buf:
+ kvfree(buf);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(drm_svm_migrate_hmmptr_to_vram);
diff --git a/include/drm/drm_svm.h b/include/drm/drm_svm.h
index fd257f25b415..9e8764e5fb59 100644
--- a/include/drm/drm_svm.h
+++ b/include/drm/drm_svm.h
@@ -211,3 +211,6 @@ void drm_svm_hmmptr_release(struct drm_hmmptr *hmmptr);
void drm_svm_hmmptr_map_dma_pages(struct drm_hmmptr *hmmptr, u64 page_idx, u64 npages);
int drm_svm_hmmptr_populate(struct drm_hmmptr *hmmptr, void *owner,
u64 start, u64 end, bool write);
+int drm_svm_migrate_hmmptr_to_vram(struct drm_gpuvm *vm,
+ struct drm_mem_region *mr,
+ struct drm_hmmptr *hmmptr, unsigned long start, unsigned long end);
--
2.26.3
next prev parent reply other threads:[~2024-05-30 0:33 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-30 0:47 [CI v3 01/26] mm/hmm: let users to tag specific PFNs Oak Zeng
2024-05-30 0:47 ` [CI v3 02/26] dma-mapping: provide an interface to allocate IOVA Oak Zeng
2024-05-30 0:47 ` [CI v3 03/26] dma-mapping: provide callbacks to link/unlink pages to specific IOVA Oak Zeng
2024-05-30 0:47 ` [CI v3 04/26] iommu/dma: Provide an interface to allow preallocate IOVA Oak Zeng
2024-05-30 0:47 ` [CI v3 05/26] iommu/dma: Prepare map/unmap page functions to receive IOVA Oak Zeng
2024-05-30 0:47 ` [CI v3 06/26] iommu/dma: Implement link/unlink page callbacks Oak Zeng
2024-05-30 0:47 ` [CI v3 07/26] drm: move xe_sg_segment_size to drm layer Oak Zeng
2024-05-30 0:47 ` [CI v3 08/26] drm: Move GPUVA_START/LAST to drm_gpuvm.h Oak Zeng
2024-05-30 0:47 ` [CI v3 09/26] drm/svm: add a mm field to drm_gpuvm struct Oak Zeng
2024-05-30 0:47 ` [CI v3 10/26] drm/svm: introduce drm_mem_region concept Oak Zeng
2024-05-30 0:47 ` [CI v3 11/26] drm/svm: introduce hmmptr and helper functions Oak Zeng
2024-05-30 0:47 ` [CI v3 12/26] drm/svm: Introduce helper to remap drm memory region Oak Zeng
2024-05-30 0:47 ` [CI v3 13/26] drm/svm: handle CPU page fault Oak Zeng
2024-05-30 0:47 ` Oak Zeng [this message]
2024-05-30 0:47 ` [CI v3 15/26] drm/svm: Add DRM SVM documentation Oak Zeng
2024-05-30 0:47 ` [CI v3 16/26] drm/xe: s/xe_tile_migrate_engine/xe_tile_migrate_exec_queue Oak Zeng
2024-05-30 0:47 ` [CI v3 17/26] drm/xe: Add xe_vm_pgtable_update_op to xe_vma_ops Oak Zeng
2024-05-30 0:47 ` [CI v3 18/26] drm/xe: Convert multiple bind ops into single job Oak Zeng
2024-05-30 0:47 ` [CI v3 19/26] drm/xe: Update VM trace events Oak Zeng
2024-05-30 0:47 ` [CI v3 20/26] drm/xe: Update PT layer with better error handling Oak Zeng
2024-05-30 0:47 ` [CI v3 21/26] drm/xe: Retry BO allocation Oak Zeng
2024-05-30 0:47 ` [CI v3 22/26] drm/xe: Rework GPU page fault handling Oak Zeng
2024-05-30 0:47 ` [CI v3 23/26] drm/xe/uapi: Add DRM_XE_VM_BIND_FLAG_SYSTEM_ALLOCATOR flag Oak Zeng
2024-05-30 0:47 ` [CI v3 24/26] drm/xe: Add dma_addr res cursor Oak Zeng
2024-05-30 0:47 ` [CI v3 25/26] drm/xe: Use drm_mem_region for xe Oak Zeng
2024-05-30 0:47 ` [CI v3 26/26] drm/xe: use drm_hmmptr in xe Oak Zeng
2024-05-30 0:50 ` ✓ CI.Patch_applied: success for series starting with [CI,v3,01/26] mm/hmm: let users to tag specific PFNs Patchwork
2024-05-30 0:51 ` ✗ CI.checkpatch: warning " Patchwork
2024-05-30 0:51 ` ✗ CI.KUnit: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2024-05-29 1:18 [CI v3 01/26] " Oak Zeng
2024-05-29 1:19 ` [CI v3 14/26] drm/svm: Migrate a range of hmmptr to vram Oak Zeng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240530004732.84898-14-oak.zeng@intel.com \
--to=oak.zeng@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox