From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753836AbdFVTaz (ORCPT ); Thu, 22 Jun 2017 15:30:55 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36026 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753749AbdFVTar (ORCPT ); Thu, 22 Jun 2017 15:30:47 -0400 From: Michal Hocko To: Andrew Morton Cc: , Naoya Horiguchi , Mike Kravetz , Mel Gorman , Vlastimil Babka , LKML , Michal Hocko Subject: [PATCH 3/3] mm, hugetlb, soft_offline: use new_page_nodemask for soft offline migration Date: Thu, 22 Jun 2017 21:30:34 +0200 Message-Id: <20170622193034.28972-4-mhocko@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170622193034.28972-1-mhocko@kernel.org> References: <20170622193034.28972-1-mhocko@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michal Hocko new_page is yet another duplication of the migration callback which has to handle hugetlb migration specially. We can safely use the generic new_page_nodemask for the same purpose. Please note that gigantic hugetlb pages do not need any special handling because alloc_huge_page_nodemask will make sure to check pages in all per node pools. The reason this was done previously was that alloc_huge_page_node treated NO_NUMA_NODE and a specific node differently and so alloc_huge_page_node(nid) would check on this specific node. Noticed-by: Vlastimil Babka Acked-by: Vlastimil Babka Signed-off-by: Michal Hocko --- mm/memory-failure.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 3615bffbd269..7040f60ecb71 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1487,16 +1487,8 @@ EXPORT_SYMBOL(unpoison_memory); static struct page *new_page(struct page *p, unsigned long private, int **x) { int nid = page_to_nid(p); - if (PageHuge(p)) { - struct hstate *hstate = page_hstate(compound_head(p)); - if (hstate_is_gigantic(hstate)) - return alloc_huge_page_node(hstate, NUMA_NO_NODE); - - return alloc_huge_page_node(hstate, nid); - } else { - return __alloc_pages_node(nid, GFP_HIGHUSER_MOVABLE, 0); - } + return new_page_nodemask(p, nid, &node_states[N_MEMORY]); } /* -- 2.11.0