From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Daniel Kiper <daniel.kiper@oracle.com>
Cc: jgross@suse.com, grub-devel@gnu.org, eric.snowberg@oracle.com,
arvidjaar@gmail.com, andrew.cooper3@citrix.com,
stefano.stabellini@eu.citrix.com, cardoe@cardoe.com,
pgnet.dev@gmail.com, roy.franz@linaro.org, ning.sun@intel.com,
david.vrabel@citrix.com, jbeulich@suse.com, phcoder@gmail.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
Subject: Re: [GRUB2 PATCH v4 2/4] multiboot2: Add tags used to pass ImageHandle to loaded image
Date: Tue, 15 Mar 2016 19:39:28 -0400 [thread overview]
Message-ID: <20160315233928.GD29495__36807.8491570943$1458085296$gmane$org@char.us.oracle.com> (raw)
In-Reply-To: <1458055562-24950-3-git-send-email-daniel.kiper@oracle.com>
On Tue, Mar 15, 2016 at 04:25:59PM +0100, 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 <daniel.kiper@oracle.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
> v4 - suggestions/fixes:
> - reduce number of #ifdefs in grub_multiboot_get_mbi_size()
> (suggested by Vladimir 'phcoder' Serbinenko).
>
> 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 | 42 ++++++++++++++++++++++++++++++-------
> include/multiboot2.h | 16 ++++++++++++++
> 2 files changed, 51 insertions(+), 7 deletions(-)
>
> diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
> index a3dca90..6c04402 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,13 +409,15 @@ 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)
> - + ALIGN_UP (sizeof (struct multiboot_tag_efi32), MULTIBOOT_TAG_ALIGN)
> - + ALIGN_UP (sizeof (struct multiboot_tag_efi64), MULTIBOOT_TAG_ALIGN)
> + 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_efi32), MULTIBOOT_TAG_ALIGN)
> + + ALIGN_UP (sizeof (struct multiboot_tag_efi32_ih), MULTIBOOT_TAG_ALIGN)
> + + ALIGN_UP (sizeof (struct multiboot_tag_efi64), MULTIBOOT_TAG_ALIGN)
> + + ALIGN_UP (sizeof (struct multiboot_tag_efi64_ih), MULTIBOOT_TAG_ALIGN)
> + ALIGN_UP (sizeof (struct multiboot_tag_efi_mmap)
> + efi_mmap_size, MULTIBOOT_TAG_ALIGN)
> #endif
> @@ -907,11 +911,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 46e7b71..f5bebe1 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
>
> #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
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-15 23:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 15:25 [GRUB2 PATCH v4 0/4] multiboot2: Add two extensions Daniel Kiper
2016-03-15 15:25 ` [GRUB2 PATCH v4 1/4] i386/relocator: Add grub_relocator64_efi relocator Daniel Kiper
2016-03-15 16:00 ` Vladimir 'phcoder' Serbinenko
[not found] ` <CAEaD8JO23MkxBVF7ZqL8pDDz_85Nof1kbMo-RtxMam8S2KOeOg@mail.gmail.com>
2016-03-15 19:59 ` Daniel Kiper
2016-03-15 15:25 ` [GRUB2 PATCH v4 2/4] multiboot2: Add tags used to pass ImageHandle to loaded image Daniel Kiper
2016-03-15 16:03 ` Vladimir 'phcoder' Serbinenko
2016-03-15 23:39 ` Konrad Rzeszutek Wilk [this message]
2016-03-15 15:26 ` [GRUB2 PATCH v4 3/4 - FOR REVIEW ONLY] multiboot2: Do not pass memory maps to image if EFI boot services are enabled Daniel Kiper
2016-03-15 23:46 ` Konrad Rzeszutek Wilk
[not found] ` <20160315234646.GE29495@char.us.oracle.com>
2016-03-16 10:02 ` Daniel Kiper
[not found] ` <20160316100214.GF31771@olila.local.net-space.pl>
2016-03-16 10:14 ` Toomas Soome
[not found] ` <D5F25A44-6157-46FB-B717-A7ED06FD01C8@me.com>
2016-03-16 10:39 ` Vladimir 'phcoder' Serbinenko
2016-03-16 13:06 ` Konrad Rzeszutek Wilk
2016-03-15 15:26 ` [GRUB2 PATCH v4 3/4 - FOR COMMIT] " Daniel Kiper
2016-03-15 16:07 ` [GRUB2 PATCH v4 3/4 - FOR REVIEW ONLY] " Vladimir 'phcoder' Serbinenko
[not found] ` <CAEaD8JP6BJQkrLSN+GgPDqYtiXMgq=A3CnhbVHv9xZ57x4NH6Q@mail.gmail.com>
2016-03-15 18:06 ` Andrei Borzenkov
[not found] ` <56E84F10.5080804@gmail.com>
2016-03-15 18:10 ` Vladimir 'phcoder' Serbinenko
[not found] ` <CAEaD8JMgHphk31781sFpZVcT5+Q+Sj1LGpNfvhr3cbT=+sU1Lg@mail.gmail.com>
2016-03-15 20:59 ` Daniel Kiper
2016-03-15 20:01 ` Daniel Kiper
2016-03-15 15:26 ` [GRUB2 PATCH v4 4/4] multiboot2: Add support for relocatable images Daniel Kiper
2016-03-15 16:27 ` Vladimir 'phcoder' Serbinenko
[not found] ` <CAEaD8JOin-GSP8+kqC3bnS-_boKzvFgV-WoByLrkDOaeNThMGg@mail.gmail.com>
2016-03-15 16:30 ` Vladimir 'phcoder' Serbinenko
[not found] ` <CAEaD8JPS9cbmmS+a0pjCMboGTd-jkwCZp59KYpnEhOgpGva6zw@mail.gmail.com>
2016-03-15 21:42 ` Daniel Kiper
[not found] ` <20160315214221.GE31771@olila.local.net-space.pl>
2016-03-15 23:54 ` Konrad Rzeszutek Wilk
2016-03-16 10:34 ` Daniel Kiper
2016-03-16 10:41 ` Vladimir 'phcoder' Serbinenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='20160315233928.GD29495__36807.8491570943$1458085296$gmane$org@char.us.oracle.com' \
--to=konrad.wilk@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=arvidjaar@gmail.com \
--cc=cardoe@cardoe.com \
--cc=daniel.kiper@oracle.com \
--cc=david.vrabel@citrix.com \
--cc=eric.snowberg@oracle.com \
--cc=fu.wei@linaro.org \
--cc=gang.wei@intel.com \
--cc=grub-devel@gnu.org \
--cc=jbeulich@suse.com \
--cc=jgross@suse.com \
--cc=ning.sun@intel.com \
--cc=pgnet.dev@gmail.com \
--cc=phcoder@gmail.com \
--cc=qiaowei.ren@intel.com \
--cc=richard.l.maliszewski@intel.com \
--cc=roy.franz@linaro.org \
--cc=seth.goldberg@oracle.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).