drm/amdkfd: Set svm range max pages
Subsystems (3)
PATCH v3 2/3 drm/amdkfd: Set svm range max pages
This will be used to split giant svm range into smaller ranges, to support VRAM overcommitment by giant range and improve GPU retry fault recover on giant range.
Signed-off-by Philip Yang <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 ++ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 21 +++++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 3 +++ 3 files changed, 26 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +2 -0
@@ -1019,6 +1019,8 @@ int svm_migrate_init(struct amdgpu_device *adev)amdgpu_amdkfd_reserve_system_mem (SVM_HMM_PAGE_STRUCT_SIZE (size)); +svm_range_set_max_pages (adev); +pr_info ("HMM registered %ldMB device memory\n" , size >>20 );return 0 ;
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +21 -0
@@ -46,6 +46,12 @@*/ #define AMDGPU_SVM_RANGE_RETRY_FAULT_PENDING (2UL * NSEC_PER_MSEC) +/* Giant svm range split into smaller ranges based on this, it is decided using +* minimum of all dGPU/APU 1/32 VRAM size, between 2MB to 1GB and alignment to +* power of 2MB. +*/ +uint64_t max_svm_range_pages; +struct criu_svm_metadata {struct list_head list;struct kfd_criu_svm_range_priv_data data;
@@ -1870,6 +1876,21 @@ static struct svm_range *svm_range_clone(struct svm_range *old)return new; } +void svm_range_set_max_pages (struct amdgpu_device *adev) +{ +uint64_t max_pages; +uint64_t pages, _pages; + +/* 1/32 VRAM size in pages */ + pages = adev->gmc.real_vram_size >>17 ; + pages =clamp (pages,1ULL <<9 ,1ULL <<18 ); + pages =rounddown_pow_of_two (pages); +do { + max_pages =READ_ONCE (max_svm_range_pages); + _pages =min_not_zero (max_pages, pages); + }while (cmpxchg (&max_svm_range_pages, max_pages, _pages) != max_pages); +} +/** * svm_range_add - add svm range and handle overlap * @p: the range add to this process svms
drivers/gpu/drm/amd/amdkfd/kfd_svm.h +3 -0
@@ -204,6 +204,9 @@ void svm_range_list_lock_and_flush_work(struct svm_range_list *svms, struct mm_s#define KFD_IS_SVM_API_SUPPORTED (dev) ((dev)->pgmap.type != 0)void svm_range_bo_unref_async (struct svm_range_bo *svm_bo); + +void svm_range_set_max_pages (struct amdgpu_device *adev); +#else struct kfd_process ;
Signature · 1 line
2.35.1
PATCH v3 3/3 drm/amdkfd: Split giant svm range
Giant svm range split to smaller ranges, align the range start address to max svm range pages to improve MMU TLB usage.
Signed-off-by Philip Yang <[email protected]>
Reviewed-by Felix Kuehling <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 49 +++++++++++++++++++--------- 1 file changed, 33 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +33 -16
@@ -1891,6 +1891,31 @@ void svm_range_set_max_pages(struct amdgpu_device *adev) }while (cmpxchg (&max_svm_range_pages, max_pages, _pages) != max_pages); } +static int +svm_range_split_new (struct svm_range_list *svms,uint64_t start,uint64_t last, +uint64_t max_pages,struct list_head *insert_list, +struct list_head *update_list) +{ +struct svm_range *prange; +uint64_t l; + +pr_debug ("max_svm_range_pages 0x%llx adding [0x%llx 0x%llx]\n" , + max_pages, start, last); + +while (last >= start) { + l =min (last,ALIGN_DOWN (start + max_pages, max_pages) -1 ); + + prange =svm_range_new (svms, start, l); +if (!prange) +return -ENOMEM ; +list_add (&prange->list, insert_list); +list_add (&prange->update_list, update_list); + + start = l +1 ; + } +return 0 ; +} +/** * svm_range_add - add svm range and handle overlap * @p: the range add to this process svms
@@ -1993,14 +2018,11 @@ svm_range_add(struct kfd_process *p, uint64_t start, uint64_t size,/* insert a new node if needed */ if (node->start > start) { - prange =svm_range_new (svms, start, node->start -1 ); -if (!prange) { - r = -ENOMEM ; + r =svm_range_split_new (svms, start, node->start -1 , +READ_ONCE (max_svm_range_pages), + insert_list, update_list); +if (r) goto out; - } - -list_add (&prange->list, insert_list); -list_add (&prange->update_list, update_list); } node = next;
@@ -2008,15 +2030,10 @@ svm_range_add(struct kfd_process *p, uint64_t start, uint64_t size, }/* add a final range at the end if needed */ -if (start <= last) { - prange =svm_range_new (svms, start, last); -if (!prange) { - r = -ENOMEM ; - goto out; - } -list_add (&prange->list, insert_list); -list_add (&prange->update_list, update_list); - } +if (start <= last) + r =svm_range_split_new (svms, start, last, +READ_ONCE (max_svm_range_pages), + insert_list, update_list); out:if (r)
Signature · 1 line
2.35.1
Am 2022-07-25 um 17:17 schrieb Philip Yang:
Quoted 5 lines
This will be used to split giant svm range into smaller ranges, to support VRAM overcommitment by giant range and improve GPU retry fault recover on giant range.
Signed-off-by Philip Yang <[email protected]>
Reviewed-by Felix Kuehling <[email protected]>
Quoted 72 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 ++ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 21 +++++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 3 +++ 3 files changed, 26 insertions(+)drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +2
-0@@ -1019,6 +1019,8 @@ int svm_migrate_init(struct amdgpu_device *adev)amdgpu_amdkfd_reserve_system_mem (SVM_HMM_PAGE_STRUCT_SIZE (size)); +svm_range_set_max_pages (adev); +pr_info ("HMM registered %ldMB device memory\n" , size >>20 );return 0 ;drivers/gpu/drm/amd/amdkfd/kfd_svm.c +21
-0@@ -46,6 +46,12 @@*/ #define AMDGPU_SVM_RANGE_RETRY_FAULT_PENDING (2UL * NSEC_PER_MSEC) +/* Giant svm range split into smaller ranges based on this, it is decided using +* minimum of all dGPU/APU 1/32 VRAM size, between 2MB to 1GB and alignment to +* power of 2MB. +*/ +uint64_t max_svm_range_pages; +struct criu_svm_metadata {struct list_head list;struct kfd_criu_svm_range_priv_data data;@@ -1870,6 +1876,21 @@ static struct svm_range *svm_range_clone(struct svm_range *old)return new; } +void svm_range_set_max_pages (struct amdgpu_device *adev) +{ +uint64_t max_pages; +uint64_t pages, _pages; + +/* 1/32 VRAM size in pages */ + pages = adev->gmc.real_vram_size >>17 ; + pages =clamp (pages,1ULL <<9 ,1ULL <<18 ); + pages =rounddown_pow_of_two (pages); +do { + max_pages =READ_ONCE (max_svm_range_pages); + _pages =min_not_zero (max_pages, pages); + }while (cmpxchg (&max_svm_range_pages, max_pages, _pages) != max_pages); +} +/** * svm_range_add - add svm range and handle overlap * @p: the range add to this process svms drivers/gpu/drm/amd/amdkfd/kfd_svm.h +3
-0@@ -204,6 +204,9 @@ void svm_range_list_lock_and_flush_work(struct svm_range_list *svms, struct mm_s#define KFD_IS_SVM_API_SUPPORTED (dev) ((dev)->pgmap.type != 0)void svm_range_bo_unref_async (struct svm_range_bo *svm_bo); + +void svm_range_set_max_pages (struct amdgpu_device *adev); +#else struct kfd_process ;