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 C4957C433F1 for ; Mon, 13 Jul 2020 06:42:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 89D5B2075D for ; Mon, 13 Jul 2020 06:42:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sDuNBNnO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 89D5B2075D 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 348998D000C; Mon, 13 Jul 2020 02:42:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F6958D0002; Mon, 13 Jul 2020 02:42:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20D548D000C; Mon, 13 Jul 2020 02:42:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0131.hostedemail.com [216.40.44.131]) by kanga.kvack.org (Postfix) with ESMTP id 0BA778D0002 for ; Mon, 13 Jul 2020 02:42:39 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id C1F822C88 for ; Mon, 13 Jul 2020 06:42:38 +0000 (UTC) X-FDA: 77032109196.15.anger66_0006a8326ee6 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 8A22E1814B0C1 for ; Mon, 13 Jul 2020 06:42:38 +0000 (UTC) X-HE-Tag: anger66_0006a8326ee6 X-Filterd-Recvd-Size: 5042 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Mon, 13 Jul 2020 06:42:38 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id p3so5624692pgh.3 for ; Sun, 12 Jul 2020 23:42:37 -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=jW8zp7RHqtHeCyFdrmHu1jeTiXid01JuKsYb1RMidWg=; b=sDuNBNnOadqLFjEboOTN+KZ8ju+GgWtvG1go57WqkF61YVPNazQlaE46OSWopM8oFZ lGrlnqSLnlJEgCDa8NbqDo83oHtueBqc3u1SeeYXj1x2pW8CfhZiW1hT34jpnIlpKQq/ gxLbBKW+H0KK1PcAN+u1pLISm2FIP1SxRFyZdUwsYFcJBTo96Cb/q1aAppvV7CtB9Z+S PjCEPG/gMe4F8bD21AVn0NheipHo0/Hd6CzGpQFJxcTGYdcGcYwh6KYbOxe/k6ukiCmP eM5kzhMnchgu7kJV04iWSI+96y2Iw5a4aIIh4QsEaDzyByhLwimrGX8VCfxDrqh2wF6T oI5A== 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=jW8zp7RHqtHeCyFdrmHu1jeTiXid01JuKsYb1RMidWg=; b=nJRiy6bf32Nz5Rdhq+NPDG66IUf7yRr5KPacEu7+g/EiL1vV8kJj49G9e8PEXschWQ ZLEmsP8NufqvxRykTgQDw+BsnZw4UN3km+iK9bmc/X/i6k9cb+UuN7Zk35fA6YsAUTDO NXTotSQ3DWiqo9j68GC1GFpOoDV+1ikgT7qKORKAQWg+DwKRaL/bBwYXpKLsPp/0/3jz W0OmIAtLpAcFx7FriKpxd0z1YSRqg5MwJiwDlRCvTfYnt44ZfxSpQME74QPN9G4RuQd6 sEfqOCTBzqprmOhlz2sQqduW3Ua8jwKLmi30xw8viDQJC7szKCq+nx1fzSkb8GypmctV FW9w== X-Gm-Message-State: AOAM530iJb2XuV41bGDAOaGleXoo8tNffjvVDzR1DffaAVwVqxbbZdQV JO1gUevglI7rVCHh1li/ml4= X-Google-Smtp-Source: ABdhPJy5rFqXfwpnbs8a3UZi85qVhXCA9wmNrP9KpOBu9eRv/VWMwN3oVOjQ51d9bfLEXvlH7Sa6LA== X-Received: by 2002:a63:de4b:: with SMTP id y11mr43982722pgi.26.1594622557329; Sun, 12 Jul 2020 23:42:37 -0700 (PDT) Received: from localhost.localdomain ([114.206.198.176]) by smtp.gmail.com with ESMTPSA id l134sm12448695pga.50.2020.07.12.23.42.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Jul 2020 23:42:36 -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 7/9] mm/page_alloc: remove a wrapper for alloc_migration_target() Date: Mon, 13 Jul 2020 15:41:55 +0900 Message-Id: <1594622517-20681-8-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: 8A22E1814B0C1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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 standard migration target callback. Use it directly. Acked-by: Michal Hocko Acked-by: Vlastimil Babka Signed-off-by: Joonsoo Kim --- mm/page_alloc.c | 8 ++++++-- mm/page_isolation.c | 10 ---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index f3b70ee..6416d08 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8354,6 +8354,10 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, unsigned long pfn = start; unsigned int tries = 0; int ret = 0; + struct migration_target_control mtc = { + .nid = zone_to_nid(cc->zone), + .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL, + }; migrate_prep(); @@ -8380,8 +8384,8 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, &cc->migratepages); cc->nr_migratepages -= nr_reclaimed; - ret = migrate_pages(&cc->migratepages, alloc_migrate_target, - NULL, 0, cc->mode, MR_CONTIG_RANGE); + ret = migrate_pages(&cc->migratepages, alloc_migration_target, + NULL, (unsigned long)&mtc, cc->mode, MR_CONTIG_RANGE); } if (ret < 0) { putback_movable_pages(&cc->migratepages); diff --git a/mm/page_isolation.c b/mm/page_isolation.c index f25c66e..242c031 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -306,13 +306,3 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn, return pfn < end_pfn ? -EBUSY : 0; } - -struct page *alloc_migrate_target(struct page *page, unsigned long private) -{ - struct migration_target_control mtc = { - .nid = page_to_nid(page), - .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL, - }; - - return alloc_migration_target(page, (unsigned long)&mtc); -} -- 2.7.4