[CI 41/42] drm/xe/svm: Introduce hmm_pfn array based resource cursor
Oak Zeng
oak.zeng at intel.com
Thu Jun 13 15:31:27 UTC 2024
This type of resource cursor will be used by system allocator or userptr.
With system allocator, all the backing resource are backed by struct page.
The resource could be in system memory or in gpu device memory. For
userptr, the backing resource is always in system memory.
For system memory, the page is already dma-mapped. The dma-mapped
address is in dma_addr array.
For gpu device memory, we will calculate the device physical address
using hmm_pfn.
Note we support a mixture placement of system memory and device memory.
In the resource range, some of the page could be backed by system mem,
and some by device memory.
Cc: Thomas Hellström <thomas.hellstrom at linux.intel.com>
Cc: Matthew Brost <matthew.brost at intel.com>
Cc: Brian Welty <brian.welty at intel.com>
Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray at intel.com>
Signed-off-by: Oak Zeng <oak.zeng at intel.com>
---
drivers/gpu/drm/xe/xe_pt.c | 5 +-
drivers/gpu/drm/xe/xe_res_cursor.h | 80 ++++++++++++++++++++----------
2 files changed, 57 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
index c68ff02a931e..4a7dab64f9b6 100644
--- a/drivers/gpu/drm/xe/xe_pt.c
+++ b/drivers/gpu/drm/xe/xe_pt.c
@@ -698,8 +698,9 @@ xe_pt_stage_bind(struct xe_tile *tile, struct xe_vma *vma, u64 start, u64 end,
u64 offset = start - xe_vma_start(vma);
u64 page_idx = offset >> PAGE_SHIFT;
if (xe_vma_is_userptr(vma))
- xe_res_first_dma(to_userptr_vma(vma)->userptr.hmmptr.dma_addr + page_idx,
- 0, xe_vma_size(vma), 0, &curs);
+ xe_res_first_hmmptr(to_userptr_vma(vma)->userptr.hmmptr.dma_addr + page_idx,
+ to_userptr_vma(vma)->userptr.hmmptr.pfn + page_idx,
+ &tile->mem.vram.drm_mr, size, &curs);
else if (xe_bo_is_vram(bo) || xe_bo_is_stolen(bo))
xe_res_first(bo->ttm.resource, xe_vma_bo_offset(vma) + offset,
size, &curs);
diff --git a/drivers/gpu/drm/xe/xe_res_cursor.h b/drivers/gpu/drm/xe/xe_res_cursor.h
index b17b3375f6d9..fae53c093a57 100644
--- a/drivers/gpu/drm/xe/xe_res_cursor.h
+++ b/drivers/gpu/drm/xe/xe_res_cursor.h
@@ -25,12 +25,16 @@
#define _XE_RES_CURSOR_H_
#include <linux/scatterlist.h>
+#include <linux/mm_types.h>
+#include <linux/memremap.h>
+#include <linux/hmm.h>
#include <drm/drm_mm.h>
#include <drm/ttm/ttm_placement.h>
#include <drm/ttm/ttm_range_manager.h>
#include <drm/ttm/ttm_resource.h>
#include <drm/ttm/ttm_tt.h>
+#include <drm/drm_svm.h>
#include "xe_bo.h"
#include "xe_device.h"
@@ -44,10 +48,11 @@ struct xe_res_cursor {
u64 remaining;
void *node;
u32 mem_type;
- unsigned int order;
struct scatterlist *sgl;
- const dma_addr_t *dma_addr;
+ dma_addr_t *dma_addr;
struct drm_buddy *mm;
+ unsigned long *hmm_pfn;
+ struct drm_mem_region *mr;
};
static struct drm_buddy *xe_res_get_buddy(struct ttm_resource *res)
@@ -80,6 +85,8 @@ static inline void xe_res_first(struct ttm_resource *res,
XE_WARN_ON(start + size > res->size);
cur->mem_type = res->mem_type;
+ cur->hmm_pfn = NULL;
+ cur->mr = NULL;
switch (cur->mem_type) {
case XE_PL_STOLEN:
@@ -160,6 +167,8 @@ static inline void xe_res_first_sg(const struct sg_table *sg,
struct xe_res_cursor *cur)
{
XE_WARN_ON(!sg);
+ cur->hmm_pfn = NULL;
+ cur->mr = NULL;
cur->node = NULL;
cur->start = start;
cur->remaining = size;
@@ -171,34 +180,43 @@ static inline void xe_res_first_sg(const struct sg_table *sg,
}
/**
- * xe_res_first_dma - initialize a xe_res_cursor with dma_addr array
+ * xe_res_first_hmmptr - initialize a xe_res_cursor for hmmptr
*
- * @dma_addr: dma_addr array to walk
- * @start: Start of the range
+ * @dma_addr: dma_addr array to walk, valid when resource is in system mem.
+ * @hmm_pfn: a hmm_pfn array, each item contains hmm_pfn of a 4k page.
+ * @mr: memory region that the resource belongs to
* @size: Size of the range
- * @order: Order of dma mapping. i.e. PAGE_SIZE << order is mapping size
* @cur: cursor object to initialize
*
- * Start walking over the range of allocations between @start and @size.
+ * Start walking over the resources used by a hmmptr. For hmmptr,
+ * the backing resource are all backed by struct page. The resource
+ * could be in system memory or in gpu device memory.
+ *
+ * For system memory, the page is already dma-mapped. The dma-mapped
+ * address is in dma_addr array.
+ *
+ * For gpu device memory, we will calculate the device physical address
+ * using hmm_pfn.
+ *
+ * Note we support a mixture placement of system memory and device memory.
+ * In the resource range, some of the page could be backed by system mem,
+ * and some by device memory.
*/
-static inline void xe_res_first_dma(const dma_addr_t *dma_addr,
- u64 start, u64 size,
- unsigned int order,
- struct xe_res_cursor *cur)
+static inline void xe_res_first_hmmptr(dma_addr_t *dma_addr,
+ unsigned long *hmm_pfn, struct drm_mem_region *mr,
+ u64 size, struct xe_res_cursor *cur)
{
- XE_WARN_ON(start);
XE_WARN_ON(!dma_addr);
- XE_WARN_ON(!IS_ALIGNED(start, PAGE_SIZE) ||
- !IS_ALIGNED(size, PAGE_SIZE));
+ XE_WARN_ON(!IS_ALIGNED(size, PAGE_SIZE));
cur->node = NULL;
- cur->start = start;
cur->remaining = size;
- cur->size = PAGE_SIZE << order;
+ cur->size = 0;
cur->dma_addr = dma_addr;
- cur->order = order;
cur->sgl = NULL;
cur->mem_type = XE_PL_TT;
+ cur->hmm_pfn = hmm_pfn;
+ cur->mr = mr;
}
/**
@@ -221,15 +239,19 @@ static inline void xe_res_next(struct xe_res_cursor *cur, u64 size)
if (!cur->remaining)
return;
- if (cur->size > size) {
- cur->size -= size;
- cur->start += size;
+ if (cur->mr) {
+ int npages;
+
+ XE_WARN_ON(!IS_ALIGNED(size, PAGE_SIZE));
+
+ npages = size >> PAGE_SHIFT;
+ cur->hmm_pfn += npages;
+ cur->dma_addr += npages;
return;
}
- if (cur->dma_addr) {
- cur->size = (PAGE_SIZE << cur->order) -
- (size - cur->size);
+ if (cur->size > size) {
+ cur->size -= size;
cur->start += size;
return;
}
@@ -275,9 +297,15 @@ static inline void xe_res_next(struct xe_res_cursor *cur, u64 size)
*/
static inline u64 xe_res_dma(const struct xe_res_cursor *cur)
{
- if (cur->dma_addr)
- return cur->dma_addr[cur->start >> (PAGE_SHIFT + cur->order)] +
- (cur->start & ((PAGE_SIZE << cur->order) - 1));
+ if (cur->mr) {
+ u64 hmm_pfn = *cur->hmm_pfn;
+ struct page *page = hmm_pfn_to_page(hmm_pfn);
+
+ if (is_device_private_page(page))
+ return drm_mem_region_page_to_dpa(cur->mr, page);
+ else
+ return *cur->dma_addr;
+ }
else if (cur->sgl)
return sg_dma_address(cur->sgl) + cur->start;
else
--
2.26.3
More information about the Intel-xe
mailing list