Skip to content

Commit 0c30c65

Browse files
committed
drm/xe: Add SVM device memory mirroring
Add SVM device memory mirroring which enables device pages for migration. Enabled via CONFIG_XE_DEVMEM_MIRROR Kconfig. Kconfig option defaults to enabled. If not enabled, SVM will work sans migration and KMD memory footprint will be less. v3: - Add CONFIG_XE_DEVMEM_MIRROR v4: - Fix Kconfig (Himal) - Use %pe to print errors (Thomas) - Fix alignment issue (Checkpatch) v5: - s/xe_mem_region/xe_vram_region (Rebase) v6: - Only compile if CONFIG_DRM_GPUSVM selected (CI, Lucas) - s/drm_info/drm_dbg/ Signed-off-by: Niranjana Vishwanathapura <[email protected]> Signed-off-by: Oak Zeng <[email protected]> Signed-off-by: Matthew Brost <[email protected]> Reviewed-by: Thomas Hellström <[email protected]> Reviewed-by: Himal Prasad Ghimiray <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 9c44fd5 commit 0c30c65

File tree

5 files changed

+91
-2
lines changed

5 files changed

+91
-2
lines changed

drivers/gpu/drm/xe/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,15 @@ config DRM_XE_DP_TUNNEL
7474

7575
If in doubt say "Y".
7676

77+
config DRM_XE_DEVMEM_MIRROR
78+
bool "Enable device memory mirror"
79+
depends on DRM_XE
80+
select GET_FREE_REGION
81+
default y
82+
help
83+
Disable this option only if you want to compile out without device
84+
memory mirror. Will reduce KMD memory footprint when disabled.
85+
7786
config DRM_XE_FORCE_PROBE
7887
string "Force probe xe for selected Intel hardware IDs"
7988
depends on DRM_XE

drivers/gpu/drm/xe/xe_device_types.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,14 @@ struct xe_vram_region {
106106
resource_size_t actual_physical_size;
107107
/** @mapping: pointer to VRAM mappable space */
108108
void __iomem *mapping;
109+
/** @pagemap: Used to remap device memory as ZONE_DEVICE */
110+
struct dev_pagemap pagemap;
111+
/**
112+
* @hpa_base: base host physical address
113+
*
114+
* This is generated when remap device memory as ZONE_DEVICE
115+
*/
116+
resource_size_t hpa_base;
109117
/** @ttm: VRAM TTM manager */
110118
struct xe_ttm_vram_mgr ttm;
111119
};

drivers/gpu/drm/xe/xe_svm.c

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ static unsigned long xe_svm_range_end(struct xe_svm_range *range)
2929
return drm_gpusvm_range_end(&range->base);
3030
}
3131

32+
static void *xe_svm_devm_owner(struct xe_device *xe)
33+
{
34+
return xe;
35+
}
36+
3237
static struct drm_gpusvm_range *
3338
xe_svm_range_alloc(struct drm_gpusvm *gpusvm)
3439
{
@@ -313,8 +318,8 @@ int xe_svm_init(struct xe_vm *vm)
313318
xe_svm_garbage_collector_work_func);
314319

