From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Vladimir 'phcoder' Serbinenko" Subject: Re: [GRUB2 PATCH v3 2/4] multiboot2: Add tags used to pass ImageHandle to loaded image Date: Thu, 10 Mar 2016 21:26:06 +0100 Message-ID: References: <1456937500-7855-1-git-send-email-daniel.kiper@oracle.com> <1456937500-7855-3-git-send-email-daniel.kiper@oracle.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1490750700205696646==" Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1ae79t-00080D-E1 for xen-devel@lists.xenproject.org; Thu, 10 Mar 2016 20:26:09 +0000 Received: by mail-wm0-f67.google.com with SMTP id p65so350734wmp.1 for ; Thu, 10 Mar 2016 12:26:07 -0800 (PST) In-Reply-To: <1456937500-7855-3-git-send-email-daniel.kiper@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Daniel Kiper Cc: "jgross@suse.com" , "grub-devel@gnu.org" , "eric.snowberg@oracle.com" , "arvidjaar@gmail.com" , "andrew.cooper3@citrix.com" , "cardoe@cardoe.com" , "pgnet.dev@gmail.com" , "roy.franz@linaro.org" , "ning.sun@intel.com" , "david.vrabel@citrix.com" , "jbeulich@suse.com" , "stefano.stabellini@eu.citrix.com" , "xen-devel@lists.xenproject.org" , "qiaowei.ren@intel.com" , "richard.l.maliszewski@intel.com" , "gang.wei@intel.com" , "fu.wei@linaro.org" , "seth.goldberg@oracle.com" List-Id: xen-devel@lists.xenproject.org --===============1490750700205696646== Content-Type: multipart/alternative; boundary=001a11422832cdc645052db79ffc --001a11422832cdc645052db79ffc Content-Type: text/plain; charset=UTF-8 On Wednesday, March 2, 2016, Daniel Kiper wrote: > Add tags used to pass ImageHandle to loaded image if requested. > It is used by at least ExitBootServices() function. > > Signed-off-by: Daniel Kiper > > --- > v3 - suggestions/fixes: > - mbi EFI related stuff size calculation > should depend on target architecture > (suggested by Konrad Rzeszutek Wilk), > - use plain type instead of pointer > dereference as sizeof() argument > (suggested by Konrad Rzeszutek Wilk), > - improve commit message > (suggested by Konrad Rzeszutek Wilk). > --- > grub-core/loader/multiboot_mbi2.c | 50 > ++++++++++++++++++++++++++++++------- > include/multiboot2.h | 16 ++++++++++++ > 2 files changed, 57 insertions(+), 9 deletions(-) > > diff --git a/grub-core/loader/multiboot_mbi2.c > b/grub-core/loader/multiboot_mbi2.c > index a3dca90..7591edc 100644 > --- a/grub-core/loader/multiboot_mbi2.c > +++ b/grub-core/loader/multiboot_mbi2.c > @@ -172,6 +172,8 @@ grub_multiboot_load (grub_file_t file, const char > *filename) > case MULTIBOOT_TAG_TYPE_NETWORK: > case MULTIBOOT_TAG_TYPE_EFI_MMAP: > case MULTIBOOT_TAG_TYPE_EFI_BS: > + case MULTIBOOT_TAG_TYPE_EFI32_IH: > + case MULTIBOOT_TAG_TYPE_EFI64_IH: > break; > > default: > @@ -407,16 +409,22 @@ grub_multiboot_get_mbi_size (void) > + grub_get_multiboot_mmap_count () > * sizeof (struct multiboot_mmap_entry)), > MULTIBOOT_TAG_ALIGN) > + ALIGN_UP (sizeof (struct multiboot_tag_framebuffer), > MULTIBOOT_TAG_ALIGN) > +#ifdef GRUB_MACHINE_EFI > +#ifdef __i386__ > + ALIGN_UP (sizeof (struct multiboot_tag_efi32), MULTIBOOT_TAG_ALIGN) > + + ALIGN_UP (sizeof (struct multiboot_tag_efi32_ih), > MULTIBOOT_TAG_ALIGN) > +#endif > +#ifdef __x86_64__ > + ALIGN_UP (sizeof (struct multiboot_tag_efi64), MULTIBOOT_TAG_ALIGN) > + + ALIGN_UP (sizeof (struct multiboot_tag_efi64_ih), > MULTIBOOT_TAG_ALIGN) > +#endif > + + ALIGN_UP (sizeof (struct multiboot_tag_efi_mmap) > + + efi_mmap_size, MULTIBOOT_TAG_ALIGN) > +#endif > It doesn't need to be exact. It's just an upper bound. Feel free to simplify knowing this, removing few #ifdef. > + ALIGN_UP (sizeof (struct multiboot_tag_old_acpi) > + sizeof (struct grub_acpi_rsdp_v10), MULTIBOOT_TAG_ALIGN) > + acpiv2_size () > + net_size () > -#ifdef GRUB_MACHINE_EFI > - + ALIGN_UP (sizeof (struct multiboot_tag_efi_mmap) > - + efi_mmap_size, MULTIBOOT_TAG_ALIGN) > -#endif > + sizeof (struct multiboot_tag_vbe) + MULTIBOOT_TAG_ALIGN - 1 > + sizeof (struct multiboot_tag_apm) + MULTIBOOT_TAG_ALIGN - 1; > } > @@ -907,11 +915,35 @@ grub_multiboot_make_mbi (grub_uint32_t *target) > > if (keep_bs) > { > - struct multiboot_tag *tag = (struct multiboot_tag *) ptrorig; > - tag->type = MULTIBOOT_TAG_TYPE_EFI_BS; > - tag->size = sizeof (struct multiboot_tag); > - ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN) > - / sizeof (grub_properly_aligned_t); > + { > + struct multiboot_tag *tag = (struct multiboot_tag *) ptrorig; > + tag->type = MULTIBOOT_TAG_TYPE_EFI_BS; > + tag->size = sizeof (struct multiboot_tag); > + ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN) > + / sizeof (grub_properly_aligned_t); > + } > + > +#ifdef __i386__ > + { > + struct multiboot_tag_efi32_ih *tag = (struct > multiboot_tag_efi32_ih *) ptrorig; > + tag->type = MULTIBOOT_TAG_TYPE_EFI32_IH; > + tag->size = sizeof (struct multiboot_tag_efi32_ih); > + tag->pointer = (grub_addr_t) grub_efi_image_handle; > + ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN) > + / sizeof (grub_properly_aligned_t); > + } > +#endif > + > +#ifdef __x86_64__ > + { > + struct multiboot_tag_efi64_ih *tag = (struct > multiboot_tag_efi64_ih *) ptrorig; > + tag->type = MULTIBOOT_TAG_TYPE_EFI64_IH; > + tag->size = sizeof (struct multiboot_tag_efi64_ih); > + tag->pointer = (grub_addr_t) grub_efi_image_handle; > + ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN) > + / sizeof (grub_properly_aligned_t); > + } > +#endif > } > #endif > > diff --git a/include/multiboot2.h b/include/multiboot2.h > index d96aa40..36a174f 100644 > --- a/include/multiboot2.h > +++ b/include/multiboot2.h > @@ -60,6 +60,8 @@ > #define MULTIBOOT_TAG_TYPE_NETWORK 16 > #define MULTIBOOT_TAG_TYPE_EFI_MMAP 17 > #define MULTIBOOT_TAG_TYPE_EFI_BS 18 > +#define MULTIBOOT_TAG_TYPE_EFI32_IH 19 > +#define MULTIBOOT_TAG_TYPE_EFI64_IH 20 > Is there a followup to define those in texi doc as well? > > #define MULTIBOOT_HEADER_TAG_END 0 > #define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST 1 > @@ -371,6 +373,20 @@ struct multiboot_tag_efi_mmap > multiboot_uint8_t efi_mmap[0]; > }; > > +struct multiboot_tag_efi32_ih > +{ > + multiboot_uint32_t type; > + multiboot_uint32_t size; > + multiboot_uint32_t pointer; > +}; > + > +struct multiboot_tag_efi64_ih > +{ > + multiboot_uint32_t type; > + multiboot_uint32_t size; > + multiboot_uint64_t pointer; > +}; > + > #endif /* ! ASM_FILE */ > > #endif /* ! MULTIBOOT_HEADER */ > -- > 1.7.10.4 > > -- Regards Vladimir 'phcoder' Serbinenko --001a11422832cdc645052db79ffc Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On Wednesday, March 2, 2016, Daniel Kiper <daniel.kiper@oracle.com> wrote:
Add tags used to pass ImageHandle to loaded image if re= quested.
It is used by at least ExitBootServices() function.

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.= com>
---
v3 - suggestions/fixes:
=C2=A0 =C2=A0- mbi EFI related stuff size calculation
=C2=A0 =C2=A0 =C2=A0should depend on target architecture
=C2=A0 =C2=A0 =C2=A0(suggested by Konrad Rzeszutek Wilk),
=C2=A0 =C2=A0- use plain type instead of pointer
=C2=A0 =C2=A0 =C2=A0dereference as sizeof() argument
=C2=A0 =C2=A0 =C2=A0(suggested by Konrad Rzeszutek Wilk),
=C2=A0 =C2=A0- improve commit message
=C2=A0 =C2=A0 =C2=A0(suggested by Konrad Rzeszutek Wilk).
---
=C2=A0grub-core/loader/multiboot_mbi2.c |=C2=A0 =C2=A050 ++++++++++++++++++= ++++++++++++-------
=C2=A0include/multiboot2.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = |=C2=A0 =C2=A016 ++++++++++++
=C2=A02 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot= _mbi2.c
index a3dca90..7591edc 100644
--- a/grub-core/loader/multiboot_mbi2.c
+++ b/grub-core/loader/multiboot_mbi2.c
@@ -172,6 +172,8 @@ grub_multiboot_load (grub_file_t file, const char *file= name)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 case MULTIBOOT_TAG_TYPE_NE= TWORK:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 case MULTIBOOT_TAG_TYPE_EF= I_MMAP:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 case MULTIBOOT_TAG_TYPE_EF= I_BS:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case MULTIBOOT_TAG_TYPE_EF= I32_IH:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case MULTIBOOT_TAG_TYPE_EF= I64_IH:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 default:
@@ -407,16 +409,22 @@ grub_multiboot_get_mbi_size (void)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0+ grub_get_mu= ltiboot_mmap_count ()
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* sizeof (str= uct multiboot_mmap_entry)), MULTIBOOT_TAG_ALIGN)
=C2=A0 =C2=A0 =C2=A0+ ALIGN_UP (sizeof (struct multiboot_tag_framebuffer), = MULTIBOOT_TAG_ALIGN)
+#ifdef GRUB_MACHINE_EFI
+#ifdef __i386__
=C2=A0 =C2=A0 =C2=A0+ ALIGN_UP (sizeof (struct multiboot_tag_efi32), MULTIB= OOT_TAG_ALIGN)
+=C2=A0 =C2=A0 + ALIGN_UP (sizeof (struct multiboot_tag_efi32_ih), MULTIBOO= T_TAG_ALIGN)
+#endif
+#ifdef __x86_64__
=C2=A0 =C2=A0 =C2=A0+ ALIGN_UP (sizeof (struct multiboot_tag_efi64), MULTIB= OOT_TAG_ALIGN)
+=C2=A0 =C2=A0 + ALIGN_UP (sizeof (struct multiboot_tag_efi64_ih), MULTIBOO= T_TAG_ALIGN)
+#endif
+=C2=A0 =C2=A0 + ALIGN_UP (sizeof (struct multiboot_tag_efi_mmap)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0+ efi_mmap_size, MU= LTIBOOT_TAG_ALIGN)
+#endif
It doesn't need to be exact. It's just= an upper bound. Feel free to simplify knowing this, removing few #ifdef.= =C2=A0
=C2=A0 =C2=A0 =C2=A0+ ALIGN_UP (sizeof (struct multiboot_tag_old_acpi)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 + sizeof (struct gr= ub_acpi_rsdp_v10), MULTIBOOT_TAG_ALIGN)
=C2=A0 =C2=A0 =C2=A0+ acpiv2_size ()
=C2=A0 =C2=A0 =C2=A0+ net_size ()
-#ifdef GRUB_MACHINE_EFI
-=C2=A0 =C2=A0 + ALIGN_UP (sizeof (struct multiboot_tag_efi_mmap)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0+ efi_mmap_size, MU= LTIBOOT_TAG_ALIGN)
-#endif
=C2=A0 =C2=A0 =C2=A0+ sizeof (struct multiboot_tag_vbe) + MULTIBOOT_TAG_ALI= GN - 1
=C2=A0 =C2=A0 =C2=A0+ sizeof (struct multiboot_tag_apm) + MULTIBOOT_TAG_ALI= GN - 1;
=C2=A0}
@@ -907,11 +915,35 @@ grub_multiboot_make_mbi (grub_uint32_t *target)

