arm64/mm: Remove add_huge_page_size()
PATCH 1/1 arm64/mm: Remove add_huge_page_size()
The function add_huge_page_size(), wrapper of hugetlb_add_hstate(), avoids to register duplicated huge page states for same size. However, the same logic has been included in hugetlb_add_hstate(). So it seems unnecessary to keep add_huge_page_size() and this just removes it.
--- arch/arm64/mm/hugetlbpage.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
arch/arm64/mm/hugetlbpage.c +5 -13
@@ -441,22 +441,14 @@ void huge_ptep_clear_flush(struct vm_area_struct *vma,clear_flush (vma->vm_mm, addr, ptep, pgsize, ncontig); } -static void __init add_huge_page_size (unsigned long size) -{ -if (size_to_hstate (size)) -return ; - -hugetlb_add_hstate (ilog2 (size) -PAGE_SHIFT ); -} -static int __init hugetlbpage_init (void ) {#ifdef CONFIG_ARM64_4K_PAGES -add_huge_page_size (PUD_SIZE ); +hugetlb_add_hstate (PUD_SHIFT -PAGE_SHIFT );#endif -add_huge_page_size (CONT_PMD_SIZE ); -add_huge_page_size (PMD_SIZE ); -add_huge_page_size (CONT_PTE_SIZE ); +hugetlb_add_hstate (CONT_PMD_SHIFT +PMD_SHIFT -PAGE_SHIFT ); +hugetlb_add_hstate (PMD_SHIFT -PAGE_SHIFT ); +hugetlb_add_hstate (CONT_PTE_SHIFT );return 0 ; }
@@ -473,7 +465,7 @@ static __init int setup_hugepagesz(char *opt)case CONT_PMD_SIZE :case PMD_SIZE :case CONT_PTE_SIZE : -add_huge_page_size (ps); +hugetlb_add_hstate (ilog2 (ps) -PAGE_SHIFT );return 1 ; }
Signature · 1 line
2.23.0
Quoted 4 lines · Gavin Shan
The function
add_huge_page_size(), wrapper ofhugetlb_add_hstate(), avoids to register duplicated huge page states for same size. However, the same logic has been included inhugetlb_add_hstate(). So it seems unnecessary to keepadd_huge_page_size()and this just removes it.
Makes sense.
Quoted 24 lines
Signed-off-by Gavin Shan <[email protected]>--- arch/arm64/mm/hugetlbpage.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)arch/arm64/mm/hugetlbpage.c +0
-8@@ -441,22 +441,14 @@ void huge_ptep_clear_flush(struct vm_area_struct *vma,clear_flush (vma->vm_mm, addr, ptep, pgsize, ncontig); } -static void __init add_huge_page_size (unsigned long size) -{ -if (size_to_hstate (size)) -return ; - -hugetlb_add_hstate (ilog2 (size) -PAGE_SHIFT ); -} -static int __init hugetlbpage_init (void ) {
arch/arm64/mm/hugetlbpage.c void huge_ptep_clear_flush(struct vm_area_struct *vma, · line 451
Quoted 10 lines
arch/arm64/mm/hugetlbpage.c +4
-4#ifdef CONFIG_ARM64_4K_PAGES -add_huge_page_size (PUD_SIZE ); +hugetlb_add_hstate (PUD_SHIFT -PAGE_SHIFT );#endif -add_huge_page_size (CONT_PMD_SIZE ); -add_huge_page_size (PMD_SIZE ); -add_huge_page_size (CONT_PTE_SIZE ); +hugetlb_add_hstate (CONT_PMD_SHIFT +PMD_SHIFT -PAGE_SHIFT ); +hugetlb_add_hstate (PMD_SHIFT -PAGE_SHIFT ); +hugetlb_add_hstate (CONT_PTE_SHIFT );
Should these page order values be converted into macros instead. Also we should probably keep (CONT_PTE_SHIFT + PAGE_SHIFT - PAGE_SHIFT) as is to make things more clear.
Will Deacon
maintainerQuoted 36 lines · Anshuman Khandual
Quoted 4 lines · Gavin Shan
The function
add_huge_page_size(), wrapper ofhugetlb_add_hstate(), avoids to register duplicated huge page states for same size. However, the same logic has been included inhugetlb_add_hstate(). So it seems unnecessary to keepadd_huge_page_size()and this just removes it.Makes sense.
Quoted 26 lines
Signed-off-by Gavin Shan <[email protected]>--- arch/arm64/mm/hugetlbpage.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)arch/arm64/mm/hugetlbpage.c +0
-9@@ -441,22 +441,14 @@ void huge_ptep_clear_flush(struct vm_area_struct *vma,clear_flush (vma->vm_mm, addr, ptep, pgsize, ncontig); } -static void __init add_huge_page_size (unsigned long size) -{ -if (size_to_hstate (size)) -return ; - -hugetlb_add_hstate (ilog2 (size) -PAGE_SHIFT ); -} -static int __init hugetlbpage_init (void ) {#ifdef CONFIG_ARM64_4K_PAGES -add_huge_page_size (PUD_SIZE );
Quoted 8 lines
arch/arm64/mm/hugetlbpage.c void huge_ptep_clear_flush(struct vm_area_struct *vma, · line 451
Quoted 8 lines
arch/arm64/mm/hugetlbpage.c +4
-3+hugetlb_add_hstate (PUD_SHIFT -PAGE_SHIFT );#endif -add_huge_page_size (CONT_PMD_SIZE ); -add_huge_page_size (PMD_SIZE ); -add_huge_page_size (CONT_PTE_SIZE ); +hugetlb_add_hstate (CONT_PMD_SHIFT +PMD_SHIFT -PAGE_SHIFT ); +hugetlb_add_hstate (PMD_SHIFT -PAGE_SHIFT ); +hugetlb_add_hstate (CONT_PTE_SHIFT );
Something similar has already been done in linux-next.
Quoted 3 lines
Should these page order values be converted into macros instead. Also we should probably keep (
CONT_PTE_SHIFT+PAGE_SHIFT-PAGE_SHIFT) as is to make things more clear.
I think the real confusion stems from us not being consistent with your *_SHIFT definitions on arm64. It's madness for CONT_PTE_SHIFT to be smaller than PAGE_SHIFT imo, but it's just cosmetic I guess.
Will
Quoted 39 lines · Will Deacon
Quoted 38 lines · Anshuman Khandual
Quoted 4 lines · Gavin Shan
The function
add_huge_page_size(), wrapper ofhugetlb_add_hstate(), avoids to register duplicated huge page states for same size. However, the same logic has been included inhugetlb_add_hstate(). So it seems unnecessary to keepadd_huge_page_size()and this just removes it.Makes sense.
Quoted 28 lines
Signed-off-by Gavin Shan <[email protected]>--- arch/arm64/mm/hugetlbpage.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)arch/arm64/mm/hugetlbpage.c +1
-9@@ -441,22 +441,14 @@ void huge_ptep_clear_flush(struct vm_area_struct *vma,clear_flush (vma->vm_mm, addr, ptep, pgsize, ncontig); } -static void __init add_huge_page_size (unsigned long size) -{ -if (size_to_hstate (size)) -return ; - -hugetlb_add_hstate (ilog2 (size) -PAGE_SHIFT ); -} -static int __init hugetlbpage_init (void ) {#ifdef CONFIG_ARM64_4K_PAGES -add_huge_page_size (PUD_SIZE ); +hugetlb_add_hstate (PUD_SHIFT -PAGE_SHIFT );#endif
Quoted 9 lines
Quoted 6 lines
arch/arm64/mm/hugetlbpage.c void huge_ptep_clear_flush(struct vm_area_struct *vma, · line 451
Quoted 6 lines
arch/arm64/mm/hugetlbpage.c +3
-3-add_huge_page_size (CONT_PMD_SIZE ); -add_huge_page_size (PMD_SIZE ); -add_huge_page_size (CONT_PTE_SIZE ); +hugetlb_add_hstate (CONT_PMD_SHIFT +PMD_SHIFT -PAGE_SHIFT ); +hugetlb_add_hstate (PMD_SHIFT -PAGE_SHIFT ); +hugetlb_add_hstate (CONT_PTE_SHIFT );Something similar has already been done in linux-next.
Thanks, Will. I didn't check linux-next before posting this patch. Please ignore it then :)
Quoted 8 lines
Quoted 3 lines
Should these page order values be converted into macros instead. Also we should probably keep (
CONT_PTE_SHIFT+PAGE_SHIFT-PAGE_SHIFT) as is to make things more clear.I think the real confusion stems from us not being consistent with your
*_SHIFTdefinitions on arm64. It's madness forCONT_PTE_SHIFTto be smaller thanPAGE_SHIFTimo, but it's just cosmetic I guess.
Yeah, Do you want me to post a patch, to fix it?
Quoted 2 lines
Will
Thanks,
Gavin
Will Deacon
maintainerQuoted 56 lines · Gavin Shan
Quoted 38 lines · Will Deacon
Quoted 37 lines · Anshuman Khandual
Quoted 4 lines · Gavin Shan
The function
add_huge_page_size(), wrapper ofhugetlb_add_hstate(), avoids to register duplicated huge page states for same size. However, the same logic has been included inhugetlb_add_hstate(). So it seems unnecessary to keepadd_huge_page_size()and this just removes it.Makes sense.
Quoted 27 lines
Signed-off-by Gavin Shan <[email protected]>--- arch/arm64/mm/hugetlbpage.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)arch/arm64/mm/hugetlbpage.c +1
-9@@ -441,22 +441,14 @@ void huge_ptep_clear_flush(struct vm_area_struct *vma,clear_flush (vma->vm_mm, addr, ptep, pgsize, ncontig); } -static void __init add_huge_page_size (unsigned long size) -{ -if (size_to_hstate (size)) -return ; - -hugetlb_add_hstate (ilog2 (size) -PAGE_SHIFT ); -} -static int __init hugetlbpage_init (void ) {#ifdef CONFIG_ARM64_4K_PAGES -add_huge_page_size (PUD_SIZE ); +hugetlb_add_hstate (PUD_SHIFT -PAGE_SHIFT );#endif Quoted 9 lines
Quoted 6 lines
arch/arm64/mm/hugetlbpage.c void huge_ptep_clear_flush(struct vm_area_struct *vma, · line 451
Quoted 6 lines
arch/arm64/mm/hugetlbpage.c +3
-3-add_huge_page_size (CONT_PMD_SIZE ); -add_huge_page_size (PMD_SIZE ); -add_huge_page_size (CONT_PTE_SIZE ); +hugetlb_add_hstate (CONT_PMD_SHIFT +PMD_SHIFT -PAGE_SHIFT ); +hugetlb_add_hstate (PMD_SHIFT -PAGE_SHIFT ); +hugetlb_add_hstate (CONT_PTE_SHIFT );Something similar has already been done in linux-next.
Thanks, Will. I didn't check linux-next before posting this patch. Please ignore it then :)
Quoted 4 lines
Quoted 3 lines
Should these page order values be converted into macros instead. Also we should probably keep (
CONT_PTE_SHIFT+PAGE_SHIFT-PAGE_SHIFT) as is to make things more clear.
Quoted 6 lines
Quoted 4 lines
I think the real confusion stems from us not being consistent with your
*_SHIFTdefinitions on arm64. It's madness forCONT_PTE_SHIFTto be smaller thanPAGE_SHIFTimo, but it's just cosmetic I guess.Yeah, Do you want me to post a patch, to fix it?
Let's wait until 5.8 is out the door first, since we've already got a fair amount of activity in this area and it would be a pity if we broke something as a result of cleanup!
Cheers,
Will