Re: [PATCH v5 8/8] add vnuma info for debug-key

["Jan Beulich" <JBeulich@suse.com>]

>>> On 03.06.14 at 06:53, <ufimtseva@gmail.com> wrote:

This patch appears to be duplicated (with slightly different titles) in
the series - please fix this up for the next revision.

> --- a/xen/arch/x86/numa.c
> +++ b/xen/arch/x86/numa.c
> @@ -347,9 +347,10 @@ EXPORT_SYMBOL(node_data);
>  static void dump_numa(unsigned char key)
>  {
>  	s_time_t now = NOW();
> -	int i;
> +	int i, j, n, err;

"unsigned int" please for any variables used as array indexes or alike
and not explicitly needing to be signed for some reason.

>  	struct domain *d;
>  	struct page_info *page;
> +	char tmp[12];

Are you perhaps unaware of keyhandler_scratch[]?

>  	unsigned int page_num_node[MAX_NUMNODES];
>  
>  	printk("'%c' pressed -> dumping numa info (now-0x%X:%08X)\n", key,
> @@ -389,6 +390,32 @@ static void dump_numa(unsigned char key)
>  
>  		for_each_online_node(i)
>  			printk("    Node %u: %u\n", i, page_num_node[i]);
> +
> +		printk("    Domain has %u vnodes\n", d->vnuma.nr_vnodes);
> +		for ( i = 0; i < d->vnuma.nr_vnodes; i++ ) {
> +			err = snprintf(tmp, 12, "%u", d->vnuma.vnode_to_pnode[i]);
> +			if ( err < 0 )
> +				printk("        vnode %u - pnode %s,", i, "any");
> +			else
> +				printk("        vnode %u - pnode %s,", i,
> +			d->vnuma.vnode_to_pnode[i] == NUMA_NO_NODE ? "any" : tmp);

Broken indentation.

> +			printk(" %"PRIu64" MB, ",
> +				(d->vnuma.vmemrange[i].end - d->vnuma.vmemrange[i].start) >> 20);

Here too.

> +			printk("vcpus: ");
> +
> +			for ( j = 0, n = 0; j < d->max_vcpus; j++ ) {
> +				if ( d->vnuma.vcpu_to_vnode[j] == i ) {
> +					if ( !((n + 1) % 8) )
> +						printk("%u\n", j);
> +					else if ( !(n % 8) && n != 0 )
> +							printk("%s%u ", "             ", j);
> +						else
> +							printk("%u ", j);

And yet more of them. Also the sequence of leading spaces would better
be expressed with %8u or some such, but from the looks of it properly
aligning the output here would require all of this to be done a little
differently anyway.

Jan