=C2=A0 =C2=A0if (keep_bs)
=C2=A0 =C2=A0 =C2=A0{
-=C2=A0 =C2=A0 =C2=A0 struct multiboot_tag *tag =3D (struct multiboot_tag *= ) ptrorig;
-=C2=A0 =C2=A0 =C2=A0 tag->type =3D MULTIBOOT_TAG_TYPE_EFI_BS;
-=C2=A0 =C2=A0 =C2=A0 tag->size =3D sizeof (struct multiboot_tag);
-=C2=A0 =C2=A0 =C2=A0 ptrorig +=3D ALIGN_UP (tag->size, MULTIBOOT_TAG_AL= IGN)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0/ sizeof (grub_properly_aligned_t);
+=C2=A0 =C2=A0 =C2=A0 {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0struct multiboot_tag *tag =3D (struct multiboot= _tag *) ptrorig;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0tag->type =3D MULTIBOOT_TAG_TYPE_EFI_BS;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0tag->size =3D sizeof (struct multiboot_tag);=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0ptrorig +=3D ALIGN_UP (tag->size, MULTIBOOT_= TAG_ALIGN)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/ sizeof (grub_properly_aligned_t);
+=C2=A0 =C2=A0 =C2=A0 }
+
+#ifdef __i386__
+=C2=A0 =C2=A0 =C2=A0 {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0struct multiboot_tag_efi32_ih *tag =3D (struct = multiboot_tag_efi32_ih *) ptrorig;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0tag->type =3D MULTIBOOT_TAG_TYPE_EFI32_IH; +=C2=A0 =C2=A0 =C2=A0 =C2=A0tag->size =3D sizeof (struct multiboot_tag_e= fi32_ih);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0tag->pointer =3D (grub_addr_t) grub_efi_imag= e_handle;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0ptrorig +=3D ALIGN_UP (tag->size, MULTIBOOT_= TAG_ALIGN)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/ sizeof (grub_properly_aligned_t);
+=C2=A0 =C2=A0 =C2=A0 }
+#endif
+
+#ifdef __x86_64__
+=C2=A0 =C2=A0 =C2=A0 {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0struct multiboot_tag_efi64_ih *tag =3D (struct = multiboot_tag_efi64_ih *) ptrorig;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0tag->type =3D MULTIBOOT_TAG_TYPE_EFI64_IH; +=C2=A0 =C2=A0 =C2=A0 =C2=A0tag->size =3D sizeof (struct multiboot_tag_e= fi64_ih);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0tag->pointer =3D (grub_addr_t) grub_efi_imag= e_handle;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0ptrorig +=3D ALIGN_UP (tag->size, MULTIBOOT_= TAG_ALIGN)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/ sizeof (grub_properly_aligned_t);
+=C2=A0 =C2=A0 =C2=A0 }
+#endif
=C2=A0 =C2=A0 =C2=A0}
=C2=A0#endif

