mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

mm: merge pte_mkhuge() call into arch_make_huge_pte()

Browse source 
Each call into pte_mkhuge() is invariably followed by
arch_make_huge_pte().  Instead arch_make_huge_pte() can accommodate
pte_mkhuge() at the beginning.  This updates generic fallback stub for
arch_make_huge_pte() and available platforms definitions.  This makes huge
pte creation much cleaner and easier to follow.

Link: https://lkml.kernel.org/r/1643860669-26307-1-git-send-email-anshuman.khandual@arm.com
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: Mike Kravetz <mike.kravetz@oracle.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Anshuman Khandual 2022-03-22 14:41:47 -07:00 committed by Linus Torvalds
parent ef696f93ed
commit 16785bd774
6 changed files with 6 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm64/mm/hugetlbpage.c
View file

@ -347,6 +347,7 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags)
{ {
size_t pagesize = 1UL << shift; size_t pagesize = 1UL << shift;
entry = pte_mkhuge(entry);
if (pagesize == CONT_PTE_SIZE) { if (pagesize == CONT_PTE_SIZE) {
entry = pte_mkcont(entry); entry = pte_mkcont(entry);
} else if (pagesize == CONT_PMD_SIZE) { } else if (pagesize == CONT_PMD_SIZE) {

4
arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h
View file

@ -71,9 +71,9 @@ static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags
size_t size = 1UL << shift; size_t size = 1UL << shift;
if (size == SZ_16K) if (size == SZ_16K)
return __pte(pte_val(entry) & ~_PAGE_HUGE); return __pte(pte_val(entry) | _PAGE_SPS);
else else
return entry; return __pte(pte_val(entry) | _PAGE_SPS | _PAGE_HUGE);
} }
#define arch_make_huge_pte arch_make_huge_pte #define arch_make_huge_pte arch_make_huge_pte
#endif #endif

1
arch/sparc/mm/hugetlbpage.c
View file

@ -181,6 +181,7 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags)
{ {
pte_t pte; pte_t pte;
entry = pte_mkhuge(entry);
pte = hugepage_shift_to_tte(entry, shift); pte = hugepage_shift_to_tte(entry, shift);
#ifdef CONFIG_SPARC64 #ifdef CONFIG_SPARC64

2
include/linux/hugetlb.h
View file

@ -754,7 +754,7 @@ static inline void arch_clear_hugepage_flags(struct page *page) { }
static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift,
vm_flags_t flags) vm_flags_t flags)
{ {
return entry; return pte_mkhuge(entry);
} }
#endif #endif

3
mm/hugetlb.c
View file

@ -4637,7 +4637,6 @@ static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page,
vma->vm_page_prot)); vma->vm_page_prot));
} }
entry = pte_mkyoung(entry); entry = pte_mkyoung(entry);
entry = pte_mkhuge(entry);
entry = arch_make_huge_pte(entry, shift, vma->vm_flags); entry = arch_make_huge_pte(entry, shift, vma->vm_flags);
return entry; return entry;
@ -6171,7 +6170,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma,
unsigned int shift = huge_page_shift(hstate_vma(vma)); unsigned int shift = huge_page_shift(hstate_vma(vma));
old_pte = huge_ptep_modify_prot_start(vma, address, ptep); old_pte = huge_ptep_modify_prot_start(vma, address, ptep);
pte = pte_mkhuge(huge_pte_modify(old_pte, newprot)); pte = huge_pte_modify(old_pte, newprot);
pte = arch_make_huge_pte(pte, shift, vma->vm_flags); pte = arch_make_huge_pte(pte, shift, vma->vm_flags);
huge_ptep_modify_prot_commit(vma, address, ptep, old_pte, pte); huge_ptep_modify_prot_commit(vma, address, ptep, old_pte, pte);
pages++; pages++;

1
mm/vmalloc.c
View file

@ -118,7 +118,6 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
if (size != PAGE_SIZE) { if (size != PAGE_SIZE) {
pte_t entry = pfn_pte(pfn, prot); pte_t entry = pfn_pte(pfn, prot);
entry = pte_mkhuge(entry);
entry = arch_make_huge_pte(entry, ilog2(size), 0); entry = arch_make_huge_pte(entry, ilog2(size), 0);
set_huge_pte_at(&init_mm, addr, pte, entry); set_huge_pte_at(&init_mm, addr, pte, entry);
pfn += PFN_DOWN(size); pfn += PFN_DOWN(size);