Re: [Xen-devel] [PATCH RESEND v7 3/9] vnuma hook to debug-keys u

[Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>]

On Thu, Aug 21, 2014 at 01:10:23AM -0400, Elena Ufimtseva wrote:
> Add debug-keys hook to display vnuma topology.
> 
> Signed-off-by: Elena Ufimtseva <ufimtseva@xxxxxxxxx>
> ---
>  xen/arch/x86/numa.c |   30 +++++++++++++++++++++++++++++-
>  1 file changed, 29 insertions(+), 1 deletion(-)
> 
> diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c
> index b141877..ab1c0bf 100644
> --- a/xen/arch/x86/numa.c
> +++ b/xen/arch/x86/numa.c
> @@ -347,7 +347,7 @@ EXPORT_SYMBOL(node_data);
>  static void dump_numa(unsigned char key)
>  {
>       s_time_t now = NOW();
> -     int i;
> +     int i, j, n, err;
>       struct domain *d;
>       struct page_info *page;
>       unsigned int page_num_node[MAX_NUMNODES];
> @@ -389,6 +389,34 @@ static void dump_numa(unsigned char key)
>  
>               for_each_online_node(i)
>                       printk("    Node %u: %u\n", i, page_num_node[i]);
> +
> +             if ( d->vnuma ) {
> +                     printk("    Domain has %u vnodes, %u vcpus\n", 
> d->vnuma->nr_vnodes, d->max_vcpus);
> +                     for ( i = 0; i < d->vnuma->nr_vnodes; i++ ) {

That '{'
needs to be on another line.

> +
> +                             err = snprintf(keyhandler_scratch, 12, "%u", 
> d->vnuma->vnode_to_pnode[i]);
> +                             if ( err < 0 || d->vnuma->vnode_to_pnode[i] == 
> NUMA_NO_NODE)

You need a space at the end, so 'NUMA_NO_NODE )'

> +                                     snprintf(keyhandler_scratch, 3, "???");
> +                             printk("        vnode %3u - pnode %s,", i, 
> keyhandler_scratch);
> +
> +                             printk(" %"PRIu64" MB, ",
> +                                     (d->vnuma->vmemrange[i].end - 
> d->vnuma->vmemrange[i].start) >> 20);
> +
> +                             printk("vcpu nrs: ");
> +                             for ( j = 0, n = 0; j < d->max_vcpus; j++ ) {

{ on its own line.
> +                                     if ( d->vnuma->vcpu_to_vnode[j] == i ) {

Ditto
> +                                             if ( ((n + 1) % 8) == 0 )
> +                                                     printk("%d\n", j);
> +                                             else if ( !(n % 8) && n != 0 )
> +                                                     printk("%s%d ", "       
>       ", j);
> +                                             else
> +                                                     printk("%d ", j);
> +                                             n++;
> +                                     }
> +                             }
> +                             printk("\n");
> +                     }
> +             }
>       }
>  
>       rcu_read_unlock(&domlist_read_lock);
> -- 
> 1.7.10.4
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel