From patchwork Thu Mar 24 20:00:34 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: 8664421 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 325AEC0553 for ; Thu, 24 Mar 2016 20:04:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 987A8203AE for ; Thu, 24 Mar 2016 20:04:03 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B4D86203A1 for ; Thu, 24 Mar 2016 20:04:02 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ajBSY-0000Ii-9s; Thu, 24 Mar 2016 20:02:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ajBSX-0000Hd-U4 for xen-devel@lists.xenproject.org; Thu, 24 Mar 2016 20:02:22 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 29/57-02874-DC744F65; Thu, 24 Mar 2016 20:02:21 +0000 X-Env-Sender: konrad@char.us.oracle.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1458849738!33382306!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: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39353 invoked from network); 24 Mar 2016 20:02:20 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-3.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 24 Mar 2016 20:02:20 -0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u2OK17rV011536 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 24 Mar 2016 20:01:07 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id u2OK16aK013324 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 24 Mar 2016 20:01:07 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id u2OK16Cv023725; Thu, 24 Mar 2016 20:01:06 GMT Received: from char.us.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 24 Mar 2016 13:01:06 -0700 Received: by char.us.oracle.com (Postfix, from userid 1000) id 21E6F6A00EF; Thu, 24 Mar 2016 16:01:04 -0400 (EDT) From: Konrad Rzeszutek Wilk To: xen-devel@lists.xenproject.org, ross.lagerwall@citrix.com, konrad@kernel.org, andrew.cooper3@citrix.com, mpohlack@amazon.de, sasha.levin@oracle.com Date: Thu, 24 Mar 2016 16:00:34 -0400 Message-Id: <1458849640-22588-23-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458849640-22588-1-git-send-email-konrad.wilk@oracle.com> References: <1458849640-22588-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Cc: Keir Fraser , Tim Deegan , Ian Jackson , Jan Beulich , Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH v5 22/28] xsplice: Print build_id in keyhandler and on bootup. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" 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 As it should be an useful debug mechanism. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Jan Beulich --- Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan v2: s/char */const void * v5: s/ssize_t/unsigned int/ --- xen/common/xsplice.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/xen/common/xsplice.c b/xen/common/xsplice.c index bf8cb1c..ec47f31 100644 --- a/xen/common/xsplice.c +++ b/xen/common/xsplice.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -1385,8 +1386,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_recursive(&payload_lock) ) { printk("Lock held. Try again.\n"); @@ -1414,10 +1420,16 @@ static void xsplice_printall(unsigned char key) static int __init xsplice_init(void) { + const void *binary_id = NULL; + unsigned int len = 0; + BUILD_BUG_ON( sizeof(struct xsplice_patch_func) != 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 "%s: build-id: %*phN\n", XSPLICE, len, binary_id); + register_keyhandler('x', xsplice_printall, "print xsplicing info", 1); arch_xsplice_register_find_space(&find_hole);