From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: "linux-mm@kvack.org" <linux-mm@kvack.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] mm/hugetlb: initialize order with UINT_MAX in dissolve_free_huge_pages()
Date: Tue, 12 May 2015 09:20:35 +0000 [thread overview]
Message-ID: <20150512092034.GF3068@hori1.linux.bs1.fc.nec.co.jp> (raw)
In-Reply-To: <20150512091640.GE3068@hori1.linux.bs1.fc.nec.co.jp>
Currently the initial value of order in dissolve_free_huge_page is 64 or 32,
which leads to the following warning in static checker:
mm/hugetlb.c:1203 dissolve_free_huge_pages()
warn: potential right shift more than type allows '9,18,64'
This is a potential risk of infinite loop, because 1 << order (== 0) is used
in for-loop like this:
for (pfn = start_pfn; pfn < end_pfn; pfn += 1 << order)
...
So this patch simply avoids the risk by initializing with UINT_MAX.
Fixes: c8721bbbdd36 ("mm: memory-hotplug: enable memory hotplug to handle hugepage")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
---
mm/hugetlb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 271e4432734c..804437505a84 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1188,7 +1188,7 @@ static void dissolve_free_huge_page(struct page *page)
*/
void dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn)
{
- unsigned int order = 8 * sizeof(void *);
+ unsigned int order = UINT_MAX;
unsigned long pfn;
struct hstate *h;
@@ -1200,6 +1200,7 @@ void dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn)
if (order > huge_page_order(h))
order = huge_page_order(h);
VM_BUG_ON(!IS_ALIGNED(start_pfn, 1 << order));
+ VM_BUG_ON(order == UINT_MAX);
for (pfn = start_pfn; pfn < end_pfn; pfn += 1 << order)
dissolve_free_huge_page(pfn_to_page(pfn));
}
--
2.1.0
--
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:[~2015-05-12 9:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 11:17 mm: memory-hotplug: enable memory hotplug to handle hugepage Dan Carpenter
2015-05-11 11:29 ` Dan Carpenter
2015-05-11 23:56 ` Naoya Horiguchi
2015-05-11 23:54 ` Naoya Horiguchi
2015-05-12 8:43 ` Dan Carpenter
2015-05-12 9:04 ` Naoya Horiguchi
2015-05-12 9:13 ` Dan Carpenter
2015-05-12 9:16 ` Naoya Horiguchi
2015-05-12 9:20 ` Naoya Horiguchi [this message]
2015-05-12 23:15 ` [PATCH] mm/hugetlb: initialize order with UINT_MAX in dissolve_free_huge_pages() Andrew Morton
2015-05-13 1:44 ` Naoya Horiguchi
2015-05-13 20:55 ` Andrew Morton
2015-05-14 6:15 ` [PATCH] mm/hugetlb: introduce minimum hugepage order Naoya Horiguchi
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=20150512092034.GF3068@hori1.linux.bs1.fc.nec.co.jp \
--to=n-horiguchi@ah.jp.nec.com \
--cc=akpm@linux-foundation.org \
--cc=dan.carpenter@oracle.com \
--cc=linux-mm@kvack.org \
/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