Avoid putting a bad page back on the LRU

Index: linux-next/mm/migrate.c
===================================================================
@@ -72,6 +72,7 @@ int putback_lru_pages(struct list_head *
 	}
 	return count;
 }
+EXPORT_SYMBOL(isolate_lru_page);
 
 /*
  * Restore a potential migration pte to a working pte entry

@@ -139,6 +140,7 @@ static void remove_migration_pte(struct 
 out:
 	pte_unmap_unlock(ptep, ptl);
 }
+EXPORT_SYMBOL(migrate_prep);
 
 /*
  * Note that remove_file_migration_ptes will only work on regular mappings,

@@ -161,6 +163,7 @@ static void remove_file_migration_ptes(s
 
 	spin_unlock(&mapping->i_mmap_lock);
 }
+EXPORT_SYMBOL(putback_lru_pages);
 
 /*
  * Must hold mmap_sem lock on at least one of the vmas containing

@@ -693,6 +696,26 @@ unlock:
  		 * restored.
  		 */
  		list_del(&page->lru);
+#ifdef CONFIG_MEMORY_FAILURE
+		if (PagePoison(page)) {
+			if (rc == 0)
+				/*
+				 * A page with a memory error that has
+				 * been migrated will not be moved to
+				 * the LRU.
+				 */
+				goto move_newpage;
+			else
+				/*
+				 * The page failed to migrate and will not
+				 * be added to the bad page list.  Clearing
+				 * the error bit will allow another attempt
+				 * to migrate if it gets another correctable
+				 * error.
+				 */
+				ClearPagePoison(page);
+		}
+#endif
 		putback_lru_page(page);
 	}
 

@@ -736,7 +759,7 @@ int migrate_pages(struct list_head *from
 	struct page *page;
 	struct page *page2;
 	int swapwrite = current->flags & PF_SWAPWRITE;
-	int rc;
+	int rc = 0;
 
 	if (!swapwrite)
 		current->flags |= PF_SWAPWRITE;

@@ -765,6 +788,19 @@ int migrate_pages(struct list_head *from
 			}
 		}
 	}
+
+#ifdef CONFIG_MEMORY_FAILURE
+	if (rc != 0)
+		list_for_each_entry_safe(page, page2, from, lru)
+			if (PagePoison(page))
+				/*
+				 * The page failed to migrate.  Clearing
+				 * the error bit will allow another attempt
+				 * to migrate if it gets another correctable
+				 * error.
+				 */
+				ClearPagePoison(page);
+#endif
 	rc = 0;
 out:
 	if (!swapwrite)

@@ -777,6 +813,7 @@ out:
 
 	return nr_failed + retry;
 }
+EXPORT_SYMBOL(migrate_pages);
 
 #ifdef CONFIG_NUMA
 /*

Index: linux-next/include/linux/page-flags.h
===================================================================
@@ -169,15 +169,21 @@ static inline int TestSetPage##uname(str
 static inline int TestClearPage##uname(struct page *page)		\
 		{ return test_and_clear_bit(PG_##lname, &page->flags); }
 
+#define PAGEFLAGMASK(uname, lname)					\
+static inline int PAGEMASK_##uname(void)				\
+		{ return (1 << PG_##lname); }
 
 #define PAGEFLAG(uname, lname) TESTPAGEFLAG(uname, lname)		\
-	SETPAGEFLAG(uname, lname) CLEARPAGEFLAG(uname, lname)
+	SETPAGEFLAG(uname, lname) CLEARPAGEFLAG(uname, lname)		\
+	PAGEFLAGMASK(uname, lname)
 
 #define __PAGEFLAG(uname, lname) TESTPAGEFLAG(uname, lname)		\
 	__SETPAGEFLAG(uname, lname)  __CLEARPAGEFLAG(uname, lname)
 
 #define PAGEFLAG_FALSE(uname) 						\
 static inline int Page##uname(struct page *page) 			\
+			{ return 0; }					\
+static inline int PAGEMASK_##uname(void)				\
 			{ return 0; }
 
 #define TESTSCFLAG(uname, lname)					\