From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1aTqky-0003la-G7 for mharc-grub-devel@gnu.org; Thu, 11 Feb 2016 07:54:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTqkv-0003lG-Dg for grub-devel@gnu.org; Thu, 11 Feb 2016 07:53:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTqkr-0006f9-6W for grub-devel@gnu.org; Thu, 11 Feb 2016 07:53:57 -0500 Received: from mx2.suse.de ([195.135.220.15]:33239) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTqkq-0006f4-SH for grub-devel@gnu.org; Thu, 11 Feb 2016 07:53:53 -0500 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 A5099ACAD; Thu, 11 Feb 2016 12:53:51 +0000 (UTC) Subject: Re: [PATCH v2 3/6] xen: factor out allocation of page tables into separate function To: Daniel Kiper References: <1455177206-8974-1-git-send-email-jgross@suse.com> <1455177206-8974-4-git-send-email-jgross@suse.com> <20160211122732.GC3482@olila.local.net-space.pl> From: Juergen Gross X-Enigmail-Draft-Status: N1110 Message-ID: <56BC845F.8080705@suse.com> Date: Thu, 11 Feb 2016 13:53:51 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <20160211122732.GC3482@olila.local.net-space.pl> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 Cc: grub-devel@gnu.org, phcoder@gmail.com, mchang@suse.com, xen-devel@lists.xen.org X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2016 12:53:58 -0000 On 11/02/16 13:27, Daniel Kiper wrote: > On Thu, Feb 11, 2016 at 08:53:23AM +0100, Juergen Gross wrote: >> Do the allocation of page tables 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 | 82 ++++++++++++++++++++++++++++----------------- >> 1 file changed, 51 insertions(+), 31 deletions(-) >> >> diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c >> index e48cc3f..65cec27 100644 >> --- a/grub-core/loader/i386/xen.c >> +++ b/grub-core/loader/i386/xen.c >> @@ -56,6 +56,9 @@ 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; >> +static grub_uint64_t *virt_pgtable; >> +static grub_uint64_t pgtbl_start; >> +static grub_uint64_t pgtbl_end; > > Same as in patches #1 and #2. Yep. > >> #define PAGE_SIZE 4096 >> #define MAX_MODULES (PAGE_SIZE / sizeof (struct xen_multiboot_mod_list)) >> @@ -106,17 +109,17 @@ get_pgtable_size (grub_uint64_t total_pages, grub_uint64_t virt_base) >> >> static void >> generate_page_table (grub_uint64_t *where, grub_uint64_t paging_start, >> - grub_uint64_t total_pages, grub_uint64_t virt_base, >> - grub_xen_mfn_t *mfn_list) >> + grub_uint64_t paging_end, grub_uint64_t total_pages, >> + grub_uint64_t virt_base, grub_xen_mfn_t *mfn_list) >> { >> if (!virt_base) >> - total_pages++; >> + paging_end++; >> >> grub_uint64_t lx[NUMBER_OF_LEVELS], lxs[NUMBER_OF_LEVELS]; >> grub_uint64_t nlx, nls, sz = 0; >> int l; >> >> - nlx = total_pages; >> + nlx = paging_end; >> nls = virt_base >> PAGE_SHIFT; >> for (l = 0; l < NUMBER_OF_LEVELS; l++) >> { >> @@ -160,7 +163,7 @@ generate_page_table (grub_uint64_t *where, grub_uint64_t paging_start, >> if (pr) >> pg += POINTERS_PER_PAGE; >> >> - for (j = 0; j < total_pages; j++) >> + for (j = 0; j < paging_end; j++) >> { >> if (j >= paging_start && j < lp) >> pg[j + lxs[0]] = page2offset (mfn_list[j]) | 5; >> @@ -261,24 +264,12 @@ grub_xen_special_alloc (void) >> } >> >> static grub_err_t >> -grub_xen_boot (void) >> +grub_xen_pt_alloc (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; >> >> next_start.pt_base = max_addr + xen_inf.virt_base; >> state.paging_start = max_addr >> PAGE_SHIFT; >> @@ -298,30 +289,59 @@ grub_xen_boot (void) >> nr_pages = nr_need_pages; >> } >> >> - grub_dprintf ("xen", "bootstrap domain %llx+%llx\n", >> - (unsigned long long) xen_inf.virt_base, >> - (unsigned long long) page2offset (nr_pages)); >> - >> err = grub_relocator_alloc_chunk_addr (relocator, &ch, >> max_addr, page2offset (nr_pt_pages)); >> if (err) >> return err; >> >> + virt_pgtable = get_virtual_current_address (ch); >> + pgtbl_start = max_addr >> PAGE_SHIFT; >> + max_addr += page2offset (nr_pt_pages); >> + state.stack = max_addr + STACK_SIZE + xen_inf.virt_base; >> + state.paging_size = nr_pt_pages; >> + next_start.nr_pt_frames = nr_pt_pages; >> + max_addr = page2offset (nr_pages); >> + pgtbl_end = nr_pages; >> + >> + 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_p2m_alloc (); >> + if (err) >> + return err; >> + err = grub_xen_special_alloc (); >> + if (err) >> + return err; >> + err = grub_xen_pt_alloc (); >> + if (err) >> + return err; > > Should not we free memory allocated by grub_xen_p2m_alloc() and > grub_xen_special_alloc() if grub_xen_pt_alloc() failed? Hmm, why? If I don't miss anything freeing memory in case of error isn't done anywhere (at least not in this source file). Juergen