diff options
author | Jiang Liu <liuj97@gmail.com> | 2013-07-03 18:03:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:33 -0400 |
commit | c3d5f5f0c2bc4eabeaf49f1a21e1aeb965246cd2 (patch) | |
tree | ec3b59b33102150b20c04de0b43d25dcea692b68 /include/linux/mm.h | |
parent | 7b4b2a0d6c8500350784beb83a6a55e60ea3bea3 (diff) |
mm: use a dedicated lock to protect totalram_pages and zone->managed_pages
Currently lock_memory_hotplug()/unlock_memory_hotplug() are used to
protect totalram_pages and zone->managed_pages. Other than the memory
hotplug driver, totalram_pages and zone->managed_pages may also be
modified at runtime by other drivers, such as Xen balloon,
virtio_balloon etc. For those cases, memory hotplug lock is a little
too heavy, so introduce a dedicated lock to protect totalram_pages and
zone->managed_pages.
Now we have a simplified locking rules totalram_pages and
zone->managed_pages as:
1) no locking for read accesses because they are unsigned long.
2) no locking for write accesses at boot time in single-threaded context.
3) serialize write accesses at runtime by acquiring the dedicated
managed_page_count_lock.
Also adjust zone->managed_pages when freeing reserved pages into the
buddy system, to keep totalram_pages and zone->managed_pages in
consistence.
[akpm@linux-foundation.org: don't export adjust_managed_page_count to modules (for now)]
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Michel Lespinasse <walken@google.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: <sworddragon2@aol.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Jianguo Wu <wujianguo@huawei.com>
Cc: Joonsoo Kim <js1304@gmail.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/mm.h')
-rw-r--r-- | include/linux/mm.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 083cc0ba2384..4310f80ce956 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -1313,6 +1313,7 @@ extern void free_initmem(void); | |||
1313 | */ | 1313 | */ |
1314 | extern unsigned long free_reserved_area(void *start, void *end, | 1314 | extern unsigned long free_reserved_area(void *start, void *end, |
1315 | int poison, char *s); | 1315 | int poison, char *s); |
1316 | |||
1316 | #ifdef CONFIG_HIGHMEM | 1317 | #ifdef CONFIG_HIGHMEM |
1317 | /* | 1318 | /* |
1318 | * Free a highmem page into the buddy system, adjusting totalhigh_pages | 1319 | * Free a highmem page into the buddy system, adjusting totalhigh_pages |
@@ -1321,10 +1322,7 @@ extern unsigned long free_reserved_area(void *start, void *end, | |||
1321 | extern void free_highmem_page(struct page *page); | 1322 | extern void free_highmem_page(struct page *page); |
1322 | #endif | 1323 | #endif |
1323 | 1324 | ||
1324 | static inline void adjust_managed_page_count(struct page *page, long count) | 1325 | extern void adjust_managed_page_count(struct page *page, long count); |
1325 | { | ||
1326 | totalram_pages += count; | ||
1327 | } | ||
1328 | 1326 | ||
1329 | /* Free the reserved page into the buddy system, so it gets managed. */ | 1327 | /* Free the reserved page into the buddy system, so it gets managed. */ |
1330 | static inline void __free_reserved_page(struct page *page) | 1328 | static inline void __free_reserved_page(struct page *page) |