From: Hugh Dickins <hugh@veritas.com>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 13/15] ptwalk: move p?d_none_or_clear_bad
Date: Wed, 9 Mar 2005 22:14:50 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.61.0503092214110.6070@goblin.wat.veritas.com> (raw)
In-Reply-To: <Pine.LNX.4.61.0503092201070.6070@goblin.wat.veritas.com>
To handle large sparse areas a little more efficiently, follow Nick and
move the p?d_none_or_clear_bad tests up from the start of each function
to its callsite.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
---
mm/memory.c | 24 ++++++++++++------------
mm/mprotect.c | 12 ++++++------
mm/msync.c | 12 ++++++------
mm/swapfile.c | 12 ++++++------
mm/vmalloc.c | 15 ++++++---------
5 files changed, 36 insertions(+), 39 deletions(-)
--- ptwalk12/mm/memory.c 2005-03-09 01:39:06.000000000 +0000
+++ ptwalk13/mm/memory.c 2005-03-09 01:39:18.000000000 +0000
@@ -113,8 +113,6 @@ void pmd_clear_bad(pmd_t *pmd)
static inline void clear_pte_range(struct mmu_gather *tlb, pmd_t *pmd,
unsigned long addr, unsigned long end)
{
- if (pmd_none_or_clear_bad(pmd))
- return;
if (!((addr | end) & ~PMD_MASK)) {
/* Only free fully aligned ranges */
struct page *page = pmd_page(*pmd);
@@ -132,8 +130,6 @@ static inline void clear_pmd_range(struc
unsigned long next;
pmd_t *empty_pmd = NULL;
- if (pud_none_or_clear_bad(pud))
- return;
pmd = pmd_offset(pud, addr);
/* Only free fully aligned ranges */
@@ -141,6 +137,8 @@ static inline void clear_pmd_range(struc
empty_pmd = pmd;
do {
next = pmd_addr_end(addr, end);
+ if (pmd_none_or_clear_bad(pmd))
+ continue;
clear_pte_range(tlb, pmd, addr, next);
} while (pmd++, addr = next, addr != end);
@@ -157,8 +155,6 @@ static inline void clear_pud_range(struc
unsigned long next;
pud_t *empty_pud = NULL;
- if (pgd_none_or_clear_bad(pgd))
- return;
pud = pud_offset(pgd, addr);
/* Only free fully aligned ranges */
@@ -166,6 +162,8 @@ static inline void clear_pud_range(struc
empty_pud = pud;
do {
next = pud_addr_end(addr, end);
+ if (pud_none_or_clear_bad(pud))
+ continue;
clear_pmd_range(tlb, pud, addr, next);
} while (pud++, addr = next, addr != end);
@@ -189,6 +187,8 @@ void clear_page_range(struct mmu_gather
pgd = pgd_offset(tlb->mm, addr);
do {
next = pgd_addr_end(addr, end);
+ if (pgd_none_or_clear_bad(pgd))
+ continue;
clear_pud_range(tlb, pgd, addr, next);
} while (pgd++, addr = next, addr != end);
}
@@ -432,8 +432,6 @@ static void zap_pte_range(struct mmu_gat
{
pte_t *pte;
- if (pmd_none_or_clear_bad(pmd))
- return;
pte = pte_offset_map(pmd, addr);
do {
pte_t ptent = *pte;
@@ -505,11 +503,11 @@ static void zap_pmd_range(struct mmu_gat
pmd_t *pmd;
unsigned long next;
- if (pud_none_or_clear_bad(pud))
- return;
pmd = pmd_offset(pud, addr);
do {
next = pmd_addr_end(addr, end);
+ if (pmd_none_or_clear_bad(pmd))
+ continue;
zap_pte_range(tlb, pmd, addr, next, details);
} while (pmd++, addr = next, addr != end);
}
@@ -521,11 +519,11 @@ static void zap_pud_range(struct mmu_gat
pud_t *pud;
unsigned long next;
- if (pgd_none_or_clear_bad(pgd))
- return;
pud = pud_offset(pgd, addr);
do {
next = pud_addr_end(addr, end);
+ if (pud_none_or_clear_bad(pud))
+ continue;
zap_pmd_range(tlb, pud, addr, next, details);
} while (pud++, addr = next, addr != end);
}
@@ -545,6 +543,8 @@ static void unmap_page_range(struct mmu_
pgd = pgd_offset(vma->vm_mm, addr);
do {
next = pgd_addr_end(addr, end);
+ if (pgd_none_or_clear_bad(pgd))
+ continue;
zap_pud_range(tlb, pgd, addr, next, details);
} while (pgd++, addr = next, addr != end);
tlb_end_vma(tlb, vma);
--- ptwalk12/mm/mprotect.c 2005-03-09 01:36:01.000000000 +0000
+++ ptwalk13/mm/mprotect.c 2005-03-09 01:39:18.000000000 +0000
@@ -30,8 +30,6 @@ static inline void change_pte_range(stru
{
pte_t *pte;
- if (pmd_none_or_clear_bad(pmd))
- return;
pte = pte_offset_map(pmd, addr);
do {
if (pte_present(*pte)) {
@@ -54,11 +52,11 @@ static inline void change_pmd_range(stru
pmd_t *pmd;
unsigned long next;
- if (pud_none_or_clear_bad(pud))
- return;
pmd = pmd_offset(pud, addr);
do {
next = pmd_addr_end(addr, end);
+ if (pmd_none_or_clear_bad(pmd))
+ continue;
change_pte_range(mm, pmd, addr, next, newprot);
} while (pmd++, addr = next, addr != end);
}
@@ -69,11 +67,11 @@ static inline void change_pud_range(stru
pud_t *pud;
unsigned long next;
- if (pgd_none_or_clear_bad(pgd))
- return;
pud = pud_offset(pgd, addr);
do {
next = pud_addr_end(addr, end);
+ if (pud_none_or_clear_bad(pud))
+ continue;
change_pmd_range(mm, pud, addr, next, newprot);
} while (pud++, addr = next, addr != end);
}
@@ -92,6 +90,8 @@ static void change_protection(struct vm_
spin_lock(&mm->page_table_lock);
do {
next = pgd_addr_end(addr, end);
+ if (pgd_none_or_clear_bad(pgd))
+ continue;
change_pud_range(mm, pgd, addr, next, newprot);
} while (pgd++, addr = next, addr != end);
flush_tlb_range(vma, start, end);
--- ptwalk12/mm/msync.c 2005-03-09 01:36:14.000000000 +0000
+++ ptwalk13/mm/msync.c 2005-03-09 01:39:18.000000000 +0000
@@ -27,8 +27,6 @@ static void sync_pte_range(struct vm_are
{
pte_t *pte;
- if (pmd_none_or_clear_bad(pmd))
- return;
pte = pte_offset_map(pmd, addr);
do {
unsigned long pfn;
@@ -56,11 +54,11 @@ static inline void sync_pmd_range(struct
pmd_t *pmd;
unsigned long next;
- if (pud_none_or_clear_bad(pud))
- return;
pmd = pmd_offset(pud, addr);
do {
next = pmd_addr_end(addr, end);
+ if (pmd_none_or_clear_bad(pmd))
+ continue;
sync_pte_range(vma, pmd, addr, next);
} while (pmd++, addr = next, addr != end);
}
@@ -71,11 +69,11 @@ static inline void sync_pud_range(struct
pud_t *pud;
unsigned long next;
- if (pgd_none_or_clear_bad(pgd))
- return;
pud = pud_offset(pgd, addr);
do {
next = pud_addr_end(addr, end);
+ if (pud_none_or_clear_bad(pud))
+ continue;
sync_pmd_range(vma, pud, addr, next);
} while (pud++, addr = next, addr != end);
}
@@ -99,6 +97,8 @@ static void sync_page_range(struct vm_ar
spin_lock(&mm->page_table_lock);
do {
next = pgd_addr_end(addr, end);
+ if (pgd_none_or_clear_bad(pgd))
+ continue;
sync_pud_range(vma, pgd, addr, next);
} while (pgd++, addr = next, addr != end);
spin_unlock(&mm->page_table_lock);
--- ptwalk12/mm/swapfile.c 2005-03-09 01:36:25.000000000 +0000
+++ ptwalk13/mm/swapfile.c 2005-03-09 01:39:18.000000000 +0000
@@ -442,8 +442,6 @@ static int unuse_pte_range(struct vm_are
pte_t *pte;
pte_t swp_pte = swp_entry_to_pte(entry);
- if (pmd_none_or_clear_bad(pmd))
- return 0;
pte = pte_offset_map(pmd, addr);
do {
/*
@@ -467,11 +465,11 @@ static int unuse_pmd_range(struct vm_are
pmd_t *pmd;
unsigned long next;
- if (pud_none_or_clear_bad(pud))
- return 0;
pmd = pmd_offset(pud, addr);
do {
next = pmd_addr_end(addr, end);
+ if (pmd_none_or_clear_bad(pmd))
+ continue;
if (unuse_pte_range(vma, pmd, addr, next, entry, page))
return 1;
} while (pmd++, addr = next, addr != end);
@@ -485,11 +483,11 @@ static int unuse_pud_range(struct vm_are
pud_t *pud;
unsigned long next;
- if (pgd_none_or_clear_bad(pgd))
- return 0;
pud = pud_offset(pgd, addr);
do {
next = pud_addr_end(addr, end);
+ if (pud_none_or_clear_bad(pud))
+ continue;
if (unuse_pmd_range(vma, pud, addr, next, entry, page))
return 1;
} while (pud++, addr = next, addr != end);
@@ -516,6 +514,8 @@ static int unuse_vma(struct vm_area_stru
pgd = pgd_offset(vma->vm_mm, addr);
do {
next = pgd_addr_end(addr, end);
+ if (pgd_none_or_clear_bad(pgd))
+ continue;
if (unuse_pud_range(vma, pgd, addr, next, entry, page))
return 1;
} while (pgd++, addr = next, addr != end);
--- ptwalk12/mm/vmalloc.c 2005-03-09 01:36:38.000000000 +0000
+++ ptwalk13/mm/vmalloc.c 2005-03-09 01:39:18.000000000 +0000
@@ -27,9 +27,6 @@ static void vunmap_pte_range(pmd_t *pmd,
{
pte_t *pte;
- if (pmd_none_or_clear_bad(pmd))
- return;
-
pte = pte_offset_kernel(pmd, addr);
do {
pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
@@ -42,12 +39,11 @@ static void vunmap_pmd_range(pud_t *pud,
pmd_t *pmd;
unsigned long next;
- if (pud_none_or_clear_bad(pud))
- return;
-
pmd = pmd_offset(pud, addr);
do {
next = pmd_addr_end(addr, end);
+ if (pmd_none_or_clear_bad(pmd))
+ continue;
vunmap_pte_range(pmd, addr, next);
} while (pmd++, addr = next, addr != end);
}
@@ -57,12 +53,11 @@ static void vunmap_pud_range(pgd_t *pgd,
pud_t *pud;
unsigned long next;
- if (pgd_none_or_clear_bad(pgd))
- return;
-
pud = pud_offset(pgd, addr);
do {
next = pud_addr_end(addr, end);
+ if (pud_none_or_clear_bad(pud))
+ continue;
vunmap_pmd_range(pud, addr, next);
} while (pud++, addr = next, addr != end);
}
@@ -79,6 +74,8 @@ void unmap_vm_area(struct vm_struct *are
flush_cache_vunmap(addr, end);
do {
next = pgd_addr_end(addr, end);
+ if (pgd_none_or_clear_bad(pgd))
+ continue;
vunmap_pud_range(pgd, addr, next);
} while (pgd++, addr = next, addr != end);
flush_tlb_kernel_range((unsigned long) area->addr, end);
next prev parent reply other threads:[~2005-03-09 23:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-09 22:05 [PATCH 0/15] ptwalk: pagetable walker cleanup Hugh Dickins
2005-03-09 22:06 ` [PATCH 1/15] ptwalk: p?d_none_or_clear_bad Hugh Dickins
2005-03-09 22:07 ` [PATCH 2/15] ptwalk: change_protection Hugh Dickins
2005-03-09 22:08 ` [PATCH 3/15] ptwalk: sync_page_range Hugh Dickins
2005-03-09 22:08 ` [PATCH 4/15] ptwalk: unuse_mm Hugh Dickins
2005-03-09 22:09 ` [PATCH 5/15] ptwalk: map and unmap_vm_area Hugh Dickins
2005-03-09 22:10 ` [PATCH 6/15] ptwalk: ioremap_page_range Hugh Dickins
2005-03-09 22:10 ` [PATCH 7/15] ptwalk: remap_pfn_range Hugh Dickins
2005-03-09 22:11 ` [PATCH 8/15] ptwalk: zeromap_page_range Hugh Dickins
2005-03-09 22:12 ` [PATCH 9/15] ptwalk: unmap_page_range Hugh Dickins
2005-03-09 22:12 ` [PATCH 10/15] ptwalk: copy_page_range Hugh Dickins
2005-03-09 22:13 ` [PATCH 11/15] ptwalk: copy_pte_range hang Hugh Dickins
2005-03-09 23:25 ` Nick Piggin
2005-03-09 22:14 ` [PATCH 12/15] ptwalk: clear_page_range Hugh Dickins
2005-03-09 22:14 ` Hugh Dickins [this message]
2005-03-09 22:15 ` [PATCH 14/15] ptwalk: inline pmd_range and pud_range Hugh Dickins
2005-03-09 22:16 ` [PATCH 15/15] ptwalk: pud and pmd folded Hugh Dickins
2005-03-10 0:39 ` [PATCH 0/15] ptwalk: pagetable walker cleanup Benjamin Herrenschmidt
2005-03-10 1:02 ` David S. Miller
2005-03-10 1:08 ` Benjamin Herrenschmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.61.0503092214110.6070@goblin.wat.veritas.com \
--to=hugh@veritas.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®