Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755858AbbDOH15 (ORCPT ); Wed, 15 Apr 2015 03:27:57 -0400 Received: from TYO202.gate.nec.co.jp ([210.143.35.52]:63496 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752508AbbDOH1t convert rfc822-to-8bit (ORCPT ); Wed, 15 Apr 2015 03:27:49 -0400 From: Naoya Horiguchi To: Andrew Morton CC: Dean Nelson , Andi Kleen , "Andrea Arcangeli" , Hidetoshi Seto , Jin Dongming , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH] mm/memory-failure: call shake_page() when error hits thp tail page Thread-Topic: [PATCH] mm/memory-failure: call shake_page() when error hits thp tail page Thread-Index: AQHQd01kNhXr1ZPoXUmV1B+zcmh3Tg== Date: Wed, 15 Apr 2015 07:25:46 +0000 Message-ID: <1429082714-26115-1-git-send-email-n-horiguchi@ah.jp.nec.com> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.128.101.13] Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1847 Lines: 45 Currently memory_failure() calls shake_page() to sweep pages out from pcplists only when the victim page is 4kB LRU page or thp head page. But we should do this for a thp tail page too. Consider that a memory error hits a thp tail page whose head page is on a pcplist when memory_failure() runs. Then, the current kernel skips shake_pages() part, so hwpoison_user_mappings() returns without calling split_huge_page() nor try_to_unmap() because PageLRU of the thp head is still cleared due to the skip of shake_page(). As a result, me_huge_page() runs for the thp, which is a broken behavior. This patch fixes this problem by calling shake_page() for thp tail case. Fixes: 385de35722c9 ("thp: allow a hwpoisoned head page to be put back to LRU") Signed-off-by: Naoya Horiguchi Cc: stable@vger.kernel.org # v3.4+ --- mm/memory-failure.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git v4.0.orig/mm/memory-failure.c v4.0/mm/memory-failure.c index d487f8dc6d39..2cc1d578144b 100644 --- v4.0.orig/mm/memory-failure.c +++ v4.0/mm/memory-failure.c @@ -1141,10 +1141,10 @@ 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 (!PageHuge(p) && !PageTransTail(p)) { - if (!PageLRU(p)) - shake_page(p, 0); - if (!PageLRU(p)) { + if (!PageHuge(p)) { + if (!PageLRU(hpage)) + shake_page(hpage, 0); + if (!PageLRU(hpage)) { /* * shake_page could have turned it free. */ -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/