[PATCH 3/3] Fix unsuitable behavior for poisoned tail pages of THP.

* [PATCH 3/3] Fix unsuitable behavior for poisoned tail pages of THP.
@ 2011-01-25  5:46 Jin Dongming
  2011-01-25 22:46 ` Andrea Arcangeli
  0 siblings, 1 reply; 3+ messages in thread
From: Jin Dongming @ 2011-01-25  5:46 UTC (permalink / raw)
  To: Andi Kleen, Andrea Arcangeli
  Cc: AKPM　, Hidetoshi Seto, Huang Ying, LKLM

When a tail page of THP is poisoned, memory-failure will do
nothing except setting poison flag, while the expected behavior is
that the process, who is using the poisoned tail page, should be
killed.

The above problem is caused by lru checking of the poisoned tail page
of THP. Because PG_lru flag is only set on the head page of
THP, the check always consider the poisoned tail page as NON
lru page.

So avoid checking NON lru for THP, as like as hugetlb.

Signed-off-by: Jin Dongming <jin.dongming@np.css.fujitsu.com>
Reviewed-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
---
 mm/memory-failure.c |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 5396603..44a1bdf 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1046,19 +1046,22 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
 	 * The check (unnecessarily) ignores LRU pages being isolated and
 	 * walked by the page reclaim code, however that's not a big loss.
 	 */
-	if (!PageLRU(p) && !PageHuge(p))
-		shake_page(p, 0);
-	if (!PageLRU(p) && !PageHuge(p)) {
-		/*
-		 * shake_page could have turned it free.
-		 */
-		if (is_free_buddy_page(p)) {
-			action_result(pfn, "free buddy, 2nd try", DELAYED);
-			return 0;
+	if (!PageCompound(p)) {
+		if (!PageLRU(p))
+			shake_page(p, 0);
+		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);
+			put_page(p);
+			return -EBUSY;
 		}
-		action_result(pfn, "non LRU", IGNORED);
-		put_page(p);
-		return -EBUSY;
 	}
 
 	/*
-- 
1.7.2.2



^ permalink raw reply related	[flat|nested] 3+ messages in thread