From patchwork Tue Feb 23 18:36:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8395481 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 B6EEB9F1D4 for ; Tue, 23 Feb 2016 18:38:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BCC05202F0 for ; Tue, 23 Feb 2016 18:38:43 +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 549F220303 for ; Tue, 23 Feb 2016 18:38:42 +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 1aYHoh-0003Hf-Ch; Tue, 23 Feb 2016 18:36:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aYHof-0003H3-26 for xen-devel@lists.xen.org; Tue, 23 Feb 2016 18:36:09 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 6A/BB-03109-896ACC65; Tue, 23 Feb 2016 18:36:08 +0000 X-Env-Sender: prvs=8544ffb4f=Andrew.Cooper3@citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1456252566!24520509!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15895 invoked from network); 23 Feb 2016 18:36:07 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 23 Feb 2016 18:36:07 -0000 X-IronPort-AV: E=Sophos;i="5.22,490,1449532800"; d="scan'208";a="333751119" From: Andrew Cooper To: Xen-devel Date: Tue, 23 Feb 2016 18:36:03 +0000 Message-ID: <1456252563-11079-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <56CC38C802000078000D516D@prv-mh.provo.novell.com> References: <56CC38C802000078000D516D@prv-mh.provo.novell.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH v3] xen: Work around Clang generating .data.rel.ro section for init-only files 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: , 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 Clang-3.8 generates several .data.rel.ro sections when compiling Xen. As these contain no global symbols, they should be .data.rel.ro.local. This breaks the SPECIAL_DATA_SECTIONS check when converting the transition units to being init-only. For alternatives.c, explicitly move the nops arrays into __initconst. For efi boot.c, manually create the optimisation performed by Clang by collapsing the switch statement into a lookup table. The double use of const is required to avoid breaking the ARM build by creating a section type conflict with fdt_guid. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Stefano Stabellini --- CC: Jan Beulich v2: Fix ARM build v3: Introduce and use __initconstrel --- xen/arch/arm/xen.lds.S | 1 + xen/arch/x86/alternative.c | 4 ++-- xen/arch/x86/xen.lds.S | 1 + xen/common/efi/boot.c | 58 +++++++++++++++------------------------------- xen/include/xen/init.h | 1 + 5 files changed, 24 insertions(+), 41 deletions(-) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index f501a2f..9f7f915 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -114,6 +114,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); .init.data : { *(.init.rodata) + *(.init.rodata.rel) *(.init.rodata.str*) *(.init.data) *(.init.data.rel) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 46ac0fd..9d54df1 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -38,7 +38,7 @@ static const unsigned char k8nops[] __initconst = { K8_NOP7, K8_NOP8 }; -static const unsigned char * const k8_nops[ASM_NOP_MAX+1] = { +static const unsigned char * const k8_nops[ASM_NOP_MAX+1] __initconstrel = { NULL, k8nops, k8nops + 1, @@ -62,7 +62,7 @@ static const unsigned char p6nops[] __initconst = { P6_NOP7, P6_NOP8 }; -static const unsigned char * const p6_nops[ASM_NOP_MAX+1] = { +static const unsigned char * const p6_nops[ASM_NOP_MAX+1] __initconstrel = { NULL, p6nops, p6nops + 1, diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 9fde1db..b3eb207 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -119,6 +119,7 @@ SECTIONS } :text .init.data : { *(.init.rodata) + *(.init.rodata.rel) *(.init.rodata.str*) *(.init.data) *(.init.data.rel) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 53c7452..125c9ce 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -241,53 +241,33 @@ static void __init noreturn blexit(const CHAR16 *str) /* generic routine for printing error messages */ static void __init PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode) { + static const CHAR16* const ErrCodeToStr[] __initconstrel = { + [~EFI_ERROR_MASK & EFI_NOT_FOUND] = L"Not found", + [~EFI_ERROR_MASK & EFI_NO_MEDIA] = L"The device has no media", + [~EFI_ERROR_MASK & EFI_MEDIA_CHANGED] = L"Media changed", + [~EFI_ERROR_MASK & EFI_DEVICE_ERROR] = L"Device error", + [~EFI_ERROR_MASK & EFI_VOLUME_CORRUPTED] = L"Volume corrupted", + [~EFI_ERROR_MASK & EFI_ACCESS_DENIED] = L"Access denied", + [~EFI_ERROR_MASK & EFI_OUT_OF_RESOURCES] = L"Out of resources", + [~EFI_ERROR_MASK & EFI_VOLUME_FULL] = L"Volume is full", + [~EFI_ERROR_MASK & EFI_SECURITY_VIOLATION] = L"Security violation", + [~EFI_ERROR_MASK & EFI_CRC_ERROR] = L"CRC error", + [~EFI_ERROR_MASK & EFI_COMPROMISED_DATA] = L"Compromised data", + [~EFI_ERROR_MASK & EFI_BUFFER_TOO_SMALL] = L"Buffer too small", + }; + EFI_STATUS ErrIdx = ErrCode & ~EFI_ERROR_MASK; + StdOut = StdErr; PrintErr((CHAR16 *)mesg); PrintErr(L": "); - switch (ErrCode) + if( (ErrIdx < ARRAY_SIZE(ErrCodeToStr)) && ErrCodeToStr[ErrIdx] ) + mesg = ErrCodeToStr[ErrIdx]; + else { - case EFI_NOT_FOUND: - mesg = L"Not found"; - break; - case EFI_NO_MEDIA: - mesg = L"The device has no media"; - break; - case EFI_MEDIA_CHANGED: - mesg = L"Media changed"; - break; - case EFI_DEVICE_ERROR: - mesg = L"Device error"; - break; - case EFI_VOLUME_CORRUPTED: - mesg = L"Volume corrupted"; - break; - case EFI_ACCESS_DENIED: - mesg = L"Access denied"; - break; - case EFI_OUT_OF_RESOURCES: - mesg = L"Out of resources"; - break; - case EFI_VOLUME_FULL: - mesg = L"Volume is full"; - break; - case EFI_SECURITY_VIOLATION: - mesg = L"Security violation"; - break; - case EFI_CRC_ERROR: - mesg = L"CRC error"; - break; - case EFI_COMPROMISED_DATA: - mesg = L"Compromised data"; - break; - case EFI_BUFFER_TOO_SMALL: - mesg = L"Buffer too small"; - break; - default: PrintErr(L"ErrCode: "); DisplayUint(ErrCode, 0); mesg = NULL; - break; } blexit(mesg); } diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h index fd8b614..671ac81 100644 --- a/xen/include/xen/init.h +++ b/xen/include/xen/init.h @@ -11,6 +11,7 @@ #define __exit __text_section(".exit.text") #define __initdata __section(".init.data") #define __initconst __section(".init.rodata") +#define __initconstrel __section(".init.rodata.rel") #define __exitdata __used_section(".exit.data") #define __initsetup __used_section(".init.setup") #define __init_call(lvl) __used_section(".initcall" lvl ".init")