| Message ID | 1456412174-20162-12-git-send-email-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 25.02.16 at 15:56, <anthony.perard@citrix.com> wrote: > --- a/tools/firmware/hvmloader/ovmf.c > +++ b/tools/firmware/hvmloader/ovmf.c > @@ -34,17 +34,10 @@ > #include <xen/hvm/ioreq.h> > #include <xen/memory.h> > > -#define ROM_INCLUDE_OVMF > -#include "roms.inc" > - > -#define OVMF_SIZE (sizeof(ovmf)) > #define OVMF_MAXOFFSET 0x000FFFFFULL > -#define OVMF_BEGIN (0x100000000ULL - ((OVMF_SIZE + OVMF_MAXOFFSET) & ~OVMF_MAXOFFSET)) > -#define OVMF_END (OVMF_BEGIN + OVMF_SIZE) > #define LOWCHUNK_BEGIN 0x000F0000 > #define LOWCHUNK_SIZE 0x00010000 > #define LOWCHUNK_MAXOFFSET 0x0000FFFF > -#define LOWCHUNK_END (OVMF_BEGIN + OVMF_SIZE) > #define OVMF_INFO_PHYSICAL_ADDRESS 0x00001000 > > extern unsigned char dsdt_anycpu_qemu_xen[]; > @@ -97,16 +90,20 @@ static void ovmf_load(const struct bios_config *config, > void *bios_addr, uint32_t bios_length) > { > xen_pfn_t mfn; > - uint64_t addr = OVMF_BEGIN; > + uint64_t addr = 0x100000000ULL > + - ((bios_length + OVMF_MAXOFFSET) & ~OVMF_MAXOFFSET); > + uint64_t ovmf_end = addr + bios_length; > + > + ovmf_config.bios_address = addr; > + ovmf_config.image_size = bios_length; > > /* Copy low-reset vector portion. */ > - memcpy((void *) LOWCHUNK_BEGIN, (uint8_t *) config->image > - + OVMF_SIZE > - - LOWCHUNK_SIZE, > + memcpy((void *) LOWCHUNK_BEGIN, > + (uint8_t *) bios_addr + bios_length - LOWCHUNK_SIZE, > LOWCHUNK_SIZE); > > /* Ensure we have backing page prior to moving FD. */ > - while ( (addr >> PAGE_SHIFT) != (OVMF_END >> PAGE_SHIFT) ) > + while ( (addr >> PAGE_SHIFT) != (ovmf_end >> PAGE_SHIFT) ) > { > mfn = (uint32_t) (addr >> PAGE_SHIFT); > addr += PAGE_SIZE; > @@ -114,7 +111,7 @@ static void ovmf_load(const struct bios_config *config, > } > > /* Copy FD. */ > - memcpy((void *) OVMF_BEGIN, config->image, OVMF_SIZE); > + memcpy((void *) ovmf_config.bios_address, bios_addr, bios_length); > } Is this safe, considering that source and destination may now overlap? Thinking about it, the same consideration applies to BIOS placement below 1Mb too. Roger - should we perhaps amend the respective hvm_start_info comment to exclude anything getting placed below 1Mb? Jan
On Tue, Mar 01, 2016 at 09:03:42AM -0700, Jan Beulich wrote: > >>> On 25.02.16 at 15:56, <anthony.perard@citrix.com> wrote: > > --- a/tools/firmware/hvmloader/ovmf.c > > +++ b/tools/firmware/hvmloader/ovmf.c > > @@ -34,17 +34,10 @@ > > #include <xen/hvm/ioreq.h> > > #include <xen/memory.h> > > > > -#define ROM_INCLUDE_OVMF > > -#include "roms.inc" > > - > > -#define OVMF_SIZE (sizeof(ovmf)) > > #define OVMF_MAXOFFSET 0x000FFFFFULL > > -#define OVMF_BEGIN (0x100000000ULL - ((OVMF_SIZE + OVMF_MAXOFFSET) & ~OVMF_MAXOFFSET)) > > -#define OVMF_END (OVMF_BEGIN + OVMF_SIZE) > > #define LOWCHUNK_BEGIN 0x000F0000 > > #define LOWCHUNK_SIZE 0x00010000 > > #define LOWCHUNK_MAXOFFSET 0x0000FFFF > > -#define LOWCHUNK_END (OVMF_BEGIN + OVMF_SIZE) > > #define OVMF_INFO_PHYSICAL_ADDRESS 0x00001000 > > > > extern unsigned char dsdt_anycpu_qemu_xen[]; > > @@ -97,16 +90,20 @@ static void ovmf_load(const struct bios_config *config, > > void *bios_addr, uint32_t bios_length) > > { > > xen_pfn_t mfn; > > - uint64_t addr = OVMF_BEGIN; > > + uint64_t addr = 0x100000000ULL > > + - ((bios_length + OVMF_MAXOFFSET) & ~OVMF_MAXOFFSET); > > + uint64_t ovmf_end = addr + bios_length; > > + > > + ovmf_config.bios_address = addr; > > + ovmf_config.image_size = bios_length; > > > > /* Copy low-reset vector portion. */ > > - memcpy((void *) LOWCHUNK_BEGIN, (uint8_t *) config->image > > - + OVMF_SIZE > > - - LOWCHUNK_SIZE, > > + memcpy((void *) LOWCHUNK_BEGIN, > > + (uint8_t *) bios_addr + bios_length - LOWCHUNK_SIZE, > > LOWCHUNK_SIZE); > > > > /* Ensure we have backing page prior to moving FD. */ > > - while ( (addr >> PAGE_SHIFT) != (OVMF_END >> PAGE_SHIFT) ) > > + while ( (addr >> PAGE_SHIFT) != (ovmf_end >> PAGE_SHIFT) ) > > { > > mfn = (uint32_t) (addr >> PAGE_SHIFT); > > addr += PAGE_SIZE; > > @@ -114,7 +111,7 @@ static void ovmf_load(const struct bios_config *config, > > } > > > > /* Copy FD. */ > > - memcpy((void *) OVMF_BEGIN, config->image, OVMF_SIZE); > > + memcpy((void *) ovmf_config.bios_address, bios_addr, bios_length); > > } > > Is this safe, considering that source and destination may now > overlap? Thinking about it, the same consideration applies to > BIOS placement below 1Mb too. It's probably not safe, it just happen to work right now. I guest I can add some checking, or leave it up to libxc to manage the memory and write this blob just after hvmloader, like it's done right now. I think I'll add some bug_on to catch unexpected changes.
On Thu, Mar 03, 2016 at 05:39:50PM +0000, Anthony PERARD wrote: > On Tue, Mar 01, 2016 at 09:03:42AM -0700, Jan Beulich wrote: > > >>> On 25.02.16 at 15:56, <anthony.perard@citrix.com> wrote: > > > --- a/tools/firmware/hvmloader/ovmf.c > > > +++ b/tools/firmware/hvmloader/ovmf.c > > > @@ -34,17 +34,10 @@ > > > #include <xen/hvm/ioreq.h> > > > #include <xen/memory.h> > > > > > > -#define ROM_INCLUDE_OVMF > > > -#include "roms.inc" > > > - > > > -#define OVMF_SIZE (sizeof(ovmf)) > > > #define OVMF_MAXOFFSET 0x000FFFFFULL > > > -#define OVMF_BEGIN (0x100000000ULL - ((OVMF_SIZE + OVMF_MAXOFFSET) & ~OVMF_MAXOFFSET)) > > > -#define OVMF_END (OVMF_BEGIN + OVMF_SIZE) > > > #define LOWCHUNK_BEGIN 0x000F0000 > > > #define LOWCHUNK_SIZE 0x00010000 > > > #define LOWCHUNK_MAXOFFSET 0x0000FFFF > > > -#define LOWCHUNK_END (OVMF_BEGIN + OVMF_SIZE) > > > #define OVMF_INFO_PHYSICAL_ADDRESS 0x00001000 > > > > > > extern unsigned char dsdt_anycpu_qemu_xen[]; > > > @@ -97,16 +90,20 @@ static void ovmf_load(const struct bios_config *config, > > > void *bios_addr, uint32_t bios_length) > > > { > > > xen_pfn_t mfn; > > > - uint64_t addr = OVMF_BEGIN; > > > + uint64_t addr = 0x100000000ULL > > > + - ((bios_length + OVMF_MAXOFFSET) & ~OVMF_MAXOFFSET); > > > + uint64_t ovmf_end = addr + bios_length; > > > + > > > + ovmf_config.bios_address = addr; > > > + ovmf_config.image_size = bios_length; > > > > > > /* Copy low-reset vector portion. */ > > > - memcpy((void *) LOWCHUNK_BEGIN, (uint8_t *) config->image > > > - + OVMF_SIZE > > > - - LOWCHUNK_SIZE, > > > + memcpy((void *) LOWCHUNK_BEGIN, > > > + (uint8_t *) bios_addr + bios_length - LOWCHUNK_SIZE, > > > LOWCHUNK_SIZE); > > > > > > /* Ensure we have backing page prior to moving FD. */ > > > - while ( (addr >> PAGE_SHIFT) != (OVMF_END >> PAGE_SHIFT) ) > > > + while ( (addr >> PAGE_SHIFT) != (ovmf_end >> PAGE_SHIFT) ) > > > { > > > mfn = (uint32_t) (addr >> PAGE_SHIFT); > > > addr += PAGE_SIZE; > > > @@ -114,7 +111,7 @@ static void ovmf_load(const struct bios_config *config, > > > } > > > > > > /* Copy FD. */ > > > - memcpy((void *) OVMF_BEGIN, config->image, OVMF_SIZE); > > > + memcpy((void *) ovmf_config.bios_address, bios_addr, bios_length); > > > } > > > > Is this safe, considering that source and destination may now > > overlap? Thinking about it, the same consideration applies to > > BIOS placement below 1Mb too. > > It's probably not safe, it just happen to work right now. I guest I can add > some checking, or leave it up to libxc to manage the memory and write this > blob just after hvmloader, like it's done right now. > > I think I'll add some bug_on to catch unexpected changes. > If the only concern is overlapping region (not overwriting something that needs to be used later), using memmove should be good enough? Wei. > -- > Anthony PERARD
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index ed0bfad..dee1c6b 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -43,7 +43,6 @@ endif CIRRUSVGA_DEBUG ?= n -OVMF_DIR := ../ovmf-dir ROMBIOS_DIR := ../rombios ifeq ($(CONFIG_ROMBIOS),y) @@ -61,12 +60,6 @@ ROMS := ifeq ($(CONFIG_OVMF),y) OBJS += ovmf.o CFLAGS += -DENABLE_OVMF -ifeq ($(OVMF_PATH),) - OVMF_ROM := $(OVMF_DIR)/ovmf.bin -else - OVMF_ROM := $(OVMF_PATH) -endif -ROMS += $(OVMF_ROM) endif ifeq ($(CONFIG_ROMBIOS),y) @@ -85,7 +78,7 @@ endif all: subdirs-all $(MAKE) hvmloader -ovmf.o rombios.o: roms.inc +rombios.o: roms.inc smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\"" hvmloader: $(OBJS) acpi/acpi.a @@ -102,12 +95,6 @@ ifneq ($(ROMBIOS_ROM),) echo "#endif" >> $@.new endif -ifneq ($(OVMF_ROM),) - echo "#ifdef ROM_INCLUDE_OVMF" >> $@.new - sh ./mkhex ovmf $(OVMF_ROM) >> $@.new - echo "#endif" >> $@.new -endif - ifneq ($(STDVGA_ROM),) echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new sh ./mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c index 858a2d4..89a005e 100644 --- a/tools/firmware/hvmloader/ovmf.c +++ b/tools/firmware/hvmloader/ovmf.c @@ -34,17 +34,10 @@ #include <xen/hvm/ioreq.h> #include <xen/memory.h> -#define ROM_INCLUDE_OVMF -#include "roms.inc" - -#define OVMF_SIZE (sizeof(ovmf)) #define OVMF_MAXOFFSET 0x000FFFFFULL -#define OVMF_BEGIN (0x100000000ULL - ((OVMF_SIZE + OVMF_MAXOFFSET) & ~OVMF_MAXOFFSET)) -#define OVMF_END (OVMF_BEGIN + OVMF_SIZE) #define LOWCHUNK_BEGIN 0x000F0000 #define LOWCHUNK_SIZE 0x00010000 #define LOWCHUNK_MAXOFFSET 0x0000FFFF -#define LOWCHUNK_END (OVMF_BEGIN + OVMF_SIZE) #define OVMF_INFO_PHYSICAL_ADDRESS 0x00001000 extern unsigned char dsdt_anycpu_qemu_xen[]; @@ -97,16 +90,20 @@ static void ovmf_load(const struct bios_config *config, void *bios_addr, uint32_t bios_length) { xen_pfn_t mfn; - uint64_t addr = OVMF_BEGIN; + uint64_t addr = 0x100000000ULL + - ((bios_length + OVMF_MAXOFFSET) & ~OVMF_MAXOFFSET); + uint64_t ovmf_end = addr + bios_length; + + ovmf_config.bios_address = addr; + ovmf_config.image_size = bios_length; /* Copy low-reset vector portion. */ - memcpy((void *) LOWCHUNK_BEGIN, (uint8_t *) config->image - + OVMF_SIZE - - LOWCHUNK_SIZE, + memcpy((void *) LOWCHUNK_BEGIN, + (uint8_t *) bios_addr + bios_length - LOWCHUNK_SIZE, LOWCHUNK_SIZE); /* Ensure we have backing page prior to moving FD. */ - while ( (addr >> PAGE_SHIFT) != (OVMF_END >> PAGE_SHIFT) ) + while ( (addr >> PAGE_SHIFT) != (ovmf_end >> PAGE_SHIFT) ) { mfn = (uint32_t) (addr >> PAGE_SHIFT); addr += PAGE_SIZE; @@ -114,7 +111,7 @@ static void ovmf_load(const struct bios_config *config, } /* Copy FD. */ - memcpy((void *) OVMF_BEGIN, config->image, OVMF_SIZE); + memcpy((void *) ovmf_config.bios_address, bios_addr, bios_length); } static void ovmf_acpi_build_tables(void) @@ -151,10 +148,6 @@ static void ovmf_setup_e820(void) struct bios_config ovmf_config = { .name = "OVMF", - .image = ovmf, - .image_size = sizeof(ovmf), - - .bios_address = OVMF_BEGIN, .bios_load = ovmf_load, .load_roms = 0,
... and do not include the OVMF ROM into hvmloader anymore. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- Change in V3: - change makefile to not include ovmf rom into roms.inc. - update the struct bios_config with bios destination --- tools/firmware/hvmloader/Makefile | 15 +-------------- tools/firmware/hvmloader/ovmf.c | 27 ++++++++++----------------- 2 files changed, 11 insertions(+), 31 deletions(-)