compaction: fix COMPACTPAGEFAILED counting
Subsystems (5)
PATCH v2 1/1 compaction: fix COMPACTPAGEFAILED counting
Now update_nr_listpages doesn't have a role. That's because lists passed is always empty just after calling migrate_pages. The migrate_pages cleans up page list which have failed to migrate before returning by aaa994b3.
[PATCH] page migration: handle freeing of pages in migrate_pages()
Do not leave pages on the lists passed to migrate_pages(). Seems that we will not need any postprocessing of pages. This will simplify the handling of pages by the callers of migrate_pages().
At that time, we thought we don't need any postprocessing of pages. But the situation is changed. The compaction need to know the number of failed to migrate for COMPACTPAGEFAILED stat
This patch makes new rule for caller of migrate_pages to call putback_lru_pages. So caller need to clean up the lists so it has a chance to postprocess the pages. [suggested by Christoph Lameter]
--- mm/memory-failure.c | 1 + mm/memory_hotplug.c | 2 ++ mm/mempolicy.c | 10 ++++++++-- mm/migrate.c | 12 +++++++----- 4 files changed, 18 insertions(+), 7 deletions(-)
mm/memory-failure.c +1 -0
@@ -1339,6 +1339,7 @@ int soft_offline_page(struct page *page, int flags)list_add (&page->lru, &pagelist); ret =migrate_pages (&pagelist, new_page,MPOL_MF_MOVE_ALL ,0 );if (ret) { +putback_lru_pages (&pagelist);pr_debug ("soft offline: %#lx: migration failed %d, type %lx\n" , pfn, ret, page->flags);if (ret >0 )
mm/memory_hotplug.c +2 -0
@@ -731,6 +731,8 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) goto out;/* this function returns # of failed pages */ ret =migrate_pages (&source, hotremove_migrate_alloc,0 ,1 ); +if (ret) +putback_lru_pages (&source); out:return ret;
mm/mempolicy.c +8 -2
@@ -931,8 +931,11 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest,check_range (mm, mm->mmap->vm_start, mm->task_size, &nmask, flags |MPOL_MF_DISCONTIG_OK , &pagelist); -if (!list_empty (&pagelist)) +if (!list_empty (&pagelist)) { err =migrate_pages (&pagelist, new_node_page, dest,0 ); +if (err) +putback_lru_pages (&pagelist); + }return err; }
@@ -1147,9 +1150,12 @@ static long do_mbind(unsigned long start, unsigned long len, err =mbind_range (mm, start, end, new); -if (!list_empty (&pagelist)) +if (!list_empty (&pagelist)) { nr_failed =migrate_pages (&pagelist, new_vma_page, (unsigned long )vma,0 ); +if (nr_failed) +putback_lru_pages (&pagelist); + }if (!err && nr_failed && (flags &MPOL_MF_STRICT )) err = -EIO ;
mm/migrate.c +7 -5
@@ -732,8 +732,9 @@ move_newpage:* * The function returns after 10 attempts or if no pages * are movable anymore because to has become empty -* or no retryable pages exist anymore. All pages will be -* returned to the LRU or freed. +* or no retryable pages exist anymore. +* Caller should call putback_lru_pages to return pages to the LRU +* or free list. * * Return: Number of pages not migrated or error code. */
@@ -780,8 +781,6 @@ out:if (!swapwrite) current->flags &= ~PF_SWAPWRITE ; -putback_lru_pages (from); -if (rc)return rc;
@@ -890,9 +889,12 @@ set_status: } err =0 ; -if (!list_empty (&pagelist)) +if (!list_empty (&pagelist)) { err =migrate_pages (&pagelist, new_page_node, (unsigned long )pm,0 ); +if (err) +putback_lru_pages (&pagelist); + }up_read (&mm->mmap_sem);return err;
Signature · 7 lines
1.7.0.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>