From patchwork Tue Mar 22 15:39:42 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: 8643851 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 B86D2C0553 for ; Tue, 22 Mar 2016 15:43:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C1DA1201FA for ; Tue, 22 Mar 2016 15:43:53 +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 B128D201EF for ; Tue, 22 Mar 2016 15:43:52 +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 1aiOQT-0002GA-OS; Tue, 22 Mar 2016 15:40:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aiOQS-0002G4-OA for xen-devel@lists.xenproject.org; Tue, 22 Mar 2016 15:40:56 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 2A/57-03304-78761F65; Tue, 22 Mar 2016 15:40:55 +0000 X-Env-Sender: konrad@char.us.oracle.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1458661253!29408461!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15783 invoked from network); 22 Mar 2016 15:40:55 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-8.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 22 Mar 2016 15:40:55 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u2MFdi1R029705 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 22 Mar 2016 15:39:45 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u2MFdib2010284 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 22 Mar 2016 15:39:44 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id u2MFdi4t025418; Tue, 22 Mar 2016 15:39:44 GMT Received: from char.us.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 22 Mar 2016 08:39:43 -0700 Received: by char.us.oracle.com (Postfix, from userid 1000) id 919A36A00B7; Tue, 22 Mar 2016 11:39:42 -0400 (EDT) Date: Tue, 22 Mar 2016 11:39:42 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20160322153942.GA20062@char.us.oracle.com> References: <1458064616-23101-1-git-send-email-konrad.wilk@oracle.com> <1458064616-23101-7-git-send-email-konrad.wilk@oracle.com> <56EC054F02000078000DE552@prv-mh.provo.novell.com> <20160318195951.GB11924@char.us.oracle.com> <56EFFBCF02000078000DED22@prv-mh.provo.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <56EFFBCF02000078000DED22@prv-mh.provo.novell.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: Keir Fraser , ross.lagerwall@citrix.com, andrew.cooper3@citrix.com, mpohlack@amazon.de, Julien Grall , Stefano Stabellini , sasha.levin@oracle.com, xen-devel@lists.xenproject.org Subject: Re: [Xen-devel] [PATCH v4 06/34] x86/arm: Add BUGFRAME_NR define and BUILD checks. 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 On Mon, Mar 21, 2016 at 06:49:03AM -0600, Jan Beulich wrote: > >>> On 18.03.16 at 20:59, wrote: > > I know I copied and pasted it and I must have done something uncanny. > > > > Anyhow this is what the change looks like now (I've retained the Reviewed > > and Ack as I think this change is mostly cosmetical in nature?) > > I think that's okay. > > > v5: Add Acks, make BUILD_BUG_ON checks look correct. Position the > > BUGFRAME_NR properly. > > Almost, that is. > > > --- a/xen/include/asm-x86/bug.h > > +++ b/xen/include/asm-x86/bug.h > > @@ -10,6 +10,7 @@ > > #define BUGFRAME_bug 2 > > #define BUGFRAME_assert 3 > > > > +#define BUGFRAME_NR 4 > > #ifndef __ASSEMBLY__ > > The insertion wants to go _before_ the blank line. (And in the > ARM case you then may consider removing the preceding blank > line too; in any event the ARM and x86 ones should look similar > in the end.) > Here it is. Last call :-) From f97548200461b9eb4d8187eb9e1f021c74160759 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Thu, 10 Mar 2016 16:45:31 -0500 Subject: [PATCH] x86/arm: Add BUGFRAME_NR define and BUILD checks. So that we have a nice mechansim to figure out the upper bounds of bug.frames and also catch compiler errors in case one tries to use a higher frame number. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper Acked-by: Julien Grall --- Cc: Stefano Stabellini Cc: Julien Grall Cc: Keir Fraser Cc: Jan Beulich Cc: Andrew Cooper v3: First time included. v4: Add BUG_FRAME check also in the assembler version of the macro. v5: Add Acks, make BUILD_BUG_ON checks look correct. Position the BUGFRAME_NR properly. Reposition the BUGFRAME_NR again. --- --- xen/include/asm-arm/bug.h | 3 +++ xen/include/asm-x86/bug.h | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/xen/include/asm-arm/bug.h b/xen/include/asm-arm/bug.h index ab9e811..68353e1 100644 --- a/xen/include/asm-arm/bug.h +++ b/xen/include/asm-arm/bug.h @@ -32,6 +32,8 @@ struct bug_frame { #define BUGFRAME_bug 1 #define BUGFRAME_assert 2 +#define BUGFRAME_NR 3 + /* Many versions of GCC doesn't support the asm %c parameter which would * be preferable to this unpleasantness. We use mergeable string * sections to avoid multiple copies of the string appearing in the @@ -39,6 +41,7 @@ struct bug_frame { */ #define BUG_FRAME(type, line, file, has_msg, msg) do { \ BUILD_BUG_ON((line) >> 16); \ + BUILD_BUG_ON((type) >= BUGFRAME_NR); \ asm ("1:"BUG_INSTR"\n" \ ".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \ "2:\t.asciz " __stringify(file) "\n" \ diff --git a/xen/include/asm-x86/bug.h b/xen/include/asm-x86/bug.h index e868e85..c5d2d4c 100644 --- a/xen/include/asm-x86/bug.h +++ b/xen/include/asm-x86/bug.h @@ -10,6 +10,8 @@ #define BUGFRAME_bug 2 #define BUGFRAME_assert 3 +#define BUGFRAME_NR 4 + #ifndef __ASSEMBLY__ struct bug_frame { @@ -51,6 +53,7 @@ struct bug_frame { #define BUG_FRAME(type, line, ptr, second_frame, msg) do { \ BUILD_BUG_ON((line) >> (BUG_LINE_LO_WIDTH + BUG_LINE_HI_WIDTH)); \ + BUILD_BUG_ON((type) >= BUGFRAME_NR); \ asm volatile ( _ASM_BUGFRAME_TEXT(second_frame) \ :: _ASM_BUGFRAME_INFO(type, line, ptr, msg) ); \ } while (0) @@ -83,6 +86,11 @@ extern const struct bug_frame __start_bug_frames[], * in .rodata */ .macro BUG_FRAME type, line, file_str, second_frame, msg + + .if \type >= BUGFRAME_NR + .error "Invalid BUGFRAME index" + .endif + .L\@ud: ud2a .pushsection .rodata.str1, "aMS", @progbits, 1