All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Kiper <daniel.kiper@oracle.com>
To: xen-devel@lists.xenproject.org
Cc: jgross@suse.com, sstabellini@kernel.org,
	andrew.cooper3@citrix.com, cardoe@cardoe.com,
	pgnet.dev@gmail.com, ning.sun@intel.com, julien.grall@arm.com,
	david.vrabel@citrix.com, jbeulich@suse.com,
	qiaowei.ren@intel.com, gang.wei@intel.com, fu.wei@linaro.org
Subject: [PATCH v8 04/13] x86: properly calculate xen ELF end of image address
Date: Thu, 29 Sep 2016 00:51:23 +0200	[thread overview]
Message-ID: <1475103092-27893-5-git-send-email-daniel.kiper@oracle.com> (raw)
In-Reply-To: <1475103092-27893-1-git-send-email-daniel.kiper@oracle.com>

Currently xen ELF end of image address is calculated using first line from
"nm -nr xen/xen-syms" output. However, potentially it may contain symbol
address not related to the end of image in any way. It can happen if a symbol
is introduced with address larger than _end symbol address. Such situation
encountered when I linked xen ELF binary with xen/arch/x86/efi/relocs-dummy.S.
Then first line from "nm -nr xen/xen-syms" contained "ffff82d0c0000000 A ALT_START"
and xen ELF image memory size was silently set to 1023 MiB. This issue happened
because there is no check which symbol address is used to calculate end of
image address. So, let's fix it and take ELF end of image address by reading
_end symbol address from nm output. This way xen ELF image build process is
not prone to changes in order of nm output.

This patch is prereq for "efi: build xen.gz with EFI code" patch which adds,
among others, xen/arch/x86/efi/relocs-dummy.S to xen.gz output.

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
---
v8 - suggestions/fixes:
   - use spaces instead of tab in indentation
     (suggested by Jan Beulich and Konrad Rzeszutek Wilk),
   - improve commit message
     (suggested by Jan Beulich).

v7 - suggestions/fixes:
   - use sed instead of awk
     (suggested by Jan Beulich),
   - improve commit message
     (suggested by Jan Beulich).
---
 xen/arch/x86/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 931917d..8e003ff 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -91,7 +91,7 @@ endif
 
 $(TARGET): $(TARGET)-syms $(efi-y) boot/mkelf32
 	./boot/mkelf32 $(notes_phdrs) $(TARGET)-syms $(TARGET) 0x100000 \
-	`$(NM) -nr $(TARGET)-syms | head -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'`
+	        `$(NM) $(TARGET)-syms | sed -ne 's/^\([^ ]*\) . _end$$/0x\1/p'`
 
 ALL_OBJS := $(BASEDIR)/arch/x86/boot/built_in.o $(BASEDIR)/arch/x86/efi/built_in.o $(ALL_OBJS)
 
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

  parent reply	other threads:[~2016-09-28 22:52 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-28 22:51 [PATCH v8 00/13] x86: multiboot2 protocol support Daniel Kiper
2016-09-28 22:51 ` [PATCH v8 01/13] x86: add " Daniel Kiper
2016-09-28 22:51 ` [PATCH v8 02/13] efi: create efi_enabled() Daniel Kiper
2016-09-28 22:51 ` [PATCH v8 03/13] x86: allow EFI reboot method neither on EFI platforms Daniel Kiper
2016-09-28 22:51 ` Daniel Kiper [this message]
2016-09-29  7:34   ` [PATCH v8 04/13] x86: properly calculate xen ELF end of image address Jan Beulich
2016-09-29  7:51     ` Daniel Kiper
2016-09-29  8:01       ` Jan Beulich
2016-09-29  8:17         ` Daniel Kiper
2016-09-29  8:34           ` Jan Beulich
2016-09-28 22:51 ` [PATCH v8 05/13] efi: build xen.gz with EFI code Daniel Kiper
2016-09-28 22:51 ` [PATCH v8 06/13] efi: create new early memory allocator Daniel Kiper
2016-09-29  7:40   ` Jan Beulich
2016-09-29  8:08     ` Daniel Kiper
2016-09-29 12:47       ` Daniel Kiper
2016-09-28 22:51 ` [PATCH v8 07/13] x86: add multiboot2 protocol support for EFI platforms Daniel Kiper
2016-09-28 22:51 ` [PATCH v8 08/13] x86/boot: implement early command line parser in C Daniel Kiper
2016-09-28 22:51 ` [PATCH v8 09/13] x86: change default load address from 1 MiB to 2 MiB Daniel Kiper
2016-09-28 22:51 ` [PATCH v8 10/13] x86/setup: use XEN_IMG_OFFSET instead of Daniel Kiper
2016-09-28 22:51 ` [PATCH v8 11/13] x86: make Xen early boot code relocatable Daniel Kiper
2016-09-28 22:51 ` [PATCH v8 12/13] x86/boot: rename sym_phys() to sym_offs() Daniel Kiper
2016-09-28 22:51 ` [PATCH v8 13/13] x86: add multiboot2 protocol support for relocatable images Daniel Kiper
2016-09-29  7:46   ` Jan Beulich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1475103092-27893-5-git-send-email-daniel.kiper@oracle.com \
    --to=daniel.kiper@oracle.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=cardoe@cardoe.com \
    --cc=david.vrabel@citrix.com \
    --cc=fu.wei@linaro.org \
    --cc=gang.wei@intel.com \
    --cc=jbeulich@suse.com \
    --cc=jgross@suse.com \
    --cc=julien.grall@arm.com \
    --cc=ning.sun@intel.com \
    --cc=pgnet.dev@gmail.com \
    --cc=qiaowei.ren@intel.com \
    --cc=sstabellini@kernel.org \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.