From patchwork Thu Feb 11 07:53:24 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: 8277011 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8E7A0BEEED for ; Thu, 11 Feb 2016 07:56:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3EE5F20376 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 55962202FE 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-0003bX-Eq; Thu, 11 Feb 2016 07:53:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aTm4B-0003aX-Qt for xen-devel@lists.xen.org; Thu, 11 Feb 2016 07:53:31 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 57/11-08977-AFD3CB65; Thu, 11 Feb 2016 07:53:30 +0000 X-Env-Sender: jgross@suse.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1455177210!15124134!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 45838 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-14.tower-21.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 DC8CDAC75; 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:24 +0100 Message-Id: <1455177206-8974-5-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 4/6] xen: add capability to load initrd outside of initial mapping 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 Modern pvops linux kernels support an initrd not covered by the initial mapping. This capability is flagged by an elf-note. In case the elf-note is set by the kernel don't place the initrd into the initial mapping. This will allow to load larger initrds and/or support domains with larger memory, as the initial mapping is limited to 2GB and it is containing the p2m list. Signed-off-by: Juergen Gross --- grub-core/loader/i386/xen.c | 56 ++++++++++++++++++++++++++++++-------- grub-core/loader/i386/xen_fileXX.c | 3 ++ include/grub/xen_file.h | 1 + 3 files changed, 49 insertions(+), 11 deletions(-) diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c index 65cec27..0f41048 100644 --- a/grub-core/loader/i386/xen.c +++ b/grub-core/loader/i386/xen.c @@ -307,15 +307,14 @@ grub_xen_pt_alloc (void) } static grub_err_t -grub_xen_boot (void) +grub_xen_alloc_end (void) { grub_err_t err; - grub_uint64_t nr_pages; - struct gnttab_set_version gnttab_setver; - grub_size_t i; + static int called = 0; - if (grub_xen_n_allocated_shared_pages) - return grub_error (GRUB_ERR_BUG, "active grants"); + if (called) + return GRUB_ERR_NONE; + called = 1; err = grub_xen_p2m_alloc (); if (err) @@ -327,6 +326,24 @@ grub_xen_boot (void) if (err) return err; + return GRUB_ERR_NONE; +} + +static grub_err_t +grub_xen_boot (void) +{ + grub_err_t err; + grub_uint64_t nr_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_alloc_end (); + if (err) + return err; + err = set_mfns (console_pfn); if (err) return err; @@ -587,6 +604,13 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), goto fail; } + if (xen_inf.unmapped_initrd) + { + err = grub_xen_alloc_end (); + if (err) + goto fail; + } + if (grub_initrd_init (argc, argv, &initrd_ctx)) goto fail; @@ -603,13 +627,22 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), goto fail; } - next_start.mod_start = max_addr + xen_inf.virt_base; - next_start.mod_len = size; - - max_addr = ALIGN_UP (max_addr + size, PAGE_SIZE); + if (xen_inf.unmapped_initrd) + { + next_start.flags |= SIF_MOD_START_PFN; + next_start.mod_start = max_addr >> PAGE_SHIFT; + next_start.mod_len = size; + } + else + { + next_start.mod_start = max_addr + xen_inf.virt_base; + next_start.mod_len = size; + } grub_dprintf ("xen", "Initrd, addr=0x%x, size=0x%x\n", - (unsigned) next_start.mod_start, (unsigned) size); + (unsigned) (max_addr + xen_inf.virt_base), (unsigned) size); + + max_addr = ALIGN_UP (max_addr + size, PAGE_SIZE); fail: grub_initrd_close (&initrd_ctx); @@ -660,6 +693,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)), if (!xen_module_info_page) { + xen_inf.unmapped_initrd = 0; n_modules = 0; max_addr = ALIGN_UP (max_addr, PAGE_SIZE); modules_target_start = max_addr; diff --git a/grub-core/loader/i386/xen_fileXX.c b/grub-core/loader/i386/xen_fileXX.c index 1ba5649..69fccd2 100644 --- a/grub-core/loader/i386/xen_fileXX.c +++ b/grub-core/loader/i386/xen_fileXX.c @@ -253,6 +253,9 @@ parse_note (grub_elf_t elf, struct grub_xen_file_info *xi, descsz == 2 ? 2 : 3) == 0) xi->arch = GRUB_XEN_FILE_I386; break; + case 16: + xi->unmapped_initrd = !!grub_le_to_cpu32(*(grub_uint32_t *) desc); + break; default: grub_dprintf ("xen", "unknown note type %d\n", nh->n_type); break; diff --git a/include/grub/xen_file.h b/include/grub/xen_file.h index 4b2ccba..ed749fa 100644 --- a/include/grub/xen_file.h +++ b/include/grub/xen_file.h @@ -36,6 +36,7 @@ struct grub_xen_file_info int has_note; int has_xen_guest; int extended_cr3; + int unmapped_initrd; enum { GRUB_XEN_FILE_I386 = 1,