linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mm: negative left shift count when PAGE_SHIFT > 20
@ 2013-07-18 16:56 Jerry
  2013-07-18 17:13 ` John Stoffel
  2013-07-18 21:39 ` Andrew Morton
  0 siblings, 2 replies; 8+ messages in thread
From: Jerry @ 2013-07-18 16:56 UTC (permalink / raw)
  To: akpm; +Cc: zhuwei.lu, tianfu.huang, linux-mm, linux-kernel, Jerry

When PAGE_SHIFT > 20, the result of "20 - PAGE_SHIFT" is negative. The
calculating here will generate an unexpected result. In addition, if
PAGE_SHIFT > 20, The memory size represented by numentries was already
integral multiple of 1MB.

Signed-off-by: Jerry <uulinux@gmail.com>
---
 mm/page_alloc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index b100255..cd41797 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5745,9 +5745,11 @@ void *__init alloc_large_system_hash(const char *tablename,
 	if (!numentries) {
 		/* round applicable memory size up to nearest megabyte */
 		numentries = nr_kernel_pages;
-		numentries += (1UL << (20 - PAGE_SHIFT)) - 1;
-		numentries >>= 20 - PAGE_SHIFT;
-		numentries <<= 20 - PAGE_SHIFT;
+		if (20 > PAGE_SHIFT) {
+			numentries += (1UL << (20 - PAGE_SHIFT)) - 1;
+			numentries >>= 20 - PAGE_SHIFT;
+			numentries <<= 20 - PAGE_SHIFT;
+		}
 
 		/* limit to 1 bucket per 2^scale bytes of low memory */
 		if (scale > PAGE_SHIFT)
-- 
1.8.1.5

--
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>

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH] mm: negative left shift count when PAGE_SHIFT > 20
@ 2013-07-20 17:12 Jerry Zhou
  0 siblings, 0 replies; 8+ messages in thread
From: Jerry Zhou @ 2013-07-20 17:12 UTC (permalink / raw)
  To: akpm
  Cc: zhuwei.lu, tianfu.huang, chunhua.zhou, linux-mm, linux-kernel,
	Jerry Zhou

When PAGE_SHIFT > 20, the result of "20 - PAGE_SHIFT" is negative. The
previous calculating here will generate an unexpected result. In
addition, if PAGE_SIZE >= 1MB, The memory size of "numentries" was
already integral multiple of 1MB.

Signed-off-by: Jerry Zhou <uulinux@gmail.com>
---
 mm/page_alloc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index b100255..7c469c6 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5745,9 +5745,10 @@ void *__init alloc_large_system_hash(const char *tablename,
 	if (!numentries) {
 		/* round applicable memory size up to nearest megabyte */
 		numentries = nr_kernel_pages;
-		numentries += (1UL << (20 - PAGE_SHIFT)) - 1;
-		numentries >>= 20 - PAGE_SHIFT;
-		numentries <<= 20 - PAGE_SHIFT;
+
+		/* It isn't necessary when PAGE_SIZE >= 1MB */
+		if (PAGE_SHIFT < 20)
+			numentries = round_up(numentries, (1<<20)/PAGE_SIZE);
 
 		/* limit to 1 bucket per 2^scale bytes of low memory */
 		if (scale > PAGE_SHIFT)
-- 
1.8.1.5

--
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>

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2013-07-20 17:17 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-18 16:56 [PATCH] mm: negative left shift count when PAGE_SHIFT > 20 Jerry
2013-07-18 17:13 ` John Stoffel
2013-07-18 17:21   ` Jerry
2013-07-18 21:39 ` Andrew Morton
2013-07-18 23:47   ` Jerry
2013-07-19 21:57     ` Andrew Morton
2013-07-20 17:16       ` Jerry
  -- strict thread matches above, loose matches on Subject: below --
2013-07-20 17:12 Jerry Zhou

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).