Generic show_mem()
Subsystems (15)
cover Generic show_mem()
Every arch implements its own show_mem() function. Most of them share quite some code, some of them are completely identical.
This series implements a generic version of this function and migrates almost all architectures to it.
---
version 3:
- Fix kbuild logic as suggested by Sam Ravnborg
version 2:
- Fix kbuild bits as suggested by Heiko Carstens
- Include quicklist info as suggested by Paul Mundt
- Extend changelogs by info on removal of redundant output
Note: This patchset is based on the `Remove redundant display of free swap space from show_mem()' series.
arch/alpha/Kconfig | 1 + arch/alpha/mm/init.c | 29 ----------------------- arch/alpha/mm/numa.c | 34 --------------------------- arch/avr32/Kconfig | 1 + arch/avr32/mm/init.c | 39 ------------------------------- arch/blackfin/Kconfig | 1 + arch/blackfin/mm/init.c | 27 ---------------------- arch/cris/Kconfig | 1 + arch/cris/mm/init.c | 30 ------------------------ arch/frv/Kconfig | 1 + arch/frv/mm/init.c | 31 ------------------------- arch/h8300/Kconfig | 1 + arch/h8300/mm/init.c | 27 ---------------------- arch/m32r/Kconfig | 1 + arch/m32r/mm/init.c | 35 ---------------------------- arch/m68k/Kconfig | 1 + arch/m68k/mm/init.c | 30 ------------------------ arch/m68knommu/Kconfig | 1 + arch/m68knommu/mm/init.c | 27 ---------------------- arch/mips/Kconfig | 1 + arch/mips/mm/Makefile | 3 +- arch/mips/mm/pgtable.c | 36 ----------------------------- arch/mn10300/Kconfig | 1 + arch/mn10300/mm/pgtable.c | 27 ---------------------- arch/powerpc/Kconfig | 1 + arch/powerpc/mm/mem.c | 39 ------------------------------- arch/ppc/Kconfig | 1 + arch/ppc/mm/init.c | 30 ------------------------ arch/s390/Kconfig | 1 + arch/s390/mm/init.c | 35 ---------------------------- arch/sh/Kconfig | 1 + arch/sh/mm/init.c | 40 -------------------------------- arch/sparc64/Kconfig | 1 + arch/sparc64/mm/init.c | 43 ----------------------------------- arch/um/Kconfig | 1 + arch/um/kernel/mem.c | 29 ----------------------- arch/v850/Kconfig | 1 + arch/v850/kernel/setup.c | 30 ------------------------ arch/x86/Kconfig | 1 + arch/x86/mm/init_64.c | 37 ------------------------------ arch/x86/mm/pgtable_32.c | 47 -------------------------------------- arch/xtensa/Kconfig | 1 + arch/xtensa/mm/init.c | 26 --------------------- mm/Kconfig | 3 ++ mm/page_alloc.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ mm/swap_state.c | 3 +- 46 files changed, 81 insertions(+), 731 deletions(-)
PATCH 1/22 Print current swapcache page count in show_swap_cache_info()
Most show_mem() implementations calculate the amount of pages within the swapcache every time. Move the output to a more appropriate place and use the anyway available total_swapcache_pages variable.
---
mm/swap_state.c +2 -1
@@ -56,7 +56,8 @@ static struct {void show_swap_cache_info (void ) { -printk ("Swap cache: add %lu, delete %lu, find %lu/%lu\n" , +printk ("%lu pages in swap cache\n" , total_swapcache_pages); +printk ("Swap cache stats: add %lu, delete %lu, find %lu/%lu\n" , swap_cache_info.add_total, swap_cache_info.del_total, swap_cache_info.find_success, swap_cache_info.find_total);printk ("Free swap = %lukB\n" , nr_swap_pages << (PAGE_SHIFT -10 ));
PATCH 2/22 Generic show_mem() implementation
In reply to Johannes WeinerThis implements a platform-independent version of show_mem().
---
Note: I added the quicklist_total_size() as `pagetable cache' because it was the only use case I have found for quicklists, anyway.
mm/Kconfig +3 -0
@@ -193,3 +193,6 @@ config NR_QUICK config VIRT_TO_BUS def_bool y depends on !ARCH_NO_VIRT_TO_BUS + +config HAVE_GENERIC_SHOW_MEM + def_bool n
mm/page_alloc.c +55 -0
67 lines not on this page · raw message
PATCH 3/22 alpha: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/alpha/Kconfig +1 -0
@@ -7,6 +7,7 @@ config ALPHA default y select HAVE_IDE select HAVE_OPROFILE + select HAVE_GENERIC_SHOW_MEM help The Alpha is a 64-bit general-purpose processor designed and marketed by the Digital Equipment Corporation of blessed memory,
arch/alpha/mm/init.c +0 -29
@@ -94,35 +94,6 @@ __bad_page(void)return pte_mkdirty (mk_pte (virt_to_page (EMPTY_PGE ),PAGE_SHARED )); } -#ifndef CONFIG_DISCONTIGMEM -void -show_mem (void ) -{ -long i,free =0 ,total =0 ,reserved =0 ; -long shared =0 , cached =0 ; - -printk ("\nMem-info:\n" ); -show_free_areas (); - i = max_mapnr; -while (i-- >0 ) { - total++; -if (PageReserved (mem_map+i)) - reserved++; -else if (PageSwapCache (mem_map+i)) - cached++; -else if (!page_count (mem_map+i)) - free++; -else - shared +=page_count (mem_map + i) -1 ; - } -printk ("%ld pages of RAM\n" ,total); -printk ("%ld free pages\n" ,free); -printk ("%ld reserved pages\n" ,reserved); -printk ("%ld pages shared\n" ,shared); -printk ("%ld pages swap cached\n" ,cached); -} -#endif -static inline unsigned long load_PCB (struct pcb_struct *pcb) {
arch/alpha/mm/numa.c +0 -34
@@ -359,37 +359,3 @@ void __init mem_init(void)mem_stress ();#endif } - -void -show_mem (void ) -{ -long i,free =0 ,total =0 ,reserved =0 ; -long shared =0 , cached =0 ; -int nid; - -printk ("\nMem-info:\n" ); -show_free_areas (); -for_each_online_node (nid) { -unsigned long flags; -pgdat_resize_lock (NODE_DATA (nid), &flags); - i =node_spanned_pages (nid); -while (i-- >0 ) { -struct page *page =nid_page_nr (nid, i); - total++; -if (PageReserved (page)) - reserved++; -else if (PageSwapCache (page)) - cached++; -else if (!page_count (page)) - free++; -else - shared +=page_count (page) -1 ; - } -pgdat_resize_unlock (NODE_DATA (nid), &flags); - } -printk ("%ld pages of RAM\n" ,total); -printk ("%ld free pages\n" ,free); -printk ("%ld reserved pages\n" ,reserved); -printk ("%ld pages shared\n" ,shared); -printk ("%ld pages swap cached\n" ,cached); -}
PATCH 4/22 avr32: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
- pages in slabs, printed by show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/avr32/mm/init.c +0 -39
@@ -37,45 +37,6 @@ unsigned long mmu_context_cache = NO_CON#define START_PFN (NODE_DATA(0)->bdata->node_boot_start >> PAGE_SHIFT)#define MAX_LOW_PFN (NODE_DATA(0)->bdata->node_low_pfn) -void show_mem (void ) -{ -int total =0 , reserved =0 , cached =0 ; -int slab =0 , free =0 , shared =0 ; -pg_data_t *pgdat; - -printk ("Mem-info:\n" ); -show_free_areas (); - -for_each_online_pgdat (pgdat) { -struct page *page, *end; - - page = pgdat->node_mem_map; - end = page + pgdat->node_spanned_pages; - -do { - total++; -if (PageReserved (page)) - reserved++; -else if (PageSwapCache (page)) - cached++; -else if (PageSlab (page)) - slab++; -else if (!page_count (page)) - free++; -else - shared +=page_count (page) -1 ; - page++; - }while (page < end); - } - -printk ("%d pages of RAM\n" , total); -printk ("%d free pages\n" , free); -printk ("%d reserved pages\n" , reserved); -printk ("%d slab pages\n" , slab); -printk ("%d pages shared\n" , shared); -printk ("%d pages swap cached\n" , cached); -} -/* * paging_init() sets up the page tables *
arch/avr32/Kconfig +1 -0
@@ -13,6 +13,7 @@ config AVR32 select HAVE_IDE select HAVE_OPROFILE select HAVE_KPROBES + select HAVE_GENERIC_SHOW_MEM help AVR32 is a high-performance 32-bit RISC microprocessor core, designed for cost-sensitive embedded applications, with particular
PATCH 5/22 blackfin: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/blackfin/mm/init.c +0 -27
@@ -53,33 +53,6 @@ static unsigned long empty_bad_page;unsigned long empty_zero_page; -void show_mem (void ) -{ -unsigned long i; -int free =0 , total =0 , reserved =0 , shared =0 ; - -int cached =0 ; -printk (KERN_INFO "Mem-info:\n" ); -show_free_areas (); - i = max_mapnr; -while (i-- >0 ) { - total++; -if (PageReserved (mem_map + i)) - reserved++; -else if (PageSwapCache (mem_map + i)) - cached++; -else if (!page_count (mem_map + i)) - free++; -else - shared +=page_count (mem_map + i) -1 ; - } -printk (KERN_INFO "%d pages of RAM\n" , total); -printk (KERN_INFO "%d free pages\n" , free); -printk (KERN_INFO "%d reserved pages\n" , reserved); -printk (KERN_INFO "%d pages shared\n" , shared); -printk (KERN_INFO "%d pages swap cached\n" , cached); -} -/* * paging_init() continues the virtual memory environment setup which * was begun by the code in arch/head.S.
arch/blackfin/Kconfig +1 -0
@@ -26,6 +26,7 @@ config BLACKFIN default y select HAVE_IDE select HAVE_OPROFILE + select HAVE_GENERIC_SHOW_MEM config ZONE_DMA bool
PATCH 6/22 cris: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/cris/Kconfig +1 -0
@@ -55,6 +55,7 @@ config CRIS bool default y select HAVE_IDE + select HAVE_GENERIC_SHOW_MEM config HZ int
arch/cris/mm/init.c +0 -30
@@ -19,36 +19,6 @@ unsigned long empty_zero_page;extern char _stext, _edata, _etext;/* From linkerscript */ extern char __init_begin, __init_end; -void -show_mem (void ) -{ -int i,free =0 ,total =0 ,cached =0 , reserved =0 , nonshared =0 ; -int shared =0 ; - -printk ("\nMem-info:\n" ); -show_free_areas (); - i = max_mapnr; -while (i-- >0 ) { - total++; -if (PageReserved (mem_map+i)) - reserved++; -else if (PageSwapCache (mem_map+i)) - cached++; -else if (!page_count (mem_map+i)) - free++; -else if (page_count (mem_map+i) ==1 ) - nonshared++; -else - shared +=page_count (mem_map+i) -1 ; - } -printk ("%d pages of RAM\n" ,total); -printk ("%d free pages\n" ,free); -printk ("%d reserved pages\n" ,reserved); -printk ("%d pages nonshared\n" ,nonshared); -printk ("%d pages shared\n" ,shared); -printk ("%d pages swap cached\n" ,cached); -} -void __init mem_init (void ) {
PATCH 7/22 frv: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
where show_mem() calls show_free_areas().
---
arch/frv/Kconfig +1 -0
@@ -6,6 +6,7 @@ config FRV bool default y select HAVE_IDE + select HAVE_GENERIC_SHOW_MEM config ZONE_DMA bool
arch/frv/mm/init.c +0 -31
@@ -60,37 +60,6 @@ unsigned long empty_zero_page;/*****************************************************************************/ /* -* -*/ -void show_mem (void ) -{ -unsigned long i; -int free =0 , total =0 , reserved =0 , shared =0 ; - -printk ("\nMem-info:\n" ); -show_free_areas (); - i = max_mapnr; -while (i-- >0 ) { -struct page *page = &mem_map[i]; - - total++; -if (PageReserved (page)) - reserved++; -else if (!page_count (page)) - free++; -else - shared +=page_count (page) -1 ; - } - -printk ("%d pages of RAM\n" ,total); -printk ("%d free pages\n" ,free); -printk ("%d reserved pages\n" ,reserved); -printk ("%d pages shared\n" ,shared); - -}/* end show_mem() */ - -/*****************************************************************************/ -/* * paging_init() continues the virtual memory environment setup which * was begun by the code in arch/head.S. * The parameters are pointers to where to stick the starting and ending
PATCH 8/22 h8300: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/h8300/Kconfig +1 -0
@@ -9,6 +9,7 @@ config H8300 bool default y select HAVE_IDE + select HAVE_GENERIC_SHOW_MEM config MMU bool
arch/h8300/mm/init.c +0 -27
@@ -64,33 +64,6 @@ unsigned long empty_zero_page;extern unsigned long rom_length; -void show_mem (void ) -{ -unsigned long i; -int free =0 , total =0 , reserved =0 , shared =0 ; -int cached =0 ; - -printk ("\nMem-info:\n" ); -show_free_areas (); - i = max_mapnr; -while (i-- >0 ) { - total++; -if (PageReserved (mem_map+i)) - reserved++; -else if (PageSwapCache (mem_map+i)) - cached++; -else if (!page_count (mem_map+i)) - free++; -else - shared +=page_count (mem_map+i) -1 ; - } -printk ("%d pages of RAM\n" ,total); -printk ("%d free pages\n" ,free); -printk ("%d reserved pages\n" ,reserved); -printk ("%d pages shared\n" ,shared); -printk ("%d pages swap cached\n" ,cached); -} -extern unsigned long memory_start;extern unsigned long memory_end;
PATCH 9/22 m32r: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/m32r/Kconfig +1 -0
@@ -10,6 +10,7 @@ config M32R default y select HAVE_IDE select HAVE_OPROFILE + select HAVE_GENERIC_SHOW_MEM config SBUS bool
arch/m32r/mm/init.c +0 -35
@@ -36,41 +36,6 @@ pgd_t swapper_pg_dir[1024]; DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); -void show_mem (void ) -{ -int total =0 , reserved =0 ; -int shared =0 , cached =0 ; -int highmem =0 ; -struct page *page; -pg_data_t *pgdat; -unsigned long i; - -printk ("Mem-info:\n" ); -show_free_areas (); -for_each_online_pgdat (pgdat) { -unsigned long flags; -pgdat_resize_lock (pgdat, &flags); -for (i =0 ; i < pgdat->node_spanned_pages; ++i) { - page =pgdat_page_nr (pgdat, i); - total++; -if (PageHighMem (page)) - highmem++; -if (PageReserved (page)) - reserved++; -else if (PageSwapCache (page)) - cached++; -else if (page_count (page)) - shared +=page_count (page) -1 ; - } -pgdat_resize_unlock (pgdat, &flags); - } -printk ("%d pages of RAM\n" , total); -printk ("%d pages of HIGHMEM\n" ,highmem); -printk ("%d reserved pages\n" ,reserved); -printk ("%d pages shared\n" ,shared); -printk ("%d pages swap cached\n" ,cached); -} -/* * Cache of MMU context last used. */
PATCH 10/22 m68k: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/m68k/Kconfig +1 -0
@@ -6,6 +6,7 @@ config M68K bool default y select HAVE_IDE + select HAVE_GENERIC_SHOW_MEM config MMU bool
arch/m68k/mm/init.c +0 -30
@@ -70,36 +70,6 @@ void __init m68k_setup_node(int node)void *empty_zero_page; -void show_mem (void ) -{ -pg_data_t *pgdat; -int free =0 , total =0 , reserved =0 , shared =0 ; -int cached =0 ; -int i; - -printk ("\nMem-info:\n" ); -show_free_areas (); -for_each_online_pgdat (pgdat) { -for (i =0 ; i < pgdat->node_spanned_pages; i++) { -struct page *page = pgdat->node_mem_map + i; - total++; -if (PageReserved (page)) - reserved++; -else if (PageSwapCache (page)) - cached++; -else if (!page_count (page)) - free++; -else - shared +=page_count (page) -1 ; - } - } -printk ("%d pages of RAM\n" ,total); -printk ("%d free pages\n" ,free); -printk ("%d reserved pages\n" ,reserved); -printk ("%d pages shared\n" ,shared); -printk ("%d pages swap cached\n" ,cached); -} -extern void init_pointer_table (unsigned long ptable);/* References to section boundaries */
PATCH 11/22 m68knommu: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/m68knommu/Kconfig +1 -0
@@ -9,6 +9,7 @@ config M68K bool default y select HAVE_IDE + select HAVE_GENERIC_SHOW_MEM config MMU bool
arch/m68knommu/mm/init.c +0 -27
@@ -62,33 +62,6 @@ static unsigned long empty_bad_page;unsigned long empty_zero_page; -void show_mem (void ) -{ -unsigned long i; -int free =0 , total =0 , reserved =0 , shared =0 ; -int cached =0 ; - -printk (KERN_INFO "\nMem-info:\n" ); -show_free_areas (); - i = max_mapnr; -while (i-- >0 ) { - total++; -if (PageReserved (mem_map+i)) - reserved++; -else if (PageSwapCache (mem_map+i)) - cached++; -else if (!page_count (mem_map+i)) - free++; -else - shared +=page_count (mem_map+i) -1 ; - } -printk (KERN_INFO "%d pages of RAM\n" ,total); -printk (KERN_INFO "%d free pages\n" ,free); -printk (KERN_INFO "%d reserved pages\n" ,reserved); -printk (KERN_INFO "%d pages shared\n" ,shared); -printk (KERN_INFO "%d pages swap cached\n" ,cached); -} -extern unsigned long memory_start;extern unsigned long memory_end;
PATCH 12/22 mips: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
And show_mem() does now actually print something on configurations with multiple nodes.
---
arch/mips/Kconfig +1 -0
@@ -3,6 +3,7 @@ config MIPS default y select HAVE_IDE select HAVE_OPROFILE + select HAVE_GENERIC_SHOW_MEM # Horrible source of confusion. Die, die, die ... select EMBEDDED select RTC_LIB
arch/mips/mm/Makefile +1 -2
@@ -3,8 +3,7 @@ # obj-y += cache.o dma-default.o extable.o fault.o \ - init.o pgtable.o tlbex.o tlbex-fault.o \ - uasm.o + init.o tlbex.o tlbex-fault.o uasm.o obj-$(CONFIG_32BIT) += ioremap.o pgtable-32.o obj-$(CONFIG_64BIT) += pgtable-64.o
arch/mips/mm/pgtable.c deleted +0 -36
@@ -1,36 +0,0 @@ -#include <linux/kernel.h> -#include <linux/mm.h> -#include <linux/swap.h> - -void show_mem (void ) -{ -#ifndef CONFIG_NEED_MULTIPLE_NODES /* XXX(hch): later.. */ -int pfn, total =0 , reserved =0 ; -int shared =0 , cached =0 ; -int highmem =0 ; -struct page *page; - -printk ("Mem-info:\n" ); -show_free_areas (); - pfn = max_mapnr; -while (pfn-- >0 ) { -if (!pfn_valid (pfn)) -continue ; - page =pfn_to_page (pfn); - total++; -if (PageHighMem (page)) - highmem++; -if (PageReserved (page)) - reserved++; -else if (PageSwapCache (page)) - cached++; -else if (page_count (page)) - shared +=page_count (page) -1 ; - } -printk ("%d pages of RAM\n" , total); -printk ("%d pages of HIGHMEM\n" , highmem); -printk ("%d reserved pages\n" , reserved); -printk ("%d pages shared\n" , shared); -printk ("%d pages swap cached\n" , cached); -#endif -}
PATCH 13/22 mn10300: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/mn10300/Kconfig +1 -0
@@ -7,6 +7,7 @@ mainmenu "Linux Kernel Configuration" config MN10300 def_bool y + select HAVE_GENERIC_SHOW_MEM config AM33 def_bool y
arch/mn10300/mm/pgtable.c +0 -27
@@ -27,33 +27,6 @@#include <asm/tlb.h> #include <asm/tlbflush.h> -void show_mem (void ) -{ -unsigned long i; -int free =0 , total =0 , reserved =0 , shared =0 ; - -int cached =0 ; -printk (KERN_INFO "Mem-info:\n" ); -show_free_areas (); - i = max_mapnr; -while (i-- >0 ) { - total++; -if (PageReserved (mem_map + i)) - reserved++; -else if (PageSwapCache (mem_map + i)) - cached++; -else if (!page_count (mem_map + i)) - free++; -else - shared +=page_count (mem_map + i) -1 ; - } -printk (KERN_INFO "%d pages of RAM\n" , total); -printk (KERN_INFO "%d free pages\n" , free); -printk (KERN_INFO "%d reserved pages\n" , reserved); -printk (KERN_INFO "%d pages shared\n" , shared); -printk (KERN_INFO "%d pages swap cached\n" , cached); -} -/* * Associate a large virtual page frame with a given physical page frame * and protection flags for that frame. pfn is for the base of the page,
PATCH 14/22 powerpc: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/powerpc/Kconfig +1 -0
@@ -91,6 +91,7 @@ config PPC select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES + select HAVE_GENERIC_SHOW_MEM config EARLY_PRINTK bool
arch/powerpc/mm/mem.c +0 -39
@@ -164,45 +164,6 @@ walk_memory_resource(unsigned long start#endif /* CONFIG_MEMORY_HOTPLUG */ -void show_mem (void ) -{ -unsigned long total =0 , reserved =0 ; -unsigned long shared =0 , cached =0 ; -unsigned long highmem =0 ; -struct page *page; -pg_data_t *pgdat; -unsigned long i; - -printk ("Mem-info:\n" ); -show_free_areas (); -for_each_online_pgdat (pgdat) { -unsigned long flags; -pgdat_resize_lock (pgdat, &flags); -for (i =0 ; i < pgdat->node_spanned_pages; i++) { -if (!pfn_valid (pgdat->node_start_pfn + i)) -continue ; - page =pgdat_page_nr (pgdat, i); - total++; -if (PageHighMem (page)) - highmem++; -if (PageReserved (page)) - reserved++; -else if (PageSwapCache (page)) - cached++; -else if (page_count (page)) - shared +=page_count (page) -1 ; - } -pgdat_resize_unlock (pgdat, &flags); - } -printk ("%ld pages of RAM\n" , total); -#ifdef CONFIG_HIGHMEM -printk ("%ld pages of HIGHMEM\n" , highmem); -#endif -printk ("%ld reserved pages\n" , reserved); -printk ("%ld pages shared\n" , shared); -printk ("%ld pages swap cached\n" , cached); -} -/* * Initialize the bootmem system and give it all the memory we * have available. If we are using highmem, we only put the
PATCH 15/22 ppc: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/ppc/Kconfig +1 -0
@@ -45,6 +45,7 @@ config PPC select HAVE_IDE select HAVE_OPROFILE select HAVE_KPROBES + select HAVE_GENERIC_SHOW_MEM config PPC32 bool
arch/ppc/mm/init.c +0 -30
@@ -101,36 +101,6 @@ unsigned long __max_memory;/* max amount of low RAM to map in */ unsigned long __max_low_memory =MAX_LOW_MEM ; -void show_mem (void ) -{ -int i,free =0 ,total =0 ,reserved =0 ; -int shared =0 , cached =0 ; -int highmem =0 ; - -printk ("Mem-info:\n" ); -show_free_areas (); - i = max_mapnr; -while (i-- >0 ) { - total++; -if (PageHighMem (mem_map+i)) - highmem++; -if (PageReserved (mem_map+i)) - reserved++; -else if (PageSwapCache (mem_map+i)) - cached++; -else if (!page_count (mem_map+i)) - free++; -else - shared +=page_count (mem_map+i) -1 ; - } -printk ("%d pages of RAM\n" ,total); -printk ("%d pages of HIGHMEM\n" , highmem); -printk ("%d free pages\n" ,free); -printk ("%d reserved pages\n" ,reserved); -printk ("%d pages shared\n" ,shared); -printk ("%d pages swap cached\n" ,cached); -} -/* Free up now-unused memory */ static void free_sec (unsigned long start,unsigned long end,const char *name) {
PATCH 16/22 s390: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- pages in swapcache, printed by show_swap_cache_info()
- dirty pages, writeback pages, mapped pages, slab pages, pagetable pages, printed by show_free_areas()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/s390/Kconfig +1 -0
@@ -62,6 +62,7 @@ config S390 select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES + select HAVE_GENERIC_SHOW_MEM source "init/Kconfig"
arch/s390/mm/init.c +0 -35
@@ -42,41 +42,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_ga pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE))); char empty_zero_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE))); -void show_mem (void ) -{ -int i, total =0 , reserved =0 ; -int shared =0 , cached =0 ; -struct page *page; - -printk ("Mem-info:\n" ); -show_free_areas (); - i = max_mapnr; -while (i-- >0 ) { -if (!pfn_valid (i)) -continue ; - page =pfn_to_page (i); - total++; -if (PageReserved (page)) - reserved++; -else if (PageSwapCache (page)) - cached++; -else if (page_count (page)) - shared +=page_count (page) -1 ; - } -printk ("%d pages of RAM\n" , total); -printk ("%d reserved pages\n" , reserved); -printk ("%d pages shared\n" , shared); -printk ("%d pages swap cached\n" , cached); - -printk ("%lu pages dirty\n" ,global_page_state (NR_FILE_DIRTY )); -printk ("%lu pages writeback\n" ,global_page_state (NR_WRITEBACK )); -printk ("%lu pages mapped\n" ,global_page_state (NR_FILE_MAPPED )); -printk ("%lu pages slab\n" , -global_page_state (NR_SLAB_RECLAIMABLE ) + -global_page_state (NR_SLAB_UNRECLAIMABLE )); -printk ("%lu pages pagetables\n" ,global_page_state (NR_PAGETABLE )); -} -static void __init setup_ro_region (void ) {pgd_t *pgd;
PATCH 17/22 sh: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
- pages in slab, printed by show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/sh/Kconfig +1 -0
@@ -10,6 +10,7 @@ config SUPERH select EMBEDDED select HAVE_IDE select HAVE_OPROFILE + select HAVE_GENERIC_SHOW_MEM help The SuperH is a RISC processor targeted for use in embedded systems and consumer electronics; it was also used in the Sega Dreamcast
arch/sh/mm/init.c +0 -40
@@ -25,46 +25,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gapgd_t swapper_pg_dir[PTRS_PER_PGD ];unsigned long cached_to_uncached =0 ; -void show_mem (void ) -{ -int total =0 , reserved =0 , free =0 ; -int shared =0 , cached =0 , slab =0 ; -pg_data_t *pgdat; - -printk ("Mem-info:\n" ); -show_free_areas (); - -for_each_online_pgdat (pgdat) { -unsigned long flags, i; - -pgdat_resize_lock (pgdat, &flags); -for (i =0 ; i < pgdat->node_spanned_pages; i++) { -struct page *page =pgdat_page_nr (pgdat, i); - total++; -if (PageReserved (page)) - reserved++; -else if (PageSwapCache (page)) - cached++; -else if (PageSlab (page)) - slab++; -else if (!page_count (page)) - free++; -else - shared +=page_count (page) -1 ; - } -pgdat_resize_unlock (pgdat, &flags); - } - -printk ("%d pages of RAM\n" , total); -printk ("%d free pages\n" , free); -printk ("%d reserved pages\n" , reserved); -printk ("%d slab pages\n" , slab); -printk ("%d pages shared\n" , shared); -printk ("%d pages swap cached\n" , cached); -printk (KERN_INFO "Total of %ld pages in page table cache\n" , -quicklist_total_size ()); -} -#ifdef CONFIG_MMU static void set_pte_phys (unsigned long addr,unsigned long phys,pgprot_t prot) {
PATCH 18/22 sparc64: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- pages in swapcache, printed by show_swap_cache_info()
- dirty pages, writeback pages, mapped pages, slab pages, pagetables pages, printed by show_free_areas()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/sparc64/Kconfig +1 -0
@@ -11,6 +11,7 @@ config SPARC select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES + select HAVE_GENERIC_SHOW_MEM config SPARC64 bool
arch/sparc64/mm/init.c +0 -43
49 lines not on this page · raw message
PATCH 19/22 um: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/um/Kconfig +1 -0
@@ -11,6 +11,7 @@ config GENERIC_HARDIRQS config UML bool default y + select HAVE_GENERIC_SHOW_MEM config MMU bool
arch/um/kernel/mem.c +0 -29
@@ -295,35 +295,6 @@ void free_initrd_mem(unsigned long start }#endif -void show_mem (void ) -{ -int pfn, total =0 , reserved =0 ; -int shared =0 , cached =0 ; -int high_mem =0 ; -struct page *page; - -printk (KERN_INFO "Mem-info:\n" ); -show_free_areas (); - pfn = max_mapnr; -while (pfn-- >0 ) { - page =pfn_to_page (pfn); - total++; -if (PageHighMem (page)) - high_mem++; -if (PageReserved (page)) - reserved++; -else if (PageSwapCache (page)) - cached++; -else if (page_count (page)) - shared +=page_count (page) -1 ; - } -printk (KERN_INFO "%d pages of RAM\n" , total); -printk (KERN_INFO "%d pages of HIGHMEM\n" , high_mem); -printk (KERN_INFO "%d reserved pages\n" , reserved); -printk (KERN_INFO "%d pages shared\n" , shared); -printk (KERN_INFO "%d pages swap cached\n" , cached); -} -/* Allocate and free page tables. */ pgd_t *pgd_alloc (struct mm_struct *mm)
PATCH 20/22 v850: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed in show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/v850/Kconfig +1 -0
@@ -79,6 +79,7 @@ config V850 bool default y select HAVE_IDE + select HAVE_GENERIC_SHOW_MEM menu "Processor type and features"
arch/v850/kernel/setup.c +0 -30
@@ -298,33 +298,3 @@ init_mem_alloc (unsigned long ram_start,free_area_init_node (0 ,NODE_DATA (0 ), zones_size,ADDR_TO_PAGE (PAGE_OFFSET ),0 ); } - - - -/* Taken from m68knommu */ -void show_mem (void ) -{ -unsigned long i; -int free =0 , total =0 , reserved =0 , shared =0 ; -int cached =0 ; - -printk (KERN_INFO "\nMem-info:\n" ); -show_free_areas (); - i = max_mapnr; -while (i-- >0 ) { - total++; -if (PageReserved (mem_map+i)) - reserved++; -else if (PageSwapCache (mem_map+i)) - cached++; -else if (!page_count (mem_map+i)) - free++; -else - shared +=page_count (mem_map+i) -1 ; - } -printk (KERN_INFO "%d pages of RAM\n" ,total); -printk (KERN_INFO "%d free pages\n" ,free); -printk (KERN_INFO "%d reserved pages\n" ,reserved); -printk (KERN_INFO "%d pages shared\n" ,shared); -printk (KERN_INFO "%d pages swap cached\n" ,cached); -}
PATCH 21/22 x86: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- pages in swapcache, printed by show_swap_cache_info()
- dirty pages, writeback pages, mapped pages, slab pages, pagetable pages, printed by show_free_areas()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/x86/mm/pgtable_32.c +0 -47
@@ -24,53 +24,6 @@#include <asm/tlb.h> #include <asm/tlbflush.h> -void show_mem (void ) -{ -int total =0 , reserved =0 ; -int shared =0 , cached =0 ; -int highmem =0 ; -struct page *page; -pg_data_t *pgdat; -unsigned long i; -unsigned long flags; - -printk (KERN_INFO "Mem-info:\n" ); -show_free_areas (); -for_each_online_pgdat (pgdat) { -pgdat_resize_lock (pgdat, &flags); -for (i =0 ; i < pgdat->node_spanned_pages; ++i) { -if (unlikely (i %MAX_ORDER_NR_PAGES ==0 )) -touch_nmi_watchdog (); - page =pgdat_page_nr (pgdat, i); - total++; -if (PageHighMem (page)) - highmem++; -if (PageReserved (page)) - reserved++; -else if (PageSwapCache (page)) - cached++; -else if (page_count (page)) - shared +=page_count (page) -1 ; - } -pgdat_resize_unlock (pgdat, &flags); - } -printk (KERN_INFO "%d pages of RAM\n" , total); -printk (KERN_INFO "%d pages of HIGHMEM\n" , highmem); -printk (KERN_INFO "%d reserved pages\n" , reserved); -printk (KERN_INFO "%d pages shared\n" , shared); -printk (KERN_INFO "%d pages swap cached\n" , cached); - -printk (KERN_INFO "%lu pages dirty\n" ,global_page_state (NR_FILE_DIRTY )); -printk (KERN_INFO "%lu pages writeback\n" , -global_page_state (NR_WRITEBACK )); -printk (KERN_INFO "%lu pages mapped\n" ,global_page_state (NR_FILE_MAPPED )); -printk (KERN_INFO "%lu pages slab\n" , -global_page_state (NR_SLAB_RECLAIMABLE ) + -global_page_state (NR_SLAB_UNRECLAIMABLE )); -printk (KERN_INFO "%lu pages pagetables\n" , -global_page_state (NR_PAGETABLE )); -} -/* * Associate a virtual page frame with a given physical page frame * and protection flags for that frame.
arch/x86/mm/init_64.c +0 -37
@@ -60,43 +60,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_ga* around without checking the pgd every time. */ -void show_mem (void ) -{ -long i, total =0 , reserved =0 ; -long shared =0 , cached =0 ; -struct page *page; -pg_data_t *pgdat; - -printk (KERN_INFO "Mem-info:\n" ); -show_free_areas (); -for_each_online_pgdat (pgdat) { -for (i =0 ; i < pgdat->node_spanned_pages; ++i) { -/* -* This loop can take a while with 256 GB and -* 4k pages so defer the NMI watchdog: -*/ -if (unlikely (i %MAX_ORDER_NR_PAGES ==0 )) -touch_nmi_watchdog (); - -if (!pfn_valid (pgdat->node_start_pfn + i)) -continue ; - - page =pfn_to_page (pgdat->node_start_pfn + i); - total++; -if (PageReserved (page)) - reserved++; -else if (PageSwapCache (page)) - cached++; -else if (page_count (page)) - shared +=page_count (page) -1 ; - } - } -printk (KERN_INFO "%lu pages of RAM\n" , total); -printk (KERN_INFO "%lu reserved pages\n" , reserved); -printk (KERN_INFO "%lu pages shared\n" , shared); -printk (KERN_INFO "%lu pages swap cached\n" , cached); -} -int after_bootmem;static __init void *spp_getpage (void )
arch/x86/Kconfig +1 -0
@@ -23,6 +23,7 @@ config X86 select HAVE_KPROBES select HAVE_KRETPROBES select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) + select HAVE_GENERIC_SHOW_MEM config GENERIC_LOCKBREAK
PATCH 22/22 xtensa: Use generic show_mem()
In reply to Johannes WeinerRemove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls show_swap_cache_info().
---
arch/xtensa/mm/init.c +0 -26
@@ -280,32 +280,6 @@ void free_initmem(void) (&__init_end - &__init_begin) >> 10); } -void show_mem (void ) -{ -int i, free =0 , total =0 , reserved =0 ; -int shared =0 , cached =0 ; - -printk ("Mem-info:\n" ); -show_free_areas (); - i = max_mapnr; -while (i-- >0 ) { - total++; -if (PageReserved (mem_map+i)) - reserved++; -else if (PageSwapCache (mem_map+i)) - cached++; -else if (!page_count (mem_map + i)) - free++; -else - shared +=page_count (mem_map + i) -1 ; - } -printk ("%d pages of RAM\n" , total); -printk ("%d reserved pages\n" , reserved); -printk ("%d pages shared\n" , shared); -printk ("%d pages swap cached\n" ,cached); -printk ("%d free pages\n" , free); -} -struct kmem_cache *pgtable_cache__read_mostly ;static void pgd_ctor (struct kmem_cache *cache,void * addr)
arch/xtensa/Kconfig +1 -0
@@ -15,6 +15,7 @@ config XTENSA bool default y select HAVE_IDE + select HAVE_GENERIC_SHOW_MEM help Xtensa processors are 32-bit RISC machines designed by Tensilica primarily for embedded systems. These processors are both