Skip to contentSkip to conversation

compaction: fix COMPACTPAGEFAILED counting

PATCH RESEND In review Minchan Kim 3 participants 4 messages Sep 2, 2010 – Sep 5, 2010

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 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
index 9c26eec..5267861 100644
@@ -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
index a4cfcdc..2638079 100644
@@ -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
index f969da5..21243b2 100644
@@ -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
index 38e7cad..ed38c22 100644
@@ -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 · 1 line
1.7.0.5
maintainer
#1 lore raw
Quoted 11 lines · On Thu, 2 Sep 2010 23:34:47 +0900 Minchan Kim <[email protected]> wrote:

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().

Quoted 7 lines

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]

I'm having trouble predicting what the user-visible effects of this bug might be. Just an inaccuracy in the COMPACTPAGEFAILED vm event?

#2 lore raw
Quoted 18 lines · Andrew Morton
Quoted 15 lines · On Thu, 2 Sep 2010 23:34:47 +0900 Minchan Kim <[email protected]> wrote:

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

Quoted 6 lines
Quoted 3 lines

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]

I'm having trouble predicting what the user-visible effects of this bug might be. Just an inaccuracy in the COMPACTPAGEFAILED vm event?

Right, it's an accounting fix. Before patch COMPACTPAGEFAILED will remain 0 regardless of how many migration failures.

The patch does slightly add dependency for migrate_pages() to return error code properly. Before patch, migrate_pages() calls putback_lru_pages() regardless of the error code. After patch, the migrate_pages() callers will check its return value before calling putback_lru_pages().

In current code, the two conditions do seem to match:

"some pages remained in the *from list" == "migrate_pages() returns an error code".

Thanks,
Fengguang

--
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>

#3 lore raw
Quoted 35 lines · Wu Fengguang
Quoted 18 lines · Andrew Morton
Quoted 15 lines · On Thu,  2 Sep 2010 23:34:47 +0900 Minchan Kim <[email protected]> wrote:

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

Quoted 6 lines
Quoted 3 lines

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]

I'm having trouble predicting what the user-visible effects of this bug might be.  Just an inaccuracy in the COMPACTPAGEFAILED vm event?

Right, it's an accounting fix. Before patch COMPACTPAGEFAILED will remain 0 regardless of how many migration failures.

The patch does slightly add dependency for migrate_pages() to return error code properly. Before patch, migrate_pages() calls putback_lru_pages() regardless of the error code. After patch, the migrate_pages() callers will check its return value before calling putback_lru_pages().

Quoted 3 lines

In current code, the two conditions do seem to match:

"some pages remained in the *from list" == "migrate_pages() returns an error code".

Exactly.
Thanks for the answering instead of me, Wu. :)

Quoted 3 lines

Thanks,
Fengguang

Signature · 8 lines
Kind regards,
Minchan Kim

--
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>