From: Luiz Capitulino <lcapitulino@redhat.com>
To: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
mtosatti@redhat.com, mgorman@suse.de, aarcange@redhat.com,
andi@firstfloor.org, riel@redhat.com
Subject: [PATCH 4/4] hugetlb: hugepagesnid=: add 1G huge page support
Date: Mon, 10 Feb 2014 12:27:48 -0500 [thread overview]
Message-ID: <1392053268-29239-5-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1392053268-29239-1-git-send-email-lcapitulino@redhat.com>
From: Luiz capitulino <lcapitulino@redhat.com>
Signed-off-by: Luiz capitulino <lcapitulino@redhat.com>
---
mm/hugetlb.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 439c3b7..d759321 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2051,6 +2051,29 @@ void __init hugetlb_add_hstate(unsigned order)
parsed_hstate = h;
}
+static void __init hugetlb_hstate_alloc_pages_nid(struct hstate *h,
+ int nid,
+ unsigned long nr_pages)
+{
+ struct huge_bootmem_page *m;
+ unsigned long i;
+ void *addr;
+
+ for (i = 0; i < nr_pages; i++) {
+ addr = memblock_virt_alloc_nid_nopanic(
+ huge_page_size(h), huge_page_size(h),
+ 0, BOOTMEM_ALLOC_ACCESSIBLE, nid);
+ if (!addr)
+ break;
+ m = addr;
+ BUG_ON((unsigned long)virt_to_phys(m) & (huge_page_size(h) - 1));
+ list_add(&m->list, &huge_boot_pages);
+ m->hstate = h;
+ }
+
+ h->max_huge_pages += i;
+}
+
void __init hugetlb_add_nrpages_nid(unsigned order, unsigned long nid,
unsigned long nr_pages)
{
@@ -2080,6 +2103,9 @@ void __init hugetlb_add_nrpages_nid(unsigned order, unsigned long nid,
}
*p = nr_pages;
+
+ if (h->order >= MAX_ORDER)
+ hugetlb_hstate_alloc_pages_nid(h, nid, nr_pages);
}
static int __init hugetlb_nrpages_setup(char *s)
--
1.8.1.4
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2014-02-10 17:28 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-10 17:27 [PATCH 0/4] hugetlb: add hugepagesnid= command-line option Luiz Capitulino
2014-02-10 17:27 ` [PATCH 1/4] memblock: memblock_virt_alloc_internal(): alloc from specified node only Luiz Capitulino
2014-02-10 23:27 ` Andrew Morton
2014-02-11 9:20 ` Mel Gorman
2014-02-10 17:27 ` [PATCH 2/4] memblock: add memblock_virt_alloc_nid_nopanic() Luiz Capitulino
2014-02-10 17:27 ` [PATCH 3/4] hugetlb: add hugepagesnid= command-line option Luiz Capitulino
2014-02-10 23:27 ` Andrew Morton
2014-02-11 15:26 ` Luiz Capitulino
2014-02-12 3:44 ` Yasuaki Ishimatsu
2014-02-12 19:39 ` Luiz Capitulino
2014-02-10 17:27 ` Luiz Capitulino [this message]
2014-02-10 23:30 ` [PATCH 4/4] hugetlb: hugepagesnid=: add 1G huge page support Andrew Morton
2014-02-11 15:27 ` Luiz Capitulino
2014-02-10 17:55 ` [PATCH 0/4] hugetlb: add hugepagesnid= command-line option Luiz Capitulino
2014-02-10 23:13 ` Andrew Morton
2014-02-11 3:58 ` Davidlohr Bueso
2014-02-11 15:10 ` Luiz Capitulino
2014-02-11 2:54 ` David Rientjes
2014-02-11 9:25 ` Mel Gorman
2014-02-11 15:26 ` Marcelo Tosatti
2014-02-11 17:10 ` Mel Gorman
2014-02-11 20:15 ` Marcelo Tosatti
2014-02-12 10:39 ` Mel Gorman
2014-02-11 15:36 ` Luiz Capitulino
2014-02-12 3:59 ` David Rientjes
2014-02-12 20:09 ` Luiz Capitulino
2014-02-11 21:17 ` Andi Kleen
2014-02-11 21:31 ` Luiz Capitulino
2014-02-12 2:37 ` Andi Kleen
2014-02-12 4:01 ` David Rientjes
2014-02-12 19:33 ` Luiz Capitulino
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=1392053268-29239-5-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=andi@firstfloor.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mtosatti@redhat.com \
--cc=riel@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).