From: Jiang Liu <liuj97@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>,
David Rientjes <rientjes@google.com>
Cc: Jiang Liu <jiang.liu@huawei.com>,
Wen Congyang <wency@cn.fujitsu.com>, Mel Gorman <mgorman@suse.de>,
Minchan Kim <minchan@kernel.org>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Michal Hocko <mhocko@suse.cz>, Jianguo Wu <wujianguo@huawei.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2, part3 11/12] mm: report available pages as "MemTotal" for each NUMA node
Date: Sun, 17 Mar 2013 01:03:32 +0800 [thread overview]
Message-ID: <1363453413-8139-12-git-send-email-jiang.liu@huawei.com> (raw)
In-Reply-To: <1363453413-8139-1-git-send-email-jiang.liu@huawei.com>
As reported by https://bugzilla.kernel.org/show_bug.cgi?id=53501,
"MemTotal" from /proc/meminfo means memory pages managed by the buddy
system (managed_pages), but "MemTotal" from /sys/.../node/nodex/meminfo
means phsical pages present (present_pages) within the NUMA node.
There's a difference between managed_pages and present_pages due to
bootmem allocator and reserved pages.
And Documentation/filesystems/proc.txt says
MemTotal: Total usable ram (i.e. physical ram minus a few reserved
bits and the kernel binary code)
So change /sys/.../node/nodex/meminfo to report available pages within
the node as "MemTotal".
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Reported-by: sworddragon2@aol.com
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Minchan Kim <minchan@kernel.org>
Cc: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org
---
mm/page_alloc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 6834104..ebfb042 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2878,9 +2878,13 @@ EXPORT_SYMBOL(si_meminfo);
#ifdef CONFIG_NUMA
void si_meminfo_node(struct sysinfo *val, int nid)
{
+ int zone_type; /* needs to be signed */
+ unsigned long managed_pages = 0;
pg_data_t *pgdat = NODE_DATA(nid);
- val->totalram = pgdat->node_present_pages;
+ for (zone_type = 0; zone_type < MAX_NR_ZONES; zone_type++)
+ managed_pages += pgdat->node_zones[zone_type].managed_pages;
+ val->totalram = managed_pages;
val->freeram = node_page_state(nid, NR_FREE_PAGES);
#ifdef CONFIG_HIGHMEM
val->totalhigh = pgdat->node_zones[ZONE_HIGHMEM].managed_pages;
--
1.7.9.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>
next prev parent reply other threads:[~2013-03-16 17:04 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-16 17:03 [PATCH v2, part3 00/12] accurately calculate zone->managed_pages Jiang Liu
2013-03-16 17:03 ` [PATCH v2, part3 01/12] mm: enhance free_reserved_area() to support poisoning memory with zero Jiang Liu
2013-03-16 17:37 ` Geert Uytterhoeven
2013-03-16 17:48 ` Jiang Liu
2013-03-16 17:03 ` [PATCH v2, part3 02/12] mm/ARM64: kill poison_init_mem() Jiang Liu
2013-03-17 21:46 ` Will Deacon
2013-03-18 17:21 ` Jiang Liu
2013-03-16 17:03 ` [PATCH v2, part3 03/12] mm/x86: use common help functions to furthur simplify code Jiang Liu
2013-03-16 17:03 ` [PATCH v2, part3 04/12] mm/tile: use common help functions to free reserved pages Jiang Liu
2013-03-16 17:03 ` [PATCH v2, part3 05/12] mm/powertv: " Jiang Liu
2013-03-16 17:03 ` [PATCH v2, part3 06/12] mm/acornfb: " Jiang Liu
2013-03-16 17:03 ` [PATCH v2, part3 07/12] mm: accurately calculate zone->managed_pages for highmem zones Jiang Liu
2013-03-16 17:03 ` [PATCH v2, part3 08/12] mm: use a dedicated lock to protect totalram_pages and zone->managed_pages Jiang Liu
2013-03-16 17:03 ` [PATCH v2, part3 09/12] mm: avoid using __free_pages_bootmem() at runtime Jiang Liu
2013-03-16 17:03 ` [PATCH v2, part3 10/12] mm: correctly update zone->mamaged_pages Jiang Liu
2013-03-16 17:03 ` Jiang Liu [this message]
2013-03-16 17:03 ` [PATCH v2, part3 12/12] mm: concentrate adjusting of totalram_pages Jiang Liu
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=1363453413-8139-12-git-send-email-jiang.liu@huawei.com \
--to=liuj97@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=jiang.liu@huawei.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.cz \
--cc=minchan@kernel.org \
--cc=rientjes@google.com \
--cc=wency@cn.fujitsu.com \
--cc=wujianguo@huawei.com \
/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;
as well as URLs for NNTP newsgroup(s).