This implements a platform-independent version of show_mem().
Signed-off-by: Johannes Weiner <[email protected]>
---
lib/Makefile | 2 -
lib/show_mem.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+), 1 deletion(-)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,7 +6,7 @@ lib-y := ctype.o string.o vsprintf.o cmd
rbtree.o radix-tree.o dump_stack.o \
idr.o int_sqrt.o extable.o prio_tree.o \
sha1.o irq_regs.o reciprocal_div.o argv_split.o \
- proportions.o prio_heap.o ratelimit.o
+ proportions.o prio_heap.o ratelimit.o show_mem.o
ifdef CONFIG_FTRACE
# Do not profile string.o, since it may be used in early boot or vdso
--- /dev/null
+++ b/lib/show_mem.c
@@ -0,0 +1,63 @@
+/*
+ * Generic show_mem() implementation
+ *
+ * Copyright (C) 2008 Johannes Weiner <[email protected]>
+ * All code subject to the GPL version 2.
+ */
+
+#include <linux/mm.h>
+#include <linux/nmi.h>
+#include <linux/quicklist.h>
+
+void show_mem(void)
+{
+ pg_data_t *pgdat;
+ unsigned long total = 0, reserved = 0, shared = 0,
+ nonshared = 0, highmem = 0;
+
+ printk(KERN_INFO "Mem-Info:\n");
+ show_free_areas();
+
+ for_each_online_pgdat(pgdat) {
+ unsigned long i, flags;
+
+ pgdat_resize_lock(pgdat, &flags);
+ for (i = 0; i < pgdat->node_spanned_pages; i++) {
+ struct page *page;
+ unsigned long pfn = pgdat->node_start_pfn + i;
+
+ if (unlikely(!(i % MAX_ORDER_NR_PAGES)))
+ touch_nmi_watchdog();
+
+ if (!pfn_valid(pfn))
+ continue;
+
+ page = pfn_to_page(pfn);
+
+ if (PageHighMem(page))
+ highmem++;
+
+ if (PageReserved(page))
+ reserved++;
+ else if (page_count(page) == 1)
+ nonshared++;
+ else if (page_count(page) > 1)
+ shared += page_count(page) - 1;
+
+ total++;
+ }
+ pgdat_resize_unlock(pgdat, &flags);
+ }
+
+ printk(KERN_INFO "%lu pages RAM\n", total);
+#ifdef CONFIG_HIGHMEM
+ printk(KERN_INFO "%lu pages HighMem\n", highmem);
+#endif
+ printk(KERN_INFO "%lu pages reserved\n", reserved);
+ printk(KERN_INFO "%lu pages shared\n", shared);
+ printk(KERN_INFO "%lu pages non-shared\n", nonshared);
+#ifdef CONFIG_QUICKLIST
+ printk(KERN_INFO "%lu pages in pagetable cache\n",
+ quicklist_total_size());
+#endif
+}
--
On Fri, Jul 04, 2008 at 06:07:39PM +0200, Johannes Weiner wrote:
> This implements a platform-independent version of show_mem().
>
> Signed-off-by: Johannes Weiner <[email protected]>
> ---
> lib/Makefile | 2 -
> lib/show_mem.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 64 insertions(+), 1 deletion(-)
>
> --- a/lib/Makefile
> +++ b/lib/Makefile
> @@ -6,7 +6,7 @@ lib-y := ctype.o string.o vsprintf.o cmd
> rbtree.o radix-tree.o dump_stack.o \
> idr.o int_sqrt.o extable.o prio_tree.o \
> sha1.o irq_regs.o reciprocal_div.o argv_split.o \
> - proportions.o prio_heap.o ratelimit.o
> + proportions.o prio_heap.o ratelimit.o show_mem.o
>
> ifdef CONFIG_FTRACE
> # Do not profile string.o, since it may be used in early boot or vdso
> --- /dev/null
> +++ b/lib/show_mem.c
> @@ -0,0 +1,63 @@
> +/*
> + * Generic show_mem() implementation
> + *
> + * Copyright (C) 2008 Johannes Weiner <[email protected]>
> + * All code subject to the GPL version 2.
> + */
> +
> +#include <linux/mm.h>
> +#include <linux/nmi.h>
> +#include <linux/quicklist.h>
> +
> +void show_mem(void)
> +{
Umh.. I think your 4th patch set was the way to go. This set is not
bisectable anymore and those architectures which you didn't convert
to the generic implementation won't build anymore. show_mem is present
twice there...
You might solve this by adding an __attribute__((weak)) but I'm sure
people will complain again, because it produces dead code for all
architectures which got converted.
Hi,
Heiko Carstens <[email protected]> writes:
> On Fri, Jul 04, 2008 at 06:07:39PM +0200, Johannes Weiner wrote:
>> This implements a platform-independent version of show_mem().
>>
>> Signed-off-by: Johannes Weiner <[email protected]>
>> ---
>> lib/Makefile | 2 -
>> lib/show_mem.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>> 2 files changed, 64 insertions(+), 1 deletion(-)
>>
>> --- a/lib/Makefile
>> +++ b/lib/Makefile
>> @@ -6,7 +6,7 @@ lib-y := ctype.o string.o vsprintf.o cmd
>> rbtree.o radix-tree.o dump_stack.o \
>> idr.o int_sqrt.o extable.o prio_tree.o \
>> sha1.o irq_regs.o reciprocal_div.o argv_split.o \
>> - proportions.o prio_heap.o ratelimit.o
>> + proportions.o prio_heap.o ratelimit.o show_mem.o
>>
>> ifdef CONFIG_FTRACE
>> # Do not profile string.o, since it may be used in early boot or vdso
>> --- /dev/null
>> +++ b/lib/show_mem.c
>> @@ -0,0 +1,63 @@
>> +/*
>> + * Generic show_mem() implementation
>> + *
>> + * Copyright (C) 2008 Johannes Weiner <[email protected]>
>> + * All code subject to the GPL version 2.
>> + */
>> +
>> +#include <linux/mm.h>
>> +#include <linux/nmi.h>
>> +#include <linux/quicklist.h>
>> +
>> +void show_mem(void)
>> +{
>
> Umh.. I think your 4th patch set was the way to go. This set is not
> bisectable anymore and those architectures which you didn't convert
> to the generic implementation won't build anymore. show_mem is present
> twice there...
hannes@skyscraper:/tmp/test$ gcc -o prog prog.c lib1.a lib2.a && ./prog
lib1
hannes@skyscraper:/tmp/test$ gcc -o prog prog.c lib2.a lib1.a && ./prog
lib2
Both lib1 and lib2 define foo() which prog calls.
I tested this with x86 and it built before and after removal of the
x86-specific show_mem() (and it did the right thing as the arch code has
higher priority than lib code).
But why is it no more bisectable? You have one point where your kernel
uses the arch-specific show_mem() and in the next commit, you use the
generic version. If something breaks, you can compare the old arch
version with the generic version.
> You might solve this by adding an __attribute__((weak)) but I'm sure
> people will complain again, because it produces dead code for all
> architectures which got converted.
Yeah, lib/show_mem.c is built in any case, which sucks a bit.
What do others think? Would you prefer conditional code generation
about linking magic here?
Hannes
> > Umh.. I think your 4th patch set was the way to go. This set is not
> > bisectable anymore and those architectures which you didn't convert
> > to the generic implementation won't build anymore. show_mem is present
> > twice there...
>
> hannes@skyscraper:/tmp/test$ gcc -o prog prog.c lib1.a lib2.a && ./prog
> lib1
> hannes@skyscraper:/tmp/test$ gcc -o prog prog.c lib2.a lib1.a && ./prog
> lib2
>
> Both lib1 and lib2 define foo() which prog calls.
>
> I tested this with x86 and it built before and after removal of the
> x86-specific show_mem() (and it did the right thing as the arch code has
> higher priority than lib code).
>
> But why is it no more bisectable? You have one point where your kernel
> uses the arch-specific show_mem() and in the next commit, you use the
> generic version. If something breaks, you can compare the old arch
> version with the generic version.
My fault. It works.