From patchwork Fri Feb 12 18:05:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 8294921 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7D8099F1E0 for ; Fri, 12 Feb 2016 18:09:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9E8CA20431 for ; Fri, 12 Feb 2016 18:09:23 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1C5A820421 for ; Fri, 12 Feb 2016 18:09:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aUI7a-0006NG-7S; Fri, 12 Feb 2016 18:07:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aUI7M-000659-0f for xen-devel@lists.xen.org; Fri, 12 Feb 2016 18:06:56 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 5B/2C-17089-F3F1EB65; Fri, 12 Feb 2016 18:06:55 +0000 X-Env-Sender: konrad@char.us.oracle.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1455300412!22061423!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21255 invoked from network); 12 Feb 2016 18:06:54 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-2.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 12 Feb 2016 18:06:54 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u1CI6i3t004492 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 12 Feb 2016 18:06:45 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u1CI6imH028751 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Fri, 12 Feb 2016 18:06:44 GMT Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id u1CI6h9L017148; Fri, 12 Feb 2016 18:06:43 GMT Received: from char.us.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 12 Feb 2016 10:06:43 -0800 Received: by char.us.oracle.com (Postfix, from userid 1000) id E76446A4BF1; Fri, 12 Feb 2016 13:06:40 -0500 (EST) From: Konrad Rzeszutek Wilk To: xen-devel@lists.xenproject.org, andrew.cooper3@citrix.com, konrad@kernel.org, mpohlack@amazon.de, ross.lagerwall@citrix.com, sasha.levin@citrix.com, jinsong.liu@alibaba-inc.com, Ian Campbell , Ian Jackson , Jan Beulich , Keir Fraser , Tim Deegan , xen-devel@lists.xen.org Date: Fri, 12 Feb 2016 13:05:55 -0500 Message-Id: <1455300361-13092-18-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1455300361-13092-1-git-send-email-konrad.wilk@oracle.com> References: <1455300361-13092-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH v3 17/23] xsplice: Print dependency and payloads build_id in the keyhandler. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/xsplice.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/xen/common/xsplice.c b/xen/common/xsplice.c index 2ba5bb5..8c5557e 100644 --- a/xen/common/xsplice.c +++ b/xen/common/xsplice.c @@ -101,6 +101,21 @@ static const char *state2str(int32_t state) return names[state]; } +static void xsplice_print_build_id(char *id, unsigned int len) +{ + unsigned int i; + + if ( !len ) + return; + + for ( i = 0; i < len; i++ ) + { + uint8_t c = id[i]; + printk("%02x", c); + } + printk("\n"); +} + static void xsplice_printall(unsigned char key) { struct payload *data; @@ -111,14 +126,9 @@ static void xsplice_printall(unsigned char key) rc = xen_build_id(&binary_id, &len); printk("build-id: "); if ( !rc ) - { - for ( i = 0; i < len; i++ ) - { - uint8_t c = binary_id[i]; - printk("%02x", c); - } - printk("\n"); - } else if ( rc < 0 ) + xsplice_print_build_id(binary_id, len); + + else if ( rc < 0 ) printk("rc = %d\n", rc); spin_lock(&payload_lock); @@ -135,6 +145,16 @@ static void xsplice_printall(unsigned char key) printk(" %s patch 0x%"PRIx64"(%u) with 0x%"PRIx64"(%u)\n", f->name, f->old_addr, f->old_size, f->new_addr, f->new_size); } + if ( data->id.len ) + { + printk(" build_id="); + xsplice_print_build_id(data->id.p, data->id.len); + } + if ( data->dep.len ) + { + printk(" depend on="); + xsplice_print_build_id(data->dep.p, data->dep.len); + } } spin_unlock(&payload_lock); }