lkml.org 
[lkml]   [2005]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 03/21] mm: msync_pte_range progress
Use latency breaking in msync_pte_range like that in copy_pte_range,
instead of the ugly CONFIG_PREEMPT filemap_msync alternatives.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
---

mm/msync.c | 38 ++++++++++++++------------------------
1 files changed, 14 insertions(+), 24 deletions(-)

--- mm02/mm/msync.c 2005-09-24 16:59:50.000000000 +0100
+++ mm03/mm/msync.c 2005-09-24 19:26:52.000000000 +0100
@@ -26,12 +26,21 @@ static void msync_pte_range(struct vm_ar
unsigned long addr, unsigned long end)
{
pte_t *pte;
+ int progress = 0;

+again:
pte = pte_offset_map(pmd, addr);
do {
unsigned long pfn;
struct page *page;

+ if (progress >= 64) {
+ progress = 0;
+ if (need_resched() ||
+ need_lockbreak(&vma->vm_mm->page_table_lock))
+ break;
+ }
+ progress++;
if (!pte_present(*pte))
continue;
if (!pte_maybe_dirty(*pte))
@@ -46,8 +55,12 @@ static void msync_pte_range(struct vm_ar
if (ptep_clear_flush_dirty(vma, addr, pte) ||
page_test_and_clear_dirty(page))
set_page_dirty(page);
+ progress += 3;
} while (pte++, addr += PAGE_SIZE, addr != end);
pte_unmap(pte - 1);
+ cond_resched_lock(&vma->vm_mm->page_table_lock);
+ if (addr != end)
+ goto again;
}

static inline void msync_pmd_range(struct vm_area_struct *vma, pud_t *pud,
@@ -106,29 +119,6 @@ static void msync_page_range(struct vm_a
spin_unlock(&mm->page_table_lock);
}

-#ifdef CONFIG_PREEMPT
-static inline void filemap_msync(struct vm_area_struct *vma,
- unsigned long addr, unsigned long end)
-{
- const size_t chunk = 64 * 1024; /* bytes */
- unsigned long next;
-
- do {
- next = addr + chunk;
- if (next > end || next < addr)
- next = end;
- msync_page_range(vma, addr, next);
- cond_resched();
- } while (addr = next, addr != end);
-}
-#else
-static inline void filemap_msync(struct vm_area_struct *vma,
- unsigned long addr, unsigned long end)
-{
- msync_page_range(vma, addr, end);
-}
-#endif
-
/*
* MS_SYNC syncs the entire file - including mappings.
*
@@ -150,7 +140,7 @@ static int msync_interval(struct vm_area
return -EBUSY;

if (file && (vma->vm_flags & VM_SHARED)) {
- filemap_msync(vma, addr, end);
+ msync_page_range(vma, addr, end);

if (flags & MS_SYNC) {
struct address_space *mapping = file->f_mapping;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-09-25 17:51    [W:0.193 / U:0.120 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site