mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-30 12:13:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: add gfp_flags to amdgpu_sa_manager v2

Browse Source 
Make sure that we use the emmergency reserves for unrecoverable page
faults and GPU resets.

v2: improve code comments a bit based on Timur's feedback

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König
2026-05-07 14:55:35 +02:00
committed by Alex Deucher
parent 16dda95626
commit fa99528ce5
3 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
View File

@@ -356,6 +356,25 @@ int amdgpu_ib_pool_init(struct amdgpu_device *adev)
[AMDGPU_IB_POOL_IMMEDIATE] = SZ_128K,
[AMDGPU_IB_POOL_DIRECT] = SZ_512K
};
const gfp_t gfp_flags[AMDGPU_IB_POOL_MAX] = {
/*
* For normal page table updates and recoverable retry faults
* (for SVM), further restricted by the VM eviction lock to not
* wait for memory reclaim.
*/
[AMDGPU_IB_POOL_DELAYED] = GFP_KERNEL,
/*
* For redirecting unrecoverable retry faults to the dummy page
* or set the PRT bits. dma_fence submissions might depend on
* that so we need the emmergency reserves.
*/
[AMDGPU_IB_POOL_IMMEDIATE] = GFP_ATOMIC,
/*
* For IB tests during GPU resets. Only very small and temporary
* allocation to allow dma_fences to signal.
*/
[AMDGPU_IB_POOL_DIRECT] = GFP_ATOMIC
};
int r, i;
if (adev->ib_pool_ready)
@@ -363,8 +382,7 @@ int amdgpu_ib_pool_init(struct amdgpu_device *adev)
for (i = 0; i < AMDGPU_IB_POOL_MAX; i++) {
r = amdgpu_sa_bo_manager_init(adev, &adev->ib_pools[i],
sizes[i], 256,
AMDGPU_GEM_DOMAIN_GTT);
sizes[i], gfp_flags[i]);
if (r)
goto error;
}

18
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
View File

@@ -46,11 +46,13 @@
int amdgpu_sa_bo_manager_init(struct amdgpu_device *adev,
struct amdgpu_sa_manager *sa_manager,
unsigned int size, u32 suballoc_align, u32 domain)
unsigned int size, gfp_t gfp_flags)
{
int r;
r = amdgpu_bo_create_kernel(adev, size, AMDGPU_GPU_PAGE_SIZE, domain,
sa_manager->gfp_flags = gfp_flags;
r = amdgpu_bo_create_kernel(adev, size, AMDGPU_GPU_PAGE_SIZE,
AMDGPU_GEM_DOMAIN_GTT,
&sa_manager->bo, &sa_manager->gpu_addr,
&sa_manager->cpu_ptr);
if (r) {
@@ -59,7 +61,8 @@ int amdgpu_sa_bo_manager_init(struct amdgpu_device *adev,
}
memset(sa_manager->cpu_ptr, 0, size);
drm_suballoc_manager_init(&sa_manager->base, size, suballoc_align);
drm_suballoc_manager_init(&sa_manager->base, size, 256);
return r;
}
@@ -73,7 +76,8 @@ void amdgpu_sa_bo_manager_fini(struct amdgpu_device *adev,
drm_suballoc_manager_fini(&sa_manager->base);
amdgpu_bo_free_kernel(&sa_manager->bo, &sa_manager->gpu_addr, &sa_manager->cpu_ptr);
amdgpu_bo_free_kernel(&sa_manager->bo, &sa_manager->gpu_addr,
&sa_manager->cpu_ptr);
}
int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager,
@@ -81,7 +85,8 @@ int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager,
unsigned int size)
{
struct drm_suballoc *sa = drm_suballoc_new(&sa_manager->base, size,
GFP_KERNEL, false, 0);
sa_manager->gfp_flags,
false, 0);
if (IS_ERR(sa)) {
*sa_bo = NULL;
@@ -110,6 +115,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
{
struct drm_printer p = drm_seq_file_printer(m);
drm_suballoc_dump_debug_info(&sa_manager->base, &p, sa_manager->gpu_addr);
drm_suballoc_dump_debug_info(&sa_manager->base, &p,
sa_manager->gpu_addr);
}
#endif

3
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.h
View File

@@ -35,6 +35,7 @@ struct amdgpu_sa_manager {
struct amdgpu_bo *bo;
uint64_t gpu_addr;
void *cpu_ptr;
gfp_t gfp_flags;
};
static inline struct amdgpu_sa_manager *
@@ -57,7 +58,7 @@ static inline void *amdgpu_sa_bo_cpu_addr(struct drm_suballoc *sa_bo)
int amdgpu_sa_bo_manager_init(struct amdgpu_device *adev,
struct amdgpu_sa_manager *sa_manager,
unsigned size, u32 align, u32 domain);
unsigned size, gfp_t gfp_flags);
void amdgpu_sa_bo_manager_fini(struct amdgpu_device *adev,
struct amdgpu_sa_manager *sa_manager);
int amdgpu_sa_bo_manager_start(struct amdgpu_device *adev,