From: Jason Andryuk <jandryuk@gmail.com>
To: jandryuk@gmail.com, xen-devel@lists.xenproject.org
Cc: andrew.cooper3@citrix.com, george.dunlap@citrix.com,
iwj@xenproject.org, jbeulich@suse.com, julien@xen.org,
roger.pau@citrix.com, sstabellini@kernel.org, wl@xen.org
Subject: [RFC PATCH 3/3] libelf: PVH: only allow elf_paddr_offset of 0
Date: Fri, 14 May 2021 11:17:31 -0400 [thread overview]
Message-ID: <20210514151731.19272-3-jandryuk@gmail.com> (raw)
In-Reply-To: <20210514151731.19272-1-jandryuk@gmail.com>
Modern Linux and FreeBSD hardcode it to 0. Just drop its use for PVH.
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
---
xen/arch/x86/hvm/dom0_build.c | 2 +-
xen/common/libelf/libelf-dominfo.c | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c
index 552448ce5d..335321ed3e 100644
--- a/xen/arch/x86/hvm/dom0_build.c
+++ b/xen/arch/x86/hvm/dom0_build.c
@@ -574,7 +574,7 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image,
}
/* Copy the OS image and free temporary buffer. */
- elf.dest_base = (void *)parms.phys_kstart - parms.elf_paddr_offset;
+ elf.dest_base = (void *)parms.phys_kstart;
elf.dest_size = parms.phys_kend - parms.phys_kstart;
elf_set_vcpu(&elf, v);
diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c
index 13eb39ec52..12feb8755e 100644
--- a/xen/common/libelf/libelf-dominfo.c
+++ b/xen/common/libelf/libelf-dominfo.c
@@ -433,6 +433,12 @@ static elf_errorstatus elf_xen_addr_calc_check_pvh(struct elf_binary *elf,
parms->phys_kend = elf->bsd_symtab_pend;
}
+ if ( parms->elf_paddr_offset != 0 ) {
+ elf_err(elf, "ERROR: ELF elf_paddr_offset (0x" PRIx64 ") is non-zero\n",
+ parms->elf_paddr_offset);
+ return -1;
+ }
+
elf_msg(elf, "ELF: addresses:\n");
elf_msg(elf, " phys_kstart = 0x%" PRIx64 "\n", parms->phys_kstart);
elf_msg(elf, " phys_kend = 0x%" PRIx64 "\n", parms->phys_kend);
--
2.31.1
next prev parent reply other threads:[~2021-05-14 15:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-14 13:50 [PATCH] libelf: improve PVH elfnote parsing Roger Pau Monne
2021-05-14 15:11 ` Jason Andryuk
2021-05-14 15:17 ` [RFC PATCH 1/3] libelf: Introduce phys_kstart/end Jason Andryuk
2021-05-14 15:17 ` [RFC PATCH 2/3] libelf: Use flags to check pv or pvh in elf_xen_parse Jason Andryuk
2021-05-14 15:17 ` Jason Andryuk [this message]
2021-05-18 11:28 ` [PATCH] libelf: improve PVH elfnote parsing Roger Pau Monné
2021-05-17 11:09 ` Jan Beulich
2021-05-18 11:22 ` Roger Pau Monné
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=20210514151731.19272-3-jandryuk@gmail.com \
--to=jandryuk@gmail.com \
--cc=andrew.cooper3@citrix.com \
--cc=george.dunlap@citrix.com \
--cc=iwj@xenproject.org \
--cc=jbeulich@suse.com \
--cc=julien@xen.org \
--cc=roger.pau@citrix.com \
--cc=sstabellini@kernel.org \
--cc=wl@xen.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).