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,URIBL_BLOCKED,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 19708C433E1 for ; Thu, 23 Jul 2020 02:46:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A569F207E8 for ; Thu, 23 Jul 2020 02:46:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OlNVwPf+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A569F207E8 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 E68426B0002; Wed, 22 Jul 2020 22:46:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DF1B46B0005; Wed, 22 Jul 2020 22:46:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB9476B0008; Wed, 22 Jul 2020 22:46:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0248.hostedemail.com [216.40.44.248]) by kanga.kvack.org (Postfix) with ESMTP id B0C256B0002 for ; Wed, 22 Jul 2020 22:46:57 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 5B9FE3B9FA for ; Thu, 23 Jul 2020 02:46:57 +0000 (UTC) X-FDA: 77067803274.24.bone75_571816826f22 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id 25D24139AA3 for ; Mon, 20 Jul 2020 04:56:51 +0000 (UTC) X-HE-Tag: bone75_571816826f22 X-Filterd-Recvd-Size: 6062 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by imf50.hostedemail.com (Postfix) with ESMTP for ; Mon, 20 Jul 2020 04:56:50 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id a24so8447041pfc.10 for ; Sun, 19 Jul 2020 21:56:50 -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=bYXHL6tBkIar+w8mWcyE6FXql8F7mBZJXR0egF1QDH8=; b=OlNVwPf+HMgvwAVg65akrh38rFGIXJkh4W7fjrmb8Q6+eGdEkN7iRxqnWHHBugAyui UiKvFQPSNuv2CfU/eTXBR8QMxczNJuqPQHxajXZDoUuC247S1SIs5G3bTfAblK+DB/5Y V5L9IUuxNKj9e89BVTirtanIOsh2ugtXQMWxJZM5t/i5F8gLIc6jFw3lUcyK0rEj4epO uoAE/+m5iWV4EkL19wDu7+4aYDARDNpEK/4AdJ6tHX/KDSXGTZveivM5gRufKW/QT9Iw 0t6e1SamXsDG8u3+w+xuaxApEod6iVdG/fqM0MHxautVDAns595npEuiXd4C5K4C513R DmfA== 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=bYXHL6tBkIar+w8mWcyE6FXql8F7mBZJXR0egF1QDH8=; b=cNirOCSlIg1viI4mTVJDpXPpC1zIdPWgea7MQjdnNQ3Ise7SHHdUCnDHicOWT+8KGt iR5nnqGc3eMQ+4W+woJawOWzZqBA9trrJUofWdRArxiwPAvCRiL4vRcG0JSBKzeZKo1x YAZdtoClT4E6jYt4XteHWuNBPw57cHSyJ2IyYUlpLB5f9XOYpAoQXdnHhF3JLOXmdJm5 +TvQCCddOdUOKySju2KnpZORNikN/x9bgyOckYgpbin3Ouk6djvNWzAHPxmgFxwclqdB xRJEGOgWFotJzAKMZg5DF+jf3bb9Un8E4VO4Y4/yNqr1oeyKsETSO9e4Yg5uwE8AgFzg 13Ow== X-Gm-Message-State: AOAM5302L2nvz9Srm3KjU5+62fcYIHl7ayEFaHUqo0qTZBRY1/Dz6FeZ wuhBGzicDZD4HtLRDDbNA/E= X-Google-Smtp-Source: ABdhPJwlx0yapsh6n0sVA8bpe1PYfFq2VO7v9/ovvTdDCF0wsJHOdujATw4X8LrzvQ6DzKdU6JQe+g== X-Received: by 2002:aa7:9e89:: with SMTP id p9mr18826525pfq.110.1595221009631; Sun, 19 Jul 2020 21:56:49 -0700 (PDT) Received: from localhost.localdomain ([114.206.198.176]) by smtp.gmail.com with ESMTPSA id w2sm10177532pjt.19.2020.07.19.21.56.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Jul 2020 21:56:49 -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 , "Aneesh Kumar K . V" , Joonsoo Kim Subject: [PATCH v2 4/4] mm/gup: use a standard migration target allocation callback Date: Mon, 20 Jul 2020 13:56:18 +0900 Message-Id: <1595220978-9890-4-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595220978-9890-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1595220978-9890-1-git-send-email-iamjoonsoo.kim@lge.com> X-Rspamd-Queue-Id: 25D24139AA3 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: Vlastimil Babka Acked-by: Michal Hocko Signed-off-by: Joonsoo Kim --- mm/gup.c | 54 ++++++------------------------------------------------ 1 file changed, 6 insertions(+), 48 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 4ba822a..628ca4c 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1608,52 +1608,6 @@ static bool check_dax_vmas(struct vm_area_struct **vmas, long nr_pages) } #ifdef CONFIG_CMA -static struct page *new_non_cma_page(struct page *page, unsigned long private) -{ - /* - * We want to make sure we allocate the new page from the same node - * as the source page. - */ - int nid = page_to_nid(page); - /* - * Trying to allocate a page for migration. Ignore allocation - * failure warnings. We don't force __GFP_THISNODE here because - * this node here is the node where we have CMA reservation and - * in some case these nodes will have really less non CMA - * allocation memory. - * - * Note that CMA region is prohibited by allocation scope. - */ - gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_NOWARN; - - if (PageHighMem(page)) - gfp_mask |= __GFP_HIGHMEM; - -#ifdef CONFIG_HUGETLB_PAGE - if (PageHuge(page)) { - struct hstate *h = page_hstate(page); - - gfp_mask = htlb_modify_alloc_mask(h, gfp_mask); - return alloc_huge_page_nodemask(h, nid, NULL, gfp_mask); - } -#endif - if (PageTransHuge(page)) { - struct page *thp; - /* - * ignore allocation failure warnings - */ - gfp_t thp_gfpmask = GFP_TRANSHUGE | __GFP_NOWARN; - - thp = __alloc_pages_node(nid, thp_gfpmask, HPAGE_PMD_ORDER); - if (!thp) - return NULL; - prep_transhuge_page(thp); - return thp; - } - - return __alloc_pages_node(nid, gfp_mask, 0); -} - static long check_and_migrate_cma_pages(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, @@ -1668,6 +1622,10 @@ static long check_and_migrate_cma_pages(struct task_struct *tsk, bool migrate_allow = true; LIST_HEAD(cma_page_list); long ret = nr_pages; + struct migration_target_control mtc = { + .nid = NUMA_NO_NODE, + .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_NOWARN, + }; check_again: for (i = 0; i < nr_pages;) { @@ -1713,8 +1671,8 @@ static long check_and_migrate_cma_pages(struct task_struct *tsk, for (i = 0; i < nr_pages; i++) put_page(pages[i]); - if (migrate_pages(&cma_page_list, new_non_cma_page, - NULL, 0, MIGRATE_SYNC, MR_CONTIG_RANGE)) { + if (migrate_pages(&cma_page_list, alloc_migration_target, NULL, + (unsigned long)&mtc, MIGRATE_SYNC, MR_CONTIG_RANGE)) { /* * some of the pages failed migration. Do get_user_pages * without migration. -- 2.7.4