All of lore.kernel.org
 help / color / mirror / Atom feed
From: Barry Song <song.bao.hua@hisilicon.com>
To: <akpm@linux-foundation.org>
Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
	<linuxarm@huawei.com>, Barry Song <song.bao.hua@hisilicon.com>,
	"Roman Gushchin" <guro@fb.com>,
	Mike Kravetz <mike.kravetz@oracle.com>,
	"Jonathan Cameron" <jonathan.cameron@huawei.com>
Subject: [PATCH] mm/hugetlb: avoid hardcoding while checking if cma is reserved
Date: Mon, 6 Jul 2020 20:44:05 +1200	[thread overview]
Message-ID: <20200706084405.14236-1-song.bao.hua@hisilicon.com> (raw)

hugetlb_cma[0] can be NULL due to various reasons, for example, node0 has
no memory. Thus, NULL hugetlb_cma[0] doesn't necessarily mean cma is not
enabled. gigantic pages might have been reserved on other nodes.

Fixes: cf11e85fc08c ("mm: hugetlb: optionally allocate gigantic hugepages using cma")
Cc: Roman Gushchin <guro@fb.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Jonathan Cameron <jonathan.cameron@huawei.com>
Signed-off-by: Barry Song <song.bao.hua@hisilicon.com>
---
 mm/hugetlb.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 57ece74e3aae..603aa854aa89 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2571,9 +2571,21 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h)
 
 	for (i = 0; i < h->max_huge_pages; ++i) {
 		if (hstate_is_gigantic(h)) {
-			if (IS_ENABLED(CONFIG_CMA) && hugetlb_cma[0]) {
-				pr_warn_once("HugeTLB: hugetlb_cma is enabled, skip boot time allocation\n");
-				break;
+			if (IS_ENABLED(CONFIG_CMA)) {
+				int nid;
+				bool cma_reserved = false;
+
+				for_each_node_state(nid, N_ONLINE) {
+					if (hugetlb_cma[nid]) {
+						pr_warn_once("HugeTLB: hugetlb_cma is reserved,"
+								"skip boot time allocation\n");
+						cma_reserved = true;
+						break;
+					}
+				}
+
+				if (cma_reserved)
+					break;
 			}
 			if (!alloc_bootmem_huge_page(h))
 				break;
-- 
2.27.0



             reply	other threads:[~2020-07-06  8:46 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-06  8:44 Barry Song [this message]
2020-07-06 21:48 ` [PATCH] mm/hugetlb: avoid hardcoding while checking if cma is reserved Roman Gushchin
2020-07-06 22:14   ` Song Bao Hua (Barry Song)
2020-07-06 22:30   ` Song Bao Hua (Barry Song)
2020-07-06 23:26     ` Roman Gushchin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200706084405.14236-1-song.bao.hua@hisilicon.com \
    --to=song.bao.hua@hisilicon.com \
    --cc=akpm@linux-foundation.org \
    --cc=guro@fb.com \
    --cc=jonathan.cameron@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linuxarm@huawei.com \
    --cc=mike.kravetz@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.