HWPOISON: limit hwpoison injector to known page types

__memory_failure()'s workflow is

	set PG_hwpoison
	//...
	unset PG_hwpoison if didn't pass hwpoison filter

That could kill unrelated process if it happens to page fault on the
page with the (temporary) PG_hwpoison. The race should be big enough to
appear in stress tests.

Fix it by grabbing the page and checking filter at inject time.  This
also avoids the very noisy "Injecting memory failure..." messages.

- we don't touch madvise() based injection, because the filters are
  generally not necessary for it.
- if we want to apply the filters to h/w aided injection, we'd better to
  rearrange the logic in __memory_failure() instead of this patch.

AK: fix documentation, use drain all, cleanups

CC: Haicheng Li <haicheng.li@intel.com>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>

diff --git a/Documentation/vm/hwpoison.txt b/Documentation/vm/hwpoison.txt
index fdf580464324de4c7b297280c28a610b7f0e50ef..4ef7bb30d15c86a68b5130fa7b0567a0ac17fd69 100644 (file)
--- a/Documentation/vm/hwpoison.txt
+++ b/Documentation/vm/hwpoison.txt
@@ -103,7 +103,8 @@ hwpoison-inject module through debugfs
 
 corrupt-pfn
 
-Inject hwpoison fault at PFN echoed into this file.
+Inject hwpoison fault at PFN echoed into this file. This does
+some early filtering to avoid corrupted unintended pages in test suites.
 
 unpoison-pfn
 

diff --git a/mm/hwpoison-inject.c b/mm/hwpoison-inject.c
index ac692a9b766c87cf6d8b8ccbf3cd295ed0c48ccd..2b6b3200fa65fd5a4b154d4b9717e1d459905e02 100644 (file)
--- a/mm/hwpoison-inject.c
+++ b/mm/hwpoison-inject.c
@@ -3,16 +3,53 @@
 #include <linux/debugfs.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/swap.h>
+#include <linux/pagemap.h>
 #include "internal.h"
 
 static struct dentry *hwpoison_dir;
 
 static int hwpoison_inject(void *data, u64 val)
 {
+       unsigned long pfn = val;
+       struct page *p;
+       int err;
+
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
-       printk(KERN_INFO "Injecting memory failure at pfn %Lx\n", val);
-       return __memory_failure(val, 18, 0);
+
+       if (!pfn_valid(pfn))
+               return -ENXIO;
+
+       p = pfn_to_page(pfn);
+       /*
+        * This implies unable to support free buddy pages.
+        */
+       if (!get_page_unless_zero(p))
+               return 0;
+
+       if (!PageLRU(p))
+               shake_page(p);
+       /*
+        * This implies unable to support non-LRU pages.
+        */
+       if (!PageLRU(p))
+               return 0;
+
+       /*
+        * do a racy check with elevated page count, to make sure PG_hwpoison
+        * will only be set for the targeted owner (or on a free page).
+        * We temporarily take page lock for try_get_mem_cgroup_from_page().
+        * __memory_failure() will redo the check reliably inside page lock.
+        */
+       lock_page(p);
+       err = hwpoison_filter(p);
+       unlock_page(p);
+       if (err)
+               return 0;
+
+       printk(KERN_INFO "Injecting memory failure at pfn %lx\n", pfn);
+       return __memory_failure(pfn, 18, MF_COUNT_INCREASED);
 }
 
 static int hwpoison_unpoison(void *data, u64 val)

diff --git a/mm/internal.h b/mm/internal.h
index 814da335f050da4faca46e15c193f36a484722ce..04bbce8b8ba61d5f9c7e34c39630a514c0fd9514 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -251,5 +251,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
 #define ZONE_RECLAIM_SUCCESS   1
 #endif
 
+extern int hwpoison_filter(struct page *p);
+
 extern u32 hwpoison_filter_dev_major;
 extern u32 hwpoison_filter_dev_minor;