From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f51.google.com (mail-pa0-f51.google.com [209.85.220.51]) by kanga.kvack.org (Postfix) with ESMTP id F01F66B025C for ; Thu, 3 Mar 2016 02:42:29 -0500 (EST) Received: by mail-pa0-f51.google.com with SMTP id fy10so10118569pac.1 for ; Wed, 02 Mar 2016 23:42:29 -0800 (PST) Received: from mail-pa0-x230.google.com (mail-pa0-x230.google.com. [2607:f8b0:400e:c03::230]) by mx.google.com with ESMTPS id fg16si303945pac.217.2016.03.02.23.42.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Mar 2016 23:42:29 -0800 (PST) Received: by mail-pa0-x230.google.com with SMTP id bj10so10185772pad.2 for ; Wed, 02 Mar 2016 23:42:29 -0800 (PST) From: Naoya Horiguchi Subject: [PATCH v1 08/11] mm: hwpoison: soft offline supports thp migration Date: Thu, 3 Mar 2016 16:41:55 +0900 Message-Id: <1456990918-30906-9-git-send-email-n-horiguchi@ah.jp.nec.com> In-Reply-To: <1456990918-30906-1-git-send-email-n-horiguchi@ah.jp.nec.com> References: <1456990918-30906-1-git-send-email-n-horiguchi@ah.jp.nec.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org Cc: "Kirill A. Shutemov" , Hugh Dickins , Andrew Morton , Dave Hansen , Andrea Arcangeli , Mel Gorman , Michal Hocko , Vlastimil Babka , Pavel Emelyanov , linux-kernel@vger.kernel.org, Naoya Horiguchi , Naoya Horiguchi This patch enables thp migration for soft offline. Signed-off-by: Naoya Horiguchi --- mm/memory-failure.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git v4.5-rc5-mmotm-2016-02-24-16-18/mm/memory-failure.c v4.5-rc5-mmotm-2016-02-24-16-18_patched/mm/memory-failure.c index bfb63c6..9099e78 100644 --- v4.5-rc5-mmotm-2016-02-24-16-18/mm/memory-failure.c +++ v4.5-rc5-mmotm-2016-02-24-16-18_patched/mm/memory-failure.c @@ -1490,7 +1490,17 @@ static struct page *new_page(struct page *p, unsigned long private, int **x) if (PageHuge(p)) return alloc_huge_page_node(page_hstate(compound_head(p)), nid); - else + else if (thp_migration_supported() && PageTransHuge(p)) { + struct page *thp; + + thp = alloc_pages_node(nid, + (GFP_TRANSHUGE | __GFP_THISNODE) & ~__GFP_RECLAIM, + HPAGE_PMD_ORDER); + if (!thp) + return NULL; + prep_transhuge_page(thp); + return thp; + } else return __alloc_pages_node(nid, GFP_HIGHUSER_MOVABLE, 0); } @@ -1693,28 +1703,11 @@ static int __soft_offline_page(struct page *page, int flags) static int soft_offline_in_use_page(struct page *page, int flags) { int ret; - struct page *hpage = compound_head(page); - - if (!PageHuge(page) && PageTransHuge(hpage)) { - lock_page(hpage); - if (!PageAnon(hpage) || unlikely(split_huge_page(hpage))) { - unlock_page(hpage); - if (!PageAnon(hpage)) - pr_info("soft offline: %#lx: non anonymous thp\n", page_to_pfn(page)); - else - pr_info("soft offline: %#lx: thp split failed\n", page_to_pfn(page)); - put_hwpoison_page(hpage); - return -EBUSY; - } - unlock_page(hpage); - get_hwpoison_page(page); - put_hwpoison_page(hpage); - } if (PageHuge(page)) ret = soft_offline_huge_page(page, flags); else - ret = __soft_offline_page(page, flags); + ret = __soft_offline_page(compound_head(page), flags); return ret; } -- 2.7.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org