[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1294247429-11768-1-git-send-email-emunson@mgebm.net>
Date: Wed, 5 Jan 2011 10:10:29 -0700
From: Eric B Munson <emunson@...bm.net>
To: akpm@...ux-foundation.org
Cc: linux-kernel@...r.kernel.org, linux-mm@...ck.org,
caiqian@...hat.com, mel@....ul.ie,
Eric B Munson <emunson@...bm.net>
Subject: [PATCH] Do not allow pagesize >= MAX_ORDER pool adjustment
Huge pages with order >= MAX_ORDER must be allocated at boot via
the kernel command line, they cannot be allocated or freed once
the kernel is up and running. Currently we allow values to be
written to the sysctl files controling pool size for these huge
page sizes. This patch makes the store functions for nr_hugepages
and nr_overcommit_hugepages return -EINVAL when the pool for
a page size >= MAX_ORDER is changed.
Reported-by: CAI Qian <caiqian@...hat.com>
Signed-off-by: Eric B Munson <emunson@...bm.net>
---
mm/hugetlb.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 5cb71a9..9da2481 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1443,6 +1443,12 @@ static ssize_t nr_hugepages_store_common(bool obey_mempolicy,
return -EINVAL;
h = kobj_to_hstate(kobj, &nid);
+
+ if (h->order >= MAX_ORDER) {
+ NODEMASK_FREE(nodes_allowed);
+ return -EINVAL;
+ }
+
if (nid == NUMA_NO_NODE) {
/*
* global hstate attribute
@@ -1517,6 +1523,9 @@ static ssize_t nr_overcommit_hugepages_store(struct kobject *kobj,
unsigned long input;
struct hstate *h = kobj_to_hstate(kobj, NULL);
+ if (h->order >= MAX_ORDER)
+ return -EINVAL;
+
err = strict_strtoul(buf, 10, &input);
if (err)
return -EINVAL;
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists