From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gKmW1-0005I2-Sh for mharc-grub-devel@gnu.org; Thu, 08 Nov 2018 10:46:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKmVw-0005Gp-Km for grub-devel@gnu.org; Thu, 08 Nov 2018 10:46:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKmVj-0006M9-1S for grub-devel@gnu.org; Thu, 08 Nov 2018 10:46:29 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:53992) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gKmVf-0005wJ-4b for grub-devel@gnu.org; Thu, 08 Nov 2018 10:46: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 wA8FiRQU077697; Thu, 8 Nov 2018 15:46:16 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=gvgJJfqbIqQPkhjZibKLkp+O75Uhc4lxR9MwfUix380=; b=J/weaxbqjMKtYmvva1AXMfvamQagGEHBIao4oMN/iTMSDxVlKPNvZmX36VS4iTy22uOT FhUAjCgotMFFJZoBzQTBFaUOK4KZZnBUGfvVjwLYaXtXSLSQdSgfwtseInXyi0ETW7g0 IujI150ypCOX8/mu+T3ukt4AHYlSm3zZHHSLZOpB01FL46E0pcxo0QQDPRGXT5S0LEA3 NKyW7YYNCmiYllrGhxmOJMTh1iuRHjMGsyqic4TQYA22OeqQCVN5EiaKATWYRzQksYwB d6qiFVcHYL0NWv2FucJPQT+AIXBbdv5mkwUE9bnBjom2pBwAkbKK/ZI9wLR7T+WN0+9J Gw== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2nh4ar23ws-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 08 Nov 2018 15:46:15 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id wA8FkEkZ000632 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 8 Nov 2018 15:46:14 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id wA8FkDcO011696; Thu, 8 Nov 2018 15:46:13 GMT Received: from olila.i.net-space.pl (/10.175.185.5) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 08 Nov 2018 07:46:01 -0800 Date: Thu, 8 Nov 2018 16:45:57 +0100 From: Daniel Kiper To: Juergen Gross Cc: grub-devel@gnu.org, xen-devel@lists.xen.org, phcoder@gmail.com, hans@knorrie.org Subject: Re: [PATCH v4 08/19] xen: add basic hooks for PVH in current code Message-ID: <20181108154557.GH4487@olila.i.net-space.pl> References: <20181102123738.16395-1-jgross@suse.com> <20181102123738.16395-9-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20181102123738.16395-9-jgross@suse.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9070 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-1811080132 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by userp2120.oracle.com id wA8FiRQU077697 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: Thu, 08 Nov 2018 15:46:40 -0000 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=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/pv= h.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/i38= 6/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; It seems to me that this change does not belong to this patch. > #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/linu= x.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 he= re. > 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 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 Hmmm... Why? Daniel