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=-9.6 required=3.0 tests=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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 1E3FAC433DF for ; Wed, 27 May 2020 06:46:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CBBCB2078C for ; Wed, 27 May 2020 06:46:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BkiAWMaX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBBCB2078C 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 73100800C1; Wed, 27 May 2020 02:46:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E02680010; Wed, 27 May 2020 02:46:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61CF5800C1; Wed, 27 May 2020 02:46:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0102.hostedemail.com [216.40.44.102]) by kanga.kvack.org (Postfix) with ESMTP id 5A72280010 for ; Wed, 27 May 2020 02:46:23 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 273DB127F for ; Wed, 27 May 2020 06:46:23 +0000 (UTC) X-FDA: 76861565046.13.fuel15_3e0acc926d50 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 640AA18140B9D for ; Wed, 27 May 2020 06:46:20 +0000 (UTC) X-HE-Tag: fuel15_3e0acc926d50 X-Filterd-Recvd-Size: 6251 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by imf50.hostedemail.com (Postfix) with ESMTP for ; Wed, 27 May 2020 06:46:19 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id t7so9782951plr.0 for ; Tue, 26 May 2020 23:46:19 -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=LD4nOSV9Q5/nUL44C/nwA6um3iZn7Ive/+WUziLGPFQ=; b=BkiAWMaX/I9ujMAoBo6t7L8zCNnJgSCLqQDS5vs1dQa0q9SDl25D+bxceT7rjR5cjk 420XJQJcVuy/uxn167AfLYIsdzCgKvIS3IpyKUYYPT6DiwXf+yk/jwjnQANKUX/L0j0/ PhTjmRaM/xBfHDmj7E9dD2lJJW6lS94kGRE7H1uq0fUKPfsMUjCkWGzKI2gTIGWnxWQ+ hsJcUW1nJIBHa28TjCjqtPRoaNaJrJKPMGqbG5z1jnKOYiJcf2T6jP8WrqvMAgz88edz yJVVZGf6OaDp1SQ9Q95TJp/2rxxXBmA3gfQrEEqx7YdyXV7748BNQzA2EzPRpAbTeKfU LiNw== 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=LD4nOSV9Q5/nUL44C/nwA6um3iZn7Ive/+WUziLGPFQ=; b=Ss5sKZXEljALks1c/ehJMvR5OlofkV/5Lr0ufFKJfCVgdiZjDOqV+5hJdic2J/U62x +fAahvWW2hucEMZTtB9R9QtdiGYd9VG7tLjJg0350rmN5ETNgPls6OxPWpla70Kfl8Ku PCMzmtvOlZwLd1l8vFOIjs+leAXWZb99+jFz/x8g48e5g7wyk1sOm0b1PV/eyjVGyUPy KpNDhfg61pUehUiE/F9KQFpkbO8JSfmXmJBcYCzclMujg4Hl0JNa6X6yjjHLSm/jVyLk T4kCfMLb0KWSw53d5Y+kMjkRdXOzh/itU6uxPvoCUstZR0tUQLJFXlpTDh8uphJsXr2U 4zHg== X-Gm-Message-State: AOAM532eHMw1rXb2LcqvpZ+iDTAXwCWvomZpqXJGElKrgG3gDw2ga9y7 WLrQoSbMYepoG2tfD8f4yNY= X-Google-Smtp-Source: ABdhPJyLR8l4BwzvlTmK4b8Jrxc14GaH/BNezIXrH95OxJbBRsyD2RFAL0GVMEGmaMkAKJVTxuFWPw== X-Received: by 2002:a17:902:4b:: with SMTP id 69mr4196053pla.99.1590561978780; Tue, 26 May 2020 23:46:18 -0700 (PDT) Received: from localhost.localdomain ([114.206.198.176]) by smtp.gmail.com with ESMTPSA id r13sm443883pgv.50.2020.05.26.23.46.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2020 23:46:18 -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 v2 11/12] mm/mempolicy: use standard migration target allocation function Date: Wed, 27 May 2020 15:45:02 +0900 Message-Id: <1590561903-13186-12-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590561903-13186-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1590561903-13186-1-git-send-email-iamjoonsoo.kim@lge.com> X-Rspamd-Queue-Id: 640AA18140B9D X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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 | 32 +++----------------------------- mm/migrate.c | 3 ++- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 6f5d810..82495ee 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; /* preferred node id */ diff --git a/mm/mempolicy.c b/mm/mempolicy.c index e50c3eb..27329bdf 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(compound_head(page)); - struct alloc_control ac = { - .nid = __ac->nid, - .nmask = NULL, - .gfp_mask = __GFP_THISNODE, - }; - - 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,7 @@ 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 | __GFP_THISNODE, }; nodes_clear(nmask); @@ -1119,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, &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 780135a..393f592 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1590,9 +1590,10 @@ static int do_move_pages_to_node(struct mm_struct *mm, int err; struct alloc_control ac = { .nid = node, + .gfp_mask = GFP_HIGHUSER_MOVABLE | __GFP_THISNODE, }; - 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); -- 2.7.4