From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Zvsk8-0006g9-LA for mharc-grub-devel@gnu.org; Mon, 09 Nov 2015 15:08:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvsk4-0006cd-MV for grub-devel@gnu.org; Mon, 09 Nov 2015 15:08:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zvsk2-00031k-Qs for grub-devel@gnu.org; Mon, 09 Nov 2015 15:08:40 -0500 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:38158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvsk2-00030t-HK for grub-devel@gnu.org; Mon, 09 Nov 2015 15:08:38 -0500 Received: by wmec201 with SMTP id c201so86112632wme.1 for ; Mon, 09 Nov 2015 12:08:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type; bh=98ePuX012l5F+bNwlShUomaGv+ZaykYJGZShJnGeOVk=; b=QUPYSdbqOJoOAWBSHvG6Eyg6WHX9qoBLaZM+0BUIeJAS4y1KJ6hjNCNKZTvzGr9mcQ gxhrH0nHvukCCcliQEbQh2QubCi0HneK08o1Sd1wqsHc1fIp81JeK4HYYB/ftobj0+U6 UCKGqsFjveejL3Uf6nKdk8DpiOd63UPgGjM7C3YYFpNoaIBGGIqCuO4hmiIlbMCppwbJ RQzsmbatKlj1HPx2c8odrUhPMWKn43WCmyq1nk9gd25fe5RImOA6/I+JooL2YRu0NJJb MS7Ke0blgIS4kX4NclW0MtpqKmYr0lV12VK+OGPEEbiKEktUk1JRI7ZW+EHbl4ao28ky 1NPA== X-Received: by 10.28.212.18 with SMTP id l18mr30757123wmg.93.1447099717929; Mon, 09 Nov 2015 12:08:37 -0800 (PST) Received: from ?IPv6:2a02:1205:34c8:dc00:863a:4bff:fe50:abc4? ([2a02:1205:34c8:dc00:863a:4bff:fe50:abc4]) by smtp.gmail.com with ESMTPSA id it4sm17149978wjb.0.2015.11.09.12.08.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Nov 2015 12:08:36 -0800 (PST) Subject: Re: [PATCH v2 5/6] multiboot2: Add support for relocatable images To: Daniel Kiper , xen-devel@lists.xenproject.org, grub-devel@gnu.org References: <1437402954-7375-1-git-send-email-daniel.kiper@oracle.com> <1437402954-7375-6-git-send-email-daniel.kiper@oracle.com> From: =?UTF-8?Q?Vladimir_'=cf=86-coder/phcoder'_Serbinenko?= Message-ID: <5640FD43.7060301@gmail.com> Date: Mon, 9 Nov 2015 21:08:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.3.0 MIME-Version: 1.0 In-Reply-To: <1437402954-7375-6-git-send-email-daniel.kiper@oracle.com> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="M6KGHQ8EXdk655SDiAXeTrOl79hodncBa" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c09::22f Cc: jgross@suse.com, keir@xen.org, ian.campbell@citrix.com, andrew.cooper3@citrix.com, stefano.stabellini@eu.citrix.com, roy.franz@linaro.org, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, wei.liu2@citrix.com, qiaowei.ren@intel.com, richard.l.maliszewski@intel.com, gang.wei@intel.com, fu.wei@linaro.org X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2015 20:08:43 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --M6KGHQ8EXdk655SDiAXeTrOl79hodncBa Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 20.07.2015 16:35, Daniel Kiper wrote: > Signed-off-by: Daniel Kiper What is handling the actual relocation? Why doesn't this patch include support for ELF relocations? > --- > grub-core/loader/i386/multiboot_mbi.c | 6 ++-- > grub-core/loader/multiboot.c | 12 +++++-- > grub-core/loader/multiboot_elfxx.c | 28 +++++++++++---- > grub-core/loader/multiboot_mbi2.c | 63 +++++++++++++++++++++++++= ++++---- > include/grub/multiboot.h | 4 ++- > include/multiboot2.h | 24 +++++++++++++ > 6 files changed, 118 insertions(+), 19 deletions(-) >=20 > diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i= 386/multiboot_mbi.c > index 956d0e3..abdb98b 100644 > --- a/grub-core/loader/i386/multiboot_mbi.c > +++ b/grub-core/loader/i386/multiboot_mbi.c > @@ -72,7 +72,8 @@ load_kernel (grub_file_t file, const char *filename, > grub_err_t err; > if (grub_multiboot_quirks & GRUB_MULTIBOOT_QUIRK_BAD_KLUDGE) > { > - err =3D grub_multiboot_load_elf (file, filename, buffer); > + err =3D grub_multiboot_load_elf (file, filename, buffer, 0, 0, 0= , 0, > + GRUB_RELOCATOR_PREFERENCE_NONE, NULL, 0); > if (err =3D=3D GRUB_ERR_UNKNOWN_OS && (header->flags & MULTIBOOT= _AOUT_KLUDGE)) > grub_errno =3D err =3D GRUB_ERR_NONE; > } > @@ -118,7 +119,8 @@ load_kernel (grub_file_t file, const char *filename= , > return GRUB_ERR_NONE; > } > =20 > - return grub_multiboot_load_elf (file, filename, buffer); > + return grub_multiboot_load_elf (file, filename, buffer, 0, 0, 0, 0, > + GRUB_RELOCATOR_PREFERENCE_NONE, NULL, 0); > } > =20 > static struct multiboot_header * > diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.= c > index ca7154f..1b1f7a9 100644 > --- a/grub-core/loader/multiboot.c > +++ b/grub-core/loader/multiboot.c > @@ -190,12 +190,18 @@ static grub_uint64_t highest_load; > /* Load ELF32 or ELF64. */ > grub_err_t > grub_multiboot_load_elf (grub_file_t file, const char *filename, > - void *buffer) > + void *buffer, int relocatable, grub_uint32_t min_addr, > + grub_uint32_t max_addr, grub_size_t align, grub_uint32_t preferenc= e, > + grub_uint32_t *base_addr, int avoid_efi_boot_services) > { > if (grub_multiboot_is_elf32 (buffer)) > - return grub_multiboot_load_elf32 (file, filename, buffer); > + return grub_multiboot_load_elf32 (file, filename, buffer, relocata= ble, > + min_addr, max_addr, align, preference, > + base_addr, avoid_efi_boot_services); > else if (grub_multiboot_is_elf64 (buffer)) > - return grub_multiboot_load_elf64 (file, filename, buffer); > + return grub_multiboot_load_elf64 (file, filename, buffer, relocata= ble, > + min_addr, max_addr, align, preference, > + base_addr, avoid_efi_boot_services); > =20 > return grub_error (GRUB_ERR_UNKNOWN_OS, N_("invalid arch-dependent E= LF magic")); > } > diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/mult= iboot_elfxx.c > index 6a220bd..4fce685 100644 > --- a/grub-core/loader/multiboot_elfxx.c > +++ b/grub-core/loader/multiboot_elfxx.c > @@ -51,7 +51,10 @@ CONCAT(grub_multiboot_is_elf, XX) (void *buffer) > } > =20 > static grub_err_t > -CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, const char *fil= ename, void *buffer) > +CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, const char *fil= ename, > + void *buffer, int relocatable, grub_uint32_t min_addr, > + grub_uint32_t max_addr, grub_size_t align, grub_uint32_t pref= erence, > + grub_uint32_t *base_addr, int avoid_efi_boot_services) > { > Elf_Ehdr *ehdr =3D (Elf_Ehdr *) buffer; > char *phdr_base; > @@ -89,19 +92,30 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t fi= le, const char *filename, voi > if (phdr(i)->p_paddr + phdr(i)->p_memsz > highest_load) > highest_load =3D phdr(i)->p_paddr + phdr(i)->p_memsz; > =20 > - grub_dprintf ("multiboot_loader", "segment %d: paddr=3D0x%lx, memsz= =3D0x%lx, vaddr=3D0x%lx\n", > - i, (long) phdr(i)->p_paddr, (long) phdr(i)->p_memsz, (long) phdr(i)= ->p_vaddr); > + grub_dprintf ("multiboot_loader", "segment %d: paddr=3D0x%lx, memsz= =3D0x%lx, vaddr=3D0x%lx," > + "align=3D0x%lx, relocatable=3D%d, avoid_efi_boot_services=3D%d\n", = i, > + (long) phdr(i)->p_paddr, (long) phdr(i)->p_memsz, (long) phdr(i)->p= _vaddr, > + (long) align, relocatable, avoid_efi_boot_services); > =20 > { > grub_relocator_chunk_t ch; > - err =3D grub_relocator_alloc_chunk_addr (grub_multiboot_relocator= ,=20 > - &ch, phdr(i)->p_paddr, > - phdr(i)->p_memsz); > + > + if (relocatable) > + err =3D grub_relocator_alloc_chunk_align (grub_multiboot_reloca= tor, &ch, > + min_addr, max_addr - phdr(i)->p_memsz, > + phdr(i)->p_memsz, align ? align : 1, > + preference, avoid_efi_boot_services); > + else > + err =3D grub_relocator_alloc_chunk_addr (grub_multiboot_relocat= or, > + &ch, phdr(i)->p_paddr, > + phdr(i)->p_memsz); > if (err) > { > grub_dprintf ("multiboot_loader", "Error loading phdr %d\n", i); > return err; > } > + if (base_addr) > + *base_addr =3D get_physical_target_address (ch); > source =3D get_virtual_current_address (ch); > } > =20 > @@ -208,7 +222,7 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t fi= le, const char *filename, voi > + 1, sh->sh_size, > sh->sh_addralign, > GRUB_RELOCATOR_PREFERENCE_NONE, > - 0); > + avoid_efi_boot_services); > if (err) > { > grub_dprintf ("multiboot_loader", "Error loading shdr %d\n", i); > diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multi= boot_mbi2.c > index dc9c709..7ac64ec 100644 > --- a/grub-core/loader/multiboot_mbi2.c > +++ b/grub-core/loader/multiboot_mbi2.c > @@ -68,6 +68,7 @@ static grub_size_t elf_sec_num, elf_sec_entsize; > static unsigned elf_sec_shstrndx; > static void *elf_sections; > static int keep_bs =3D 0; > +static grub_uint32_t base_addr =3D 0; > =20 > void > grub_multiboot_add_elfsyms (grub_size_t num, grub_size_t entsize, > @@ -107,11 +108,13 @@ grub_multiboot_load (grub_file_t file, const char= *filename) > grub_err_t err; > struct multiboot_header_tag *tag; > struct multiboot_header_tag_address *addr_tag =3D NULL; > - int entry_specified =3D 0, efi_entry_specified =3D 0; > + int entry_specified =3D 0, efi_entry_specified =3D 0, relocatable =3D= 0; > grub_addr_t entry =3D 0, efi_entry =3D 0; > - grub_uint32_t console_required =3D 0; > + grub_uint32_t console_required =3D 0, min_addr =3D 0; > + grub_uint32_t max_addr =3D 0, preference =3D 0; > struct multiboot_header_tag_framebuffer *fbtag =3D NULL; > int accepted_consoles =3D GRUB_MULTIBOOT_CONSOLE_EGA_TEXT; > + grub_size_t align =3D 0; > =20 > buffer =3D grub_malloc (MULTIBOOT_SEARCH); > if (!buffer) > @@ -174,6 +177,7 @@ grub_multiboot_load (grub_file_t file, const char *= filename) > case MULTIBOOT_TAG_TYPE_EFI_BS: > case MULTIBOOT_TAG_TYPE_EFI32_IH: > case MULTIBOOT_TAG_TYPE_EFI64_IH: > + case MULTIBOOT_TAG_TYPE_BASE_ADDR: > break; > =20 > default: > @@ -215,6 +219,26 @@ grub_multiboot_load (grub_file_t file, const char = *filename) > accepted_consoles |=3D GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER; > break; > =20 > + case MULTIBOOT_HEADER_TAG_RELOCATABLE: > + relocatable =3D 1; > + min_addr =3D ((struct multiboot_header_tag_relocatable *) tag)->min_a= ddr; > + max_addr =3D ((struct multiboot_header_tag_relocatable *) tag)->max_a= ddr; > + align =3D ((struct multiboot_header_tag_relocatable *) tag)->align; > + switch (((struct multiboot_header_tag_relocatable *) tag)->preference= ) > + { > + case MULTIBOOT_LOAD_PREFERENCE_LOW: > + preference =3D GRUB_RELOCATOR_PREFERENCE_LOW; > + break; > + > + case MULTIBOOT_LOAD_PREFERENCE_HIGH: > + preference =3D GRUB_RELOCATOR_PREFERENCE_HIGH; > + break; > + > + default: > + preference =3D GRUB_RELOCATOR_PREFERENCE_NONE; > + } > + break; > + > /* GRUB always page-aligns modules. */ > case MULTIBOOT_HEADER_TAG_MODULE_ALIGN: > break; > @@ -260,15 +284,22 @@ grub_multiboot_load (grub_file_t file, const char= *filename) > else > code_size =3D load_size; > =20 > - err =3D grub_relocator_alloc_chunk_addr (grub_multiboot_relocato= r,=20 > - &ch, load_addr, > - code_size); > + if (relocatable) > + err =3D grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &= ch, > + min_addr, max_addr - code_size, > + code_size, align ? align : 1, > + preference, keep_bs); > + else > + err =3D grub_relocator_alloc_chunk_addr (grub_multiboot_relocator, > + &ch, load_addr, > + code_size); > if (err) > { > grub_dprintf ("multiboot_loader", "Error loading aout kludge\n"); > grub_free (buffer); > return err; > } > + base_addr =3D get_physical_target_address (ch); > source =3D get_virtual_current_address (ch); > =20 > if ((grub_file_seek (file, offset)) =3D=3D (grub_off_t) -1) > @@ -290,7 +321,9 @@ grub_multiboot_load (grub_file_t file, const char *= filename) > } > else > { > - err =3D grub_multiboot_load_elf (file, filename, buffer); > + err =3D grub_multiboot_load_elf (file, filename, buffer, > + relocatable, min_addr, max_addr, > + align, preference, &base_addr, keep_bs); > if (err) > { > grub_free (buffer); > @@ -303,6 +336,14 @@ grub_multiboot_load (grub_file_t file, const char = *filename) > else if (entry_specified) > grub_multiboot_payload_eip =3D entry; > =20 > + if (relocatable) > + { > + if (base_addr > min_addr) > + grub_multiboot_payload_eip +=3D base_addr - min_addr; > + else > + grub_multiboot_payload_eip -=3D min_addr - base_addr; > + } > + > if (fbtag) > err =3D grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_FRAMEBU= FFER, > accepted_consoles, > @@ -409,6 +450,7 @@ 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_T= AG_ALIGN) > + + ALIGN_UP (sizeof (struct multiboot_tag_base_addr), MULTIBOOT_TAG= _ALIGN) > #ifdef GRUB_MACHINE_EFI > + ALIGN_UP (sizeof (struct multiboot_tag_efi32), MULTIBOOT_TAG_ALI= GN) > + ALIGN_UP (sizeof (struct multiboot_tag_efi64), MULTIBOOT_TAG_ALI= GN) > @@ -693,6 +735,15 @@ grub_multiboot_make_mbi (grub_uint32_t *target) > ptrorig +=3D (2 * sizeof (grub_uint32_t)) / sizeof (grub_properly_al= igned_t); > =20 > { > + struct multiboot_tag_base_addr *tag =3D (struct multiboot_tag_base= _addr *) ptrorig; > + tag->type =3D MULTIBOOT_TAG_TYPE_BASE_ADDR; > + tag->size =3D sizeof (struct multiboot_tag_base_addr);=20 > + tag->base_addr =3D base_addr; > + ptrorig +=3D ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN) > + / sizeof (grub_properly_aligned_t); > + } > + > + { > struct multiboot_tag_string *tag =3D (struct multiboot_tag_string = *) ptrorig; > tag->type =3D MULTIBOOT_TAG_TYPE_CMDLINE; > tag->size =3D sizeof (struct multiboot_tag_string) + cmdline_size;= =20 > diff --git a/include/grub/multiboot.h b/include/grub/multiboot.h > index e13c084..ec322b0 100644 > --- a/include/grub/multiboot.h > +++ b/include/grub/multiboot.h > @@ -94,7 +94,9 @@ grub_multiboot_load (grub_file_t file, const char *fi= lename); > /* Load ELF32 or ELF64. */ > grub_err_t > grub_multiboot_load_elf (grub_file_t file, const char *filename, > - void *buffer); > + void *buffer, int relocatable, grub_uint32_t min_addr, > + grub_uint32_t max_addr, grub_size_t align, grub_uint32_t preferenc= e, > + grub_uint32_t *base_addr, int avoid_efi_boot_services); > extern grub_size_t grub_multiboot_pure_size; > extern grub_size_t grub_multiboot_alloc_mbi; > extern grub_uint32_t grub_multiboot_payload_eip; > diff --git a/include/multiboot2.h b/include/multiboot2.h > index 9f97ddc..941a95d 100644 > --- a/include/multiboot2.h > +++ b/include/multiboot2.h > @@ -62,6 +62,7 @@ > #define MULTIBOOT_TAG_TYPE_EFI_BS 18 > #define MULTIBOOT_TAG_TYPE_EFI32_IH 19 > #define MULTIBOOT_TAG_TYPE_EFI64_IH 20 > +#define MULTIBOOT_TAG_TYPE_BASE_ADDR 21 > =20 > #define MULTIBOOT_HEADER_TAG_END 0 > #define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST 1 > @@ -72,11 +73,16 @@ > #define MULTIBOOT_HEADER_TAG_MODULE_ALIGN 6 > #define MULTIBOOT_HEADER_TAG_EFI_BS 7 > #define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI64 9 > +#define MULTIBOOT_HEADER_TAG_RELOCATABLE 10 > =20 > #define MULTIBOOT_ARCHITECTURE_I386 0 > #define MULTIBOOT_ARCHITECTURE_MIPS32 4 > #define MULTIBOOT_HEADER_TAG_OPTIONAL 1 > =20 > +#define MULTIBOOT_LOAD_PREFERENCE_NONE 0 > +#define MULTIBOOT_LOAD_PREFERENCE_LOW 1 > +#define MULTIBOOT_LOAD_PREFERENCE_HIGH 2 > + > #define MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED 1 > #define MULTIBOOT_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED 2 > =20 > @@ -169,6 +175,17 @@ struct multiboot_header_tag_module_align > multiboot_uint32_t size; > }; > =20 > +struct multiboot_header_tag_relocatable > +{ > + multiboot_uint16_t type; > + multiboot_uint16_t flags; > + multiboot_uint32_t size; > + multiboot_uint32_t min_addr; > + multiboot_uint32_t max_addr; > + multiboot_uint32_t align; > + multiboot_uint32_t preference; > +}; > + > struct multiboot_color > { > multiboot_uint8_t red; > @@ -395,6 +412,13 @@ struct multiboot_tag_efi64_ih > multiboot_uint64_t pointer; > }; > =20 > +struct multiboot_tag_base_addr > +{ > + multiboot_uint32_t type; > + multiboot_uint32_t size; > + multiboot_uint32_t base_addr; > +}; > + > #endif /* ! ASM_FILE */ > =20 > #endif /* ! MULTIBOOT_HEADER */ >=20 --M6KGHQ8EXdk655SDiAXeTrOl79hodncBa Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iF4EAREKAAYFAlZA/UMACgkQmBXlbbo5nOsnWgD+J830Q5qI0LjOYwSGf4eQ1jNC 4XEshnzy/my5tdUUpgoA/iAGWMtVP6xbGUWF9aS4KP55Q6gkiK8jrj1qTQAg6NB+ =wZBL -----END PGP SIGNATURE----- --M6KGHQ8EXdk655SDiAXeTrOl79hodncBa--