315320
err = drm_gpusvm_init(&vm->svm.gpusvm, "Xe SVM", &vm->xe->drm,
316-
current->mm, NULL, 0, vm->size,
317-
SZ_512M, &gpusvm_ops, fault_chunk_sizes,
321+
current->mm, xe_svm_devm_owner(vm->xe), 0,
322+
vm->size, SZ_512M, &gpusvm_ops, fault_chunk_sizes,
318323
ARRAY_SIZE(fault_chunk_sizes));
319324
if (err)
320325
return err;
@@ -449,3 +454,56 @@ bool xe_svm_has_mapping(struct xe_vm *vm, u64 start, u64 end)
449454
{
450455
return drm_gpusvm_has_mapping(&vm->svm.gpusvm, start, end);
451456
}
457+
458+
#if IS_ENABLED(CONFIG_DRM_XE_DEVMEM_MIRROR)
459+
/**
460+
* xe_devm_add: Remap and provide memmap backing for device memory
461+
* @tile: tile that the memory region belongs to
462+
* @vr: vram memory region to remap
463+
*
464+
* This remap device memory to host physical address space and create
465+
* struct page to back device memory
466+
*
467+
* Return: 0 on success standard error code otherwise
468+
*/
469+
int xe_devm_add(struct xe_tile *tile, struct xe_vram_region *vr)
470+
{
471+
struct xe_device *xe = tile_to_xe(tile);
472+
struct device *dev = &to_pci_dev(xe->drm.dev)->dev;
473+
struct resource *res;
474+
void *addr;
475+
int ret;
476+
477+
res = devm_request_free_mem_region(dev, &iomem_resource,
478+
vr->usable_size);
479+
if (IS_ERR(res)) {
480+
ret = PTR_ERR(res);
481+
return ret;
482+
}
483+
484+
vr->pagemap.type = MEMORY_DEVICE_PRIVATE;
485+
vr->pagemap.range.start = res->start;
486+
vr->pagemap.range.end = res->end;
487+
vr->pagemap.nr_range = 1;
488+
vr->pagemap.ops = drm_gpusvm_pagemap_ops_get();
489+
vr->pagemap.owner = xe_svm_devm_owner(xe);
490+
addr = devm_memremap_pages(dev, &vr->pagemap);
491+
if (IS_ERR(addr)) {
492+
devm_release_mem_region(dev, res->start, resource_size(res));
493+
ret = PTR_ERR(addr);
494+
drm_err(&xe->drm, "Failed to remap tile %d memory, errno %pe\n",
495+
tile->id, ERR_PTR(ret));
496+
return ret;
497+
}
498+
vr->hpa_base = res->start;
499+
500+
drm_dbg(&xe->drm, "Added tile %d memory [%llx-%llx] to devm, remapped to %pr\n",
501+
tile->id, vr->io_start, vr->io_start + vr->usable_size, res);
502+
return 0;
503+
}
504+
#else
505+
int xe_devm_add(struct xe_tile *tile, struct xe_vram_region *vr)
506+
{
507+
return 0;
508+
}
509+
#endif

drivers/gpu/drm/xe/xe_svm.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#define XE_INTERCONNECT_VRAM DRM_INTERCONNECT_DRIVER
1313

14+
struct xe_vram_region;
1415
struct xe_tile;
1516
struct xe_vm;
1617
struct xe_vma;
@@ -48,6 +49,8 @@ static inline bool xe_svm_range_pages_valid(struct xe_svm_range *range)
4849
return drm_gpusvm_range_pages_valid(range->base.gpusvm, &range->base);
4950
}
5051

52+
int xe_devm_add(struct xe_tile *tile, struct xe_vram_region *vr);
53+
5154
int xe_svm_init(struct xe_vm *vm);
5255

5356
void xe_svm_fini(struct xe_vm *vm);
@@ -65,6 +68,12 @@ static inline bool xe_svm_range_pages_valid(struct xe_svm_range *range)
6568
return false;
6669
}
6770

71+
static inline
72+
int xe_devm_add(struct xe_tile *tile, struct xe_vram_region *vr)
73+
{
74+
return 0;
75+
}
76+
6877
static inline
6978
int xe_svm_init(struct xe_vm *vm)
7079
{

drivers/gpu/drm/xe/xe_tile.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "xe_migrate.h"
1414
#include "xe_pcode.h"
1515
#include "xe_sa.h"
16+
#include "xe_svm.h"
1617
#include "xe_tile.h"
1718
#include "xe_tile_sysfs.h"
1819
#include "xe_ttm_vram_mgr.h"
@@ -160,6 +161,7 @@ static int tile_ttm_mgr_init(struct xe_tile *tile)
160161
*/
161162
int xe_tile_init_noalloc(struct xe_tile *tile)
162163
{
164+
struct xe_device *xe = tile_to_xe(tile);
163165
int err;
164166

165167
err = tile_ttm_mgr_init(tile);
@@ -168,6 +170,9 @@ int xe_tile_init_noalloc(struct xe_tile *tile)
168170

169171
xe_wa_apply_tile_workarounds(tile);
170172

173+
if (xe->info.has_usm && IS_DGFX(xe))
174+
xe_devm_add(tile, &tile->mem.vram);
175+
171176
return xe_tile_sysfs_init(tile);
172177
}
173178

0 commit comments

Comments
 (0)