From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECFB9C433ED for ; Mon, 13 Jul 2020 06:42:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A740C20720 for ; Mon, 13 Jul 2020 06:42:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="shEu22P2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A740C20720 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 4A6A18D000B; Mon, 13 Jul 2020 02:42:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 457B48D0002; Mon, 13 Jul 2020 02:42:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 31E568D000B; Mon, 13 Jul 2020 02:42:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0176.hostedemail.com [216.40.44.176]) by kanga.kvack.org (Postfix) with ESMTP id 19C968D0002 for ; Mon, 13 Jul 2020 02:42:36 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id CBD8D8248068 for ; Mon, 13 Jul 2020 06:42:35 +0000 (UTC) X-FDA: 77032109070.10.dogs94_3e0aabb26ee6 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id 9EC8D16A4B0 for ; Mon, 13 Jul 2020 06:42:35 +0000 (UTC) X-HE-Tag: dogs94_3e0aabb26ee6 X-Filterd-Recvd-Size: 6451 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Mon, 13 Jul 2020 06:42:35 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id w2so5602794pgg.10 for ; Sun, 12 Jul 2020 23:42:35 -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=E3uBP2PMxjhLbF/Qn6q1UBEwi29LNMNdydYz1iguy44=; b=shEu22P2JCmXlIIFbQ38vJWAUx4gInp3gxoVw4iwmwo1mZaIbkEONC/XBFxYprb/nU YtaTTgu8vwTKy44PKXsrTXTqMcJJ8F6x9UHSM7a5oqU4qGIUFCvWUTtrhsMqKoJs5k0G PdNYlGmwSduhF82avB4fixx/okO4YsXzQmP+1T3CxzOEn9Gj3fHkivQapqwaWwID2Mm4 YQD5wrmwhPC858Mk3YXSUPdMyjm6SUkFzJuqmp2vp4JMACxQnVujgzwHtYoRTl9OvH7j U05dK8Mdu6OAtGHz6HDsLnR0EmNjP9689BJrpmZEz7Tyny/s22VWYwyRVVWR/BESD9Sj 0INQ== 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=E3uBP2PMxjhLbF/Qn6q1UBEwi29LNMNdydYz1iguy44=; b=e4UkZBzMSO+alu0tQHdIO8kGXLVkKaFgiCxJPtUpywzu3918zDzDfSNKGlFPe1AYjx AvNW6KqTSrClLtqRdd5KA9wqTodcEOmaJtw56Z+mscnCPo8x3IldCZwSSqABjE77RfMS hymnm9y/yQ/02zc0VUgYPqwEdg3/w9y+J5V1vQmi/6ok+pWq8wa5KpgO7B8V+mkOhoUr R9mtPMk0cAOSiRmwVibrBQsQXnD9KHopbl037U1QYAHLq2KQT+xQ5GjotLMoDOIQKBXT MaSQP45IIOTZm9+bdSiPOgOqChMDdz1EYKmb908RDaa1WRykdSw9UfCZocYulBdxF2qJ Mvbg== X-Gm-Message-State: AOAM531F2WIzoCbYS8SbPvW77n/t0XbTnq/65Y+jb9+r8le+PG3sIV64 wBV1DwKja5CNwIK+vBWrh5o= X-Google-Smtp-Source: ABdhPJwPpmFYrn1YsAQ6i67c53VPDIBX+BbW5s3FvEk2clA/rAsyvjpKb5hQQV4RXblLbW3xVq35QQ== X-Received: by 2002:a63:2223:: with SMTP id i35mr6735847pgi.64.1594622554361; Sun, 12 Jul 2020 23:42:34 -0700 (PDT) Received: from localhost.localdomain ([114.206.198.176]) by smtp.gmail.com with ESMTPSA id l134sm12448695pga.50.2020.07.12.23.42.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Jul 2020 23:42:33 -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 v5 6/9] mm/mempolicy: use a standard migration target allocation callback Date: Mon, 13 Jul 2020 15:41:54 +0900 Message-Id: <1594622517-20681-7-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1594622517-20681-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1594622517-20681-1-git-send-email-iamjoonsoo.kim@lge.com> X-Rspamd-Queue-Id: 9EC8D16A4B0 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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 a well-defined migration target allocation callback. Use it. Acked-by: Michal Hocko Acked-by: Vlastimil Babka Signed-off-by: Joonsoo Kim --- mm/internal.h | 1 - mm/mempolicy.c | 31 ++++++------------------------- mm/migrate.c | 8 ++++++-- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 0beacf3..10c6776 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -613,7 +613,6 @@ static inline bool is_migrate_highatomic_page(struct page *page) } void setup_zone_pageset(struct zone *zone); -extern struct page *alloc_new_node_page(struct page *page, unsigned long node); struct migration_target_control { int nid; /* preferred node id */ diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 9034a53..93fcfc1 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1065,29 +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, unsigned long node) -{ - if (PageHuge(page)) { - struct hstate *h = page_hstate(compound_head(page)); - gfp_t gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE; - - return alloc_huge_page_nodemask(h, node, NULL, gfp_mask); - } else if (PageTransHuge(page)) { - struct page *thp; - - thp = alloc_pages_node(node, - (GFP_TRANSHUGE | __GFP_THISNODE), - HPAGE_PMD_ORDER); - if (!thp) - return NULL; - prep_transhuge_page(thp); - return thp; - } else - return __alloc_pages_node(node, GFP_HIGHUSER_MOVABLE | - __GFP_THISNODE, 0); -} - /* * Migrate pages from one node to a target node. * Returns error or the number of pages not migrated. @@ -1098,6 +1075,10 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest, nodemask_t nmask; LIST_HEAD(pagelist); int err = 0; + struct migration_target_control mtc = { + .nid = dest, + .gfp_mask = GFP_HIGHUSER_MOVABLE | __GFP_THISNODE, + }; nodes_clear(nmask); node_set(source, nmask); @@ -1112,8 +1093,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, dest, - MIGRATE_SYNC, MR_SYSCALL); + err = migrate_pages(&pagelist, alloc_migration_target, NULL, + (unsigned long)&mtc, MIGRATE_SYNC, MR_SYSCALL); if (err) putback_movable_pages(&pagelist); } diff --git a/mm/migrate.c b/mm/migrate.c index c35ba2a..1a891c4 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1591,9 +1591,13 @@ static int do_move_pages_to_node(struct mm_struct *mm, struct list_head *pagelist, int node) { int err; + struct migration_target_control mtc = { + .nid = node, + .gfp_mask = GFP_HIGHUSER_MOVABLE | __GFP_THISNODE, + }; - err = migrate_pages(pagelist, alloc_new_node_page, NULL, node, - MIGRATE_SYNC, MR_SYSCALL); + err = migrate_pages(pagelist, alloc_migration_target, NULL, + (unsigned long)&mtc, MIGRATE_SYNC, MR_SYSCALL); if (err) putback_movable_pages(pagelist); return err; -- 2.7.4