[v6,20/24] xsplice: Print build_id in keyhandler and on bootup.

Commit Message

Konrad Rzeszutek Wilk April 7, 2016, 3:49 a.m. UTC

As it should be an useful debug mechanism.

Signed-off-by: Konrad Rzeszutek Wilk <[e-mail]>
Acked-by: Jan Beulich <[e-mail]>

--
Cc: Ian Jackson <[e-mail]>
Cc: Jan Beulich <[e-mail]>
Cc: Keir Fraser <[e-mail]>
Cc: Tim Deegan <[e-mail]>

v2: s/char */const void *
v5: s/ssize_t/unsigned int/
v6: Remove pointless initializers, use string literal instead of %s,
    add Jan's Ack.
---
---
 xen/common/xsplice.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Andrew Cooper April 8, 2016, 6:12 p.m. UTC | #1

On 07/04/16 04:49, Konrad Rzeszutek Wilk wrote:
> As it should be an useful debug mechanism.
>
> Signed-off-by: Konrad Rzeszutek Wilk <[e-mail]>
> Acked-by: Jan Beulich <[e-mail]>

Reviewed-by: Andrew Cooper <[e-mail]>

Patch

diff --git a/xen/common/xsplice.c b/xen/common/xsplice.c
index fea184c..1c1727e 100644
--- a/xen/common/xsplice.c
+++ b/xen/common/xsplice.c
@@ -16,6 +16,7 @@ 
 #include <xen/spinlock.h>
 #include <xen/string.h>
 #include <xen/symbols.h>
+#include <xen/version.h>
 #include <xen/virtual_region.h>
 #include <xen/vmap.h>
 #include <xen/wait.h>
@@ -1331,8 +1332,13 @@  static const char *state2str(uint32_t state)
 static void xsplice_printall(unsigned char key)
 {
     struct payload *data;
+    const void *binary_id = NULL;
+    unsigned int len = 0;
     unsigned int i;
 
+    if ( !xen_build_id(&binary_id, &len) )
+        printk("build-id: %*phN\n", len, binary_id);
+
     if ( !spin_trylock(&payload_lock) )
     {
         printk("Lock held. Try again.\n");
@@ -1365,11 +1371,17 @@  static void xsplice_printall(unsigned char key)
 
 static int __init xsplice_init(void)
 {
+    const void *binary_id;
+    unsigned int len;
+
     BUILD_BUG_ON( sizeof(struct xsplice_patch_func) != 64 );
     BUILD_BUG_ON( sizeof(struct xsplice_patch_func_internal) != 64 );
     BUILD_BUG_ON( offsetof(struct xsplice_patch_func, new_addr) != 8 );
     BUILD_BUG_ON( offsetof(struct xsplice_patch_func, new_size) != 24 );
 
+    if ( !xen_build_id(&binary_id, &len) )
+        printk(XENLOG_INFO XSPLICE ": build-id: %*phN\n", len, binary_id);
+
     register_keyhandler('x', xsplice_printall, "print xsplicing info", 1);
 
     arch_xsplice_init();