From patchwork Mon May 18 01:20:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonsoo Kim X-Patchwork-Id: 11554537 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF9B1912 for ; Mon, 18 May 2020 01:22:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7CFAE207F9 for ; Mon, 18 May 2020 01:22:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hm5UwG+Z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7CFAE207F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 96AE180011; Sun, 17 May 2020 21:22:13 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8F3D08000B; Sun, 17 May 2020 21:22:13 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7BBE380011; Sun, 17 May 2020 21:22:13 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0116.hostedemail.com [216.40.44.116]) by kanga.kvack.org (Postfix) with ESMTP id 56C8B8000B for ; Sun, 17 May 2020 21:22:13 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 1753C180AD81D for ; Mon, 18 May 2020 01:22:13 +0000 (UTC) X-FDA: 76828088946.10.power87_87bf30dd40736 X-Spam-Summary: 2,0,0,1eca9c911b5f5e87,d41d8cd98f00b204,js1304@gmail.com,,RULES_HIT:41:69:355:379:541:800:960:973:988:989:1260:1345:1359:1437:1535:1543:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:3138:3139:3140:3141:3142:3354:3865:3866:3867:3871:3872:4117:4250:4321:5007:6119:6261:6653:7576:8957:9413:9592:10004:11026:11232:11233:11473:11658:11914:12043:12296:12297:12438:12517:12519:12555:12679:12683:12895:12986:13161:13229:14096:14110:14181:14394:14721:21080:21220:21444:21451:21627:21666:21990:30034:30054,0,RBL:209.85.214.194:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.50.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:2,LUA_SUMMARY:none X-HE-Tag: power87_87bf30dd40736 X-Filterd-Recvd-Size: 6212 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Mon, 18 May 2020 01:22:12 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id w19so1765010ply.11 for ; Sun, 17 May 2020 18:22:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HXYaPMT+SVgZJKyj+XorbmOxAFnVq7RiQ7gBCNzN/kI=; b=hm5UwG+Zx1o4N1ihTvYSjyxBc7/uy2dWCq2ulN17NpxWmVr7Kg63sHo+4FsHYXc+rj jVA+TehaieVkUt7meL7EpEKdaLCkSSmvaXZUJ44cHrVSmAOFIPe8J48UmXIaL7Rc2bhC GMLIlyx7MMwdq9gSaSph6/S0rR7m22pz3dPmn5QgJPXweDSP/h3YK4mYO6iPIwJ8UMpo JyS0Y7zbp2sNY0wLCUtme6wNtr4Lcah9wceoS7cO1zusXHd4lmQ7ea6vE34H0FwXPhpL AkeznJkwuNW5OuMET5RFr6Udm1oplUzPDluv8v1dwVeibQdBPwfn8yJ8QxRvifoEF8zw GcDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HXYaPMT+SVgZJKyj+XorbmOxAFnVq7RiQ7gBCNzN/kI=; b=SPIP9UYTTknPz7uMutHF65qvoKZLALFn/0kA59T4blduerbJn5vVINZfrrRWU9GLXe QSOp8+WoYNw7WKzaQnhFHx652hu4UyXsRRHyICixRI60PW7iXAFROgbF8cxHPTVGc+Fn VCWVYhYERXQcYtDfYZpM13In6flIHaw34Ygpqfp/1p4zI5HbwfVM9NtR+DyVws5IC1Op wxUNk+zuEQfqvYgdha1ftxjLr9qvrUOLDRH6q7wpF/6nQqtfz+qaQPnChQAuanYWf3mw j5hH/rz3/T9kqsMCQETh+AK4C70Lnm89l5zZwxPZEqCR4D9qQofz+H/hxVCWXL9MtgaR 4qPQ== X-Gm-Message-State: AOAM532HH1Fj4HPkrdHYDsKeELLlVZcGw2N0SU/RkSRG5dQ+KQvLX45J kZPYUpeu06xcSkcwgmJxZxs= X-Google-Smtp-Source: ABdhPJzQLX/QK88KtjHmhxzKx7FYJGgbKyKlaasqEJOPwsmOPrl3zaNCB3La0U1yyYqhwFK4kGSOyQ== X-Received: by 2002:a17:90a:9606:: with SMTP id v6mr10046595pjo.20.1589764931926; Sun, 17 May 2020 18:22:11 -0700 (PDT) Received: from localhost.localdomain ([114.206.198.176]) by smtp.gmail.com with ESMTPSA id fw4sm1544376pjb.31.2020.05.17.18.22.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 May 2020 18:22:11 -0700 (PDT) From: js1304@gmail.com X-Google-Original-From: iamjoonsoo.kim@lge.com To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@lge.com, Vlastimil Babka , Christoph Hellwig , Roman Gushchin , Mike Kravetz , Naoya Horiguchi , Michal Hocko , Joonsoo Kim Subject: [PATCH 10/11] mm/mempolicy: use standard migration target allocation function Date: Mon, 18 May 2020 10:20:56 +0900 Message-Id: <1589764857-6800-11-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1589764857-6800-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1589764857-6800-1-git-send-email-iamjoonsoo.kim@lge.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Joonsoo Kim There is no reason to implement it's own function for migration target allocation. Use standard one. Signed-off-by: Joonsoo Kim --- mm/internal.h | 3 --- mm/mempolicy.c | 33 ++++----------------------------- mm/migrate.c | 4 +++- 3 files changed, 7 insertions(+), 33 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index abe94a7..5ade079 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -612,9 +612,6 @@ static inline bool is_migrate_highatomic_page(struct page *page) } void setup_zone_pageset(struct zone *zone); -struct alloc_control; -extern struct page *alloc_new_node_page(struct page *page, - struct alloc_control *ac); struct alloc_control { int nid; diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 7241621..8d3ccab 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1065,33 +1065,6 @@ static int migrate_page_add(struct page *page, struct list_head *pagelist, return 0; } -/* page allocation callback for NUMA node migration */ -struct page *alloc_new_node_page(struct page *page, struct alloc_control *__ac) -{ - if (PageHuge(page)) { - struct hstate *h = page_hstate(page); - struct alloc_control ac = { - .nid = __ac->nid, - .nmask = NULL, - .thisnode = true, - }; - - return alloc_huge_page_nodemask(h, &ac); - } else if (PageTransHuge(page)) { - struct page *thp; - - thp = alloc_pages_node(__ac->nid, - (GFP_TRANSHUGE | __GFP_THISNODE), - HPAGE_PMD_ORDER); - if (!thp) - return NULL; - prep_transhuge_page(thp); - return thp; - } else - return __alloc_pages_node(__ac->nid, GFP_HIGHUSER_MOVABLE | - __GFP_THISNODE, 0); -} - /* * Migrate pages from one node to a target node. * Returns error or the number of pages not migrated. @@ -1104,6 +1077,8 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest, int err = 0; struct alloc_control ac = { .nid = dest, + .gfp_mask = GFP_HIGHUSER_MOVABLE, + .thisnode = true, }; nodes_clear(nmask); @@ -1119,8 +1094,8 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest, flags | MPOL_MF_DISCONTIG_OK, &pagelist); if (!list_empty(&pagelist)) { - err = migrate_pages(&pagelist, alloc_new_node_page, NULL, &ac, - MIGRATE_SYNC, MR_SYSCALL); + err = migrate_pages(&pagelist, alloc_migration_target, NULL, + &ac, MIGRATE_SYNC, MR_SYSCALL); if (err) putback_movable_pages(&pagelist); } diff --git a/mm/migrate.c b/mm/migrate.c index 029af0b..3dfb108 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1574,9 +1574,11 @@ static int do_move_pages_to_node(struct mm_struct *mm, int err; struct alloc_control ac = { .nid = node, + .gfp_mask = GFP_HIGHUSER_MOVABLE, + .thisnode = true, }; - err = migrate_pages(pagelist, alloc_new_node_page, NULL, &ac, + err = migrate_pages(pagelist, alloc_migration_target, NULL, &ac, MIGRATE_SYNC, MR_SYSCALL); if (err) putback_movable_pages(pagelist);