diff options
author | Wanpeng Li <liwanp@linux.vnet.ibm.com> | 2013-07-03 18:02:40 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-21 21:21:36 -0400 |
commit | 7642257802319a58c118649e20ad5c7ee0d663f3 (patch) | |
tree | 4ef067169aa1df797c55b8375a063bdc6152a870 | |
parent | 71a429cf00c7ff8da3fc3356617987e746055c00 (diff) |
mm/memory-hotplug: fix lowmem count overflow when offline pages
commit cea27eb2a202959783f81254c48c250ddd80e129 upstream.
The logic for the memory-remove code fails to correctly account the
Total High Memory when a memory block which contains High Memory is
offlined as shown in the example below. The following patch fixes it.
Before logic memory remove:
MemTotal: 7603740 kB
MemFree: 6329612 kB
Buffers: 94352 kB
Cached: 872008 kB
SwapCached: 0 kB
Active: 626932 kB
Inactive: 519216 kB
Active(anon): 180776 kB
Inactive(anon): 222944 kB
Active(file): 446156 kB
Inactive(file): 296272 kB
Unevictable: 0 kB
Mlocked: 0 kB
HighTotal: 7294672 kB
HighFree: 5704696 kB
LowTotal: 309068 kB
LowFree: 624916 kB
After logic memory remove:
MemTotal: 7079452 kB
MemFree: 5805976 kB
Buffers: 94372 kB
Cached: 872000 kB
SwapCached: 0 kB
Active: 626936 kB
Inactive: 519236 kB
Active(anon): 180780 kB
Inactive(anon): 222944 kB
Active(file): 446156 kB
Inactive(file): 296292 kB
Unevictable: 0 kB
Mlocked: 0 kB
HighTotal: 7294672 kB
HighFree: 5181024 kB
LowTotal: 4294752076 kB
LowFree: 624952 kB
[mhocko@suse.cz: fix CONFIG_HIGHMEM=n build]
Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | mm/page_alloc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c3edb624fccf..2ee0fd313f03 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -6142,6 +6142,10 @@ __offline_isolated_pages(unsigned long start_pfn, unsigned long end_pfn) | |||
6142 | list_del(&page->lru); | 6142 | list_del(&page->lru); |
6143 | rmv_page_order(page); | 6143 | rmv_page_order(page); |
6144 | zone->free_area[order].nr_free--; | 6144 | zone->free_area[order].nr_free--; |
6145 | #ifdef CONFIG_HIGHMEM | ||
6146 | if (PageHighMem(page)) | ||
6147 | totalhigh_pages -= 1 << order; | ||
6148 | #endif | ||
6145 | for (i = 0; i < (1 << order); i++) | 6149 | for (i = 0; i < (1 << order); i++) |
6146 | SetPageReserved((page+i)); | 6150 | SetPageReserved((page+i)); |
6147 | pfn += (1 << order); | 6151 | pfn += (1 << order); |