From patchwork Fri May 6 15:48:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Lagerwall X-Patchwork-Id: 9034191 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 69F679F1D3 for ; Fri, 6 May 2016 15:50:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7CF9F20392 for ; Fri, 6 May 2016 15:50:43 +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 8E4A620394 for ; Fri, 6 May 2016 15:50:42 +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 1ayhzF-0001ca-V0; Fri, 06 May 2016 15:48:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ayhzE-0001cC-0o for xen-devel@lists.xen.org; Fri, 06 May 2016 15:48:16 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 68/1F-03651-FBCBC275; Fri, 06 May 2016 15:48:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrrBXnffHp1 wgxk7bSyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oyZT7+xFezmr/j/9DdrA+Nlri5GTg4JAX+J /nlL2UBsNgEDiVuXvjOD2CICshKru+awdzFycTALvGeS+LPzNpDDwSEM1PBhPlgNi4CKxOKtp xlBbF4BT4mW/bNYIGbKSZxb/wXM5hTwkmj++xqsXgioZsmUrVC2msTb5WdYIHoFJU7OfAJmMw tISBx88YIZZJWEALfE3277CYx8s5BUzUJStYCRaRWjenFqUVlqka6ZXlJRZnpGSW5iZo6uoYG xXm5qcXFiempOYlKxXnJ+7iZGYEDVMzAw7mC80uZ8iFGSg0lJlPd7gU64EF9SfkplRmJxRnxR aU5q8SFGGQ4OJQnet7uAcoJFqempFWmZOcDQhklLcPAoifAeBUnzFhck5hZnpkOkTjEqSonza u8GSgiAJDJK8+DaYPF0iVFWSpiXkYGBQYinILUoN7MEVf4VozgHo5IwLzvIFJ7MvBK46a+AFj MBLX4/VxNkcUkiQkqqgbHAwOTq+6i8QG9Rh4iYaX0+TgcPS0YyO75ub2RWWHa38K7JH72Dv0P vViiq/7TX//iAx+mOZnf5tBUvdf55bNpZpKTlbdiuv1tDPvLe2RXbP51e7fnylVq0R/ahih8H G3XE1szncpz+SX/7+hsf/VKvMl5aJKZt8jDst0+m1R7+BTcz1aaKLFZiKc5INNRiLipOBADnu tY9ogIAAA== X-Env-Sender: prvs=92798eb09=ross.lagerwall@citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1462549692!12612491!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20103 invoked from network); 6 May 2016 15:48:14 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 6 May 2016 15:48:14 -0000 X-IronPort-AV: E=Sophos;i="5.24,587,1454976000"; d="scan'208";a="358833605" From: Ross Lagerwall To: Date: Fri, 6 May 2016 16:48:03 +0100 Message-ID: <1462549688-29263-3-git-send-email-ross.lagerwall@citrix.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1462549688-29263-1-git-send-email-ross.lagerwall@citrix.com> References: <1462549688-29263-1-git-send-email-ross.lagerwall@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Ross Lagerwall , Jan Beulich Subject: [Xen-devel] [PATCH v1 2/7] sched: Remove dependency on __LINE__ for release builds 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: , 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 When using xsplice, use of __LINE__ can generate spurious changes in functions due to embedded line numbers. For release builds, remove the use of these line numbers in domain_crash*() and print the current text address instead. Signed-off-by: Ross Lagerwall --- xen/include/xen/sched.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index fe15e9c..b282671 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -611,20 +611,34 @@ void vcpu_end_shutdown_deferral(struct vcpu *v); * from any processor. */ void __domain_crash(struct domain *d); +#ifdef NDEBUG +#define domain_crash(d) do { \ + printk("domain_crash called from %p\n", current_text_addr()); \ + __domain_crash(d); \ +} while (0) +#else #define domain_crash(d) do { \ printk("domain_crash called from %s:%d\n", __FILE__, __LINE__); \ __domain_crash(d); \ } while (0) +#endif /* * Mark current domain as crashed and synchronously deschedule from the local * processor. This function never returns. */ void noreturn __domain_crash_synchronous(void); +#ifdef NDEBUG +#define domain_crash_synchronous() do { \ + printk("domain_crash_sync called from %p\n", current_text_addr()); \ + __domain_crash_synchronous(); \ +} while (0) +#else #define domain_crash_synchronous() do { \ printk("domain_crash_sync called from %s:%d\n", __FILE__, __LINE__); \ __domain_crash_synchronous(); \ } while (0) +#endif /* * Called from assembly code, with an optional address to help indicate why