cpumask: use mm_cpumask() wrapper: arm
PATCH 7/13 cpumask: use mm_cpumask() wrapper: arm
Makes code futureproof against the impending change to mm->cpu_vm_mask.
It's also a chance to use the new cpumask_ ops which take a pointer (the older ones are deprecated, but there's no hurry for arch code).
Signed-off-by Rusty Russell <[email protected]>
--- arch/arm/include/asm/cacheflush.h | 8 ++++---- arch/arm/include/asm/mmu_context.h | 7 ++++--- arch/arm/include/asm/tlbflush.h | 4 ++-- arch/arm/kernel/smp.c | 10 +++++----- arch/arm/mm/context.c | 2 +- arch/arm/mm/flush.c | 10 +++++----- 6 files changed, 21 insertions(+), 20 deletions(-)
arch/arm/include/asm/cacheflush.h +4 -4
@@ -318,14 +318,14 @@ static inline void outer_flush_range(uns#ifndef CONFIG_CPU_CACHE_VIPT static inline void flush_cache_mm (struct mm_struct *mm) { -if (cpu_isset (smp_processor_id (), mm->cpu_vm_mask)) +if (cpumask_test_cpu (smp_processor_id (),mm_cpumask (mm)))__cpuc_flush_user_all (); }static inline void flush_cache_range (struct vm_area_struct *vma,unsigned long start,unsigned long end) { -if (cpu_isset (smp_processor_id (), vma->vm_mm->cpu_vm_mask)) +if (cpumask_test_cpu (smp_processor_id (),mm_cpumask (vma->vm_mm)))__cpuc_flush_user_range (start &PAGE_MASK ,PAGE_ALIGN (end), vma->vm_flags); }
@@ -333,7 +333,7 @@ static inline voidstatic inline void flush_cache_page (struct vm_area_struct *vma,unsigned long user_addr,unsigned long pfn) { -if (cpu_isset (smp_processor_id (), vma->vm_mm->cpu_vm_mask)) { +if (cpumask_test_cpu (smp_processor_id (),mm_cpumask (vma->vm_mm))) {unsigned long addr = user_addr &PAGE_MASK ;__cpuc_flush_user_range (addr, addr +PAGE_SIZE , vma->vm_flags); }
@@ -344,7 +344,7 @@ flush_ptrace_access(struct vm_area_struc unsigned long uaddr, void *kaddr, unsigned long len, int write) { - if (cpu_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask)) { + if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) { unsigned long addr = (unsigned long)kaddr;__cpuc_coherent_kern_range (addr, addr + len); }
arch/arm/include/asm/mmu_context.h +4 -3
@@ -101,14 +101,15 @@ switch_mm(struct mm_struct *prev, struct#ifdef CONFIG_SMP /* check for possible thread migration */ -if (!cpus_empty (next->cpu_vm_mask) && !cpu_isset (cpu, next->cpu_vm_mask)) +if (!cpumask_empty (mm_cpumask (next)) && + !cpumask_test_cpu (cpu,mm_cpumask (next)))__flush_icache_all ();#endif -if (!cpu_test_and_set (cpu, next->cpu_vm_mask) || prev != next) { +if (!cpumask_test_and_set_cpu (cpu,mm_cpumask (next)) || prev != next) {check_context (next);cpu_switch_mm (next->pgd, next);if (cache_is_vivt ()) -cpu_clear (cpu, prev->cpu_vm_mask); +cpumask_clear_cpu (cpu,mm_cpumask (prev)); }#endif }
arch/arm/include/asm/tlbflush.h +2 -2
@@ -316,7 +316,7 @@ static inline void local_flush_tlb_mm(stif (tlb_flag (TLB_WB ))dsb (); -if (cpu_isset (smp_processor_id (), mm->cpu_vm_mask)) { +if (cpumask_test_cpu (smp_processor_id (),mm_cpumask (mm))) {if (tlb_flag (TLB_V3_FULL )) asm("mcr p15, 0, %0, c6, c0, 0" : :"r" (zero) :"cc" );if (tlb_flag (TLB_V4_U_FULL ))
@@ -354,7 +354,7 @@ local_flush_tlb_page(struct vm_area_struif (tlb_flag (TLB_WB ))dsb (); -if (cpu_isset (smp_processor_id (), vma->vm_mm->cpu_vm_mask)) { +if (cpumask_test_cpu (smp_processor_id (),mm_cpumask (vma->vm_mm))) {if (tlb_flag (TLB_V3_PAGE )) asm("mcr p15, 0, %0, c6, c0, 0" : :"r" (uaddr) :"cc" );if (tlb_flag (TLB_V4_U_PAGE ))
arch/arm/kernel/smp.c +5 -5
@@ -183,7 +183,7 @@ int __cpuexit __cpu_disable(void)read_lock (&tasklist_lock);for_each_process (p) {if (p->mm) -cpu_clear (cpu, p->mm->cpu_vm_mask); +cpumask_clear_cpu (cpu,mm_cpumask (p->mm)); }read_unlock (&tasklist_lock);
@@ -251,7 +251,7 @@ asmlinkage void __cpuinit secondary_staratomic_inc (&mm->mm_users);atomic_inc (&mm->mm_count); current->active_mm = mm; -cpu_set (cpu, mm->cpu_vm_mask); +cpumask_set_cpu (cpu,mm_cpumask (mm));cpu_switch_mm (mm->pgd, mm);enter_lazy_tlb (mm, current);local_flush_tlb_all ();
@@ -597,7 +597,7 @@ void flush_tlb_all(void)void flush_tlb_mm (struct mm_struct *mm) { -on_each_cpu_mask (ipi_flush_tlb_mm, mm,1 , &mm->cpu_vm_mask); +on_each_cpu_mask (ipi_flush_tlb_mm, mm,1 ,mm_cpumask (mm)); }void flush_tlb_page (struct vm_area_struct *vma,unsigned long uaddr)
@@ -607,7 +607,7 @@ void flush_tlb_page(struct vm_area_struc ta.ta_vma = vma; ta.ta_start = uaddr; -on_each_cpu_mask (ipi_flush_tlb_page, &ta,1 , &vma->vm_mm->cpu_vm_mask); +on_each_cpu_mask (ipi_flush_tlb_page, &ta,1 ,mm_cpumask (vma->vm_mm)); }void flush_tlb_kernel_page (unsigned long kaddr)
@@ -628,7 +628,7 @@ void flush_tlb_range(struct vm_area_stru ta.ta_start = start; ta.ta_end = end; -on_each_cpu_mask (ipi_flush_tlb_range, &ta,1 , &vma->vm_mm->cpu_vm_mask); +on_each_cpu_mask (ipi_flush_tlb_range, &ta,1 ,mm_cpumask (vma->vm_mm)); }void flush_tlb_kernel_range (unsigned long start,unsigned long end)
arch/arm/mm/context.c +1 -1
@@ -59,6 +59,6 @@ void __new_context(struct mm_struct *mm) }spin_unlock (&cpu_asid_lock); - mm->cpu_vm_mask =cpumask_of_cpu (smp_processor_id ()); +cpumask_copy (mm_cpumask (mm),cpumask_of (smp_processor_id ())); mm->context.id = asid; }
arch/arm/mm/flush.c +5 -5
@@ -41,7 +41,7 @@ void flush_cache_mm(struct mm_struct *mmvoid flush_cache_mm (struct mm_struct *mm) {if (cache_is_vivt ()) { -if (cpu_isset (smp_processor_id (), mm->cpu_vm_mask)) +if (cpumask_test_cpu (smp_processor_id (),mm_cpumask (mm)))__cpuc_flush_user_all ();return ; }
@@ -59,7 +59,7 @@ void flush_cache_range(struct vm_area_stvoid flush_cache_range (struct vm_area_struct *vma,unsigned long start,unsigned long end) {if (cache_is_vivt ()) { -if (cpu_isset (smp_processor_id (), vma->vm_mm->cpu_vm_mask)) +if (cpumask_test_cpu (smp_processor_id (),mm_cpumask (vma->vm_mm)))__cpuc_flush_user_range (start &PAGE_MASK ,PAGE_ALIGN (end), vma->vm_flags);return ;
@@ -78,7 +78,7 @@ void flush_cache_page(struct vm_area_strvoid flush_cache_page (struct vm_area_struct *vma,unsigned long user_addr,unsigned long pfn) {if (cache_is_vivt ()) { -if (cpu_isset (smp_processor_id (), vma->vm_mm->cpu_vm_mask)) { +if (cpumask_test_cpu (smp_processor_id (),mm_cpumask (vma->vm_mm))) {unsigned long addr = user_addr &PAGE_MASK ;__cpuc_flush_user_range (addr, addr +PAGE_SIZE , vma->vm_flags); }
@@ -94,7 +94,7 @@ void flush_ptrace_access(struct vm_area_ unsigned long len, int write) { if (cache_is_vivt()) { - if (cpu_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask)) { + if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) { unsigned long addr = (unsigned long)kaddr;__cpuc_coherent_kern_range (addr, addr + len); }
@@ -107,7 +107,7 @@ void flush_ptrace_access(struct vm_area_ }/* VIPT non-aliasing cache */ -if (cpu_isset (smp_processor_id (), vma->vm_mm->cpu_vm_mask) && +if (cpumask_test_cpu (smp_processor_id (),mm_cpumask (vma->vm_mm)) && vma->vm_flags &VM_EXEC ) {unsigned long addr = (unsigned long )kaddr;/* only flushing the kernel mapping on non-aliasing VIPT */