From patchwork Thu Feb 11 07:53:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 8276981 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 569869F4DD for ; Thu, 11 Feb 2016 07:56:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 594A820380 for ; Thu, 11 Feb 2016 07:56:25 +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 5B65320351 for ; Thu, 11 Feb 2016 07:56:24 +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 1aTm4E-0003bQ-2N; Thu, 11 Feb 2016 07:53:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aTm4B-0003aa-LN for xen-devel@lists.xen.org; Thu, 11 Feb 2016 07:53:31 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 48/46-31443-AFD3CB65; Thu, 11 Feb 2016 07:53:30 +0000 X-Env-Sender: jgross@suse.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1455177210!14175168!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58883 invoked from network); 11 Feb 2016 07:53:30 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-7.tower-31.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 11 Feb 2016 07:53:30 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 7C5A8ABB4; Thu, 11 Feb 2016 07:53:29 +0000 (UTC) From: Juergen Gross To: grub-devel@gnu.org, xen-devel@lists.xen.org, phcoder@gmail.com, daniel.kiper@oracle.com, mchang@suse.com Date: Thu, 11 Feb 2016 08:53:22 +0100 Message-Id: <1455177206-8974-3-git-send-email-jgross@suse.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1455177206-8974-1-git-send-email-jgross@suse.com> References: <1455177206-8974-1-git-send-email-jgross@suse.com> Cc: Juergen Gross Subject: [Xen-devel] [PATCH v2 2/6] xen: factor out allocation of special pages into separate function 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 Do the allocation of special pages (start info, console and xenbus ring buffers) in a separate function. This will allow to do the allocation at different times of the boot preparations depending on the features the kernel is supporting. Signed-off-by: Juergen Gross --- grub-core/loader/i386/xen.c | 50 +++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c index 42ed7c7..e48cc3f 100644 --- a/grub-core/loader/i386/xen.c +++ b/grub-core/loader/i386/xen.c @@ -54,6 +54,8 @@ static grub_uint64_t modules_target_start; static grub_size_t n_modules; static struct grub_relocator_xen_state state; static grub_xen_mfn_t *virt_mfn_list; +static struct start_info *virt_start_info; +static grub_xen_mfn_t console_pfn; #define PAGE_SIZE 4096 #define MAX_MODULES (PAGE_SIZE / sizeof (struct xen_multiboot_mod_list)) @@ -232,43 +234,51 @@ grub_xen_p2m_alloc (void) } static grub_err_t -grub_xen_boot (void) +grub_xen_special_alloc (void) { grub_relocator_chunk_t ch; grub_err_t err; - struct start_info *nst; - grub_uint64_t nr_info_pages; - grub_uint64_t nr_pages, nr_pt_pages, nr_need_pages; - struct gnttab_set_version gnttab_setver; - grub_size_t i; - - if (grub_xen_n_allocated_shared_pages) - return grub_error (GRUB_ERR_BUG, "active grants"); - - err = grub_xen_p2m_alloc (); - if (err) - return err; err = grub_relocator_alloc_chunk_addr (relocator, &ch, max_addr, sizeof (next_start)); if (err) return err; state.start_info = max_addr + xen_inf.virt_base; - nst = get_virtual_current_address (ch); + virt_start_info = get_virtual_current_address (ch); max_addr = ALIGN_UP (max_addr + sizeof (next_start), PAGE_SIZE); + console_pfn = max_addr >> PAGE_SHIFT; + max_addr += 2 * PAGE_SIZE; next_start.nr_pages = grub_xen_start_page_addr->nr_pages; grub_memcpy (next_start.magic, grub_xen_start_page_addr->magic, sizeof (next_start.magic)); + next_start.shared_info = grub_xen_start_page_addr->shared_info; next_start.store_mfn = grub_xen_start_page_addr->store_mfn; next_start.store_evtchn = grub_xen_start_page_addr->store_evtchn; next_start.console.domU = grub_xen_start_page_addr->console.domU; - next_start.shared_info = grub_xen_start_page_addr->shared_info; - err = set_mfns (max_addr >> PAGE_SHIFT); + return GRUB_ERR_NONE; +} + +static grub_err_t +grub_xen_boot (void) +{ + grub_relocator_chunk_t ch; + grub_err_t err; + grub_uint64_t nr_info_pages; + grub_uint64_t nr_pages, nr_pt_pages, nr_need_pages; + struct gnttab_set_version gnttab_setver; + grub_size_t i; + + if (grub_xen_n_allocated_shared_pages) + return grub_error (GRUB_ERR_BUG, "active grants"); + + err = grub_xen_p2m_alloc (); + if (err) + return err; + err = grub_xen_special_alloc (); if (err) return err; - max_addr += 2 * PAGE_SIZE; next_start.pt_base = max_addr + xen_inf.virt_base; state.paging_start = max_addr >> PAGE_SHIFT; @@ -297,6 +307,10 @@ grub_xen_boot (void) if (err) return err; + err = set_mfns (console_pfn); + if (err) + return err; + generate_page_table (get_virtual_current_address (ch), max_addr >> PAGE_SHIFT, nr_pages, xen_inf.virt_base, virt_mfn_list); @@ -308,7 +322,7 @@ grub_xen_boot (void) next_start.nr_pt_frames = nr_pt_pages; state.paging_size = nr_pt_pages; - *nst = next_start; + *virt_start_info = next_start; grub_memset (&gnttab_setver, 0, sizeof (gnttab_setver));