From: Oak Zeng <oak.zeng@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [CI 32/42] drm/xe/svm: implement functions to allocate and free device memory
Date: Thu, 13 Jun 2024 11:31:18 -0400 [thread overview]
Message-ID: <20240613153128.681864-32-oak.zeng@intel.com> (raw)
In-Reply-To: <20240613153128.681864-1-oak.zeng@intel.com>
Function xe_svm_alloc_pages allocate pages from drm buddy and perform
house keeping work for all the pages allocated, such as get a page
refcount, set page's zone_device_data to point to the drm buddy block
that the page belongs to.
Function xe_svm_free_page free one page back to drm buddy allocator.
v1: Drop buddy block meta data (Matt)
Take vram_mgr->lock during buddy operation (Matt)
Moving to page granularity memory free (Oak)
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@intel.com>
Cc: Brian Welty <brian.welty@intel.com>
Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Co-developed-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Signed-off-by: Oak Zeng <oak.zeng@intel.com>
---
drivers/gpu/drm/drm_svm.c | 1 -
drivers/gpu/drm/xe/Makefile | 1 +
drivers/gpu/drm/xe/xe_svm.c | 148 ++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/xe/xe_svm.h | 16 ++++
4 files changed, 165 insertions(+), 1 deletion(-)
create mode 100644 drivers/gpu/drm/xe/xe_svm.c
create mode 100644 drivers/gpu/drm/xe/xe_svm.h
diff --git a/drivers/gpu/drm/drm_svm.c b/drivers/gpu/drm/drm_svm.c
index 967e7addae54..a751cc2c9c91 100644
--- a/drivers/gpu/drm/drm_svm.c
+++ b/drivers/gpu/drm/drm_svm.c
@@ -3,7 +3,6 @@
* Copyright © 2024 Intel Corporation
*/
-
#include <linux/scatterlist.h>
#include <linux/mmu_notifier.h>
#include <linux/dma-mapping.h>
diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index 6457f1b74cd8..cf5ce447648c 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -108,6 +108,7 @@ xe-y += xe_bb.o \
xe_sa.o \
xe_sched_job.o \
xe_step.o \
+ xe_svm.o \
xe_sync.o \
xe_tile.o \
xe_tile_sysfs.o \
diff --git a/drivers/gpu/drm/xe/xe_svm.c b/drivers/gpu/drm/xe/xe_svm.c
new file mode 100644
index 000000000000..a2c52f205ea0
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_svm.c
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#include <linux/mm_types.h>
+#include <linux/sched/mm.h>
+#include <linux/gfp.h>
+#include <drm/drm_buddy.h>
+#include "xe_ttm_vram_mgr_types.h"
+#include "xe_device_types.h"
+#include "xe_device.h"
+#include "xe_tile.h"
+#include "xe_svm.h"
+#include "xe_assert.h"
+
+/** This is a placeholder for compilation. Will introduce function to drm buddy */
+static void drm_buddy_block_free_subrange(struct drm_buddy_block *block, u64 start,
+ u64 end, struct list_head *block_list)
+{
+}
+
+static u64 block_offset_to_pfn(struct xe_mem_region *mr, u64 offset)
+{
+ /** DRM buddy's block offset is 0-based*/
+ offset += mr->drm_mr.hpa_base;
+
+ return PHYS_PFN(offset);
+}
+
+void xe_svm_free_page(struct page *page)
+{
+ struct drm_buddy_block *block =
+ (struct drm_buddy_block *)page->zone_device_data;
+ struct drm_mem_region *mr = drm_page_to_mem_region(page);
+ struct xe_mem_region *xe_mr = container_of(mr, struct xe_mem_region, drm_mr);
+ struct xe_tile *tile = xe_mem_region_to_tile(xe_mr);
+ struct drm_buddy *mm = &tile->mem.vram_mgr->mm;
+ u64 size = drm_buddy_block_size(mm, block);
+ u64 pages_per_block = size >> PAGE_SHIFT;
+ u64 block_pfn_first =
+ block_offset_to_pfn(xe_mr, drm_buddy_block_offset(block));
+ u64 page_pfn = page_to_pfn(page);
+ u64 page_idx = page_pfn - block_pfn_first;
+ struct list_head blocks = LIST_HEAD_INIT(blocks);
+ struct drm_buddy_block *tmp;
+ int i;
+
+ xe_assert(tile->xe, page_idx < pages_per_block);
+ drm_buddy_block_free_subrange(block, page_idx << PAGE_SHIFT,
+ (page_idx << PAGE_SHIFT) + PAGE_SIZE, &blocks);
+
+ /**
+ * page's buddy_block (record in page's zone_device_data) is changed
+ * due to above partial free. update zone_device_data.
+ */
+ list_for_each_entry_safe(block, tmp, &blocks, link) {
+ size = drm_buddy_block_size(mm, block);
+ pages_per_block = size >> PAGE_SHIFT;
+ block_pfn_first =
+ block_offset_to_pfn(xe_mr, drm_buddy_block_offset(block));
+ for(i = 0; i < pages_per_block; i++) {
+ struct page *p;
+
+ p = pfn_to_page(block_pfn_first + i);
+ p->zone_device_data = block;
+ }
+ }
+}
+
+/**
+ * __free_blocks() - free all memory blocks
+ *
+ * @mm: drm_buddy that the blocks belongs to
+ * @blocks: memory blocks list head
+ */
+static void __free_blocks(struct drm_buddy *mm, struct list_head *blocks)
+{
+ struct drm_buddy_block *block, *tmp;
+
+ list_for_each_entry_safe(block, tmp, blocks, link)
+ drm_buddy_free_block(mm, block);
+}
+
+/**
+ * xe_svm_alloc_pages() - allocate device pages from buddy allocator
+ *
+ * @mr: which memory region to allocate device memory from
+ * @npages: how many pages to allocate
+ * @pfn: used to return the pfn of all allocated pages. Must be big enough
+ * to hold at @npages entries.
+ *
+ * This function allocate blocks of memory from drm buddy allocator, and
+ * performs initialization work: set struct page::zone_device_data to point
+ * to the memory block; zone_device_page_init each page allocated; add pages
+ * to lru managers lru list for eviction purpose - this is TBD.
+ *
+ * return: 0 on success
+ * error code otherwise
+ */
+int xe_svm_alloc_pages(struct drm_mem_region *mr,
+ unsigned long npages, unsigned long *pfn)
+{
+ struct xe_mem_region *xe_mr = container_of(mr, struct xe_mem_region, drm_mr);
+ struct xe_tile *tile = xe_mem_region_to_tile(xe_mr);
+ struct drm_buddy *mm = &tile->mem.vram_mgr->mm;
+ struct drm_buddy_block *block, *tmp;
+ u64 size = npages << PAGE_SHIFT;
+ int ret = 0, i, j = 0;
+ struct list_head blocks;
+
+ mutex_lock(&tile->mem.vram_mgr->lock);
+ ret = drm_buddy_alloc_blocks(mm, 0, mm->size, size, PAGE_SIZE,
+ &blocks, DRM_BUDDY_CONTIGUOUS_ALLOCATION);
+
+ if (unlikely(ret)) {
+ mutex_unlock(&tile->mem.vram_mgr->lock);
+ return ret;
+ }
+
+ ret = drm_buddy_block_trim(mm, size, &blocks);
+ if (ret) {
+ __free_blocks(mm, &blocks);
+ mutex_unlock(&tile->mem.vram_mgr->lock);
+ return ret;
+ }
+ mutex_unlock(&tile->mem.vram_mgr->lock);
+
+ list_for_each_entry_safe(block, tmp, &blocks, link) {
+ u64 block_pfn_first, pages_per_block;
+
+ size = drm_buddy_block_size(mm, block);
+ pages_per_block = size >> PAGE_SHIFT;
+ block_pfn_first =
+ block_offset_to_pfn(xe_mr, drm_buddy_block_offset(block));
+ for(i = 0; i < pages_per_block; i++) {
+ struct page *page;
+
+ pfn[j++] = block_pfn_first + i;
+ page = pfn_to_page(block_pfn_first + i);
+ /**Lock page per hmm requirement, see hmm.rst.*/
+ zone_device_page_init(page);
+ page->zone_device_data = block;
+ }
+ }
+
+ return ret;
+}
diff --git a/drivers/gpu/drm/xe/xe_svm.h b/drivers/gpu/drm/xe/xe_svm.h
new file mode 100644
index 000000000000..09fef8ea97f3
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_svm.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2024 Intel Corporation
+ */
+
+#ifndef _XE_SVM_
+#define _XE_SVM_
+
+struct drm_mem_region;
+struct page;
+
+int xe_svm_alloc_pages(struct drm_mem_region *mr,
+ unsigned long npages, unsigned long *pfn);
+void xe_svm_free_page(struct page *page);
+
+#endif
--
2.26.3
next prev parent reply other threads:[~2024-06-13 15:21 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-13 15:30 [CI 01/42] mm/hmm: let users to tag specific PFNs Oak Zeng
2024-06-13 15:30 ` [CI 02/42] dma-mapping: provide an interface to allocate IOVA Oak Zeng
2024-06-13 15:30 ` [CI 03/42] dma-mapping: provide callbacks to link/unlink pages to specific IOVA Oak Zeng
2024-06-13 15:30 ` [CI 04/42] iommu/dma: Provide an interface to allow preallocate IOVA Oak Zeng
2024-06-13 15:30 ` [CI 05/42] iommu/dma: Prepare map/unmap page functions to receive IOVA Oak Zeng
2024-06-13 15:30 ` [CI 06/42] iommu/dma: Implement link/unlink page callbacks Oak Zeng
2024-06-13 15:30 ` [CI 07/42] drm: Move GPUVA_START/LAST to drm_gpuvm.h Oak Zeng
2024-06-13 15:30 ` [CI 08/42] drm/svm: Mark drm_gpuvm to participate SVM Oak Zeng
2024-06-13 15:30 ` [CI 09/42] drm/svm: introduce drm_mem_region concept Oak Zeng
2024-06-13 15:30 ` [CI 10/42] drm/svm: introduce hmmptr and helper functions Oak Zeng
2024-06-13 15:30 ` [CI 11/42] drm/svm: Introduce helper to remap drm memory region Oak Zeng
2024-06-13 15:30 ` [CI 12/42] drm/svm: handle CPU page fault Oak Zeng
2024-06-13 15:30 ` [CI 13/42] drm/svm: Migrate a range of hmmptr to vram Oak Zeng
2024-06-13 15:31 ` [CI 14/42] drm/svm: Add DRM SVM documentation Oak Zeng
2024-06-13 15:31 ` [CI 15/42] drm/xe: s/xe_tile_migrate_engine/xe_tile_migrate_exec_queue Oak Zeng
2024-06-13 15:31 ` [CI 16/42] drm/xe: Add xe_vm_pgtable_update_op to xe_vma_ops Oak Zeng
2024-06-13 15:31 ` [CI 17/42] drm/xe: Convert multiple bind ops into single job Oak Zeng
2024-06-13 15:31 ` [CI 18/42] drm/xe: Update VM trace events Oak Zeng
2024-06-13 15:31 ` [CI 19/42] drm/xe: Update PT layer with better error handling Oak Zeng
2024-06-13 15:31 ` [CI 20/42] drm/xe: Retry BO allocation Oak Zeng
2024-06-13 15:31 ` [CI 21/42] drm/xe/uapi: Add DRM_XE_VM_BIND_FLAG_SYSTEM_ALLOCATOR flag Oak Zeng
2024-06-13 15:31 ` [CI 22/42] drm/xe: Add a helper to calculate userptr end address Oak Zeng
2024-06-13 15:31 ` [CI 23/42] drm/xe: Add dma_addr res cursor Oak Zeng
2024-06-13 15:31 ` [CI 24/42] drm/xe: Use drm_mem_region for xe Oak Zeng
2024-06-13 15:31 ` [CI 25/42] drm/xe: use drm_hmmptr in xe Oak Zeng
2024-06-13 15:31 ` [CI 26/42] drm/xe: Moving to range based vma invalidation Oak Zeng
2024-06-13 15:31 ` [CI 27/42] drm/xe: Support range based page table update Oak Zeng
2024-06-13 15:31 ` [CI 28/42] drm/xe/uapi: Add DRM_XE_VM_CREATE_FLAG_PARTICIPATE_SVM flag Oak Zeng
2024-06-13 15:31 ` [CI 29/42] drm/xe/svm: Create userptr if page fault occurs on system_allocator VMA Oak Zeng
2024-06-13 15:31 ` [CI 30/42] drm/xe/svm: Add faulted userptr VMA garbage collector Oak Zeng
2024-06-13 15:31 ` [CI 31/42] drm/xe: Introduce helper to get tile from memory region Oak Zeng
2024-06-13 15:31 ` Oak Zeng [this message]
2024-06-13 15:31 ` [CI 33/42] drm/xe/svm: Get drm device from drm " Oak Zeng
2024-06-13 15:31 ` [CI 34/42] drm/xe/svm: Get page map owner of a " Oak Zeng
2024-06-13 15:31 ` [CI 35/42] drm/xe/svm: Add migrate layer functions for SVM support Oak Zeng
2024-06-13 15:31 ` [CI 36/42] drm/xe/svm: introduce svm migration function Oak Zeng
2024-06-13 15:31 ` [CI 37/42] drm/xe/svm: Register xe memory region to drm layer Oak Zeng
2024-06-13 15:31 ` [CI 38/42] drm/xe/svm: Introduce DRM_XE_SVM kernel config Oak Zeng
2024-06-13 15:31 ` [CI 39/42] drm/xe/svm: Migration from sram to vram for system allocator Oak Zeng
2024-06-13 15:31 ` [CI 40/42] drm/xe/svm: Determine a vma is backed by device memory Oak Zeng
2024-06-13 15:31 ` [CI 41/42] drm/xe/svm: Introduce hmm_pfn array based resource cursor Oak Zeng
2024-06-13 15:31 ` [CI 42/42] drm/xe: Enable system allocator uAPI Oak Zeng
2024-06-13 15:53 ` ✓ CI.Patch_applied: success for series starting with [CI,01/42] mm/hmm: let users to tag specific PFNs Patchwork
2024-06-13 15:54 ` ✗ CI.checkpatch: warning " Patchwork
2024-06-13 15:54 ` ✗ CI.KUnit: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2024-06-13 4:23 [CI 01/42] " Oak Zeng
2024-06-13 4:24 ` [CI 32/42] drm/xe/svm: implement functions to allocate and free device memory 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=20240613153128.681864-32-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