From patchwork Tue Jan 5 22:26:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 7963661 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 34B429FC69 for ; Tue, 5 Jan 2016 22:29:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 350562010F for ; Tue, 5 Jan 2016 22:28:59 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2F12B201F4 for ; Tue, 5 Jan 2016 22:28:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aGa35-0004FH-IK; Tue, 05 Jan 2016 22:25:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aGa33-0004F5-Ta for xen-devel@lists.xen.org; Tue, 05 Jan 2016 22:25:50 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 98/FD-24450-DE24C865; Tue, 05 Jan 2016 22:25:49 +0000 X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1452032746!14580111!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38925 invoked from network); 5 Jan 2016 22:25:48 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-3.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 5 Jan 2016 22:25:48 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u05MPeul013584 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 5 Jan 2016 22:25:41 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.13.8/8.13.8) with ESMTP id u05MPeCr001788 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 5 Jan 2016 22:25:40 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u05MPdvx018320; Tue, 5 Jan 2016 22:25:40 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 05 Jan 2016 14:25:39 -0800 From: Boris Ostrovsky To: ian.jackson@eu.citrix.com, stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com, wei.liu2@citrix.com Date: Tue, 5 Jan 2016 17:26:10 -0500 Message-Id: <1452032770-5642-3-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1452032770-5642-1-git-send-email-boris.ostrovsky@oracle.com> References: <1452032770-5642-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Cc: jgross@suse.com, Boris Ostrovsky , roger.pau@citrix.com, xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH v2 2/2] libxc: Defer initialization of start_page for HVM guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With commit 8c45adec18e0 ("libxc: create unmapped initrd in domain builder if supported") location of ramdisk may not be available to HVMlite guests by the time alloc_magic_pages_hvm() is invoked if the guest supports unmapped initrd. So let's move ramdisk info initialization (along with a few other operations that are not directly related to allocating magic/special pages) from alloc_magic_pages_hvm() to bootlate_hvm(). Signed-off-by: Boris Ostrovsky Acked-by: Wei Liu --- tools/libxc/xc_dom_x86.c | 117 ++++++++++++++++++++++++++------------------- 1 files changed, 68 insertions(+), 49 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index b696149..e8c947f 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -586,23 +586,12 @@ static void build_hvm_info(void *hvm_info_page, struct xc_dom_image *dom) static int alloc_magic_pages_hvm(struct xc_dom_image *dom) { unsigned long i; - void *hvm_info_page; uint32_t *ident_pt, domid = dom->guest_domid; int rc; 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; - if ( dom->device_model ) - { - if ( (hvm_info_page = xc_map_foreign_range( - xch, domid, PAGE_SIZE, PROT_READ | PROT_WRITE, - HVM_INFO_PFN)) == NULL ) - goto error_out; - build_hvm_info(hvm_info_page, dom); - munmap(hvm_info_page, PAGE_SIZE); - } - /* Allocate and clear special pages. */ for ( i = 0; i < X86_HVM_NR_SPECIAL_PAGES; i++ ) special_array[i] = special_pfn(i); @@ -637,12 +626,9 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) if ( !dom->device_model ) { struct xc_dom_seg seg; - struct hvm_start_info *start_info; - char *cmdline; struct hvm_modlist_entry *modlist; - void *start_page; size_t cmdline_size = 0; - size_t start_info_size = sizeof(*start_info); + size_t start_info_size = sizeof(struct hvm_start_info); if ( dom->cmdline ) { @@ -666,39 +652,6 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) goto out; } - start_page = xc_map_foreign_range(xch, domid, start_info_size, - PROT_READ | PROT_WRITE, - seg.pfn); - if ( start_page == NULL ) - { - DOMPRINTF("Unable to map HVM start info page"); - goto error_out; - } - - start_info = start_page; - cmdline = start_page + sizeof(*start_info); - modlist = start_page + sizeof(*start_info) + cmdline_size; - - if ( dom->cmdline ) - { - strcpy(cmdline, dom->cmdline); - start_info->cmdline_paddr = (seg.pfn << PAGE_SHIFT) + - ((uintptr_t)cmdline - (uintptr_t)start_info); - } - - if ( dom->ramdisk_blob ) - { - 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 = (seg.pfn << PAGE_SHIFT) + - ((uintptr_t)modlist - (uintptr_t)start_info); - start_info->nr_modules = 1; - } - - start_info->magic = HVM_START_MAGIC_VALUE; - - munmap(start_page, start_info_size); - dom->start_info_pfn = seg.pfn; } else @@ -1788,7 +1741,73 @@ static int alloc_pgtables_hvm(struct xc_dom_image *dom) static int bootlate_hvm(struct xc_dom_image *dom) { - DOMPRINTF("%s: doing nothing", __func__); + uint32_t domid = dom->guest_domid; + xc_interface *xch = dom->xch; + + if ( !dom->device_model ) + { + struct hvm_start_info *start_info; + size_t start_info_size = sizeof(*start_info); + void *start_page; + struct hvm_modlist_entry *modlist; + size_t cmdline_size = 0; + + if ( dom->cmdline ) + { + cmdline_size = ROUNDUP(strlen(dom->cmdline) + 1, 8); + start_info_size += cmdline_size; + } + if ( dom->ramdisk_blob ) + start_info_size += sizeof(*modlist); /* Limited to one module. */ + + start_page = xc_map_foreign_range(xch, domid, start_info_size, + PROT_READ | PROT_WRITE, + dom->start_info_pfn); + if ( start_page == NULL ) + { + DOMPRINTF("Unable to map HVM start info page"); + return -1; + } + + start_info = start_page; + + if ( dom->cmdline ) + { + char *cmdline = start_page + sizeof(*start_info); + + /* We've already tested cmdline's size in alloc_magic_pages_hvm() */ + strcpy(cmdline, dom->cmdline); + start_info->cmdline_paddr = (dom->start_info_pfn << PAGE_SHIFT) + + ((uintptr_t)cmdline - (uintptr_t)start_info); + } + + if ( dom->ramdisk_blob ) + { + modlist = start_page + sizeof(*start_info) + 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_pfn << PAGE_SHIFT) + + ((uintptr_t)modlist - (uintptr_t)start_info); + start_info->nr_modules = 1; + } + + start_info->magic = HVM_START_MAGIC_VALUE; + + munmap(start_page, start_info_size); + } + else + { + void *hvm_info_page; + + if ( (hvm_info_page = xc_map_foreign_range( + xch, domid, PAGE_SIZE, PROT_READ | PROT_WRITE, + HVM_INFO_PFN)) == NULL ) + return -1; + build_hvm_info(hvm_info_page, dom); + munmap(hvm_info_page, PAGE_SIZE); + } + return 0; }