[PATCH v11 3/4] vnuma hook to debug-keys u

[Elena Ufimtseva <ufimtseva@gmail.com>]

Add debug-keys hook to display vnuma topology.

Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Signed-off-by: Elena Ufimtseva <ufimtseva@gmail.com>
---
 xen/arch/x86/numa.c |   35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c
index 05b220a..4bd3db0 100644
--- a/xen/arch/x86/numa.c
+++ b/xen/arch/x86/numa.c
@@ -357,10 +357,11 @@ EXPORT_SYMBOL(node_data);
 static void dump_numa(unsigned char key)
 {
     s_time_t now = NOW();
-    int i;
+    int i, j, err, n;
     struct domain *d;
     struct page_info *page;
     unsigned int page_num_node[MAX_NUMNODES];
+    uint64_t mem;
 
     printk("'%c' pressed -> dumping numa info (now-0x%X:%08X)\n", key,
            (u32)(now>>32), (u32)now);
@@ -402,6 +403,38 @@ 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 )
+            continue;
+
+        printk("   %u vnodes, %u vcpus\n", d->vnuma->nr_vnodes, d->max_vcpus);
+        for ( i = 0; i < d->vnuma->nr_vnodes; i++ )
+        {
+            err = snprintf(keyhandler_scratch, 12, "%u",
+                           d->vnuma->vnode_to_pnode[i]);
+            if ( err < 0 || d->vnuma->vnode_to_pnode[i] == NUMA_NO_NODE )
+                snprintf(keyhandler_scratch, 3, "???");
+
+            printk("        vnode %3u - pnode %s,", i, keyhandler_scratch);
+            mem = d->vnuma->vmemrange[i].end - d->vnuma->vmemrange[i].start;
+            printk(" %"PRIu64" MB, ", mem >> 20);
+
+            printk("vcpu nrs: ");
+            for ( j = 0, n = 0; j < d->max_vcpus; j++ )
+            {
+                if ( d->vnuma->vcpu_to_vnode[j] == i )
+                {
+                    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