From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gKpu7-0007mL-Pq for mharc-grub-devel@gnu.org; Thu, 08 Nov 2018 14:23:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKpu5-0007mF-SJ for grub-devel@gnu.org; Thu, 08 Nov 2018 14:23:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKpu1-0008CT-Fj for grub-devel@gnu.org; Thu, 08 Nov 2018 14:23:45 -0500 Received: from mx2.suse.de ([195.135.220.15]:51228 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gKpty-00081u-U7 for grub-devel@gnu.org; Thu, 08 Nov 2018 14:23:39 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 516ABAD56; Thu, 8 Nov 2018 19:23:21 +0000 (UTC) Subject: Re: [Xen-devel] [PATCH v4 08/19] xen: add basic hooks for PVH in current code To: Daniel Kiper Cc: hans@knorrie.org, grub-devel@gnu.org, phcoder@gmail.com, xen-devel@lists.xen.org References: <20181102123738.16395-1-jgross@suse.com> <20181102123738.16395-9-jgross@suse.com> <20181108154557.GH4487@olila.i.net-space.pl> From: Juergen Gross Openpgp: preference=signencrypt Autocrypt: addr=jgross@suse.com; prefer-encrypt=mutual; keydata= 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 Message-ID: <5ce5c08b-2517-e209-5786-c255170c8b88@suse.com> Date: Thu, 8 Nov 2018 20:23:20 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20181108154557.GH4487@olila.i.net-space.pl> Content-Type: text/plain; charset=utf-8 Content-Language: de-DE Content-Transfer-Encoding: quoted-printable 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 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Nov 2018 19:23:47 -0000 On 08/11/2018 16:45, Daniel Kiper wrote: > On Fri, Nov 02, 2018 at 01:37:27PM +0100, Juergen Gross wrote: >> Add the hooks to current code needed for Xen PVH. They will be filled >> with code later when the related functionality is being added. >> >> Signed-off-by: Juergen Gross >> --- >> V3: xenpvh->xen_pvh (Daniel Kiper) >> adjust copyright date (Roger Pau Monn=C3=A9) >> --- >> grub-core/kern/i386/xen/pvh.c | 36 ++++++++++++++++++++++++++= +++++++++ >> grub-core/kern/i386/xen/startup_pvh.S | 29 ++++++++++++++++++++++++++= ++ >> grub-core/kern/xen/init.c | 6 ++++++ >> grub-core/loader/i386/linux.c | 1 + >> include/grub/i386/xen_pvh/kernel.h | 30 ++++++++++++++++++++++++++= +++ >> include/grub/xen.h | 6 ++++++ >> 6 files changed, 108 insertions(+) >> create mode 100644 grub-core/kern/i386/xen/pvh.c >> create mode 100644 grub-core/kern/i386/xen/startup_pvh.S >> create mode 100644 include/grub/i386/xen_pvh/kernel.h >> >> diff --git a/grub-core/kern/i386/xen/pvh.c b/grub-core/kern/i386/xen/p= vh.c >> new file mode 100644 >> index 000000000..ac6181f4e >> --- /dev/null >> +++ b/grub-core/kern/i386/xen/pvh.c >> @@ -0,0 +1,36 @@ >> +/* >> + * GRUB -- GRand Unified Bootloader >> + * Copyright (C) 2018 Free Software Foundation, Inc. >> + * >> + * GRUB is free software: you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License as published= by >> + * the Free Software Foundation, either version 3 of the License, or >> + * (at your option) any later version. >> + * >> + * GRUB is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with GRUB. If not, see . >> + */ >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +grub_uint64_t grub_rsdp_addr; >> + >> +void >> +grub_xen_setup_pvh (void) >> +{ >> +} >> + >> +grub_err_t >> +grub_machine_mmap_iterate (grub_memory_hook_t hook, void *hook_data) >> +{ >> +} >> diff --git a/grub-core/kern/i386/xen/startup_pvh.S b/grub-core/kern/i3= 86/xen/startup_pvh.S >> new file mode 100644 >> index 000000000..69b8fdcca >> --- /dev/null >> +++ b/grub-core/kern/i386/xen/startup_pvh.S >> @@ -0,0 +1,29 @@ >> +/* startup.S - bootstrap GRUB itself */ >> +/* >> + * GRUB -- GRand Unified Bootloader >> + * Copyright (C) 2018 Free Software Foundation, Inc. >> + * >> + * GRUB is free software: you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License as published= by >> + * the Free Software Foundation, either version 3 of the License, or >> + * (at your option) any later version. >> + * >> + * GRUB is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with GRUB. If not, see . >> + */ >> + >> +#include >> +#include >> + >> + .file "startup_pvh.S" >> + .text >> + >> +/* Saved pointer to start info structure. */ >> + .globl pvh_start_info >> +pvh_start_info: >> + .long 0 >> diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c >> index 10007b411..782ca7295 100644 >> --- a/grub-core/kern/xen/init.c >> +++ b/grub-core/kern/xen/init.c >> @@ -45,6 +45,8 @@ grub_xen_ptr2mfn (void *ptr) >> grub_xen_mfn_t *mfn_list =3D >> (grub_xen_mfn_t *) grub_xen_start_page_addr->mfn_list; >> return mfn_list[(grub_addr_t) ptr >> GRUB_XEN_LOG_PAGE_SIZE]; >> +#else >> + return (grub_addr_t) ptr >> GRUB_XEN_LOG_PAGE_SIZE; >=20 > It seems to me that this change does not belong to this patch. Hmm, in which patch would you put it? I wanted to have all modifications to current grub-core code in place after this patch. This includes all needed #ifdefs. >=20 >> #endif >> } >> >> @@ -562,6 +564,10 @@ grub_machine_init (void) >> + GRUB_KERNEL_MACHINE_MOD_GAP, >> GRUB_KERNEL_MACHINE_MOD_ALIGN); >> >> +#ifdef GRUB_MACHINE_XEN_PVH >> + grub_xen_setup_pvh (); >> +#endif >> + >> grub_xen_setup_gnttab (); >> >> #ifdef GRUB_MACHINE_XEN >> diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/lin= ux.c >> index 51920896e..f96309476 100644 >> --- a/grub-core/loader/i386/linux.c >> +++ b/grub-core/loader/i386/linux.c >> @@ -35,6 +35,7 @@ >> #include >> #include >> #include >> +#include >=20 > Please say in the commit message why you include grub/machine/kernel.h = here. Okay. >=20 >> GRUB_MOD_LICENSE ("GPLv3+"); >> >> diff --git a/include/grub/i386/xen_pvh/kernel.h b/include/grub/i386/xe= n_pvh/kernel.h >> new file mode 100644 >> index 000000000..2b7b8a129 >> --- /dev/null >> +++ b/include/grub/i386/xen_pvh/kernel.h >> @@ -0,0 +1,30 @@ >> +/* >> + * GRUB -- GRand Unified Bootloader >> + * Copyright (C) 2018 Free Software Foundation, Inc. >> + * >> + * GRUB is free software: you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License as published= by >> + * the Free Software Foundation, either version 3 of the License, or >> + * (at your option) any later version. >> + * >> + * GRUB is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with GRUB. If not, see . >> + */ >> + >> +#ifndef GRUB_KERNEL_MACHINE_HEADER >> +#define GRUB_KERNEL_MACHINE_HEADER 1 >> + >> +#ifndef ASM_FILE >> + >> +#define GRUB_KERNEL_USE_RSDP_ADDR 1 >> + >> +extern grub_uint64_t EXPORT_VAR(grub_rsdp_addr); >> + >> +#endif /* ! ASM_FILE */ >> + >> +#endif /* GRUB_KERNEL_MACHINE_HEADER */ >> diff --git a/include/grub/xen.h b/include/grub/xen.h >> index c31cc10c7..4cb2c8f43 100644 >> --- a/include/grub/xen.h >> +++ b/include/grub/xen.h >> @@ -43,6 +43,7 @@ typedef grub_uint64_t uint64_t; >> >> #include >> #include >> +#include >=20 > Hmmm... Why? This header contains all #includes of xen interface headers. I can omit this one and add it to the source files where it is needed if you like that better. Juergen