The patch titled
page migration: replace radix_tree_lookup_slot with radix_tree_lockup
has been added to the -mm tree. Its filename is
page-migration-replace-radix_tree_lookup_slot-with-radix_tree_lockup.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: page migration: replace radix_tree_lookup_slot with radix_tree_lockup
From: Christoph Lameter <clameter@xxxxxxx>
The radix tree rcu code runs into trouble when we use radix_tree_lookup
slot and use the slot to update the page reference. Use radix_tree_lookup
instead and update the page reference via radix_tree_delete and
radix_tree_insert.
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Cc: Nick Piggin <nickpiggin@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/migrate.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff -puN mm/migrate.c~page-migration-replace-radix_tree_lookup_slot-with-radix_tree_lockup mm/migrate.c
--- a/mm/migrate.c~page-migration-replace-radix_tree_lookup_slot-with-radix_tree_lockup
+++ a/mm/migrate.c
@@ -294,7 +294,8 @@ out:
static int migrate_page_move_mapping(struct address_space *mapping,
struct page *newpage, struct page *page)
{
- struct page **radix_pointer;
+ struct page *current_page;
+ long index;
if (!mapping) {
/* Anonymous page */
@@ -305,12 +306,14 @@ static int migrate_page_move_mapping(str
write_lock_irq(&mapping->tree_lock);
- radix_pointer = (struct page **)radix_tree_lookup_slot(
+ index = page_index(page);
+
+ current_page = (struct page *)radix_tree_lookup(
&mapping->page_tree,
- page_index(page));
+ index);
if (page_count(page) != 2 + !!PagePrivate(page) ||
- radix_tree_deref_slot(radix_pointer) != page) {
+ current_page != page) {
write_unlock_irq(&mapping->tree_lock);
return -EAGAIN;
}
@@ -326,7 +329,8 @@ static int migrate_page_move_mapping(str
}
#endif
- radix_tree_replace_slot(radix_pointer, newpage);
+ radix_tree_delete(&mapping->page_tree, index);
+ radix_tree_insert(&mapping->page_tree, index, newpage);
__put_page(page);
write_unlock_irq(&mapping->tree_lock);
_
Patches currently in -mm which might be from clameter@xxxxxxx are
page-migration-replace-radix_tree_lookup_slot-with-radix_tree_lockup.patch
reduce-max_nr_zones-remove-two-strange-uses-of-max_nr_zones.patch
reduce-max_nr_zones-fix-max_nr_zones-array-initializations.patch
reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem.patch
reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem-tidy.patch
reduce-max_nr_zones-move-highmem-counters-into-highmemc-h.patch
reduce-max_nr_zones-move-highmem-counters-into-highmemc-h-fix.patch
reduce-max_nr_zones-page-allocator-zone_highmem-cleanup.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-cleanup.patch
reduce-max_nr_zones-make-zone_dma32-optional.patch
reduce-max_nr_zones-make-zone_highmem-optional.patch
reduce-max_nr_zones-make-zone_highmem-optional-fix.patch
reduce-max_nr_zones-make-zone_highmem-optional-fix-fix.patch
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones.patch
reduce-max_nr_zones-fix-i386-srat-check-for-max_nr_zones.patch
mempolicies-fix-policy_zone-check.patch
apply-type-enum-zone_type.patch
apply-type-enum-zone_type-fix.patch
linearly-index-zone-node_zonelists.patch
slab-respect-architecture-and-caller-mandated-alignment.patch
slab-optimize-kmalloc_node-the-same-way-as-kmalloc.patch
slab-optimize-kmalloc_node-the-same-way-as-kmalloc-fix.patch
x86-implement-always-locked-bit-ops-for-memory-shared-with-an-smp-hypervisor.patch
reduce-max_nr_zones-swap_prefetch-remove-incorrect-use-of-zone_highmem.patch
readahead-state-based-method-aging-accounting-apply-type-enum-zone_type-readahead.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
