path: root/mm
diff options
authorAndi Kleen <andi@firstfloor.org>2009-12-16 12:20:00 +0100
committerAndi Kleen <ak@linux.intel.com>2009-12-16 12:20:00 +0100
commit0474a60ec704324577782b1057d05b574388d552 (patch)
tree75c574fe9a64332aeed6c636bf6bd9e6485d1603 /mm
parentfe194d3e100dea323d7b2de96d3b44d0c067ba7a (diff)
HWPOISON: Use new shake_page in memory_failure
shake_page handles more types of page caches than the much simpler lru_add_drain_all: - slab (quite inefficiently for now) - any other caches with a shrinker callback - per cpu page allocator pages - per CPU LRU Use this call to try to turn pages into free or LRU pages. Then handle the case of the page becoming free after drain everything. Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'mm')
1 files changed, 8 insertions, 1 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 2d5f1223bf4..ded1d387b4c 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -936,8 +936,15 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
* walked by the page reclaim code, however that's not a big loss.
if (!PageLRU(p))
- lru_add_drain_all();
+ shake_page(p);
if (!PageLRU(p)) {
+ /*
+ * shake_page could have turned it free.
+ */
+ if (is_free_buddy_page(p)) {
+ action_result(pfn, "free buddy, 2nd try", DELAYED);
+ return 0;
+ }
action_result(pfn, "non LRU", IGNORED);
return -EBUSY;