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 1E5E0C433DF for ; Wed, 27 May 2020 06:46:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D44422078C for ; Wed, 27 May 2020 06:46:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RNNjsksJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D44422078C 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 7F49B800BC; Wed, 27 May 2020 02:46:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A36780010; Wed, 27 May 2020 02:46:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6BA61800BC; Wed, 27 May 2020 02:46:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0229.hostedemail.com [216.40.44.229]) by kanga.kvack.org (Postfix) with ESMTP id 6359580010 for ; Wed, 27 May 2020 02:46:01 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 377542C9D for ; Wed, 27 May 2020 06:46:01 +0000 (UTC) X-FDA: 76861564122.17.cow29_6314cca26d50 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 1F048180D0180 for ; Wed, 27 May 2020 06:46:01 +0000 (UTC) X-HE-Tag: cow29_6314cca26d50 X-Filterd-Recvd-Size: 6145 Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Wed, 27 May 2020 06:46:00 +0000 (UTC) Received: by mail-pj1-f67.google.com with SMTP id cx22so1131709pjb.1 for ; Tue, 26 May 2020 23:46:00 -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=4+7G4sF/LBY2T1Rcr4q2hABu3PPTL1U0eg/qjTVIM5Q=; b=RNNjsksJBEQSxwRaNcnVBhv83AMTxB3wY3MlvdwSMKYgoPiK/kARvmuDjFJcftvh3S 79VFKJ+he2uzx32m5P5mHvnTDbrIZsBr90Ydysl3aebsb8+Dno7RZzjqNjEk3BvavEfY Rg7oO+jPMM5Wccn1TjWZYOFdG7HmnG7yJFPhYN3xLOXUK5AaFZzSLdRzWe/OaIkFgRj2 mgrLhLJL5dbtN34btLxxUwRastIZdCY8rPbUFqyxn6GjzNoekeTGmIYxJcLn4tZyBuXQ T+xFn7oBofObcYuB/UBtvXD1bFNQiY54+a80X2jrwjWK9FrWoP3jnt1//BwNA9flzbwi 5BDQ== 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=4+7G4sF/LBY2T1Rcr4q2hABu3PPTL1U0eg/qjTVIM5Q=; b=VYeqBIeoYf6ZnrVWQcBl6RCIQdqTtaKhIiOZql8XROtZ05461HWSrs3Ij9V3Iehj6w pd2uuPqlrJGzB9e2rJbZr/2XU1JuUOhXDSSWvrnXyhAiqCTfhX6IW08K4jz1J2kvGUQR IWARJ7PgutfDcqUVvONlmZNAfeq5OyTx25DnGacgFJyV2n0g1lL0t8Cupnb4InSrIbD5 mQx8VslsSf9MiozrVbdaI25f6CJ0Q/OlbA81KC2uCHYzbyQNIYua2lL1c6+zjnan8qhz NtnHOJUhWfpSfyetXXHCWDOx0/DLA4RrFjCV0ntJSqFUrtpaQ5QLBKDcEHLkt5Xl7FNU DoiA== X-Gm-Message-State: AOAM531p7nUgvcv0H5f7PqCnXZhmDsyxkJoBzvOH5tDapseueniQ2BUG ZSq5twxyt4XUejYhXNj45/Y= X-Google-Smtp-Source: ABdhPJwb/bznyw4ccdgL1+FH7sh9R8l8nGE2XSUt8mY61KSL7oERqpos6LYIsBdJBtNARZkTPVr5JQ== X-Received: by 2002:a17:902:be09:: with SMTP id r9mr4508282pls.271.1590561959345; Tue, 26 May 2020 23:45:59 -0700 (PDT) Received: from localhost.localdomain ([114.206.198.176]) by smtp.gmail.com with ESMTPSA id r13sm443883pgv.50.2020.05.26.23.45.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2020 23:45:58 -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 05/12] mm/hugetlb: unify hugetlb migration callback function Date: Wed, 27 May 2020 15:44:56 +0900 Message-Id: <1590561903-13186-6-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: 1F048180D0180 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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 difference between two migration callback functions, alloc_huge_page_node() and alloc_huge_page_nodemask(), except __GFP_THISNODE handling. This patch moves this handling to alloc_huge_page_nodemask() and function caller. Then, remove alloc_huge_page_node(). Signed-off-by: Joonsoo Kim --- include/linux/hugetlb.h | 8 -------- mm/hugetlb.c | 23 ++--------------------- mm/mempolicy.c | 3 ++- 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 15c8fb8..f482563 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -505,8 +505,6 @@ struct huge_bootmem_page { struct page *alloc_migrate_huge_page(struct hstate *h, struct alloc_control *ac); -struct page *alloc_huge_page_node(struct hstate *h, - struct alloc_control *ac); struct page *alloc_huge_page_nodemask(struct hstate *h, struct alloc_control *ac); struct page *alloc_huge_page_vma(struct hstate *h, struct vm_area_struct *vma, @@ -755,12 +753,6 @@ static inline void huge_ptep_modify_prot_commit(struct vm_area_struct *vma, struct hstate {}; static inline struct page * -alloc_huge_page_node(struct hstate *h, struct alloc_control *ac) -{ - return NULL; -} - -static inline struct page * alloc_huge_page_nodemask(struct hstate *h, struct alloc_control *ac) { return NULL; diff --git a/mm/hugetlb.c b/mm/hugetlb.c index dabe460..8132985 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1980,31 +1980,12 @@ struct page *alloc_buddy_huge_page_with_mpol(struct hstate *h, } /* page migration callback function */ -struct page *alloc_huge_page_node(struct hstate *h, - struct alloc_control *ac) -{ - struct page *page = NULL; - - ac->gfp_mask |= htlb_alloc_mask(h); - if (ac->nid != NUMA_NO_NODE) - ac->gfp_mask |= __GFP_THISNODE; - - spin_lock(&hugetlb_lock); - if (h->free_huge_pages - h->resv_huge_pages > 0) - page = dequeue_huge_page_nodemask(h, ac); - spin_unlock(&hugetlb_lock); - - if (!page) - page = alloc_migrate_huge_page(h, ac); - - return page; -} - -/* page migration callback function */ struct page *alloc_huge_page_nodemask(struct hstate *h, struct alloc_control *ac) { ac->gfp_mask |= htlb_alloc_mask(h); + if (ac->nid == NUMA_NO_NODE) + ac->gfp_mask &= ~__GFP_THISNODE; spin_lock(&hugetlb_lock); if (h->free_huge_pages - h->resv_huge_pages > 0) { diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 3b6b551..e705efd 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1073,9 +1073,10 @@ struct page *alloc_new_node_page(struct page *page, unsigned long node) struct alloc_control ac = { .nid = node, .nmask = NULL, + .gfp_mask = __GFP_THISNODE, }; - return alloc_huge_page_node(h, &ac); + return alloc_huge_page_nodemask(h, &ac); } else if (PageTransHuge(page)) { struct page *thp; -- 2.7.4