Add update_mmu_tlb_range() to simplify code
Subsystems (6)
v3 cover Add update_mmu_tlb_range() to simplify code
This series of commits mainly adds the update_mmu_tlb_range() to batch update tlb in an address range and refactor the update_mmu_tlb().
After the commit 19eaf44954df ("mm: thp: support allocation of anonymous multi-size THP"), We may need to batch update tlb of a certain address range by calling update_mmu_tlb() in a loop. Using the update_mmu_tlb_range(), we can simplify the code and possibly reduce the execution of some unnecessary code in some architectures.
Thanks,
Bang
Changes since v2 [2]:
- Use generic architecture to implement update_mmu_tlb() (per Ryan)
Changes since v1 [1]:
- Add __HAVE_ARCH_UPDATE_MMU_TLB_RANGE macro (per Lance Yang)
[1] https://lore.kernel.org/linux-mm/[email protected]/
[2] https://lore.kernel.org/linux-mm/[email protected]/
Bang Li (3):
mm: Add update_mmu_tlb_range()
mm: Refactor update_mmu_tlb()
mm: Use update_mmu_tlb_range() to simplify code
arch/loongarch/include/asm/pgtable.h | 4 ++-- arch/mips/include/asm/pgtable.h | 4 ++-- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/xtensa/include/asm/pgtable.h | 6 +++--- arch/xtensa/mm/tlb.c | 6 +++--- include/linux/pgtable.h | 11 ++++++++--- mm/memory.c | 4 +--- 7 files changed, 21 insertions(+), 18 deletions(-)
Signature · 1 line
2.19.1.6.gb485710b
PATCH v3 1/3 mm: Add update_mmu_tlb_range()
Added update_mmu_tlb_range(), we can batch update tlb of an address range.
--- arch/loongarch/include/asm/pgtable.h | 2 ++ arch/mips/include/asm/pgtable.h | 2 ++ arch/riscv/include/asm/pgtable.h | 2 ++ arch/xtensa/include/asm/pgtable.h | 3 +++ arch/xtensa/mm/tlb.c | 6 ++++++ 5 files changed, 15 insertions(+)
arch/loongarch/include/asm/pgtable.h +2 -0
@@ -469,6 +469,8 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf,#define __HAVE_ARCH_UPDATE_MMU_TLB#define update_mmu_tlb update_mmu_cache +#define update_mmu_tlb_range (vma, addr, ptep, nr) \ + update_mmu_cache_range(NULL, vma, addr, ptep, nr)static inline void update_mmu_cache_pmd (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp)
arch/mips/include/asm/pgtable.h +2 -0
@@ -596,6 +596,8 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf,#define __HAVE_ARCH_UPDATE_MMU_TLB#define update_mmu_tlb update_mmu_cache +#define update_mmu_tlb_range (vma, address, ptep, nr) \ + update_mmu_cache_range(NULL, vma, address, ptep, nr)static inline void update_mmu_cache_pmd (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp)
arch/riscv/include/asm/pgtable.h +2 -0
@@ -488,6 +488,8 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf,#define __HAVE_ARCH_UPDATE_MMU_TLB#define update_mmu_tlb update_mmu_cache +#define update_mmu_tlb_range (vma, addr, ptep, nr) \ + update_mmu_cache_range(NULL, vma, addr, ptep, nr)static inline void update_mmu_cache_pmd (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp)
arch/xtensa/include/asm/pgtable.h +3 -0
@@ -413,6 +413,9 @@ typedef pte_t *pte_addr_t;void update_mmu_tlb (struct vm_area_struct *vma,unsigned long address,pte_t *ptep);#define __HAVE_ARCH_UPDATE_MMU_TLB +void update_mmu_tlb_range (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep,unsigned int nr); +#define update_mmu_tlb_range update_mmu_tlb_range#endif /* !defined (__ASSEMBLY__) */
arch/xtensa/mm/tlb.c +6 -0
@@ -169,6 +169,12 @@ void update_mmu_tlb(struct vm_area_struct *vma,local_flush_tlb_page (vma, address); } +void update_mmu_tlb_range (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep,unsigned int nr) +{ +local_flush_tlb_range (vma, address, address +PAGE_SIZE * nr); +} +#ifdef CONFIG_DEBUG_TLB_SANITY static unsigned get_pte_for_vaddr (unsigned vaddr)
Signature · 1 line
2.19.1.6.gb485710b
Re: [PATCH v3 1/3] mm: Add update_mmu_tlb_range()
Quoted 5 lines · Bang Li
Added
update_mmu_tlb_range(), we can batch update tlb of an address range.Signed-off-by Bang Li <[email protected]>---
The generic variant that is a NOP from patch #2 should go into this patch as well.
Apart from that LGTM
Signature · 3 lines
Cheers, David / dhildenb
Re: [PATCH v3 1/3] mm: Add update_mmu_tlb_range()
Hi David,
Thanks for you review!
Quoted 8 lines · David Hildenbrand
Quoted 5 lines · Bang Li
Added
update_mmu_tlb_range(), we can batch update tlb of an address range.Signed-off-by Bang Li <[email protected]>---
The generic variant that is a NOP from patch #2 should go into this patch as well.
Good point. Thanks for pointing this out.
Thanks,
Bang
Quoted 3 lines
Apart from that LGTM
PATCH v3 2/3 mm: Refactor update_mmu_tlb()
In reply to Bang LiRemove update_mmu_tlb() from those architectures and define generically via update_mmu_tlb_range(), removing the ability for arches to override it.
--- arch/loongarch/include/asm/pgtable.h | 2 -- arch/mips/include/asm/pgtable.h | 2 -- arch/riscv/include/asm/pgtable.h | 2 -- arch/xtensa/include/asm/pgtable.h | 3 --- arch/xtensa/mm/tlb.c | 6 ------ include/linux/pgtable.h | 11 ++++++++--- 6 files changed, 8 insertions(+), 18 deletions(-)
arch/loongarch/include/asm/pgtable.h +0 -2
@@ -467,8 +467,6 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf,#define update_mmu_cache (vma, addr, ptep) \ update_mmu_cache_range(NULL, vma, addr, ptep, 1) -#define __HAVE_ARCH_UPDATE_MMU_TLB -#define update_mmu_tlb update_mmu_cache#define update_mmu_tlb_range (vma, addr, ptep, nr) \ update_mmu_cache_range(NULL, vma, addr, ptep, nr)
arch/mips/include/asm/pgtable.h +0 -2
@@ -594,8 +594,6 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf,#define update_mmu_cache (vma, address, ptep) \ update_mmu_cache_range(NULL, vma, address, ptep, 1) -#define __HAVE_ARCH_UPDATE_MMU_TLB -#define update_mmu_tlb update_mmu_cache#define update_mmu_tlb_range (vma, address, ptep, nr) \ update_mmu_cache_range(NULL, vma, address, ptep, nr)
arch/riscv/include/asm/pgtable.h +0 -2
@@ -486,8 +486,6 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf,#define update_mmu_cache (vma, addr, ptep) \ update_mmu_cache_range(NULL, vma, addr, ptep, 1) -#define __HAVE_ARCH_UPDATE_MMU_TLB -#define update_mmu_tlb update_mmu_cache#define update_mmu_tlb_range (vma, addr, ptep, nr) \ update_mmu_cache_range(NULL, vma, addr, ptep, nr)
arch/xtensa/include/asm/pgtable.h +0 -3
@@ -410,9 +410,6 @@ void update_mmu_cache_range(struct vm_fault *vmf, struct vm_area_struct *vma,typedef pte_t *pte_addr_t ; -void update_mmu_tlb (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep); -#define __HAVE_ARCH_UPDATE_MMU_TLBvoid update_mmu_tlb_range (struct vm_area_struct *vma,unsigned long address,pte_t *ptep,unsigned int nr);#define update_mmu_tlb_range update_mmu_tlb_range
arch/xtensa/mm/tlb.c +0 -6
@@ -163,12 +163,6 @@ void local_flush_tlb_kernel_range(unsigned long start, unsigned long end) } } -void update_mmu_tlb (struct vm_area_struct *vma, -unsigned long address,pte_t *ptep) -{ -local_flush_tlb_page (vma, address); -} -void update_mmu_tlb_range (struct vm_area_struct *vma,unsigned long address,pte_t *ptep,unsigned int nr) {
include/linux/pgtable.h +8 -3
@@ -729,13 +729,18 @@ static inline void clear_full_ptes(struct mm_struct *mm, unsigned long addr,* fault. This function updates TLB only, do nothing with cache or others. * It is the difference with function update_mmu_cache. */ -#ifndef __HAVE_ARCH_UPDATE_MMU_TLB +#ifndef update_mmu_tlb_range +static inline void update_mmu_tlb_range (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep,unsigned int nr) +{ +} +#endif +static inline void update_mmu_tlb (struct vm_area_struct *vma,unsigned long address,pte_t *ptep) { +update_mmu_tlb_range (vma, address, ptep,1 ); } -#define __HAVE_ARCH_UPDATE_MMU_TLB -#endif /* * Some architectures may be able to avoid expensive synchronization
Signature · 1 line
2.19.1.6.gb485710b
Re: [PATCH v3 2/3] mm: Refactor update_mmu_tlb()
Quoted 3 lines · Bang Li
Remove
update_mmu_tlb()from those architectures and define generically viaupdate_mmu_tlb_range(), removing the ability for arches to override it.
I'd suggest something like
"mm: implement update_mmu_tlb() using update_mmu_tlb_range()
Let's make update_mmu_tlb() simply a generic wrapper around update_mmu_tlb_range(). Only the latter can now be overridden by the architecture. We can now remove __HAVE_ARCH_UPDATE_MMU_TLB as well. "
[...]
include/linux/pgtable.h static inline void clear_full_ptes(struct mm_struct *mm, unsigned long addr, · line 737
Quoted 6 lines
include/linux/pgtable.h +6
-0+#ifndef update_mmu_tlb_range +static inline void update_mmu_tlb_range (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep,unsigned int nr) +{ +} +#endif
With that in patch #1
Signature · 3 lines
Cheers, David / dhildenb
Re: [PATCH v3 2/3] mm: Refactor update_mmu_tlb()
Hi David,
Thanks for you review!
Quoted 11 lines · David Hildenbrand
Quoted 3 lines · Bang Li
Remove
update_mmu_tlb()from those architectures and define generically viaupdate_mmu_tlb_range(), removing the ability for arches to override it.I'd suggest something like
"mm: implement
update_mmu_tlb()usingupdate_mmu_tlb_range()Let's make
update_mmu_tlb()simply a generic wrapper aroundupdate_mmu_tlb_range(). Only the latter can now be overridden by the architecture. We can now remove__HAVE_ARCH_UPDATE_MMU_TLBas well. "
Agree! Thank you for your suggestion, I will modify it in the next version
Quoted 11 lines
[...]
include/linux/pgtable.h static inline void clear_full_ptes(struct mm_struct *mm, unsigned long addr, · line 737
Quoted 6 lines
include/linux/pgtable.h +6
-0+#ifndef update_mmu_tlb_range +static inline void update_mmu_tlb_range (struct vm_area_struct *vma, + unsigned long address, pte_t *ptep, unsigned int nr) +{ +} +#endif With that in patch #1
Thanks again.
Bang
Quoted 3 lines
PATCH v3 3/3 mm: Use update_mmu_tlb_range() to simplify code
In reply to Bang LiLet us simplify the code by update_mmu_tlb_range().
--- mm/memory.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
mm/memory.c +1 -3
@@ -4421,7 +4421,6 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf)vm_fault_t ret =0 ;int nr_pages =1 ;pte_t entry; -int i;/* File mapping without ->vm_ops ? */ if (vma->vm_flags &VM_SHARED )
@@ -4491,8 +4490,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf)update_mmu_tlb (vma, addr, vmf->pte); goto release; }else if (nr_pages >1 && !pte_range_none (vmf->pte, nr_pages)) { -for (i =0 ; i < nr_pages; i++) -update_mmu_tlb (vma, addr +PAGE_SIZE * i, vmf->pte + i); +update_mmu_tlb_range (vma, addr, vmf->pte, nr_pages); goto release; }
Signature · 1 line
2.19.1.6.gb485710b
Re: [PATCH v3 3/3] mm: Use update_mmu_tlb_range() to simplify code
Quoted 3 lines · Bang Li
Let us simplify the code by
update_mmu_tlb_range().
LGTM.
Quoted 30 lines
Signed-off-by Bang Li <[email protected]>--- mm/memory.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)mm/memory.c +1
-4@@ -4421,7 +4421,6 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf)vm_fault_t ret =0 ;int nr_pages =1 ;pte_t entry; -int i;/* File mapping without ->vm_ops ? */ if (vma->vm_flags &VM_SHARED )@@ -4491,8 +4490,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf)update_mmu_tlb (vma, addr, vmf->pte); goto release; }else if (nr_pages >1 && !pte_range_none (vmf->pte, nr_pages)) { -for (i =0 ; i < nr_pages; i++) -update_mmu_tlb (vma, addr +PAGE_SIZE * i, vmf->pte + i); +update_mmu_tlb_range (vma, addr, vmf->pte, nr_pages); goto release; } --2.19.1.6.gb485710b
Re: [PATCH v3 3/3] mm: Use update_mmu_tlb_range() to simplify code
In reply to Bang LiQuoted 20 lines · Bang Li
Let us simplify the code by
update_mmu_tlb_range().Signed-off-by Bang Li <[email protected]>--- mm/memory.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)mm/memory.c +0
-1@@ -4421,7 +4421,6 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf)vm_fault_t ret =0 ;int nr_pages =1 ;pte_t entry; -int i;/* File mapping without ->vm_ops ? */ if (vma->vm_flags &VM_SHARED )
mm/memory.c static vm_fault_t do_anonymous_page(struct vm_fault *vmf) · line 4496
Quoted 9 lines
mm/memory.c +1
-2@@ -4491,8 +4490,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf)update_mmu_tlb (vma, addr, vmf->pte); goto release; }else if (nr_pages >1 && !pte_range_none (vmf->pte, nr_pages)) { -for (i =0 ; i < nr_pages; i++) -update_mmu_tlb (vma, addr +PAGE_SIZE * i, vmf->pte + i); +update_mmu_tlb_range (vma, addr, vmf->pte, nr_pages); goto release; }
Signature · 3 lines
Cheers, David / dhildenb