Commit 47f8f929 authored Dec 18, 2014 by Pintu Kumar Committed by Linus Torvalds Dec 18, 2014

fs/proc/meminfo.c: include cma info in proc/meminfo



This patch include CMA info (CMATotal, CMAFree) in /proc/meminfo.
Currently, in a CMA enabled system, if somebody wants to know the total
CMA size declared, there is no way to tell, other than the dmesg or
/var/log/messages logs.

With this patch we are showing the CMA info as part of meminfo, so that it
can be determined at any point of time.  This will be populated only when
CMA is enabled.

Below is the sample output from a ARM based device with RAM:512MB and CMA:16MB.

  MemTotal:         471172 kB
  MemFree:          111712 kB
  MemAvailable:     271172 kB
  .
  .
  .
  CmaTotal:          16384 kB
  CmaFree:            6144 kB

This patch also fix below checkpatch errors that were found during these changes.

  ERROR: space required after that ',' (ctx:ExV)
  199: FILE: fs/proc/meminfo.c:199:
  +       ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
          ^

  ERROR: space required after that ',' (ctx:ExV)
  202: FILE: fs/proc/meminfo.c:202:
  +       ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
          ^

  ERROR: space required after that ',' (ctx:ExV)
  206: FILE: fs/proc/meminfo.c:206:
  +       ,K(totalcma_pages)
          ^

  total: 3 errors, 0 warnings, 2 checks, 236 lines checked

Signed-off-by: Pintu Kumar <pintu.k@samsung.com>
Signed-off-by: Vishnu Pratap Singh <vishnu.ps@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Cc: Rafael Aquini <aquini@redhat.com>
Cc: Jerome Marchand <jmarchan@redhat.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent e48322ab

fs/proc/meminfo.c

+13 −2

Original line number	Diff line number	Diff line
		@@ -12,6 +12,9 @@
		#include <linux/vmstat.h>
		#include <linux/atomic.h>
		#include <linux/vmalloc.h>
		#ifdef CONFIG_CMA
		#include <linux/cma.h>
		#endif
		#include <asm/page.h>
		#include <asm/pgtable.h>
		#include "internal.h"
		@@ -137,6 +140,10 @@ static int meminfo_proc_show(struct seq_file m, void v)
		#endif
		#ifdef CONFIG_TRANSPARENT_HUGEPAGE
		"AnonHugePages: %8lu kB\n"
		#endif
		#ifdef CONFIG_CMA
		"CmaTotal: %8lu kB\n"
		"CmaFree: %8lu kB\n"
		#endif
		,
		K(i.totalram),
		@@ -192,6 +199,10 @@ static int meminfo_proc_show(struct seq_file m, void v)
		#ifdef CONFIG_TRANSPARENT_HUGEPAGE
		, K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
		HPAGE_PMD_NR)
		#endif
		#ifdef CONFIG_CMA
		, K(totalcma_pages)
		, K(global_page_state(NR_FREE_CMA_PAGES))
		#endif
		);

Admin message