The patch titled
Subject: HWPOISON: soft offlining for non-lru movable pages
has been removed from the -mm tree. Its filename was
hwpoison-soft-offlining-for-non-lru-movable-page.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Yisheng Xie <xieyisheng1@xxxxxxxxxx>
Subject: HWPOISON: soft offlining for non-lru movable pages
Extend the soft offlining framework to support non-lru page, which already
support migration after commit bda807d44454 ("mm: migrate: support non-lru
movable page migration")
When memory correction errors occur on a non-lru movable page, we can
choose to stop using it by migrating data onto another page and disable
the original (maybe half-broken) one.
Link: http://lkml.kernel.org/r/1485183010-9276-1-git-send-email-ysxie@xxxxxxxxxxx
Signed-off-by: Yisheng Xie <xieyisheng1@xxxxxxxxxx>
Suggested-by: Michal Hocko <mhocko@xxxxxxxxxx>
Suggested-by: Minchan Kim <minchan@xxxxxxxxxx>
Acked-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Reviewed-by: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/migrate.h | 5 ++++-
mm/memory-failure.c | 26 ++++++++++++++++----------
2 files changed, 20 insertions(+), 11 deletions(-)
diff -puN mm/memory-failure.c~hwpoison-soft-offlining-for-non-lru-movable-page mm/memory-failure.c
--- a/mm/memory-failure.c~hwpoison-soft-offlining-for-non-lru-movable-page
+++ a/mm/memory-failure.c
@@ -1527,7 +1527,8 @@ static int get_any_page(struct page *pag
{
int ret = __get_any_page(page, pfn, flags);
- if (ret == 1 && !PageHuge(page) && !PageLRU(page)) {
+ if (ret == 1 && !PageHuge(page) &&
+ !PageLRU(page) && !__PageMovable(page)) {
/*
* Try to free it.
*/
@@ -1649,7 +1650,10 @@ static int __soft_offline_page(struct pa
* Try to migrate to a new page instead. migrate.c
* handles a large number of cases for us.
*/
- ret = isolate_lru_page(page);
+ if (PageLRU(page))
+ ret = isolate_lru_page(page);
+ else if (!isolate_movable_page(page, ISOLATE_UNEVICTABLE))
+ ret = -EBUSY;
/*
* Drop page reference which is came from get_any_page()
* successful isolate_lru_page() already took another one.
@@ -1657,18 +1661,20 @@ static int __soft_offline_page(struct pa
put_hwpoison_page(page);
if (!ret) {
LIST_HEAD(pagelist);
- inc_node_page_state(page, NR_ISOLATED_ANON +
- page_is_file_cache(page));
+ /*
+ * After isolated lru page, the PageLRU will be cleared,
+ * so use !__PageMovable instead for LRU page's mapping
+ * cannot have PAGE_MAPPING_MOVABLE.
+ */
+ if (!__PageMovable(page))
+ inc_node_page_state(page, NR_ISOLATED_ANON +
+ page_is_file_cache(page));
list_add(&page->lru, &pagelist);
ret = migrate_pages(&pagelist, new_page, NULL, MPOL_MF_MOVE_ALL,
MIGRATE_SYNC, MR_MEMORY_FAILURE);
if (ret) {
- if (!list_empty(&pagelist)) {
- list_del(&page->lru);
- dec_node_page_state(page, NR_ISOLATED_ANON +
- page_is_file_cache(page));
- putback_lru_page(page);
- }
+ if (!list_empty(&pagelist))
+ putback_movable_pages(&pagelist);
pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
pfn, ret, page->flags);
diff -puN include/linux/migrate.h~hwpoison-soft-offlining-for-non-lru-movable-page include/linux/migrate.h
--- a/include/linux/migrate.h~hwpoison-soft-offlining-for-non-lru-movable-page
+++ a/include/linux/migrate.h
@@ -10,7 +10,7 @@ typedef struct page *new_page_t(struct p
typedef void free_page_t(struct page *page, unsigned long private);
/*
- * Return values from addresss_space_operations.migratepage():
+ * Return values from address_space_operations.migratepage():
* - negative errno on page migration failure;
* - zero on page migration success;
*/
@@ -57,6 +57,9 @@ static inline int migrate_pages(struct l
int reason)
{ return -ENOSYS; }
+static inline bool isolate_movable_page(struct page *page, isolate_mode_t mode)
+ { return false; }
+
static inline int migrate_prep(void) { return -ENOSYS; }
static inline int migrate_prep_local(void) { return -ENOSYS; }
_
Patches currently in -mm which might be from xieyisheng1@xxxxxxxxxx are
--
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
