Commit fa78e188 authored by Badal Nilawar's avatar Badal Nilawar Committed by Rodrigo Vivi

drm/xe/dgfx: Release mmap mappings on rpm suspend

Release all mmap mappings for all vram objects which are associated
with userfault such that, while pcie function in D3hot, any access
to memory mappings will raise a userfault.

Upon userfault, in order to access memory mappings, if graphics
function is in D3 then runtime resume of dgpu will be triggered to
transition to D0.

v2:
  - Avoid iomem check before bo migration check as bo can migrate
    to system memory (Matthew Auld)
v3:
  - Delete bo userfault link during bo destroy
  - Upon bo move (vram-smem), do bo userfault link deletion in
    xe_bo_move_notify instead of xe_bo_move (Thomas Hellström)
  - Grab lock in rpm hook while deleting bo userfault link (Matthew Auld)
v4:
  - Add kernel doc and wrap vram_userfault related
    stuff in the structure (Matthew Auld)
  - Get rpm wakeref before taking dma reserve lock (Matthew Auld)
  - In suspend path apply lock for entire list op
    including list iteration (Matthew Auld)
v5:
  - Use mutex lock instead of spin lock
v6:
  - Fix review comments (Matthew Auld)

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: default avatarBadal Nilawar <badal.nilawar@intel.com>
Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> #For the xe_bo_move_notify() changes
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://lore.kernel.org/r/20240104130702.950078-1-badal.nilawar@intel.comSigned-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent ddb5bade
...@@ -586,6 +586,8 @@ static int xe_bo_move_notify(struct xe_bo *bo, ...@@ -586,6 +586,8 @@ static int xe_bo_move_notify(struct xe_bo *bo,
{ {
struct ttm_buffer_object *ttm_bo = &bo->ttm; struct ttm_buffer_object *ttm_bo = &bo->ttm;
struct xe_device *xe = ttm_to_xe_device(ttm_bo->bdev); struct xe_device *xe = ttm_to_xe_device(ttm_bo->bdev);
struct ttm_resource *old_mem = ttm_bo->resource;
u32 old_mem_type = old_mem ? old_mem->mem_type : XE_PL_SYSTEM;
int ret; int ret;
/* /*
...@@ -605,6 +607,18 @@ static int xe_bo_move_notify(struct xe_bo *bo, ...@@ -605,6 +607,18 @@ static int xe_bo_move_notify(struct xe_bo *bo,
if (ttm_bo->base.dma_buf && !ttm_bo->base.import_attach) if (ttm_bo->base.dma_buf && !ttm_bo->base.import_attach)
dma_buf_move_notify(ttm_bo->base.dma_buf); dma_buf_move_notify(ttm_bo->base.dma_buf);
/*
* TTM has already nuked the mmap for us (see ttm_bo_unmap_virtual),
* so if we moved from VRAM make sure to unlink this from the userfault
* tracking.
*/
if (mem_type_is_vram(old_mem_type)) {
mutex_lock(&xe->mem_access.vram_userfault.lock);
if (!list_empty(&bo->vram_userfault_link))
list_del_init(&bo->vram_userfault_link);
mutex_unlock(&xe->mem_access.vram_userfault.lock);
}
return 0; return 0;
} }
...@@ -1063,6 +1077,11 @@ static void xe_ttm_bo_destroy(struct ttm_buffer_object *ttm_bo) ...@@ -1063,6 +1077,11 @@ static void xe_ttm_bo_destroy(struct ttm_buffer_object *ttm_bo)
if (bo->vm && xe_bo_is_user(bo)) if (bo->vm && xe_bo_is_user(bo))
xe_vm_put(bo->vm); xe_vm_put(bo->vm);
mutex_lock(&xe->mem_access.vram_userfault.lock);
if (!list_empty(&bo->vram_userfault_link))
list_del(&bo->vram_userfault_link);
mutex_unlock(&xe->mem_access.vram_userfault.lock);
kfree(bo); kfree(bo);
} }
...@@ -1110,16 +1129,20 @@ static vm_fault_t xe_gem_fault(struct vm_fault *vmf) ...@@ -1110,16 +1129,20 @@ static vm_fault_t xe_gem_fault(struct vm_fault *vmf)
{ {
struct ttm_buffer_object *tbo = vmf->vma->vm_private_data; struct ttm_buffer_object *tbo = vmf->vma->vm_private_data;
struct drm_device *ddev = tbo->base.dev; struct drm_device *ddev = tbo->base.dev;
struct xe_device *xe = to_xe_device(ddev);
struct xe_bo *bo = ttm_to_xe_bo(tbo);
bool needs_rpm = bo->flags & XE_BO_CREATE_VRAM_MASK;
vm_fault_t ret; vm_fault_t ret;
int idx, r = 0; int idx, r = 0;
if (needs_rpm)
xe_device_mem_access_get(xe);
ret = ttm_bo_vm_reserve(tbo, vmf); ret = ttm_bo_vm_reserve(tbo, vmf);
if (ret) if (ret)
return ret; goto out;
if (drm_dev_enter(ddev, &idx)) { if (drm_dev_enter(ddev, &idx)) {
struct xe_bo *bo = ttm_to_xe_bo(tbo);
trace_xe_bo_cpu_fault(bo); trace_xe_bo_cpu_fault(bo);
if (should_migrate_to_system(bo)) { if (should_migrate_to_system(bo)) {
...@@ -1137,10 +1160,24 @@ static vm_fault_t xe_gem_fault(struct vm_fault *vmf) ...@@ -1137,10 +1160,24 @@ static vm_fault_t xe_gem_fault(struct vm_fault *vmf)
} else { } else {
ret = ttm_bo_vm_dummy_page(vmf, vmf->vma->vm_page_prot); ret = ttm_bo_vm_dummy_page(vmf, vmf->vma->vm_page_prot);
} }
if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT))
return ret; goto out;
/*
* ttm_bo_vm_reserve() already has dma_resv_lock.
*/
if (ret == VM_FAULT_NOPAGE && mem_type_is_vram(tbo->resource->mem_type)) {
mutex_lock(&xe->mem_access.vram_userfault.lock);
if (list_empty(&bo->vram_userfault_link))
list_add(&bo->vram_userfault_link, &xe->mem_access.vram_userfault.list);
mutex_unlock(&xe->mem_access.vram_userfault.lock);
}
dma_resv_unlock(tbo->base.resv); dma_resv_unlock(tbo->base.resv);
out:
if (needs_rpm)
xe_device_mem_access_put(xe);
return ret; return ret;
} }
...@@ -1254,6 +1291,7 @@ struct xe_bo *___xe_bo_create_locked(struct xe_device *xe, struct xe_bo *bo, ...@@ -1254,6 +1291,7 @@ struct xe_bo *___xe_bo_create_locked(struct xe_device *xe, struct xe_bo *bo,
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
INIT_LIST_HEAD(&bo->client_link); INIT_LIST_HEAD(&bo->client_link);
#endif #endif
INIT_LIST_HEAD(&bo->vram_userfault_link);
drm_gem_private_object_init(&xe->drm, &bo->ttm.base, size); drm_gem_private_object_init(&xe->drm, &bo->ttm.base, size);
...@@ -2264,6 +2302,16 @@ int xe_bo_dumb_create(struct drm_file *file_priv, ...@@ -2264,6 +2302,16 @@ int xe_bo_dumb_create(struct drm_file *file_priv,
return err; return err;
} }
void xe_bo_runtime_pm_release_mmap_offset(struct xe_bo *bo)
{
struct ttm_buffer_object *tbo = &bo->ttm;
struct ttm_device *bdev = tbo->bdev;
drm_vma_node_unmap(&tbo->base.vma_node, bdev->dev_mapping);
list_del_init(&bo->vram_userfault_link);
}
#if IS_ENABLED(CONFIG_DRM_XE_KUNIT_TEST) #if IS_ENABLED(CONFIG_DRM_XE_KUNIT_TEST)
#include "tests/xe_bo.c" #include "tests/xe_bo.c"
#endif #endif
...@@ -249,6 +249,8 @@ int xe_gem_create_ioctl(struct drm_device *dev, void *data, ...@@ -249,6 +249,8 @@ int xe_gem_create_ioctl(struct drm_device *dev, void *data,
struct drm_file *file); struct drm_file *file);
int xe_gem_mmap_offset_ioctl(struct drm_device *dev, void *data, int xe_gem_mmap_offset_ioctl(struct drm_device *dev, void *data,
struct drm_file *file); struct drm_file *file);
void xe_bo_runtime_pm_release_mmap_offset(struct xe_bo *bo);
int xe_bo_dumb_create(struct drm_file *file_priv, int xe_bo_dumb_create(struct drm_file *file_priv,
struct drm_device *dev, struct drm_device *dev,
struct drm_mode_create_dumb *args); struct drm_mode_create_dumb *args);
......
...@@ -88,6 +88,9 @@ struct xe_bo { ...@@ -88,6 +88,9 @@ struct xe_bo {
* objects. * objects.
*/ */
u16 cpu_caching; u16 cpu_caching;
/** @vram_userfault_link: Link into @mem_access.vram_userfault.list */
struct list_head vram_userfault_link;
}; };
#define intel_bo_to_drm_bo(bo) (&(bo)->ttm.base) #define intel_bo_to_drm_bo(bo) (&(bo)->ttm.base)
......
...@@ -387,6 +387,22 @@ struct xe_device { ...@@ -387,6 +387,22 @@ struct xe_device {
struct { struct {
/** @ref: ref count of memory accesses */ /** @ref: ref count of memory accesses */
atomic_t ref; atomic_t ref;
/** @vram_userfault: Encapsulate vram_userfault related stuff */
struct {
/**
* @lock: Protects access to @vram_usefault.list
* Using mutex instead of spinlock as lock is applied to entire
* list operation which may sleep
*/
struct mutex lock;
/**
* @list: Keep list of userfaulted vram bo, which require to release their
* mmap mappings at runtime suspend path
*/
struct list_head list;
} vram_userfault;
} mem_access; } mem_access;
/** /**
......
...@@ -774,6 +774,8 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -774,6 +774,8 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
str_yes_no(xe_device_has_sriov(xe)), str_yes_no(xe_device_has_sriov(xe)),
xe_sriov_mode_to_string(xe_device_sriov_mode(xe))); xe_sriov_mode_to_string(xe_device_sriov_mode(xe)));
xe_pm_init_early(xe);
err = xe_device_probe(xe); err = xe_device_probe(xe);
if (err) if (err)
return err; return err;
......
...@@ -163,6 +163,12 @@ static void xe_pm_runtime_init(struct xe_device *xe) ...@@ -163,6 +163,12 @@ static void xe_pm_runtime_init(struct xe_device *xe)
pm_runtime_put(dev); pm_runtime_put(dev);
} }
void xe_pm_init_early(struct xe_device *xe)
{
INIT_LIST_HEAD(&xe->mem_access.vram_userfault.list);
drmm_mutex_init(&xe->drm, &xe->mem_access.vram_userfault.lock);
}
void xe_pm_init(struct xe_device *xe) void xe_pm_init(struct xe_device *xe)
{ {
struct pci_dev *pdev = to_pci_dev(xe->drm.dev); struct pci_dev *pdev = to_pci_dev(xe->drm.dev);
...@@ -214,6 +220,7 @@ struct task_struct *xe_pm_read_callback_task(struct xe_device *xe) ...@@ -214,6 +220,7 @@ struct task_struct *xe_pm_read_callback_task(struct xe_device *xe)
int xe_pm_runtime_suspend(struct xe_device *xe) int xe_pm_runtime_suspend(struct xe_device *xe)
{ {
struct xe_bo *bo, *on;
struct xe_gt *gt; struct xe_gt *gt;
u8 id; u8 id;
int err = 0; int err = 0;
...@@ -247,6 +254,16 @@ int xe_pm_runtime_suspend(struct xe_device *xe) ...@@ -247,6 +254,16 @@ int xe_pm_runtime_suspend(struct xe_device *xe)
*/ */
lock_map_acquire(&xe_device_mem_access_lockdep_map); lock_map_acquire(&xe_device_mem_access_lockdep_map);
/*
* Applying lock for entire list op as xe_ttm_bo_destroy and xe_bo_move_notify
* also checks and delets bo entry from user fault list.
*/
mutex_lock(&xe->mem_access.vram_userfault.lock);
list_for_each_entry_safe(bo, on,
&xe->mem_access.vram_userfault.list, vram_userfault_link)
xe_bo_runtime_pm_release_mmap_offset(bo);
mutex_unlock(&xe->mem_access.vram_userfault.lock);
if (xe->d3cold.allowed) { if (xe->d3cold.allowed) {
err = xe_bo_evict_all(xe); err = xe_bo_evict_all(xe);
if (err) if (err)
......
...@@ -20,6 +20,7 @@ struct xe_device; ...@@ -20,6 +20,7 @@ struct xe_device;
int xe_pm_suspend(struct xe_device *xe); int xe_pm_suspend(struct xe_device *xe);
int xe_pm_resume(struct xe_device *xe); int xe_pm_resume(struct xe_device *xe);
void xe_pm_init_early(struct xe_device *xe);
void xe_pm_init(struct xe_device *xe); void xe_pm_init(struct xe_device *xe);
void xe_pm_runtime_fini(struct xe_device *xe); void xe_pm_runtime_fini(struct xe_device *xe);
int xe_pm_runtime_suspend(struct xe_device *xe); int xe_pm_runtime_suspend(struct xe_device *xe);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment