Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 11338
b: refs/heads/master
c: fc2acab
h: refs/heads/master
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Oct 30, 2005
1 parent f726f2c commit 8450e39
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 70 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4d6ddfa9242bc3d27fb0f7248f6fdee0299c731f
refs/heads/master: fc2acab31be8e869b2d5f6de12f557f6f054f19c
3 changes: 1 addition & 2 deletions trunk/arch/sparc64/mm/tlb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@

/* Heavily inspired by the ppc64 code. */

DEFINE_PER_CPU(struct mmu_gather, mmu_gathers) =
{ NULL, 0, 0, 0, 0, 0, { 0 }, { NULL }, };
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers) = { 0, };

void flush_tlb_pending(void)
{
Expand Down
15 changes: 1 addition & 14 deletions trunk/include/asm-arm/tlb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@
*/
struct mmu_gather {
struct mm_struct *mm;
unsigned int freed;
unsigned int fullmm;

unsigned int flushes;
unsigned int avoided_flushes;
};

DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
Expand All @@ -42,7 +38,6 @@ tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);

tlb->mm = mm;
tlb->freed = 0;
tlb->fullmm = full_mm_flush;

return tlb;
Expand All @@ -51,16 +46,8 @@ tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
static inline void
tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
{
struct mm_struct *mm = tlb->mm;
unsigned long freed = tlb->freed;
int rss = get_mm_counter(mm, rss);

if (rss < freed)
freed = rss;
add_mm_counter(mm, rss, -freed);

if (tlb->fullmm)
flush_tlb_mm(mm);
flush_tlb_mm(tlb->mm);

/* keep the page table cache within bounds */
check_pgt_cache();
Expand Down
35 changes: 13 additions & 22 deletions trunk/include/asm-arm26/tlb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@
*/
struct mmu_gather {
struct mm_struct *mm;
unsigned int freed;
unsigned int fullmm;

unsigned int flushes;
unsigned int avoided_flushes;
unsigned int need_flush;
unsigned int fullmm;
};

DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
Expand All @@ -25,29 +22,17 @@ tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);

tlb->mm = mm;
tlb->freed = 0;
tlb->fullmm = full_mm_flush;
tlb->need_flush = 0;
tlb->fullmm = full_mm_flush;

return tlb;
}

static inline void
tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
{
struct mm_struct *mm = tlb->mm;
unsigned long freed = tlb->freed;
int rss = get_mm_counter(mm, rss);

if (rss < freed)
freed = rss;
add_mm_counter(mm, rss, -freed);

if (freed) {
flush_tlb_mm(mm);
tlb->flushes++;
} else {
tlb->avoided_flushes++;
}
if (tlb->need_flush)
flush_tlb_mm(tlb->mm);

/* keep the page table cache within bounds */
check_pgt_cache();
Expand All @@ -65,7 +50,13 @@ tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
} while (0)
#define tlb_end_vma(tlb,vma) do { } while (0)

#define tlb_remove_page(tlb,page) free_page_and_swap_cache(page)
static inline void
tlb_remove_page(struct mmu_gather *tlb, struct page *page)
{
tlb->need_flush = 1;
free_page_and_swap_cache(page);
}

#define pte_free_tlb(tlb,ptep) pte_free(ptep)
#define pmd_free_tlb(tlb,pmdp) pmd_free(pmdp)

Expand Down
9 changes: 0 additions & 9 deletions trunk/include/asm-generic/tlb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ struct mmu_gather {
unsigned int nr; /* set to ~0U means fast mode */
unsigned int need_flush;/* Really unmapped some ptes? */
unsigned int fullmm; /* non-zero means full mm flush */
unsigned long freed;
struct page * pages[FREE_PTE_NR];
};

Expand All @@ -63,7 +62,6 @@ tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
tlb->nr = num_online_cpus() > 1 ? 0U : ~0U;

tlb->fullmm = full_mm_flush;
tlb->freed = 0;

return tlb;
}
Expand All @@ -88,13 +86,6 @@ tlb_flush_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
static inline void
tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
{
int freed = tlb->freed;
struct mm_struct *mm = tlb->mm;
int rss = get_mm_counter(mm, rss);

if (rss < freed)
freed = rss;
add_mm_counter(mm, rss, -freed);
tlb_flush_mmu(tlb, start, end);

/* keep the page table cache within bounds */
Expand Down
9 changes: 0 additions & 9 deletions trunk/include/asm-ia64/tlb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ struct mmu_gather {
unsigned int nr; /* == ~0U => fast mode */
unsigned char fullmm; /* non-zero means full mm flush */
unsigned char need_flush; /* really unmapped some PTEs? */
unsigned long freed; /* number of pages freed */
unsigned long start_addr;
unsigned long end_addr;
struct page *pages[FREE_PTE_NR];
Expand Down Expand Up @@ -147,7 +146,6 @@ tlb_gather_mmu (struct mm_struct *mm, unsigned int full_mm_flush)
*/
tlb->nr = (num_online_cpus() == 1) ? ~0U : 0;
tlb->fullmm = full_mm_flush;
tlb->freed = 0;
tlb->start_addr = ~0UL;
return tlb;
}
Expand All @@ -159,13 +157,6 @@ tlb_gather_mmu (struct mm_struct *mm, unsigned int full_mm_flush)
static inline void
tlb_finish_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long end)
{
unsigned long freed = tlb->freed;
struct mm_struct *mm = tlb->mm;
unsigned long rss = get_mm_counter(mm, rss);

if (rss < freed)
freed = rss;
add_mm_counter(mm, rss, -freed);
/*
* Note: tlb->nr may be 0 at this point, so we can't rely on tlb->start_addr and
* tlb->end_addr.
Expand Down
14 changes: 2 additions & 12 deletions trunk/include/asm-sparc64/tlb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ struct mmu_gather {
unsigned int need_flush;
unsigned int fullmm;
unsigned int tlb_nr;
unsigned long freed;
unsigned long vaddrs[TLB_BATCH_NR];
struct page *pages[FREE_PTE_NR];
};
Expand All @@ -51,7 +50,6 @@ static inline struct mmu_gather *tlb_gather_mmu(struct mm_struct *mm, unsigned i
mp->mm = mm;
mp->pages_nr = num_online_cpus() > 1 ? 0U : ~0U;
mp->fullmm = full_mm_flush;
mp->freed = 0;

return mp;
}
Expand All @@ -78,19 +76,11 @@ extern void smp_flush_tlb_mm(struct mm_struct *mm);

static inline void tlb_finish_mmu(struct mmu_gather *mp, unsigned long start, unsigned long end)
{
unsigned long freed = mp->freed;
struct mm_struct *mm = mp->mm;
unsigned long rss = get_mm_counter(mm, rss);

if (rss < freed)
freed = rss;
add_mm_counter(mm, rss, -freed);

tlb_flush_mmu(mp);

if (mp->fullmm) {
if (CTX_VALID(mm->context))
do_flush_tlb_mm(mm);
if (CTX_VALID(mp->mm->context))
do_flush_tlb_mm(mp->mm);
mp->fullmm = 0;
} else
flush_tlb_pending();
Expand Down
2 changes: 1 addition & 1 deletion trunk/mm/memory.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ static void zap_pte_range(struct mmu_gather *tlb, pmd_t *pmd,
if (pte_young(ptent))
mark_page_accessed(page);
}
tlb->freed++;
dec_mm_counter(tlb->mm, rss);
page_remove_rmap(page);
tlb_remove_page(tlb, page);
continue;
Expand Down

0 comments on commit 8450e39

Please sign in to comment.