diff --git a/include/multiboot2.h b/include/multiboot2.h
index d96aa40..36a174f 100644
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -60,6 +60,8 @@
=C2=A0#define MULTIBOOT_TAG_TYPE_NETWORK=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A016
=C2=A0#define MULTIBOOT_TAG_TYPE_EFI_MMAP=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= 17
=C2=A0#define MULTIBOOT_TAG_TYPE_EFI_BS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 18
+#define MULTIBOOT_TAG_TYPE_EFI32_IH=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 19 +#define MULTIBOOT_TAG_TYPE_EFI64_IH=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 20
Is there a followup to define those in texi doc as well= ?=C2=A0

=C2=A0#define MULTIBOOT_HEADER_TAG_END=C2=A0 0
=C2=A0#define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST=C2=A0 1
@@ -371,6 +373,20 @@ struct multiboot_tag_efi_mmap
=C2=A0 =C2=A0multiboot_uint8_t efi_mmap[0];
=C2=A0};

+struct multiboot_tag_efi32_ih
+{
+=C2=A0 multiboot_uint32_t type;
+=C2=A0 multiboot_uint32_t size;
+=C2=A0 multiboot_uint32_t pointer;
+};
+
+struct multiboot_tag_efi64_ih
+{
+=C2=A0 multiboot_uint32_t type;
+=C2=A0 multiboot_uint32_t size;
+=C2=A0 multiboot_uint64_t pointer;
+};
+
=C2=A0#endif /* ! ASM_FILE */

=C2=A0#endif /* ! MULTIBOOT_HEADER */
--
1.7.10.4



--
Regards
Vladimir 'phcoder' Serbinenk= o

--001a11422832cdc645052db79ffc-- --===============1490750700205696646== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9y Zy94ZW4tZGV2ZWwK --===============1490750700205696646==--