path: root/mm/hwpoison-inject.c
diff options
authorNaoya Horiguchi <>2017-05-03 14:56:19 -0700
committerLinus Torvalds <>2017-05-03 15:52:12 -0700
commit8bcb74de764aaa261d6af3ce5ac723e435f00ff4 (patch)
tree614316758c5c70378ce2fcf40d3c40b2c5d871a9 /mm/hwpoison-inject.c
parent0ccfece6ed507738c0e7e4414c3688b78d4e3756 (diff)
mm: hwpoison: call shake_page() unconditionally
shake_page() is called before going into core error handling code in order to ensure that the error page is flushed from lru_cache lists where pages stay during transferring among LRU lists. But currently it's not fully functional because when the page is linked to lru_cache by calling activate_page(), its PageLRU flag is set and shake_page() is skipped. The result is to fail error handling with "still referenced by 1 users" message. When the page is linked to lru_cache by isolate_lru_page(), its PageLRU is clear, so that's fine. This patch makes shake_page() unconditionally called to avoild the failure. Fixes: 23a003bfd23ea9ea0b7756b920e51f64b284b468 ("mm/madvise: pass return code of memory_failure() to userspace") Link: Link: Signed-off-by: Naoya Horiguchi <> Reported-by: kernel test robot <> Cc: Xiaolong Ye <> Cc: Chen Gong <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'mm/hwpoison-inject.c')
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/hwpoison-inject.c b/mm/hwpoison-inject.c
index 9d26fd9fefe4..356df057a2a8 100644
--- a/mm/hwpoison-inject.c
+++ b/mm/hwpoison-inject.c
@@ -34,8 +34,7 @@ static int hwpoison_inject(void *data, u64 val)
if (!hwpoison_filter_enable)
goto inject;
- if (!PageLRU(hpage) && !PageHuge(p))
- shake_page(hpage, 0);
+ shake_page(hpage, 0);
* This implies unable to support non-LRU pages.