Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP2:Update
xen.6649
0002-libxc-Prepare-a-start-info-structure-for-h...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0002-libxc-Prepare-a-start-info-structure-for-hvmloader.patch of Package xen.6649
From 34cd9218de8579722240d1acdcaae4e4278f667e Mon Sep 17 00:00:00 2001 From: Anthony PERARD <anthony.perard@citrix.com> Date: Mon, 14 Mar 2016 17:55:37 +0000 Subject: [PATCH 02/15] libxc: Prepare a start info structure for hvmloader ... and load BIOS into guest memory. This adds a new firmware module, bios_module. It is loaded in the guest memory and final location is provided to hvmloader via the hvm_start_info struct. This patch create the hvm_start_info struct for HVM guest that have a device model, so this is now common code with HVM guest without device model. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- tools/libxc/include/xc_dom.h | 3 + tools/libxc/xc_dom_hvmloader.c | 2 + tools/libxc/xc_dom_x86.c | 132 ++++++++++++++++++++++++++++------------- xen/include/public/xen.h | 2 +- 4 files changed, 96 insertions(+), 43 deletions(-) Index: xen-4.7.3-testing/tools/libxc/include/xc_dom.h =================================================================== --- xen-4.7.3-testing.orig/tools/libxc/include/xc_dom.h +++ xen-4.7.3-testing/tools/libxc/include/xc_dom.h @@ -209,6 +209,9 @@ struct xc_dom_image { /* If unset disables the setup of the IOREQ pages. */ bool device_model; + /* BIOS passed to HVMLOADER */ + struct xc_hvm_firmware_module bios_module; + /* Extra ACPI tables passed to HVMLOADER */ struct xc_hvm_firmware_module acpi_module; Index: xen-4.7.3-testing/tools/libxc/xc_dom_hvmloader.c =================================================================== --- xen-4.7.3-testing.orig/tools/libxc/xc_dom_hvmloader.c +++ xen-4.7.3-testing/tools/libxc/xc_dom_hvmloader.c @@ -167,6 +167,8 @@ static int modules_init(struct xc_dom_im { int rc; + rc = module_init_one(dom, &dom->bios_module, "bios module"); + if ( rc ) goto err; rc = module_init_one(dom, &dom->acpi_module, "acpi module"); if ( rc ) goto err; rc = module_init_one(dom, &dom->smbios_module, "smbios module"); Index: xen-4.7.3-testing/tools/libxc/xc_dom_x86.c =================================================================== --- xen-4.7.3-testing.orig/tools/libxc/xc_dom_x86.c +++ xen-4.7.3-testing/tools/libxc/xc_dom_x86.c @@ -64,6 +64,9 @@ #define round_up(addr, mask) ((addr) | (mask)) #define round_pg_up(addr) (((addr) + PAGE_SIZE_X86 - 1) & ~(PAGE_SIZE_X86 - 1)) +#define HVMLOADER_MODULE_MAX_COUNT 1 +#define HVMLOADER_MODULE_NAME_SIZE 10 + struct xc_dom_params { unsigned levels; xen_vaddr_t vaddr_mask; @@ -585,6 +588,7 @@ static int alloc_magic_pages_hvm(struct xen_pfn_t special_array[X86_HVM_NR_SPECIAL_PAGES]; xen_pfn_t ioreq_server_array[NR_IOREQ_SERVER_PAGES]; xc_interface *xch = dom->xch; + size_t start_info_size = sizeof(struct hvm_start_info); /* Allocate and clear special pages. */ for ( i = 0; i < X86_HVM_NR_SPECIAL_PAGES; i++ ) @@ -619,8 +623,6 @@ static int alloc_magic_pages_hvm(struct if ( !dom->device_model ) { - size_t start_info_size = sizeof(struct hvm_start_info); - if ( dom->cmdline ) { dom->cmdline_size = ROUNDUP(strlen(dom->cmdline) + 1, 8); @@ -630,17 +632,26 @@ static int alloc_magic_pages_hvm(struct /* Limited to one module. */ if ( dom->ramdisk_blob ) start_info_size += sizeof(struct hvm_modlist_entry); - - rc = xc_dom_alloc_segment(dom, &dom->start_info_seg, - "HVMlite start info", 0, start_info_size); - if ( rc != 0 ) - { - DOMPRINTF("Unable to reserve memory for the start info"); - goto out; - } } else { + start_info_size += + sizeof(struct hvm_modlist_entry) * HVMLOADER_MODULE_MAX_COUNT; + /* Add extra space to write modules name */ + start_info_size += + HVMLOADER_MODULE_NAME_SIZE * HVMLOADER_MODULE_MAX_COUNT; + } + + rc = xc_dom_alloc_segment(dom, &dom->start_info_seg, + "HVMlite start info", 0, start_info_size); + if ( rc != 0 ) + { + DOMPRINTF("Unable to reserve memory for the start info"); + goto out; + } + + if ( dom->device_model ) + { /* * Allocate and clear additional ioreq server pages. The default * server will use the IOREQ and BUFIOREQ special pages above. @@ -1684,39 +1695,68 @@ static int alloc_pgtables_hvm(struct xc_ return 0; } +static void add_module_to_list(struct xc_dom_image *dom, + struct xc_hvm_firmware_module *module, + const char *name, + struct hvm_modlist_entry *modlist, + struct hvm_start_info *start_info) +{ + uint32_t index = start_info->nr_modules; + if ( module->length == 0 ) + return; + + assert(start_info->nr_modules < HVMLOADER_MODULE_MAX_COUNT); + assert(strnlen(name, HVMLOADER_MODULE_NAME_SIZE) + < HVMLOADER_MODULE_NAME_SIZE); + + modlist[index].paddr = module->guest_addr_out; + modlist[index].size = module->length; + strncpy((char*)(modlist + HVMLOADER_MODULE_MAX_COUNT) + + HVMLOADER_MODULE_NAME_SIZE * index, + name, HVMLOADER_MODULE_NAME_SIZE); + modlist[index].cmdline_paddr = + (dom->start_info_seg.pfn << PAGE_SHIFT) + + ((uintptr_t)modlist - (uintptr_t)start_info) + + sizeof(struct hvm_modlist_entry) * HVMLOADER_MODULE_MAX_COUNT + + HVMLOADER_MODULE_NAME_SIZE * index; + + start_info->nr_modules++; +} + static int bootlate_hvm(struct xc_dom_image *dom) { uint32_t domid = dom->guest_domid; xc_interface *xch = dom->xch; + struct hvm_start_info *start_info; + size_t start_info_size; + void *start_page; + struct hvm_modlist_entry *modlist; - if ( !dom->device_model ) - { - struct hvm_start_info *start_info; - size_t start_info_size; - void *start_page; - - start_info_size = sizeof(*start_info) + dom->cmdline_size; - if ( dom->ramdisk_blob ) - start_info_size += sizeof(struct hvm_modlist_entry); + start_info_size = sizeof(*start_info) + dom->cmdline_size; + if ( dom->ramdisk_blob ) + start_info_size += sizeof(struct hvm_modlist_entry); - if ( start_info_size > - dom->start_info_seg.pages << XC_DOM_PAGE_SHIFT(dom) ) - { - DOMPRINTF("Trying to map beyond start_info_seg"); - return -1; - } + if ( start_info_size > + dom->start_info_seg.pages << XC_DOM_PAGE_SHIFT(dom) ) + { + DOMPRINTF("Trying to map beyond start_info_seg"); + return -1; + } - start_page = xc_map_foreign_range(xch, domid, start_info_size, - PROT_READ | PROT_WRITE, - dom->start_info_seg.pfn); - if ( start_page == NULL ) - { - DOMPRINTF("Unable to map HVM start info page"); - return -1; - } + start_page = xc_map_foreign_range(xch, domid, start_info_size, + PROT_READ | PROT_WRITE, + dom->start_info_seg.pfn); + if ( start_page == NULL ) + { + DOMPRINTF("Unable to map HVM start info page"); + return -1; + } - start_info = start_page; + start_info = start_page; + modlist = start_page + sizeof(*start_info) + dom->cmdline_size; + if ( !dom->device_model ) + { if ( dom->cmdline ) { char *cmdline = start_page + sizeof(*start_info); @@ -1728,22 +1768,30 @@ static int bootlate_hvm(struct xc_dom_im if ( dom->ramdisk_blob ) { - struct hvm_modlist_entry *modlist = - start_page + sizeof(*start_info) + dom->cmdline_size; modlist[0].paddr = dom->ramdisk_seg.vstart - dom->parms.virt_base; modlist[0].size = dom->ramdisk_seg.vend - dom->ramdisk_seg.vstart; - start_info->modlist_paddr = (dom->start_info_seg.pfn << PAGE_SHIFT) + - ((uintptr_t)modlist - (uintptr_t)start_info); start_info->nr_modules = 1; } - - start_info->magic = XEN_HVM_START_MAGIC_VALUE; - - munmap(start_page, start_info_size); } else { + add_module_to_list(dom, &dom->bios_module, "bios", + modlist, start_info); + } + + if ( start_info->nr_modules ) + { + start_info->modlist_paddr = (dom->start_info_seg.pfn << PAGE_SHIFT) + + ((uintptr_t)modlist - (uintptr_t)start_info); + } + + start_info->magic = XEN_HVM_START_MAGIC_VALUE; + + munmap(start_page, start_info_size); + + if ( dom->device_model ) + { void *hvm_info_page; if ( (hvm_info_page = xc_map_foreign_range( Index: xen-4.7.3-testing/xen/include/public/xen.h =================================================================== --- xen-4.7.3-testing.orig/xen/include/public/xen.h +++ xen-4.7.3-testing/xen/include/public/xen.h @@ -814,7 +814,7 @@ struct start_info { typedef struct start_info start_info_t; /* - * Start of day structure passed to PVH guests in %ebx. + * Start of day structure passed to PVH guests and to HVM guests in %ebx. * * NOTE: nothing will be loaded at physical address 0, so a 0 value in any * of the address fields should be treated as not present.
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
