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=-7.0 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 62F94C433E0 for ; Tue, 9 Jun 2020 12:44:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 29674207C3 for ; Tue, 9 Jun 2020 12:44:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 29674207C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9E8CB6B0005; Tue, 9 Jun 2020 08:44:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 974996B0006; Tue, 9 Jun 2020 08:44:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 861C76B0007; Tue, 9 Jun 2020 08:44:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0040.hostedemail.com [216.40.44.40]) by kanga.kvack.org (Postfix) with ESMTP id 6B59F6B0005 for ; Tue, 9 Jun 2020 08:44:34 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 1FA4715CB for ; Tue, 9 Jun 2020 12:44:34 +0000 (UTC) X-FDA: 76909642068.01.stamp79_3e1183426dc2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id C604918030331 for ; Tue, 9 Jun 2020 12:44:33 +0000 (UTC) X-HE-Tag: stamp79_3e1183426dc2 X-Filterd-Recvd-Size: 6588 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Tue, 9 Jun 2020 12:44:33 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id k26so2997763wmi.4 for ; Tue, 09 Jun 2020 05:44:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=bUQBLKaV0rY++J1kBEYJ4YPNIo1mi5EzugMLZWIn43Q=; b=WqHOEAXhaXPidT83Vmk7z33oUwFnQQAzSTnqS9OvIpkZMlbVge5l2sVk0Jy8Xl79JZ MQATTquZsjDJXuvQVbaSAvkdGGTTTOkDqSYGLL3340SYDGNuGA3TVs8FtaJxs1f8nDyF Kka0gxQm8pUphTxIXu6VY5gGLApnkZEUm2cmMDHSlDrXNb80wyBg61Hd7H0gUrVLtr9Y K/TqjoZ+80zubXkow7J6VG7azUWEF6TsLSDmBYKgDyzvLOO9xb/dVozn0V+ckvZ2bbbF PQ/vlqZImXCxYG2XL+CpBRuTYcrxdPUd18Q4AHVIWu5iwu75sei0WUC0zuBOym0/824s 87Ug== X-Gm-Message-State: AOAM532r4jEEKKFPxMDfEohFckAxtEsyMJ7DR0xPsiAVWw01MqhLnZkb w0Cm7G++Sfkm7DXIZ/YtoHI= X-Google-Smtp-Source: ABdhPJzb2sh3iX+SD2l+aAZZxwA5hfV9JkiFsghd22abF8GC87Hoh5tSfr9vbVoOozVFyrm/rpQwvw== X-Received: by 2002:a7b:c8d6:: with SMTP id f22mr3722092wml.108.1591706672380; Tue, 09 Jun 2020 05:44:32 -0700 (PDT) Received: from localhost (ip-37-188-174-195.eurotel.cz. [37.188.174.195]) by smtp.gmail.com with ESMTPSA id p16sm3438105wru.27.2020.06.09.05.44.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 05:44:31 -0700 (PDT) Date: Tue, 9 Jun 2020 14:44:30 +0200 From: Michal Hocko To: js1304@gmail.com Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@lge.com, Vlastimil Babka , Christoph Hellwig , Roman Gushchin , Mike Kravetz , Naoya Horiguchi , Joonsoo Kim Subject: Re: [PATCH v2 02/12] mm/migrate: move migration helper from .h to .c Message-ID: <20200609124430.GD22623@dhcp22.suse.cz> References: <1590561903-13186-1-git-send-email-iamjoonsoo.kim@lge.com> <1590561903-13186-3-git-send-email-iamjoonsoo.kim@lge.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1590561903-13186-3-git-send-email-iamjoonsoo.kim@lge.com> X-Rspamd-Queue-Id: C604918030331 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: On Wed 27-05-20 15:44:53, Joonsoo Kim wrote: > From: Joonsoo Kim > > It's not performance sensitive function. Move it to .c. > This is a preparation step for future change. > > Acked-by: Mike Kravetz > Signed-off-by: Joonsoo Kim Acked-by: Michal Hocko > --- > include/linux/migrate.h | 33 +++++---------------------------- > mm/migrate.c | 29 +++++++++++++++++++++++++++++ > 2 files changed, 34 insertions(+), 28 deletions(-) > > diff --git a/include/linux/migrate.h b/include/linux/migrate.h > index 3e546cb..1d70b4a 100644 > --- a/include/linux/migrate.h > +++ b/include/linux/migrate.h > @@ -31,34 +31,6 @@ enum migrate_reason { > /* In mm/debug.c; also keep sync with include/trace/events/migrate.h */ > extern const char *migrate_reason_names[MR_TYPES]; > > -static inline struct page *new_page_nodemask(struct page *page, > - int preferred_nid, nodemask_t *nodemask) > -{ > - gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL; > - unsigned int order = 0; > - struct page *new_page = NULL; > - > - if (PageHuge(page)) > - return alloc_huge_page_nodemask(page_hstate(compound_head(page)), > - preferred_nid, nodemask); > - > - if (PageTransHuge(page)) { > - gfp_mask |= GFP_TRANSHUGE; > - order = HPAGE_PMD_ORDER; > - } > - > - if (PageHighMem(page) || (zone_idx(page_zone(page)) == ZONE_MOVABLE)) > - gfp_mask |= __GFP_HIGHMEM; > - > - new_page = __alloc_pages_nodemask(gfp_mask, order, > - preferred_nid, nodemask); > - > - if (new_page && PageTransHuge(new_page)) > - prep_transhuge_page(new_page); > - > - return new_page; > -} > - > #ifdef CONFIG_MIGRATION > > extern void putback_movable_pages(struct list_head *l); > @@ -67,6 +39,8 @@ extern int migrate_page(struct address_space *mapping, > enum migrate_mode mode); > extern int migrate_pages(struct list_head *l, new_page_t new, free_page_t free, > unsigned long private, enum migrate_mode mode, int reason); > +extern struct page *new_page_nodemask(struct page *page, > + int preferred_nid, nodemask_t *nodemask); > extern int isolate_movable_page(struct page *page, isolate_mode_t mode); > extern void putback_movable_page(struct page *page); > > @@ -85,6 +59,9 @@ static inline int migrate_pages(struct list_head *l, new_page_t new, > free_page_t free, unsigned long private, enum migrate_mode mode, > int reason) > { return -ENOSYS; } > +static inline struct page *new_page_nodemask(struct page *page, > + int preferred_nid, nodemask_t *nodemask) > + { return NULL; } > static inline int isolate_movable_page(struct page *page, isolate_mode_t mode) > { return -EBUSY; } > > diff --git a/mm/migrate.c b/mm/migrate.c > index 22a26a5..824c22e 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -1537,6 +1537,35 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, > return rc; > } > > +struct page *new_page_nodemask(struct page *page, > + int preferred_nid, nodemask_t *nodemask) > +{ > + gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL; > + unsigned int order = 0; > + struct page *new_page = NULL; > + > + if (PageHuge(page)) > + return alloc_huge_page_nodemask( > + page_hstate(compound_head(page)), > + preferred_nid, nodemask); > + > + if (PageTransHuge(page)) { > + gfp_mask |= GFP_TRANSHUGE; > + order = HPAGE_PMD_ORDER; > + } > + > + if (PageHighMem(page) || (zone_idx(page_zone(page)) == ZONE_MOVABLE)) > + gfp_mask |= __GFP_HIGHMEM; > + > + new_page = __alloc_pages_nodemask(gfp_mask, order, > + preferred_nid, nodemask); > + > + if (new_page && PageTransHuge(new_page)) > + prep_transhuge_page(new_page); > + > + return new_page; > +} > + > #ifdef CONFIG_NUMA > > static int store_status(int __user *status, int start, int value, int nr) > -- > 2.7.4 > -- Michal Hocko SUSE Labs