From nobody Fri Apr 26 20:10:21 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1578577782; cv=none; d=zohomail.com; s=zohoarc; b=nkuKFD8EK8p8Haayc3arbNI3ubn092KznIDD+dPpPpr+y5V8+cQVnXNET/8Hsw+K2SNdk8vp3cn+qUhlhrVK5o9S3kjJ1IoUri53ao9NWxfkOOJLGt6XSSDPyVgLj14Tzc9If8t/Ro9/q1/fLZhJtdpxw9syE5LM9AiWpwcihrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578577782; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JOxdgGd04mnbg1FoUZ9RICDXZalxr4PoX+27fywuk4w=; b=KQGmmZwsnGzNvgSl2cCFsgIRWlIiPhmzWED5fm/x52r6kRo8ILnC0g9IHWyTQ1GKQMUxG4IrHNtkoLAomO6wOLc/hVyoaDraVuM0Zs2KddkKw+e4AUABw9cEpnFWgupa0TyLqJXiATZ6Z0GhUaL4lACcchNgv4RlIESLUgT+so4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1578577782141745.6339510050683; Thu, 9 Jan 2020 05:49:42 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ipYBU-0003J8-56; Thu, 09 Jan 2020 13:49:12 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ipYBT-0003Ix-8i for xen-devel@lists.xenproject.org; Thu, 09 Jan 2020 13:49:11 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id cb123d62-32e6-11ea-b89f-bc764e2007e4; Thu, 09 Jan 2020 13:49:02 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 55D8FAD78; Thu, 9 Jan 2020 13:48:28 +0000 (UTC) X-Inumbo-ID: cb123d62-32e6-11ea-b89f-bc764e2007e4 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Thu, 9 Jan 2020 14:48:24 +0100 Message-Id: <20200109134825.31482-2-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200109134825.31482-1-jgross@suse.com> References: <20200109134825.31482-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v2 1/2] xen: add config option to include failing condition in BUG_ON() message X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Julien Grall , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Today a triggering BUG_ON() will only print source file and line information. Add the possibility to print the triggering condition like ASSERT(). Do that by introducing BUG_ON_VERBOSE() and add a Kconfig option to make BUG_ON use BUG_ON_VERBOSE(). Signed-off-by: Juergen Gross --- xen/Kconfig.debug | 6 ++++++ xen/include/asm-x86/bug.h | 5 +++-- xen/include/xen/lib.h | 5 +++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index b3511e81a2..dfbcac575a 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -81,6 +81,12 @@ config PERF_ARRAYS ---help--- Enables software performance counter array histograms. =20 +config DEBUG_BUGVERBOSE + bool "Verbose BUG_ON messages" + default DEBUG + ---help--- + In case a BUG_ON triggers additionally print the triggering + condition on the console. =20 config VERBOSE_DEBUG bool "Verbose debug messages" diff --git a/xen/include/asm-x86/bug.h b/xen/include/asm-x86/bug.h index 9bb4a19420..46d282777f 100644 --- a/xen/include/asm-x86/bug.h +++ b/xen/include/asm-x86/bug.h @@ -60,10 +60,11 @@ struct bug_frame { =20 =20 #define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, 0, NULL) -#define BUG() do { \ - BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, 0, NULL); \ +#define BUG_VERBOSE(msg) do { \ + BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, 0, msg); \ unreachable(); \ } while (0) +#define BUG() BUG_VERBOSE(NULL) =20 #define run_in_exception_handler(fn) BUG_FRAME(BUGFRAME_run_fn, 0, fn, 0, = NULL) =20 diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 8fbe84032d..e7770b0d24 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -8,7 +8,12 @@ #include #include =20 +#define BUG_ON_VERBOSE(p) do { if (unlikely(p)) BUG_VERBOSE(#p); } while = (0) +#ifdef CONFIG_DEBUG_BUGVERBOSE +#define BUG_ON(p) BUG_ON_VERBOSE(p) +#else #define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0) +#endif #define WARN_ON(p) do { if (unlikely(p)) WARN(); } while (0) =20 #if __GNUC__ > 4 || (__GNUC__ =3D=3D 4 && __GNUC_MINOR__ >=3D 6) --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Fri Apr 26 20:10:21 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1578577786; cv=none; d=zohomail.com; s=zohoarc; b=Z9wgPof/A6s8wLeoi5EX6abAFw7QnI0kAKAkCmGOPUR8yGe+4FJ/XmbPsTqrOH6e/2wK0+37Ff+45CyHu9BrFwWcy35d3YljzbVzW5gYtKBSc+LbDZUcw561KlkvpvkTu/jMg9RwX33yhslY+377gElG0f/YKLT43sJAeJNXSKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578577786; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QkSJdEP+YYoFRWCKZfdlCxhIZ2RsmVA5uCrf64ROOUE=; b=L+B1Vn3RYN7bvzZeHtU6XogQXiosYX0QJnUL5BUlWtVYjQFYlxr1PW08BAeRF5++SjgAGsiTCXDJIdL1sA0QWX0xVFFjGBn5WQZZXsaMnwqqNyI4WEnOSVCNwSWQWjY3vGU9HqS3Q3NS/Ne4RK9CGbol+53+hsB6KdQHDVXCb4o= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1578577786500534.3180432187825; Thu, 9 Jan 2020 05:49:46 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ipYBZ-0003Ki-EK; Thu, 09 Jan 2020 13:49:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ipYBY-0003KO-7w for xen-devel@lists.xenproject.org; Thu, 09 Jan 2020 13:49:16 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id cb1255ae-32e6-11ea-a985-bc764e2007e4; Thu, 09 Jan 2020 13:49:02 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 55B4AAD5D; Thu, 9 Jan 2020 13:48:28 +0000 (UTC) X-Inumbo-ID: cb1255ae-32e6-11ea-a985-bc764e2007e4 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Thu, 9 Jan 2020 14:48:25 +0100 Message-Id: <20200109134825.31482-3-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200109134825.31482-1-jgross@suse.com> References: <20200109134825.31482-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v2 2/2] xen: make CONFIG_DEBUG_LOCKS usable without CONFIG_DEBUG X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Julien Grall , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Jan Beulich MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" In expert mode it is possible to enable CONFIG_DEBUG_LOCKS without having enabled CONFIG_DEBUG. The coding is depending on CONFIG_DEBUG as it is using ASSERT(), however. Fix that by using BUG_ON() instead of ASSERT() in rel_lock(). Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/common/spinlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 286f916bca..344981c54a 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -86,7 +86,7 @@ static void got_lock(union lock_debug *debug) static void rel_lock(union lock_debug *debug) { if ( atomic_read(&spin_debug) > 0 ) - ASSERT(debug->cpu =3D=3D smp_processor_id()); + BUG_ON(debug->cpu !=3D smp_processor_id()); debug->cpu =3D SPINLOCK_NO_CPU; } =20 --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel