On Thu, Jul 26, 2012 at 05:47:13PM +0200, Martin Schwidefsky wrote:
> To enable lazy TLB flush schemes with a scope limited to a single
> mm_struct add the mm pointer as argument to the three lazy mmu mode
> hooks.
>
> Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
> ---
> arch/powerpc/include/asm/tlbflush.h | 6 +++---
> arch/powerpc/mm/subpage-prot.c | 4 ++--
> arch/powerpc/mm/tlb_hash64.c | 4 ++--
> arch/tile/mm/fault.c | 2 +-
> arch/tile/mm/highmem.c | 4 ++--
> arch/x86/include/asm/paravirt.h | 6 +++---
> arch/x86/kernel/paravirt.c | 10 +++++-----
> arch/x86/mm/highmem_32.c | 4 ++--
> arch/x86/mm/iomap_32.c | 2 +-
> include/asm-generic/pgtable.h | 6 +++---
> mm/memory.c | 16 ++++++++--------
> mm/mprotect.c | 4 ++--
> mm/mremap.c | 4 ++--
> 13 files changed, 36 insertions(+), 36 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/tlbflush.h b/arch/powerpc/include/asm/tlbflush.h
> index 81143fc..7851e0c1 100644
> --- a/arch/powerpc/include/asm/tlbflush.h
> +++ b/arch/powerpc/include/asm/tlbflush.h
> @@ -108,14 +108,14 @@ extern void hpte_need_flush(struct mm_struct *mm, unsigned long addr,
>
> #define __HAVE_ARCH_ENTER_LAZY_MMU_MODE
>
> -static inline void arch_enter_lazy_mmu_mode(void)
> +static inline void arch_enter_lazy_mmu_mode(struct mm_struct *mm)
> {
> struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
>
> batch->active = 1;
> }
>
> -static inline void arch_leave_lazy_mmu_mode(void)
> +static inline void arch_leave_lazy_mmu_mode(struct mm_struct *mm)
> {
> struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
>
> @@ -124,7 +124,7 @@ static inline void arch_leave_lazy_mmu_mode(void)
> batch->active = 0;
> }
>
> -#define arch_flush_lazy_mmu_mode() do {} while (0)
> +#define arch_flush_lazy_mmu_mode(mm) do {} while (0)
>
>
> extern void flush_hash_page(unsigned long va, real_pte_t pte, int psize,
> diff --git a/arch/powerpc/mm/subpage-prot.c b/arch/powerpc/mm/subpage-prot.c
> index e4f8f1f..bf95185 100644
> --- a/arch/powerpc/mm/subpage-prot.c
> +++ b/arch/powerpc/mm/subpage-prot.c
> @@ -76,13 +76,13 @@ static void hpte_flush_range(struct mm_struct *mm, unsigned long addr,
> if (pmd_none(*pmd))
> return;
> pte = pte_offset_map_lock(mm, pmd, addr, &ptl);
> - arch_enter_lazy_mmu_mode();
> + arch_enter_lazy_mmu_mode(mm);
> for (; npages > 0; --npages) {
> pte_update(mm, addr, pte, 0, 0);
> addr += PAGE_SIZE;
> ++pte;
> }
> - arch_leave_lazy_mmu_mode();
> + arch_leave_lazy_mmu_mode(mm);
> pte_unmap_unlock(pte - 1, ptl);
> }
>
> diff --git a/arch/powerpc/mm/tlb_hash64.c b/arch/powerpc/mm/tlb_hash64.c
> index 31f1820..73fd065 100644
> --- a/arch/powerpc/mm/tlb_hash64.c
> +++ b/arch/powerpc/mm/tlb_hash64.c
> @@ -205,7 +205,7 @@ void __flush_hash_table_range(struct mm_struct *mm, unsigned long start,
> * way to do things but is fine for our needs here.
> */
> local_irq_save(flags);
> - arch_enter_lazy_mmu_mode();
> + arch_enter_lazy_mmu_mode(mm);
> for (; start < end; start += PAGE_SIZE) {
> pte_t *ptep = find_linux_pte(mm->pgd, start);
> unsigned long pte;
> @@ -217,7 +217,7 @@ void __flush_hash_table_range(struct mm_struct *mm, unsigned long start,
> continue;
> hpte_need_flush(mm, start, ptep, pte, 0);
> }
> - arch_leave_lazy_mmu_mode();
> + arch_leave_lazy_mmu_mode(mm);
> local_irq_restore(flags);
> }
>
> diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c
> index 84ce7ab..0d78f93 100644
> --- a/arch/tile/mm/fault.c
> +++ b/arch/tile/mm/fault.c
> @@ -123,7 +123,7 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address)
> return NULL;
> if (!pmd_present(*pmd)) {
> set_pmd(pmd, *pmd_k);
> - arch_flush_lazy_mmu_mode();
> + arch_flush_lazy_mmu_mode(&init_mm);
> } else
> BUG_ON(pmd_ptfn(*pmd) != pmd_ptfn(*pmd_k));
> return pmd_k;
> diff --git a/arch/tile/mm/highmem.c b/arch/tile/mm/highmem.c
> index ef8e5a6..85b061e 100644
> --- a/arch/tile/mm/highmem.c
> +++ b/arch/tile/mm/highmem.c
> @@ -114,7 +114,7 @@ static void kmap_atomic_register(struct page *page, enum km_type type,
>
> list_add(&->list, &_list);
> set_pte(ptep, pteval);
> - arch_flush_lazy_mmu_mode();
> + arch_flush_lazy_mmu_mode(&init_mm);
>
> spin_unlock(&_lock);
> homecache_kpte_unlock(flags);
> @@ -259,7 +259,7 @@ void __kunmap_atomic(void *kvaddr)
> BUG_ON(vaddr >= (unsigned long)high_memory);
> }
>
> - arch_flush_lazy_mmu_mode();
> + arch_flush_lazy_mmu_mode(&init_mm);
> pagefault_enable();
> }
> EXPORT_SYMBOL(__kunmap_atomic);
> diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
> index 0b47ddb..b097945 100644
> --- a/arch/x86/include/asm/paravirt.h
> +++ b/arch/x86/include/asm/paravirt.h
> @@ -694,17 +694,17 @@ static inline void arch_end_context_switch(struct task_struct *next)
> }
>
> #define __HAVE_ARCH_ENTER_LAZY_MMU_MODE
> -static inline void arch_enter_lazy_mmu_mode(void)
> +static inline void arch_enter_lazy_mmu_mode(struct mm_struct *mm)
> {
> PVOP_VCALL0(pv_mmu_ops.lazy_mode.enter);
If you are doing that, you should probably also update the pvops call to
pass in the 'struct mm_struct'?
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>