From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gLB0C-0008SU-96 for mharc-grub-devel@gnu.org; Fri, 09 Nov 2018 12:55:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLB09-0008S9-VM for grub-devel@gnu.org; Fri, 09 Nov 2018 12:55:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gLB05-0007GJ-T7 for grub-devel@gnu.org; Fri, 09 Nov 2018 12:55:25 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:54226) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gLB05-0007FB-Jy for grub-devel@gnu.org; Fri, 09 Nov 2018 12:55:21 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id wA9HsMNe125831; Fri, 9 Nov 2018 17:55:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : content-transfer-encoding : in-reply-to; s=corp-2018-07-02; bh=jWloVsE99l8UMsCf1dlUZBBIrTCTFv4QlOGbEVFPsao=; b=ipxt0nBpCpFBhADmQmfxRL6M+7iB0pIkVzHibnPACmn2qDcn166B003heKJVKLYf5BP2 P5ifjS1KKR2EfzQ16k2XGbBue98z2X++KyCDKZLtHDes+bLgbtjeyv35+8M1rDckbTxx 0JGeIfV7cJXwRxMEyyOwz51QrCJTSZH7F4RCll/Ftdl1pfV7xvVYfv2r58zpm5YOJHhM Y2lgqtXyoTj5dBtzFl/BQOnIN5AqiH/LUe6Sw3dv9RTgl4emuDed5GRVng5SYxA3YLkP iDGtsdJCLQ5sVVicU9EzhGdYUS/mqDIHbcgQpZcrXKDwmHKIAmblOr0Pep5+SJIhzNSR RA== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2120.oracle.com with ESMTP id 2nh4ar8c7u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 09 Nov 2018 17:55:15 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id wA9HtE3i029177 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 9 Nov 2018 17:55:14 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id wA9HtEwE003326; Fri, 9 Nov 2018 17:55:14 GMT Received: from olila.i.net-space.pl (/10.175.209.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 09 Nov 2018 09:55:13 -0800 Date: Fri, 9 Nov 2018 18:55:09 +0100 From: Daniel Kiper To: Juergen Gross Cc: hans@knorrie.org, grub-devel@gnu.org, phcoder@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH v4 08/19] xen: add basic hooks for PVH in current code Message-ID: <20181109175509.GC4363@olila.i.net-space.pl> References: <20181102123738.16395-1-jgross@suse.com> <20181102123738.16395-9-jgross@suse.com> <20181108154557.GH4487@olila.i.net-space.pl> <5ce5c08b-2517-e209-5786-c255170c8b88@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <5ce5c08b-2517-e209-5786-c255170c8b88@suse.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9072 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1811090163 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by userp2120.oracle.com id wA9HsMNe125831 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 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: Fri, 09 Nov 2018 17:55:27 -0000 On Thu, Nov 08, 2018 at 08:23:20PM +0100, Juergen Gross wrote: > 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 fille= d > >> 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=E9) > >> --- > >> 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= /pvh.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 publish= ed 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 Licen= se > >> + * 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/= i386/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 publish= ed 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 Licen= se > >> + * 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; > > > > It seems to me that this change does not belong to this patch. > > Hmm, in which patch would you put it? Separate one? Or at least say something in the commit message. Otherwise it is misleading. Hmmm... But probably I prefer the former... > I wanted to have all modifications to current grub-core code in place > after this patch. This includes all needed #ifdefs. > > > > >> #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/l= inux.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 > > > > Please say in the commit message why you include grub/machine/kernel.= h here. > > Okay. > > > > >> GRUB_MOD_LICENSE ("GPLv3+"); > >> > >> diff --git a/include/grub/i386/xen_pvh/kernel.h b/include/grub/i386/= xen_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 publish= ed 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 Licen= se > >> + * 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 > > > > 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. Yes, please. Daniel