From nobody Fri Sep 20 16:51:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43281+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1562251359; cv=none; d=zoho.com; s=zohoarc; b=HJv27w0yBLAlNmH4XhFHItyNb5g+EupoeYr5jyTKK5c7S2KIQl6fgwg0bv3UPpgYHXuNvKxFb5XlUEnz4DbceWiypNskVJvvYhM10gsfVXmbkiMvS4IbxSu9LZ5LcjOt2icahoPV9FUIUsFH9vWATjZDB6YHql6gOZozcKes0oA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562251359; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=kXlmmSg4qhkQYdY5o1JA8nLpoZ75tfq+g0CqFrAg3mw=; b=RsDWj7KGs0KbhTw4H575nnXuP2k4yjFfdWgF4ytGL+YqrZqXf5Wo8pDMgRuMbi9ZgA0MLwYLxOSUsKHaWQmB2TlzPEyQtnXiDkEGANAvy5zP4fwum2DUhW+2w2syD/cbdHjrMtwL6XPJ5v4Aq7N9b5UL0eorAXKrJPmFuMYHuSc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43281+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1562251359888547.4712652990584; Thu, 4 Jul 2019 07:42:39 -0700 (PDT) Return-Path: X-Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com []) by groups.io with SMTP; Thu, 04 Jul 2019 07:42:37 -0700 Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+43281+1787277+3901457@groups.io; helo=web01.groups.io; Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: oWZxkNLqqPmlqfn+TXI9xs2s6uB23HpmXn60oaqU9O1DjC2JSgeu/F6/Xfhg+7u8DnLBPyHqWB qTSas+1uAhvbOAqrT63LlNc7TBmwLvLAZAPGfTgug5FDyJpPpl0dT7NLiGQHNwFUBH/2SWnej3 KF1TPdHFhWVAKZdTq5DPkZMfIBy+B5QKOdIXgKGg2nRpPsMzRX8imCT+VDeX7Bb3eaNpeywLvi F1rjLhT+f7s1LLinckddJrArstNHiF0phtB1D3baVkLBLWLOA6DwnGFFFETiRxmr045IbC4E1t 5bg= X-SBRS: 2.7 X-MesageID: 2588783 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.63,451,1557201600"; d="scan'208";a="2588783" From: "Anthony PERARD" To: CC: , Ard Biesheuvel , Jordan Justen , Laszlo Ersek , Julien Grall , Anthony PERARD Subject: [edk2-devel] [PATCH v3 05/35] OvmfPkg/OvmfXen: Creating an ELF header Date: Thu, 4 Jul 2019 15:42:03 +0100 Message-ID: <20190704144233.27968-6-anthony.perard@citrix.com> In-Reply-To: <20190704144233.27968-1-anthony.perard@citrix.com> References: <20190704144233.27968-1-anthony.perard@citrix.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,anthony.perard@citrix.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1562251358; bh=HDnYRlyamd/auwIKuzLo+WlyKSKMk3723BT9y7+YPkM=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=rj05W17/aIAB4WwYp8hZXHEbNrLUDAQOkuPRv6naWBMTZJlDznjBBOIsrIRRNHucj+w E5lPmoqScXbICSDTRQQXtZZ6tXBld3D8Hp+ZV+WCkfeov5wf3DNKGu4jB9oifU85nPm7W R2SF+jqkR5IE6fwqxJ8cUX2NHYk8erppl3M= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This patch changes the flash device image of OvmfXen to make it look like it's an ELF. For this, we replace the empty embedded variable store by a binary array, which is a ELF file header. The ELF header explain to a loader to load the binary at the address 1MB, then jump to the PVH entry point which will be created in a later patch. The header also includes a Xen ELF note that is part of the PVH ABI. That patch include OvmfXenElfHeaderGenerator.c which can be use to regenerate the ELF header, but this will be a manual step. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1689 Signed-off-by: Anthony PERARD Acked-by: Laszlo Ersek --- Notes: v3: - added license to generate_elf_header.c which is renamed to OvmfPkg/OvmfXenElfHeaderGenerator.c - added an ELF NOTE into the header OvmfPkg/OvmfXen.fdf | 101 +++++++++++++++++++- OvmfPkg/OvmfXenElfHeaderGenerator.c | 140 ++++++++++++++++++++++++++++ 2 files changed, 238 insertions(+), 3 deletions(-) create mode 100644 OvmfPkg/OvmfXenElfHeaderGenerator.c diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index 2ceff7baa2..43c268f6cb 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -15,8 +15,8 @@ [Defines] !include OvmfPkg.fdf.inc =20 # -# Build the variable store and the firmware code as one unified flash devi= ce -# image. +# This will allow the flash device image to be recognize as an ELF, with f= irst +# an ELF headers, then the firmware code. # [FD.OVMF] BaseAddress =3D $(FW_BASE_ADDRESS) @@ -25,7 +25,102 @@ [FD.OVMF] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(FW_BLOCKS) =20 -!include VarStore.fdf.inc +!if ($(FD_SIZE_IN_KB) =3D=3D 1024) || ($(FD_SIZE_IN_KB) =3D=3D 2048) +0x00000000|0x0000e000 +!endif +!if $(FD_SIZE_IN_KB) =3D=3D 4096 +0x00000000|0x00040000 +!endif +DATA =3D { + # + # This hex array have been generated by OvmfPkg/OvmfXenElfHeaderGenerato= r.c + # and copied manually. + # + # ELF file header + 0x7f, 0x45, 0x4c, 0x46, # e_ident[0..3]: Magic number + 0x01, # File class: 32-bit objects + 0x01, # Data encoding: 2's complement, little endian + 0x01, # File version + 0x03, # OS ABI identification: Object uses GNU ELF extensions + 0x00, # ABI version + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # e_ident[EI_PAD...] + 0x02, 0x00, # e_type =3D Executable file + 0x03, 0x00, # e_machine =3D Intel 80386 + 0x01, 0x00, 0x00, 0x00, # e_version + 0xd0, 0xff, 0x2f, 0x00, # e_entry: Entry point virtual address + 0x34, 0x00, 0x00, 0x00, # e_phoff: Program header table file offset + 0x00, 0x00, 0x00, 0x00, # e_shoff: Section header table file offset + 0x00, 0x00, 0x00, 0x00, # e_flags: Processor-specific flags + 0x34, 0x00, # e_ehsize: ELF header size + 0x20, 0x00, # e_phentsize: Program header table entry size + 0x02, 0x00, # e_phnum: Program header table entry count + 0x00, 0x00, # e_shentsize: Section header table entry size + 0x00, 0x00, # e_shnum: Section header table entry count + 0x00, 0x00, # e_shstrndx + + # ELF Program segment headers + # - Load segment + 0x01, 0x00, 0x00, 0x00, # p_type =3D Loadable program segment + 0x00, 0x00, 0x00, 0x00, # p_offset + 0x00, 0x00, 0x10, 0x00, # p_vaddr: Segment virtual address + 0x00, 0x00, 0x10, 0x00, # p_paddr: Segment physical address + 0x00, 0x00, 0x20, 0x00, # p_filesz: Segment size in file + 0x00, 0x00, 0x20, 0x00, # p_memsz: Segment size in memory + 0x07, 0x00, 0x00, 0x00, # p_flags =3D Segment is executable | writable |= readable + 0x00, 0x00, 0x00, 0x00, # p_align + # - ELFNOTE segment + 0x04, 0x00, 0x00, 0x00, # p_type =3D PT_NOTE + 0x74, 0x00, 0x00, 0x00, # p_offset =3D point to XEN_ELFNOTE_PHYS32_ENTRY= below + 0x74, 0x00, 0x10, 0x00, + 0x74, 0x00, 0x10, 0x00, + 0x14, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, # p_flags =3D Segment is readable + 0x00, 0x00, 0x00, 0x00, + + # XEN_ELFNOTE_PHYS32_ENTRY + 0x04, 0x00, 0x00, 0x00, # name size + 0x04, 0x00, 0x00, 0x00, # desc size + 0x12, 0x00, 0x00, 0x00, # type =3D XEN_ELFNOTE_PHYS32_ENTRY + 0x58, 0x65, 0x6e, 0x00, # name =3D "Xen" + 0xd0, 0xff, 0x2f, 0x00, # desc: PVH entry point + 0x00 +} + +!if ($(FD_SIZE_IN_KB) =3D=3D 1024) || ($(FD_SIZE_IN_KB) =3D=3D 2048) +0x0000e000|0x00001000 +!endif +!if $(FD_SIZE_IN_KB) =3D=3D 4096 +0x00040000|0x00001000 +!endif +#NV_EVENT_LOG + +!if ($(FD_SIZE_IN_KB) =3D=3D 1024) || ($(FD_SIZE_IN_KB) =3D=3D 2048) +0x0000f000|0x00001000 +!endif +!if $(FD_SIZE_IN_KB) =3D=3D 4096 +0x00041000|0x00001000 +!endif +#NV_FTW_WORKING +DATA =3D { + # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature =3D gEdkiiWorkingBl= ockSignatureGuid =3D + # { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65, 0x0, 0xfd, 0x9f, 0= x1b, 0x95 }} + 0x2b, 0x29, 0x58, 0x9e, 0x68, 0x7c, 0x7d, 0x49, + 0xa0, 0xce, 0x65, 0x0, 0xfd, 0x9f, 0x1b, 0x95, + # Crc:UINT32 #WorkingBlockValid:1, WorkingBlockInvalid:1, Res= erved + 0x2c, 0xaf, 0x2c, 0x64, 0xFE, 0xFF, 0xFF, 0xFF, + # WriteQueueSize: UINT64 + 0xE0, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +} + +!if ($(FD_SIZE_IN_KB) =3D=3D 1024) || ($(FD_SIZE_IN_KB) =3D=3D 2048) +0x00010000|0x00010000 +!endif +!if $(FD_SIZE_IN_KB) =3D=3D 4096 +0x00042000|0x00042000 +!endif +#NV_FTW_SPARE + =20 $(VARS_SIZE)|$(FVMAIN_SIZE) FV =3D FVMAIN_COMPACT diff --git a/OvmfPkg/OvmfXenElfHeaderGenerator.c b/OvmfPkg/OvmfXenElfHeader= Generator.c new file mode 100644 index 0000000000..6cbad8fbf7 --- /dev/null +++ b/OvmfPkg/OvmfXenElfHeaderGenerator.c @@ -0,0 +1,140 @@ +/* + * @file + * This program generates a hex array to be manually coppied into + * OvmfXen.fdf. + * The purpose is for the flash device image to be recognize as an ELF. + * + * Copyright (c) 2019, Citrix Systems, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause-Patent + */ + +#include "elf.h" +#include "stdio.h" +#include "stddef.h" + +void print_hdr(void *s, size_t size) +{ + char *c =3D s; + + while (size--) { + printf("0x%02hhx, ", *(c++)); + } +} + +/* Format for the XEN_ELFNOTE_PHYS32_ENTRY program segment */ +#define XEN_ELFNOTE_PHYS32_ENTRY 18 +typedef struct { + uint32_t name_size; + uint32_t desc_size; + uint32_t type; + char name[4]; + uint32_t desc; +} xen_elfnote_phys32_entry; + +int main(void) +{ + /* FW_SIZE */ + size_t ovmf_blob_size =3D 0x00200000; + /* Load OVMF at 1MB when running as PVH guest */ + uint32_t ovmf_base_address =3D 0x00100000; + /* Xen PVH entry point */ + uint32_t ovmfxen_pvh_entry_point =3D ovmf_base_address + ovmf_blob_size = - 0x30; + size_t offset_into_file =3D 0; + + /* ELF file header */ + Elf32_Ehdr hdr =3D { + .e_ident =3D ELFMAG, + .e_type =3D ET_EXEC, + .e_machine =3D EM_386, + .e_version =3D EV_CURRENT, + .e_entry =3D ovmfxen_pvh_entry_point, + .e_flags =3D R_386_NONE, + .e_ehsize =3D sizeof (hdr), + .e_phentsize =3D sizeof (Elf32_Phdr), + }; + offset_into_file +=3D sizeof (hdr); + + hdr.e_ident[EI_CLASS] =3D ELFCLASS32; + hdr.e_ident[EI_DATA] =3D ELFDATA2LSB; + hdr.e_ident[EI_VERSION] =3D EV_CURRENT; + hdr.e_ident[EI_OSABI] =3D ELFOSABI_LINUX; + /* Placing program headers just after hdr */ + hdr.e_phoff =3D sizeof (hdr); + + /* program header */ + Elf32_Phdr phdr_load =3D { + .p_type =3D PT_LOAD, + .p_offset =3D 0, /* load everything */ + .p_paddr =3D ovmf_base_address, + .p_filesz =3D ovmf_blob_size, + .p_memsz =3D ovmf_blob_size, + .p_flags =3D PF_X | PF_W | PF_R, + .p_align =3D 0, + }; + phdr_load.p_vaddr =3D phdr_load.p_paddr; + hdr.e_phnum +=3D 1; + offset_into_file +=3D sizeof (phdr_load); + + /* Xen ELF Note. */ + + xen_elfnote_phys32_entry xen_elf_note =3D { + .type =3D XEN_ELFNOTE_PHYS32_ENTRY, + .name =3D "Xen", + .desc =3D ovmfxen_pvh_entry_point, + .name_size =3D + offsetof (xen_elfnote_phys32_entry, desc) - + offsetof (xen_elfnote_phys32_entry, name), + .desc_size =3D + sizeof (xen_elfnote_phys32_entry) - + offsetof (xen_elfnote_phys32_entry, desc), + }; + Elf32_Phdr phdr_note =3D { + .p_type =3D PT_NOTE, + .p_filesz =3D sizeof (xen_elf_note), + .p_memsz =3D sizeof (xen_elf_note), + .p_flags =3D PF_R, + .p_align =3D 0, + }; + hdr.e_phnum +=3D 1; + offset_into_file +=3D sizeof (phdr_note); + phdr_note.p_offset =3D offset_into_file; + phdr_note.p_paddr =3D ovmf_base_address + phdr_note.p_offset; + phdr_note.p_vaddr =3D phdr_note.p_paddr; + + + /* + * print elf header + */ + + size_t i; + size_t hdr_size =3D sizeof (hdr); + size_t entry_off =3D offsetof(typeof(hdr), e_entry); + + printf("# ELF file header\n"); + print_hdr(&hdr, entry_off); + printf("\n"); + print_hdr(&hdr.e_entry, sizeof (hdr.e_entry)); + printf(" # hdr.e_entry\n"); + print_hdr(&hdr.e_entry + 1, hdr_size - entry_off - sizeof (hdr.e_entry)); + + printf("\n\n# ELF Program segment headers\n"); + printf("# - Load segment\n"); + for (i =3D 0; i < sizeof (phdr_load); i +=3D 4) { + print_hdr(((char*)&phdr_load) + i, 4); + printf("\n"); + } + printf("# - ELFNOTE segment\n"); + for (i =3D 0; i < sizeof (phdr_note); i +=3D 4) { + print_hdr(((char*)&phdr_note) + i, 4); + printf("\n"); + } + + printf("\n# XEN_ELFNOTE_PHYS32_ENTRY\n"); + for (i =3D 0; i < sizeof (xen_elf_note); i +=3D 4) { + print_hdr(((char*)&xen_elf_note) + i, 4); + printf("\n"); + } + + return 0; +} --=20 Anthony PERARD -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43281): https://edk2.groups.io/g/devel/message/43281 Mute This Topic: https://groups.io/mt/32308566/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-