linux-kernel - [PATCH] lib/show_mem.c: correct reserved memory calculation

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-id: <1437383665-29874-1-git-send-email-vishnu.ps@samsung.com>
Date:	Mon, 20 Jul 2015 14:44:25 +0530
From:	Vishnu Pratap Singh <vishnu.ps@...sung.com>
To:	akpm@...ux-foundation.org, linux@...musvillemoes.dk,
	riel@...hat.com, isimatu.yasuaki@...fujitsu.com, aquini@...hat.com,
	linux-kernel@...r.kernel.org
Cc:	cpgs@...sung.com, vishu13285@...il.com, pintu.k@...sung.com,
	rohit.kr@...sung.com, Vishnu Pratap Singh <vishnu.ps@...sung.com>
Subject: [PATCH] lib/show_mem.c: correct reserved memory calculation

CMA reserved memory is not part of total reserved memory.
Currently when we print the total reserve memory it considers
cma as part of reserve memory and do minus of totalcma_pages
from reserved, which is wrong. In cases where total reserved
is less than cma reserved we will get negative values & while
printing we print as unsigned and we will get a very large value.

Below is the show mem output on X86 ubuntu based system where
CMA reserved is 100MB (25600 pages) & total reserved is ~40MB(10316 pages).
And reserve memory shows a large value because of this bug.

Before:
[  127.066430] 898908 pages RAM
[  127.066432] 671682 pages HighMem/MovableOnly
[  127.066434] 4294952012 pages reserved
[  127.066436] 25600 pages cma reserved

After:
[   44.663129] 898908 pages RAM
[   44.663130] 671682 pages HighMem/MovableOnly
[   44.663130] 10316 pages reserved
[   44.663131] 25600 pages cma reserved

Also this patch change printk to pr_info.

Signed-off-by: Vishnu Pratap Singh <vishnu.ps@...sung.com>
---
 lib/show_mem.c |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/show_mem.c b/lib/show_mem.c
index adc98e18..0af5ede 100644
--- a/lib/show_mem.c
+++ b/lib/show_mem.c
@@ -14,7 +14,7 @@ void show_mem(unsigned int filter)
 	pg_data_t *pgdat;
 	unsigned long total = 0, reserved = 0, highmem = 0;
 
-	printk("Mem-Info:\n");
+	pr_info("Mem-Info:\n");
 	show_free_areas(filter);
 
 	for_each_online_pgdat(pgdat) {
@@ -36,19 +36,18 @@ void show_mem(unsigned int filter)
 		pgdat_resize_unlock(pgdat, &flags);
 	}
 
-	printk("%lu pages RAM\n", total);
-	printk("%lu pages HighMem/MovableOnly\n", highmem);
+	pr_info("%lu pages RAM\n", total);
+	pr_info("%lu pages HighMem/MovableOnly\n", highmem);
+	pr_info("%lu pages reserved\n", reserved);
 #ifdef CONFIG_CMA
-	printk("%lu pages reserved\n", (reserved - totalcma_pages));
-	printk("%lu pages cma reserved\n", totalcma_pages);
-#else
-	printk("%lu pages reserved\n", reserved);
+	pr_info("%lu pages cma reserved\n", totalcma_pages);
 #endif
 #ifdef CONFIG_QUICKLIST
-	printk("%lu pages in pagetable cache\n",
+	pr_info("%lu pages in pagetable cache\n",
 		quicklist_total_size());
 #endif
 #ifdef CONFIG_MEMORY_FAILURE
-	printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
+	pr_info("%lu pages hwpoisoned\n",
+		atomic_long_read(&num_poisoned_pages));
 #endif
 }
-- 
1.7.9.5

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