From patchwork Tue Jan 17 20:07:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 9521839 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A141B60244 for ; Tue, 17 Jan 2017 20:10:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 844522858D for ; Tue, 17 Jan 2017 20:10:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 78A47285AE; Tue, 17 Jan 2017 20:10:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id C18982858D for ; Tue, 17 Jan 2017 20:10:21 +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 1cTa35-0004G7-37; Tue, 17 Jan 2017 20:08:07 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cTa33-0004FL-Hf for xen-devel@lists.xen.org; Tue, 17 Jan 2017 20:08:05 +0000 Received: from [193.109.254.147] by server-8.bemta-6.messagelabs.com id 7D/1A-21675-4A97E785; Tue, 17 Jan 2017 20:08:04 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLIsWRWlGSWpSXmKPExsVyMfTqQd0llXU RBms2sVgs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBlPV05iK1isU9Gz+wJbA+NClS5GLg4hgYmM Emd272TvYuTkYBHYzyzx80gFSEJCYBmrxLtVN5hBEhICMRJzOtewQNiVEnf3/QZrEBJQkPg94 RATxKTlTBKzzn5jBEmwCWhIPPk1gw3EFhGQlrj2+TIjSBGzwBMmiRX73gN1c3AIC5hLfD/IBb FZVaLr3G5WkDCvQJzE9kPiELvkJRaeP8IEYnMKpEo8+/yDGWJvisSDt28YcYlPYBRawMiwilG jOLWoLLVI19BML6koMz2jJDcxM0fX0MBMLze1uDgxPTUnMalYLzk/dxMjMBAZgGAH4/2NAYcY JTmYlER5Ox7XRgjxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4JWvqIsQEixKTU+tSMvMAcYETFqCg 0dJhDcWJM1bXJCYW5yZDpE6xWjM0dN1+iUTx55dl18yCbHk5eelSonzhoKUCoCUZpTmwQ2Cxe olRlkpYV5GoNOEeApSi3IzS1DlXzGKczAqCUMs5MnMK4Hb9wroFCagU67rVIOcUpKIkJJqYFQ /kDhzE8OcaZMjLqxtOeJ37O5t3i3lXEIOk5VtmH+fLzikaPGil8X33bmOg5K73q04eiX/f2np v5XqMR7OhVUdCVHt29ivvVwjrhwv9rHEhymM0fj+lL/syXcdE3bxOOTf599x4iGXjtyvmCLb5 OPzLepk27fvFVvbKLY8Sq3k1fn2exYCGkosxRmJhlrMRcWJAEUFpBrQAgAA X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1484683683!77788500!1 X-Originating-IP: [209.85.213.193] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51663 invoked from network); 17 Jan 2017 20:08:03 -0000 Received: from mail-yb0-f193.google.com (HELO mail-yb0-f193.google.com) (209.85.213.193) by server-7.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 17 Jan 2017 20:08:03 -0000 Received: by mail-yb0-f193.google.com with SMTP id l23so6109086ybj.3 for ; Tue, 17 Jan 2017 12:08:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=RRKOV3xd8sKPOJq/Co9jRv9M6sNvoAGuUTdRMoSXIKk=; b=CzNAOvwa0le/k7UbltrP/TRWncvsbykkJ9ILDC1tTB68PTRsYn7oi8qqufxWW9i7rh xhcOyiGXoGINRws/nnzaVrb4jeN0mtwZ6qt/jbUXNNJKZCD1IK4pXccN3mVxvgHn4f1K V2rcD00kGCScJ2ugB0vWkITvD/wF64bTMQDY8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=RRKOV3xd8sKPOJq/Co9jRv9M6sNvoAGuUTdRMoSXIKk=; b=Frsk0PT0r5QFMZ/7DnQ3wEUIVyMYzEsWnWRSKlGJU/DxJNZ69cL635gdFXbiq5HfC+ key3lzZl1uSdgeB5DugJQwzLbqAEUDa8hoQ9odq8OH7/TfXyXcIF0mFBKi3vwJjFpDNW iCVUYII+74S7CE+TQ0GMVvuQqI42hN3O09c3CozTXbnauKGUQ2shuhhJKRWr/GyetsOa PJO3mofxI61YxtqNHPYsVBtgi5TbVn2pbl70uwRb+uR9LGwSB9CatwplyuAKCoFXpFK8 8Ps9g/Bpby4odDTpG+FpfOUuQGEmtHnewAfJC7kNkZPvACfMKx5Xb54J7BCguvlXIttB jJkg== X-Gm-Message-State: AIkVDXKAjIVaiqGSy283YBa4pcaUXW1RYFpk47arEbUxiiqAZwp7lP28RKPAympd0Htu1A== X-Received: by 10.37.42.80 with SMTP id q77mr25366623ybq.102.1484683682657; Tue, 17 Jan 2017 12:08:02 -0800 (PST) Received: from swanson.attlocal.net (104-179-196-18.lightspeed.brhmal.sbcglobal.net. [104.179.196.18]) by smtp.gmail.com with ESMTPSA id o5sm11798104ywj.4.2017.01.17.12.08.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 12:08:02 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Tue, 17 Jan 2017 14:07:45 -0600 Message-Id: <6d0733a6d4e6e5663945c9b001405fe9a06c106f.1484683034.git-series.cardoe@cardoe.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: References: In-Reply-To: References: Cc: jgross@suse.com, sstabellini@kernel.org, konrad.wilk@oracle.com, Andrew Cooper , Daniel Kiper , Doug Goldstein , pgnet.dev@gmail.com, ning.sun@intel.com, julien.grall@arm.com, Jan Beulich , qiaowei.ren@intel.com, gang.wei@intel.com, fu.wei@linaro.org Subject: [Xen-devel] [PATCH v3 2/5] efi: build xen.gz with EFI code 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-Virus-Scanned: ClamAV using ClamSMTP From: Daniel Kiper Build xen.gz with EFI code. We need this to support multiboot2 protocol on EFI platforms. If we wish to load non-ELF file using multiboot (v1) or multiboot2 then it must contain "linear" (or "flat") representation of code and data. This is requirement of both boot protocols. Currently, PE file contains many sections which are not "linear" (one after another without any holes) or even do not have representation in a file (e.g. BSS). From EFI point of view everything is OK and works. However, this file layout cannot be properly interpreted by multiboot protocols family. In theory there is a chance that we could build proper PE file (from multiboot protocols POV) using current build system. However, it means that xen.efi further diverge from Xen ELF file (in terms of contents and build method). On the other hand ELF has all needed properties. So, it means that this is good starting point for further development. Additionally, I think that this is also good starting point for further xen.efi code and build optimizations. It looks that there is a chance that finally we can generate xen.efi directly from Xen ELF using just simple objcopy or other tool. This way we will have one Xen binary which can be loaded by three boot protocols: EFI native loader, multiboot (v1) and multiboot2. Signed-off-by: Daniel Kiper Acked-by: Jan Beulich Reviewed-by: Doug Goldstein --- v6 - suggestions/fixes: - improve efi_enabled() checks in efi_runtime_call() (suggested by Jan Beulich). v5 - suggestions/fixes: - properly calculate efi symbol address in xen/arch/x86/xen.lds.S (I hope that this change does not invalidate Jan's ACK). v4 - suggestions/fixes: - functions should return -ENOSYS instead of -EOPNOTSUPP if EFI runtime services are not available (suggested by Jan Beulich), - remove stale bits from xen/arch/x86/Makefile (suggested by Jan Beulich). v3 - suggestions/fixes: - check for EFI platform in EFI code (suggested by Jan Beulich), - fix Makefiles (suggested by Jan Beulich), - improve commit message (suggested by Jan Beulich). v2 - suggestions/fixes: - build EFI code only if it is supported in a given build environment (suggested by Jan Beulich). --- --- xen/arch/x86/Makefile | 2 +- xen/arch/x86/efi/Makefile | 12 ++++-------- xen/arch/x86/xen.lds.S | 4 ++-- xen/common/efi/boot.c | 3 +++ xen/common/efi/runtime.c | 9 +++++++++ 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 7f6b5d7..2e22cdf 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -219,6 +219,6 @@ efi/mkreloc: efi/mkreloc.c clean:: rm -f asm-offsets.s *.lds boot/*.o boot/*~ boot/core boot/mkelf32 rm -f $(BASEDIR)/.xen-syms.[0-9]* boot/.*.d - rm -f $(BASEDIR)/.xen.efi.[0-9]* efi/*.o efi/.*.d efi/*.efi efi/disabled efi/mkreloc + rm -f $(BASEDIR)/.xen.efi.[0-9]* efi/*.efi efi/disabled efi/mkreloc rm -f boot/reloc.S boot/reloc.lnk boot/reloc.bin rm -f note.o diff --git a/xen/arch/x86/efi/Makefile b/xen/arch/x86/efi/Makefile index ad3fdf7..442f3fc 100644 --- a/xen/arch/x86/efi/Makefile +++ b/xen/arch/x86/efi/Makefile @@ -1,18 +1,14 @@ CFLAGS += -fshort-wchar -obj-y += stub.o - -create = test -e $(1) || touch -t 199901010000 $(1) - efi := y$(shell rm -f disabled) efi := $(if $(efi),$(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c check.c 2>disabled && echo y)) efi := $(if $(efi),$(shell $(LD) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y)) -efi := $(if $(efi),$(shell rm disabled)y,$(shell $(call create,boot.init.o); $(call create,runtime.o))) - -extra-$(efi) += boot.init.o relocs-dummy.o runtime.o compat.o buildid.o +efi := $(if $(efi),$(shell rm disabled)y) %.o: %.ihex $(OBJCOPY) -I ihex -O binary $< $@ -stub.o: $(extra-y) +obj-y := stub.o +obj-$(efi) := boot.init.o compat.o relocs-dummy.o runtime.o +extra-$(efi) += buildid.o nogcov-$(efi) += stub.o diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 7676de9..b0b1c9b 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -270,10 +270,10 @@ SECTIONS .pad : { . = ALIGN(MB(16)); } :text -#else - efi = .; #endif + efi = DEFINED(efi) ? efi : .; + /* Sections to be discarded */ /DISCARD/ : { *(.exit.text) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 3e5e4ab..df8c702 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1251,6 +1251,9 @@ void __init efi_init_memory(void) } *extra, *extra_head = NULL; #endif + if ( !efi_enabled(EFI_BOOT) ) + return; + printk(XENLOG_INFO "EFI memory map:%s\n", map_bs ? " (mapping BootServices)" : ""); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index 8c44835..25323de 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -196,6 +196,9 @@ int efi_get_info(uint32_t idx, union xenpf_efi_info *info) { unsigned int i, n; + if ( !efi_enabled(EFI_BOOT) ) + return -ENOSYS; + switch ( idx ) { case XEN_FW_EFI_VERSION: @@ -331,6 +334,12 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) EFI_STATUS status = EFI_NOT_STARTED; int rc = 0; + if ( !efi_enabled(EFI_BOOT) ) + return -ENOSYS; + + if ( !efi_enabled(EFI_RS) ) + return -EOPNOTSUPP; + switch ( op->function ) { case XEN_EFI_get_time: