Commit 4d6ddfa9 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

[PATCH] mm: tlb_is_full_mm was obscure

tlb_is_full_mm?  What does that mean?  The TLB is full?  No, it means that the
mm's last user has gone and the whole mm is being torn down.  And it's an
inline function because sparc64 uses a different (slightly better)
"tlb_frozen" name for the flag others call "fullmm".

And now the ptep_get_and_clear_full macro used in zap_pte_range refers
directly to tlb->fullmm, which would be wrong for sparc64.  Rather than
correct that, I'd prefer to scrap tlb_is_full_mm altogether, and change
sparc64 to just use the same poor name as everyone else - is that okay?
Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 15a23ffa
...@@ -72,7 +72,7 @@ void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t ...@@ -72,7 +72,7 @@ void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t
no_cache_flush: no_cache_flush:
if (mp->tlb_frozen) if (mp->fullmm)
return; return;
nr = mp->tlb_nr; nr = mp->tlb_nr;
...@@ -97,7 +97,7 @@ void flush_tlb_pgtables(struct mm_struct *mm, unsigned long start, unsigned long ...@@ -97,7 +97,7 @@ void flush_tlb_pgtables(struct mm_struct *mm, unsigned long start, unsigned long
unsigned long nr = mp->tlb_nr; unsigned long nr = mp->tlb_nr;
long s = start, e = end, vpte_base; long s = start, e = end, vpte_base;
if (mp->tlb_frozen) if (mp->fullmm)
return; return;
/* If start is greater than end, that is a real problem. */ /* If start is greater than end, that is a real problem. */
......
...@@ -68,11 +68,6 @@ tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end) ...@@ -68,11 +68,6 @@ tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
put_cpu_var(mmu_gathers); put_cpu_var(mmu_gathers);
} }
static inline unsigned int tlb_is_full_mm(struct mmu_gather *tlb)
{
return tlb->fullmm;
}
#define tlb_remove_tlb_entry(tlb,ptep,address) do { } while (0) #define tlb_remove_tlb_entry(tlb,ptep,address) do { } while (0)
/* /*
......
...@@ -55,13 +55,6 @@ tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end) ...@@ -55,13 +55,6 @@ tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
put_cpu_var(mmu_gathers); put_cpu_var(mmu_gathers);
} }
static inline unsigned int
tlb_is_full_mm(struct mmu_gather *tlb)
{
return tlb->fullmm;
}
#define tlb_remove_tlb_entry(tlb,ptep,address) do { } while (0) #define tlb_remove_tlb_entry(tlb,ptep,address) do { } while (0)
//#define tlb_start_vma(tlb,vma) do { } while (0) //#define tlb_start_vma(tlb,vma) do { } while (0)
//FIXME - ARM32 uses this now that things changed in the kernel. seems like it may be pointless on arm26, however to get things compiling... //FIXME - ARM32 uses this now that things changed in the kernel. seems like it may be pointless on arm26, however to get things compiling...
......
...@@ -103,12 +103,6 @@ tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end) ...@@ -103,12 +103,6 @@ tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
put_cpu_var(mmu_gathers); put_cpu_var(mmu_gathers);
} }
static inline unsigned int
tlb_is_full_mm(struct mmu_gather *tlb)
{
return tlb->fullmm;
}
/* tlb_remove_page /* tlb_remove_page
* Must perform the equivalent to __free_pte(pte_get_and_clear(ptep)), while * Must perform the equivalent to __free_pte(pte_get_and_clear(ptep)), while
* handling the additional races in SMP caused by other CPUs caching valid * handling the additional races in SMP caused by other CPUs caching valid
......
...@@ -178,12 +178,6 @@ tlb_finish_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long end) ...@@ -178,12 +178,6 @@ tlb_finish_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long end)
put_cpu_var(mmu_gathers); put_cpu_var(mmu_gathers);
} }
static inline unsigned int
tlb_is_full_mm(struct mmu_gather *tlb)
{
return tlb->fullmm;
}
/* /*
* Logically, this routine frees PAGE. On MP machines, the actual freeing of the page * Logically, this routine frees PAGE. On MP machines, the actual freeing of the page
* must be delayed until after the TLB has been flushed (see comments at the beginning of * must be delayed until after the TLB has been flushed (see comments at the beginning of
......
...@@ -25,7 +25,7 @@ struct mmu_gather { ...@@ -25,7 +25,7 @@ struct mmu_gather {
struct mm_struct *mm; struct mm_struct *mm;
unsigned int pages_nr; unsigned int pages_nr;
unsigned int need_flush; unsigned int need_flush;
unsigned int tlb_frozen; unsigned int fullmm;
unsigned int tlb_nr; unsigned int tlb_nr;
unsigned long freed; unsigned long freed;
unsigned long vaddrs[TLB_BATCH_NR]; unsigned long vaddrs[TLB_BATCH_NR];
...@@ -50,7 +50,7 @@ static inline struct mmu_gather *tlb_gather_mmu(struct mm_struct *mm, unsigned i ...@@ -50,7 +50,7 @@ static inline struct mmu_gather *tlb_gather_mmu(struct mm_struct *mm, unsigned i
mp->mm = mm; mp->mm = mm;
mp->pages_nr = num_online_cpus() > 1 ? 0U : ~0U; mp->pages_nr = num_online_cpus() > 1 ? 0U : ~0U;
mp->tlb_frozen = full_mm_flush; mp->fullmm = full_mm_flush;
mp->freed = 0; mp->freed = 0;
return mp; return mp;
...@@ -88,10 +88,10 @@ static inline void tlb_finish_mmu(struct mmu_gather *mp, unsigned long start, un ...@@ -88,10 +88,10 @@ static inline void tlb_finish_mmu(struct mmu_gather *mp, unsigned long start, un
tlb_flush_mmu(mp); tlb_flush_mmu(mp);
if (mp->tlb_frozen) { if (mp->fullmm) {
if (CTX_VALID(mm->context)) if (CTX_VALID(mm->context))
do_flush_tlb_mm(mm); do_flush_tlb_mm(mm);
mp->tlb_frozen = 0; mp->fullmm = 0;
} else } else
flush_tlb_pending(); flush_tlb_pending();
...@@ -101,11 +101,6 @@ static inline void tlb_finish_mmu(struct mmu_gather *mp, unsigned long start, un ...@@ -101,11 +101,6 @@ static inline void tlb_finish_mmu(struct mmu_gather *mp, unsigned long start, un
put_cpu_var(mmu_gathers); put_cpu_var(mmu_gathers);
} }
static inline unsigned int tlb_is_full_mm(struct mmu_gather *mp)
{
return mp->tlb_frozen;
}
static inline void tlb_remove_page(struct mmu_gather *mp, struct page *page) static inline void tlb_remove_page(struct mmu_gather *mp, struct page *page)
{ {
mp->need_flush = 1; mp->need_flush = 1;
......
...@@ -249,7 +249,7 @@ void free_pgd_range(struct mmu_gather **tlb, ...@@ -249,7 +249,7 @@ void free_pgd_range(struct mmu_gather **tlb,
free_pud_range(*tlb, pgd, addr, next, floor, ceiling); free_pud_range(*tlb, pgd, addr, next, floor, ceiling);
} while (pgd++, addr = next, addr != end); } while (pgd++, addr = next, addr != end);
if (!tlb_is_full_mm(*tlb)) if (!(*tlb)->fullmm)
flush_tlb_pgtables((*tlb)->mm, start, end); flush_tlb_pgtables((*tlb)->mm, start, end);
} }
...@@ -698,7 +698,7 @@ unsigned long unmap_vmas(struct mmu_gather **tlbp, struct mm_struct *mm, ...@@ -698,7 +698,7 @@ unsigned long unmap_vmas(struct mmu_gather **tlbp, struct mm_struct *mm,
int tlb_start_valid = 0; int tlb_start_valid = 0;
unsigned long start = start_addr; unsigned long start = start_addr;
spinlock_t *i_mmap_lock = details? details->i_mmap_lock: NULL; spinlock_t *i_mmap_lock = details? details->i_mmap_lock: NULL;
int fullmm = tlb_is_full_mm(*tlbp); int fullmm = (*tlbp)->fullmm;
for ( ; vma && vma->vm_start < end_addr; vma = vma->vm_next) { for ( ; vma && vma->vm_start < end_addr; vma = vma->vm_next) {
unsigned long end; unsigned long end;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment