The patch titled
page migration: Fix up remove_migration_ptes()
has been added to the -mm tree. Its filename is
more-page-migration-use-migration-entries-for-file-pages-remove_migration_ptes.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Christoph Lameter <clameter@xxxxxxx>
Add the update_mmu/lazy_mmu_update() calls that most arches need and that IA64
needs for executable pages.
Also move the call to page_address_in_vma into remove_migrate_pte() and check
for the possible -EFAULT return code.
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/migrate.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff -puN mm/migrate.c~more-page-migration-use-migration-entries-for-file-pages-remove_migration_ptes mm/migrate.c
--- devel/mm/migrate.c~more-page-migration-use-migration-entries-for-file-pages-remove_migration_ptes 2006-05-11 00:03:58.000000000 -0700
+++ devel-akpm/mm/migrate.c 2006-05-11 00:03:58.000000000 -0700
@@ -123,7 +123,7 @@ static inline int is_swap_pte(pte_t pte)
/*
* Restore a potential migration pte to a working pte entry
*/
-static void remove_migration_pte(struct vm_area_struct *vma, unsigned long addr,
+static void remove_migration_pte(struct vm_area_struct *vma,
struct page *old, struct page *new)
{
struct mm_struct *mm = vma->vm_mm;
@@ -133,6 +133,10 @@ static void remove_migration_pte(struct
pmd_t *pmd;
pte_t *ptep, pte;
spinlock_t *ptl;
+ unsigned long addr = page_address_in_vma(new, vma);
+
+ if (addr == -EFAULT)
+ return;
pgd = pgd_offset(mm, addr);
if (!pgd_present(*pgd))
@@ -175,6 +179,10 @@ static void remove_migration_pte(struct
else
page_add_file_rmap(new);
+ /* No need to invalidate - it was non-present before */
+ update_mmu_cache(vma, addr, pte);
+ lazy_mmu_prot_update(pte);
+
out:
pte_unmap_unlock(ptep, ptl);
}
@@ -196,7 +204,7 @@ static void remove_file_migration_ptes(s
spin_lock(&mapping->i_mmap_lock);
vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff)
- remove_migration_pte(vma, page_address_in_vma(new, vma), old, new);
+ remove_migration_pte(vma, old, new);
spin_unlock(&mapping->i_mmap_lock);
}
@@ -223,8 +231,7 @@ static void remove_anon_migration_ptes(s
spin_lock(&anon_vma->lock);
list_for_each_entry(vma, &anon_vma->head, anon_vma_node)
- remove_migration_pte(vma, page_address_in_vma(new, vma),
- old, new);
+ remove_migration_pte(vma, old, new);
spin_unlock(&anon_vma->lock);
}
_
Patches currently in -mm which might be from clameter@xxxxxxx are
origin.patch
page-migration-make-do_swap_page-redo-the-fault.patch
slab-extract-cache_free_alien-from-__cache_free.patch
migration-remove-unnecessary-pageswapcache-checks.patch
page-migration-cleanup-rename-ignrefs-to-migration.patch
page-migration-cleanup-group-functions.patch
page-migration-cleanup-remove-useless-definitions.patch
page-migration-cleanup-drop-nr_refs-in-remove_references.patch
page-migration-cleanup-extract-try_to_unmap-from-migration-functions.patch
page-migration-cleanup-extract-try_to_unmap-from-migration-functions-update-comments-7.patch
page-migration-cleanup-pass-mapping-to-migration-functions.patch
page-migration-cleanup-move-fallback-handling-into-special-function.patch
page-migration-cleanup-move-fallback-handling-into-special-function-update-comments-9.patch
swapless-pm-add-r-w-migration-entries.patch
swapless-pm-add-r-w-migration-entries-ifdefs.patch
swapless-pm-add-r-w-migration-entries-update-comments.patch
swapless-pm-add-r-w-migration-entries-update-comments-4.patch
swapless-pm-add-r-w-migration-entries-update-comments-6.patch
swapless-page-migration-rip-out-swap-based-logic.patch
swapless-page-migration-modify-core-logic.patch
swapless-page-migration-modify-core-logic-remove-useless-mapping-checks.patch
more-page-migration-do-not-inc-dec-rss-counters.patch
more-page-migration-use-migration-entries-for-file-pages.patch
more-page-migration-use-migration-entries-for-file-pages-fix.patch
more-page-migration-use-migration-entries-for-file-pages-update-comments-5.patch
more-page-migration-use-migration-entries-for-file-pages-update-comments-8.patch
more-page-migration-use-migration-entries-for-file-pages-remove_migration_ptes.patch
page-migration-update-documentation.patch
page-migration-replace-call-to-pageout-with-writepage.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
