From patchwork Tue Jun 23 06:13:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonsoo Kim X-Patchwork-Id: 11619827 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6265C90 for ; Tue, 23 Jun 2020 06:14:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2265B20772 for ; Tue, 23 Jun 2020 06:14:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="up5DFWGz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2265B20772 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 02D836B0008; Tue, 23 Jun 2020 02:14:40 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ED2B76B000A; Tue, 23 Jun 2020 02:14:39 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D26596B000C; Tue, 23 Jun 2020 02:14:39 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0142.hostedemail.com [216.40.44.142]) by kanga.kvack.org (Postfix) with ESMTP id B72AE6B0008 for ; Tue, 23 Jun 2020 02:14:39 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 85F502C8F for ; Tue, 23 Jun 2020 06:14:39 +0000 (UTC) X-FDA: 76959462678.23.trip20_0b0256826e39 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 5D6233762A for ; Tue, 23 Jun 2020 06:14:39 +0000 (UTC) X-Spam-Summary: 2,0,0,26eca16357275e1a,d41d8cd98f00b204,js1304@gmail.com,,RULES_HIT:1:2:41:355:379:541:800:960:966:973:988:989:1260:1345:1359:1437:1605:1730:1747:1777:1792:2196:2199:2393:2559:2562:2693:2898:3138:3139:3140:3141:3142:3865:3866:3867:3868:3870:3871:3872:3874:4050:4250:4321:4385:4605:5007:6119:6261:6653:7576:7903:8957:9010:9413:10004:11026:11232:11473:11658:11914:12043:12291:12296:12297:12438:12485:12517:12519:12555:12679:12683:12895:12986:14096:14394:21080:21212:21444:21451:21611:21627:21666:21740:21990:30003:30054:30064:30070,0,RBL:209.85.216.68:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: trip20_0b0256826e39 X-Filterd-Recvd-Size: 10832 Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Tue, 23 Jun 2020 06:14:38 +0000 (UTC) Received: by mail-pj1-f68.google.com with SMTP id i4so1092808pjd.0 for ; Mon, 22 Jun 2020 23:14:38 -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=Dc8LghL6mPcKqqBO+Tl511spB3nCK4Lh+EbuLfVS40I=; b=up5DFWGzS5WrjfCoJJN5xdu/dSnt80JnCIvsIR4FO584vq8RGK7mjGJlO4zGnQnNt9 NDY1nG1cVMwu4sfBRNJyFolgiS5lSDAnc63N6CgrsQqsDGoeM2Jm2F0l009uokROvN6L TcUVe/dRulxTsgXTBZ2IbIXV2QdSufrJOOF6888yhzHDBKa6m9H7zbcooNgkaNZwgvHQ 8/p5jgQyvOV5rB+VkogjzEos4W758txaS7wzQQfMCXFgtwB6CP7yGkIMdJfhsgLs6nqY miY0y/GsbyMyZ9j/9XiP7D9ZxKNn3KHoCCQ3ouGbMvYgmwqqFC/mcZW5Vr5EErUq9TLy Jv7A== 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=Dc8LghL6mPcKqqBO+Tl511spB3nCK4Lh+EbuLfVS40I=; b=KotKFHtyRO70ihTWqJwvMgfGS5KzCprWqbmrMF+bwFI5K4SFM9HyU7inGhPtT9jfgQ ycpOQSCV/MRWkIIkESafri8U4W0UsHexXaWek+FCQsToq511bZhdalMaXnmgutV1gex5 w+Ugp42IBHucSUIEHdseipWG+TefXpzgy+m8DPBSmpOIDps4l1epTbAaar5Kaq0cx95z vhmt8gqbe/zv9V+9pZVtnaMwbabDnO3qa1r14uY6q+o7ZIVrwuTeBMl32VpL03TmfU/E IfN8+CqQ7rcAHonEGF4F5GTbqcL6tqDfpkJHbTp0Wh941STAw7HyCM8Va24Ap48QEj0q km5A== X-Gm-Message-State: AOAM532L23V2QojxsQWrFHe/XfUGS9SO6/xuGA1Hx92zDassHtAGqARd ++EvkjF00l029Fj5qOZYjjE= X-Google-Smtp-Source: ABdhPJzKX1HSJANYr7NhAx6gNraDC6+KJqFwV6wV6/d6ax9bWH8Sqo5hTpSz6Y3cF5ezGkJ0Cy/U0Q== X-Received: by 2002:a17:90a:f0d4:: with SMTP id fa20mr21701832pjb.160.1592892878004; Mon, 22 Jun 2020 23:14:38 -0700 (PDT) Received: from localhost.localdomain ([114.206.198.176]) by smtp.gmail.com with ESMTPSA id m15sm12801093pgv.45.2020.06.22.23.14.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 23:14:37 -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 v3 4/8] mm/hugetlb: make hugetlb migration callback CMA aware Date: Tue, 23 Jun 2020 15:13:44 +0900 Message-Id: <1592892828-1934-5-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592892828-1934-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1592892828-1934-1-git-send-email-iamjoonsoo.kim@lge.com> X-Rspamd-Queue-Id: 5D6233762A 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 new_non_cma_page() in gup.c which try to allocate migration target page requires to allocate the new page that is not on the CMA area. new_non_cma_page() implements it by removing __GFP_MOVABLE flag. This way works well for THP page or normal page but not for hugetlb page. hugetlb page allocation process consists of two steps. First is dequeing from the pool. Second is, if there is no available page on the queue, allocating from the page allocator. new_non_cma_page() can control allocation from the page allocator by specifying correct gfp flag. However, dequeing cannot be controlled until now, so, new_non_cma_page() skips dequeing completely. It is a suboptimal since new_non_cma_page() cannot utilize hugetlb pages on the queue so this patch tries to fix this situation. This patch makes the deque function on hugetlb CMA aware and skip CMA pages if newly added skip_cma argument is passed as true. Acked-by: Mike Kravetz Signed-off-by: Joonsoo Kim --- include/linux/hugetlb.h | 6 ++---- mm/gup.c | 3 ++- mm/hugetlb.c | 31 ++++++++++++++++++++++--------- mm/mempolicy.c | 2 +- mm/migrate.c | 2 +- 5 files changed, 28 insertions(+), 16 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 8a8b755..858522e 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -505,11 +505,9 @@ struct huge_bootmem_page { struct page *alloc_huge_page(struct vm_area_struct *vma, unsigned long addr, int avoid_reserve); struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid, - nodemask_t *nmask, gfp_t gfp_mask); + nodemask_t *nmask, gfp_t gfp_mask, bool skip_cma); struct page *alloc_huge_page_vma(struct hstate *h, struct vm_area_struct *vma, unsigned long address); -struct page *alloc_migrate_huge_page(struct hstate *h, gfp_t gfp_mask, - int nid, nodemask_t *nmask); int huge_add_to_page_cache(struct page *page, struct address_space *mapping, pgoff_t idx); @@ -760,7 +758,7 @@ static inline struct page *alloc_huge_page(struct vm_area_struct *vma, static inline struct page * alloc_huge_page_nodemask(struct hstate *h, int preferred_nid, - nodemask_t *nmask, gfp_t gfp_mask) + nodemask_t *nmask, gfp_t gfp_mask, bool skip_cma) { return NULL; } diff --git a/mm/gup.c b/mm/gup.c index 6f47697..15be281 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1630,11 +1630,12 @@ static struct page *new_non_cma_page(struct page *page, unsigned long private) #ifdef CONFIG_HUGETLB_PAGE if (PageHuge(page)) { struct hstate *h = page_hstate(page); + /* * We don't want to dequeue from the pool because pool pages will * mostly be from the CMA region. */ - return alloc_migrate_huge_page(h, gfp_mask, nid, NULL); + return alloc_huge_page_nodemask(h, nid, NULL, gfp_mask, true); } #endif if (PageTransHuge(page)) { diff --git a/mm/hugetlb.c b/mm/hugetlb.c index bd408f2..1410e62 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1033,13 +1033,18 @@ static void enqueue_huge_page(struct hstate *h, struct page *page) h->free_huge_pages_node[nid]++; } -static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid) +static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid, bool skip_cma) { struct page *page; - list_for_each_entry(page, &h->hugepage_freelists[nid], lru) + list_for_each_entry(page, &h->hugepage_freelists[nid], lru) { + if (skip_cma && is_migrate_cma_page(page)) + continue; + if (!PageHWPoison(page)) break; + } + /* * if 'non-isolated free hugepage' not found on the list, * the allocation fails. @@ -1054,7 +1059,7 @@ static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid) } static struct page *dequeue_huge_page_nodemask(struct hstate *h, gfp_t gfp_mask, int nid, - nodemask_t *nmask) + nodemask_t *nmask, bool skip_cma) { unsigned int cpuset_mems_cookie; struct zonelist *zonelist; @@ -1079,7 +1084,7 @@ static struct page *dequeue_huge_page_nodemask(struct hstate *h, gfp_t gfp_mask, continue; node = zone_to_nid(zone); - page = dequeue_huge_page_node_exact(h, node); + page = dequeue_huge_page_node_exact(h, node, skip_cma); if (page) return page; } @@ -1124,7 +1129,7 @@ static struct page *dequeue_huge_page_vma(struct hstate *h, gfp_mask = htlb_alloc_mask(h); nid = huge_node(vma, address, gfp_mask, &mpol, &nodemask); - page = dequeue_huge_page_nodemask(h, gfp_mask, nid, nodemask); + page = dequeue_huge_page_nodemask(h, gfp_mask, nid, nodemask, false); if (page && !avoid_reserve && vma_has_reserves(vma, chg)) { SetPagePrivate(page); h->resv_huge_pages--; @@ -1937,7 +1942,7 @@ static struct page *alloc_surplus_huge_page(struct hstate *h, gfp_t gfp_mask, return page; } -struct page *alloc_migrate_huge_page(struct hstate *h, gfp_t gfp_mask, +static struct page *alloc_migrate_huge_page(struct hstate *h, gfp_t gfp_mask, int nid, nodemask_t *nmask) { struct page *page; @@ -1980,7 +1985,7 @@ struct page *alloc_buddy_huge_page_with_mpol(struct hstate *h, /* page migration callback function */ struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid, - nodemask_t *nmask, gfp_t gfp_mask) + nodemask_t *nmask, gfp_t gfp_mask, bool skip_cma) { gfp_mask |= htlb_alloc_mask(h); @@ -1988,7 +1993,8 @@ struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid, if (h->free_huge_pages - h->resv_huge_pages > 0) { struct page *page; - page = dequeue_huge_page_nodemask(h, gfp_mask, preferred_nid, nmask); + page = dequeue_huge_page_nodemask(h, gfp_mask, + preferred_nid, nmask, skip_cma); if (page) { spin_unlock(&hugetlb_lock); return page; @@ -1996,6 +2002,13 @@ struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid, } spin_unlock(&hugetlb_lock); + /* + * To skip the memory on CMA area, we need to clear __GFP_MOVABLE. + * Clearing __GFP_MOVABLE at the top of this function would also skip + * the proper allocation candidates for dequeue so clearing it here. + */ + if (skip_cma) + gfp_mask &= ~__GFP_MOVABLE; return alloc_migrate_huge_page(h, gfp_mask, preferred_nid, nmask); } @@ -2011,7 +2024,7 @@ struct page *alloc_huge_page_vma(struct hstate *h, struct vm_area_struct *vma, gfp_mask = htlb_alloc_mask(h); node = huge_node(vma, address, gfp_mask, &mpol, &nodemask); - page = alloc_huge_page_nodemask(h, node, nodemask, 0); + page = alloc_huge_page_nodemask(h, node, nodemask, 0, false); mpol_cond_put(mpol); return page; diff --git a/mm/mempolicy.c b/mm/mempolicy.c index f21cff5..a3abf64 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1071,7 +1071,7 @@ struct page *alloc_new_node_page(struct page *page, unsigned long node) if (PageHuge(page)) { return alloc_huge_page_nodemask( page_hstate(compound_head(page)), node, - NULL, __GFP_THISNODE); + NULL, __GFP_THISNODE, false); } else if (PageTransHuge(page)) { struct page *thp; diff --git a/mm/migrate.c b/mm/migrate.c index 6ca9f0c..634f1ea 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1546,7 +1546,7 @@ struct page *new_page_nodemask(struct page *page, if (PageHuge(page)) { return alloc_huge_page_nodemask( page_hstate(compound_head(page)), - preferred_nid, nodemask, 0); + preferred_nid, nodemask, 0, false); } if (PageTransHuge(page)) {