drm/amdkfd: Use last + 1 of vm range to check 2MB huge page alignment
Subsystems (3)
PATCH 1/1 drm/amdkfd: Use last + 1 of vm range to check 2MB huge page alignment
From: Xiaogang Chen <[email protected]>
The last byte of svm range is included. Should use last + 1 to check 2MB alignment for possible huge page mapping.
Fixes 448ee45353ef("drm/amdkfd: Use huge page size to check split svm
range alignment")
Signed-off-by Xiaogang Chen <[email protected]>
Tested-by Gerhard Schwanzer <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +4 -4
@@ -1144,7 +1144,7 @@ static int svm_range_split_tail(struct svm_range *prange, uint64_t new_last, struct list_head *insert_list, struct list_head *remap_list) { - unsigned long last_align_down = ALIGN_DOWN(prange->last, 512); + unsigned long last_align_down = ALIGN_DOWN(prange->last + 1, 512);unsigned long start_align =ALIGN (prange->start,512 );bool huge_page_mapping = last_align_down > start_align;struct svm_range *tail =NULL ;
@@ -1168,7 +1168,7 @@ static int svm_range_split_head(struct svm_range *prange, uint64_t new_start, struct list_head *insert_list, struct list_head *remap_list) { - unsigned long last_align_down = ALIGN_DOWN(prange->last, 512); + unsigned long last_align_down = ALIGN_DOWN(prange->last + 1, 512);unsigned long start_align =ALIGN (prange->start,512 );bool huge_page_mapping = last_align_down > start_align;struct svm_range *head =NULL ;
@@ -1181,8 +1181,8 @@ svm_range_split_head(struct svm_range *prange, uint64_t new_start,list_add (&head->list, insert_list); -if (huge_page_mapping && head->last +1 > start_align && - head->last +1 < last_align_down && (!IS_ALIGNED (head->last,512 ))) +if (huge_page_mapping && head->last > start_align && + head->last < last_align_down && (!IS_ALIGNED (head->last,512 )))list_add (&head->update_list, remap_list);return 0 ;
Signature · 1 line
2.34.1
Quoted 11 lines · Xiaogang.Chen
From: Xiaogang Chen <[email protected]>
The last byte of svm range is included. Should use last + 1 to check 2MB alignment for possible huge page mapping.
Fixes 448ee45353ef("drm/amdkfd: Use huge page size to check split svmrange alignment")
Signed-off-by Xiaogang Chen <[email protected]>Tested-by Gerhard Schwanzer <[email protected]>
Acked-by Alex Deucher <[email protected]>
Quoted 40 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_svm.c +4
-5@@ -1144,7 +1144,7 @@ static int svm_range_split_tail(struct svm_range *prange, uint64_t new_last, struct list_head *insert_list, struct list_head *remap_list) { - unsigned long last_align_down = ALIGN_DOWN(prange->last, 512); + unsigned long last_align_down = ALIGN_DOWN(prange->last + 1, 512);unsigned long start_align =ALIGN (prange->start,512 );bool huge_page_mapping = last_align_down > start_align;struct svm_range *tail =NULL ;@@ -1168,7 +1168,7 @@ static int svm_range_split_head(struct svm_range *prange, uint64_t new_start, struct list_head *insert_list, struct list_head *remap_list) { - unsigned long last_align_down = ALIGN_DOWN(prange->last, 512); + unsigned long last_align_down = ALIGN_DOWN(prange->last + 1, 512);unsigned long start_align =ALIGN (prange->start,512 );bool huge_page_mapping = last_align_down > start_align;struct svm_range *head =NULL ;@@ -1181,8 +1181,8 @@ svm_range_split_head(struct svm_range *prange, uint64_t new_start,list_add (&head->list, insert_list); -if (huge_page_mapping && head->last +1 > start_align && - head->last +1 < last_align_down && (!IS_ALIGNED (head->last,512 ))) +if (huge_page_mapping && head->last > start_align && + head->last < last_align_down && (!IS_ALIGNED (head->last,512 )))list_add (&head->update_list, remap_list);return 0 ; --2.34.1