lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] mm: msync_pte_range progress

Browse Source 
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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Hugh Dickins
2005-10-29 18:15:53 -07:00
committed by Linus Torvalds
parent e040f218bb
commit 0c942a4539
1 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mm/msync.c
View File

@@ -26,12 +26,21 @@ static void msync_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
unsigned long addr, unsigned long end) unsigned long addr, unsigned long end)
{ {
pte_t *pte; pte_t *pte;
int progress = 0;
again:
pte = pte_offset_map(pmd, addr); pte = pte_offset_map(pmd, addr);
do { do {
unsigned long pfn; unsigned long pfn;
struct page *page; 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)) if (!pte_present(*pte))
continue; continue;
if (!pte_maybe_dirty(*pte)) if (!pte_maybe_dirty(*pte))
@@ -46,8 +55,12 @@ static void msync_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
if (ptep_clear_flush_dirty(vma, addr, pte) || if (ptep_clear_flush_dirty(vma, addr, pte) ||
page_test_and_clear_dirty(page)) page_test_and_clear_dirty(page))
set_page_dirty(page); set_page_dirty(page);
progress += 3;
} while (pte++, addr += PAGE_SIZE, addr != end); } while (pte++, addr += PAGE_SIZE, addr != end);
pte_unmap(pte - 1); 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, 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_area_struct *vma,
spin_unlock(&mm->page_table_lock); 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. * MS_SYNC syncs the entire file - including mappings.
* *
@@ -150,7 +140,7 @@ static int msync_interval(struct vm_area_struct *vma,
return -EBUSY; return -EBUSY;
if (file && (vma->vm_flags & VM_SHARED)) { if (file && (vma->vm_flags & VM_SHARED)) {
filemap_msync(vma, addr, end); msync_page_range(vma, addr, end);
if (flags & MS_SYNC) { if (flags & MS_SYNC) {
struct address_space *mapping = file->f_mapping; struct address_space *mapping = file->f_mapping;