From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andres Lagar-Cavilla Subject: [PATCH 07 of 12] Add the ability to poll stats about shared memory via the console Date: Sun, 15 Jan 2012 21:56:27 -0500 Message-ID: <98cc0713476ff072635b.1326682587@xdev.gridcentric.ca> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: ian.campbell@citrix.com, andres@gridcentric.ca, tim@xen.org, keir.xen@gmail.com, JBeulich@suse.com, ian.jackson@citrix.com, adin@gridcentric.ca List-Id: xen-devel@lists.xenproject.org xen/arch/ia64/xen/mm.c | 5 +++++ xen/arch/x86/mm.c | 14 ++++++++++++++ xen/common/keyhandler.c | 7 +++++-- xen/include/xen/mm.h | 3 +++ 4 files changed, 27 insertions(+), 2 deletions(-) Signed-off-by: Andres Lagar-Cavilla Signed-off-by: Adin Scannell diff -r da6576b82e16 -r 98cc0713476f xen/arch/ia64/xen/mm.c --- a/xen/arch/ia64/xen/mm.c +++ b/xen/arch/ia64/xen/mm.c @@ -3573,6 +3573,11 @@ p2m_pod_decrease_reservation(struct doma return 0; } +/* Simple no-op */ +void arch_dump_shared_mem_info(void) +{ +} + /* * Local variables: * mode: C diff -r da6576b82e16 -r 98cc0713476f xen/arch/x86/mm.c --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -113,6 +113,7 @@ #include #include #include +#include #include #include #include @@ -5832,6 +5833,19 @@ void memguard_unguard_stack(void *p) memguard_unguard_range(p, PAGE_SIZE); } +#if defined(__x86_64__) +void arch_dump_shared_mem_info(void) +{ + printk("Shared frames %u -- Saved frames %u\n", + mem_sharing_get_nr_shared_mfns(), + mem_sharing_get_nr_saved_mfns()); +} +#else +void arch_dump_shared_mem_info(void) +{ +} +#endif + /* * Local variables: * mode: C diff -r da6576b82e16 -r 98cc0713476f xen/common/keyhandler.c --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -248,8 +249,8 @@ static void dump_domains(unsigned char k printk(" refcnt=%d dying=%d pause_count=%d\n", atomic_read(&d->refcnt), d->is_dying, atomic_read(&d->pause_count)); - printk(" nr_pages=%d xenheap_pages=%d dirty_cpus=%s max_pages=%u\n", - d->tot_pages, d->xenheap_pages, tmpstr, d->max_pages); + printk(" nr_pages=%d xenheap_pages=%d shared_pages=%u dirty_cpus=%s max_pages=%u\n", + d->tot_pages, d->xenheap_pages, atomic_read(&d->shr_pages), tmpstr, d->max_pages); printk(" handle=%02x%02x%02x%02x-%02x%02x-%02x%02x-" "%02x%02x-%02x%02x%02x%02x%02x%02x vm_assist=%08lx\n", d->handle[ 0], d->handle[ 1], d->handle[ 2], d->handle[ 3], @@ -308,6 +309,8 @@ static void dump_domains(unsigned char k } } + arch_dump_shared_mem_info(); + rcu_read_unlock(&domlist_read_lock); #undef tmpstr } diff -r da6576b82e16 -r 98cc0713476f xen/include/xen/mm.h --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -73,6 +73,9 @@ int assign_pages( unsigned int order, unsigned int memflags); +/* Dump info to serial console */ +void arch_dump_shared_mem_info(void); + /* memflags: */ #define _MEMF_no_refcount 0 #define MEMF_no_refcount (1U<<_MEMF_no_refcount)