From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by kanga.kvack.org (Postfix) with ESMTP id BAC366B0032 for ; Thu, 4 Dec 2014 20:44:06 -0500 (EST) Received: by mail-pa0-f48.google.com with SMTP id rd3so19106727pab.35 for ; Thu, 04 Dec 2014 17:44:06 -0800 (PST) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com. [119.145.14.65]) by mx.google.com with ESMTPS id s5si45529093pdg.142.2014.12.04.17.44.04 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 04 Dec 2014 17:44:05 -0800 (PST) Message-ID: <54810D74.4030606@huawei.com> Date: Fri, 5 Dec 2014 09:42:12 +0800 From: Xishi Qiu MIME-Version: 1.0 Subject: Re: [PATCH] CMA: add the amount of cma memory in meminfo References: <547FCCE9.2020600@huawei.com> In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: To: Michal Nazarewicz Cc: Andrew Morton , m.szyprowski@samsung.com, aneesh.kumar@linux.vnet.ibm.com, iamjoonsoo.kim@lge.com, LKML , Linux MM On 2014/12/5 0:26, Michal Nazarewicz wrote: > On Thu, Dec 04 2014, Xishi Qiu wrote: >> Add the amount of cma memory in the following meminfo. >> /proc/meminfo >> /sys/devices/system/node/nodeXX/meminfo >> >> Signed-off-by: Xishi Qiu >> --- >> drivers/base/node.c | 16 ++++++++++------ >> fs/proc/meminfo.c | 12 +++++++++--- >> 2 files changed, 19 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/base/node.c b/drivers/base/node.c >> index 472168c..a27e4e0 100644 >> --- a/drivers/base/node.c >> +++ b/drivers/base/node.c >> @@ -120,6 +120,9 @@ static ssize_t node_read_meminfo(struct device *dev, >> #ifdef CONFIG_TRANSPARENT_HUGEPAGE >> "Node %d AnonHugePages: %8lu kB\n" >> #endif >> +#ifdef CONFIG_CMA >> + "Node %d FreeCMAPages: %8lu kB\n" >> +#endif >> , >> nid, K(node_page_state(nid, NR_FILE_DIRTY)), >> nid, K(node_page_state(nid, NR_WRITEBACK)), >> @@ -136,14 +139,15 @@ static ssize_t node_read_meminfo(struct device *dev, >> nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE) + >> node_page_state(nid, NR_SLAB_UNRECLAIMABLE)), >> nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)), >> -#ifdef CONFIG_TRANSPARENT_HUGEPAGE >> nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)) > > Why is this line suddenly out of a??#ifdef CONFIG_TRANSPARENT_HUGEPAGEa??? > Hi Michal, The original code is like this. ... #ifdef CONFIG_TRANSPARENT_HUGEPAGE nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)) , nid, K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) * HPAGE_PMD_NR)); #else nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))); #endif ... I change it to like this, just move ");" out of the "#ifdef". ... nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)) #ifdef CONFIG_TRANSPARENT_HUGEPAGE , nid, K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) * HPAGE_PMD_NR) #endif ); ... >> - , nid, >> - K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) * >> - HPAGE_PMD_NR)); >> -#else >> - nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))); >> +#ifdef CONFIG_TRANSPARENT_HUGEPAGE >> + , nid, K(node_page_state(nid, >> + NR_ANON_TRANSPARENT_HUGEPAGES) * HPAGE_PMD_NR) > > This is mere white-space change which is confusing. > you mean change like this ", nid, K(...)" -> ",nid, K(xxx)"? Thanks, Xishi Qiu >> +#endif >> +#ifdef CONFIG_CMA >> + , nid, K(node_page_state(nid, NR_FREE_CMA_PAGES)) >> #endif >> + ); >> n += hugetlb_report_node_meminfo(nid, buf + n); >> return n; >> } >> diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c >> index aa1eee0..d42e082 100644 >> --- a/fs/proc/meminfo.c >> +++ b/fs/proc/meminfo.c >> @@ -138,6 +138,9 @@ static int meminfo_proc_show(struct seq_file *m, void *v) >> #ifdef CONFIG_TRANSPARENT_HUGEPAGE >> "AnonHugePages: %8lu kB\n" >> #endif >> +#ifdef CONFIG_CMA >> + "FreeCMAPages: %8lu kB\n" >> +#endif >> , >> K(i.totalram), >> K(i.freeram), >> @@ -187,11 +190,14 @@ static int meminfo_proc_show(struct seq_file *m, void *v) >> vmi.used >> 10, >> vmi.largest_chunk >> 10 >> #ifdef CONFIG_MEMORY_FAILURE >> - ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10) >> + , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10) >> #endif >> #ifdef CONFIG_TRANSPARENT_HUGEPAGE >> - ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) * >> - HPAGE_PMD_NR) >> + , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) * >> + HPAGE_PMD_NR) >> +#endif > > Again, please don't include white space changes. They are confusing. > >> +#ifdef CONFIG_CMA >> + , K(global_page_state(NR_FREE_CMA_PAGES)) >> #endif >> ); >> >> -- >> 2.0.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: email@kvack.org