* [Qemu-devel] [PATCH v3 1/5] roms: add the edk2 project as a git submodule
2019-02-04 16:03 [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule Laszlo Ersek
@ 2019-02-04 16:03 ` Laszlo Ersek
2019-02-04 16:50 ` Philippe Mathieu-Daudé
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 2/5] roms: build the EfiRom utility from the roms/edk2 submodule Laszlo Ersek
` (5 subsequent siblings)
6 siblings, 1 reply; 23+ messages in thread
From: Laszlo Ersek @ 2019-02-04 16:03 UTC (permalink / raw)
To: qemu devel list
Cc: Michael S. Tsirkin, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Philippe Mathieu-Daudé, Shannon Zhao
The roms/edk2 submodule can help with three goals:
- build the OVMF and ArmVirtQemu virtual UEFI firmware platforms (to be
implemented later),
- build the EfiRom tool on the fly, which is used in roms/Makefile, for
building the "efirom" target,
- build UEFI test applications (to be run in guests), for qtest support.
Edk2 commit 85588389222a3636baf0f9ed8227f2434af4c3f9 stands for the latest
"stable tag", namely "edk2-stable201811".
The edk2 repository tracks some binary files that should not be removed by
QEMU's top-level "make clean"; exempt the full pathnames from the "find"
command.
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
---
Notes:
v3:
- no change
v2:
- pick up R-b [Gerd]
Makefile | 6 +++++-
.gitmodules | 3 +++
roms/edk2 | 1 +
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 1278a3eb5293..e55bb7255ad8 100644
--- a/Makefile
+++ b/Makefile
@@ -607,7 +607,11 @@ clean:
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
rm -f qemu-options.def
rm -f *.msi
- find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f -exec rm {} +
+ find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f \
+ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \
+ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
+ ! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \
+ -exec rm {} +
rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~
rm -f fsdev/*.pod scsi/*.pod
rm -f qemu-img-cmds.h
diff --git a/.gitmodules b/.gitmodules
index 6b91176098c8..ceafb0ee29a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,3 +49,6 @@
[submodule "tests/fp/berkeley-softfloat-3"]
path = tests/fp/berkeley-softfloat-3
url = https://github.com/cota/berkeley-softfloat-3
+[submodule "roms/edk2"]
+ path = roms/edk2
+ url = https://github.com/tianocore/edk2.git
diff --git a/roms/edk2 b/roms/edk2
new file mode 160000
index 000000000000..85588389222a
--- /dev/null
+++ b/roms/edk2
@@ -0,0 +1 @@
+Subproject commit 85588389222a3636baf0f9ed8227f2434af4c3f9
--
2.19.1.3.g30247aa5d201
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 1/5] roms: add the edk2 project as a git submodule
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 1/5] roms: add the edk2 project as a git submodule Laszlo Ersek
@ 2019-02-04 16:50 ` Philippe Mathieu-Daudé
2019-02-04 17:29 ` Laszlo Ersek
0 siblings, 1 reply; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-02-04 16:50 UTC (permalink / raw)
To: Laszlo Ersek, qemu devel list
Cc: Michael S. Tsirkin, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Shannon Zhao
On 2/4/19 5:03 PM, Laszlo Ersek wrote:
> The roms/edk2 submodule can help with three goals:
> - build the OVMF and ArmVirtQemu virtual UEFI firmware platforms (to be
> implemented later),
> - build the EfiRom tool on the fly, which is used in roms/Makefile, for
> building the "efirom" target,
> - build UEFI test applications (to be run in guests), for qtest support.
>
> Edk2 commit 85588389222a3636baf0f9ed8227f2434af4c3f9 stands for the latest
> "stable tag", namely "edk2-stable201811".
>
> The edk2 repository tracks some binary files that should not be removed by
> QEMU's top-level "make clean"; exempt the full pathnames from the "find"
> command.
>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Already reviewed v2 ;)
https://www.mail-archive.com/qemu-devel@nongnu.org/msg592311.html
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>
> Notes:
> v3:
> - no change
>
> v2:
> - pick up R-b [Gerd]
>
> Makefile | 6 +++++-
> .gitmodules | 3 +++
> roms/edk2 | 1 +
> 3 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 1278a3eb5293..e55bb7255ad8 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -607,7 +607,11 @@ clean:
> rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
> rm -f qemu-options.def
> rm -f *.msi
> - find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f -exec rm {} +
> + find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f \
> + ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \
> + ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
> + ! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \
> + -exec rm {} +
> rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~
> rm -f fsdev/*.pod scsi/*.pod
> rm -f qemu-img-cmds.h
> diff --git a/.gitmodules b/.gitmodules
> index 6b91176098c8..ceafb0ee29a0 100644
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -49,3 +49,6 @@
> [submodule "tests/fp/berkeley-softfloat-3"]
> path = tests/fp/berkeley-softfloat-3
> url = https://github.com/cota/berkeley-softfloat-3
> +[submodule "roms/edk2"]
> + path = roms/edk2
> + url = https://github.com/tianocore/edk2.git
> diff --git a/roms/edk2 b/roms/edk2
> new file mode 160000
> index 000000000000..85588389222a
> --- /dev/null
> +++ b/roms/edk2
> @@ -0,0 +1 @@
> +Subproject commit 85588389222a3636baf0f9ed8227f2434af4c3f9
>
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 1/5] roms: add the edk2 project as a git submodule
2019-02-04 16:50 ` Philippe Mathieu-Daudé
@ 2019-02-04 17:29 ` Laszlo Ersek
0 siblings, 0 replies; 23+ messages in thread
From: Laszlo Ersek @ 2019-02-04 17:29 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu devel list
Cc: Michael S. Tsirkin, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Shannon Zhao
On 02/04/19 17:50, Philippe Mathieu-Daudé wrote:
> On 2/4/19 5:03 PM, Laszlo Ersek wrote:
>> The roms/edk2 submodule can help with three goals:
>> - build the OVMF and ArmVirtQemu virtual UEFI firmware platforms (to be
>> implemented later),
>> - build the EfiRom tool on the fly, which is used in roms/Makefile, for
>> building the "efirom" target,
>> - build UEFI test applications (to be run in guests), for qtest support.
>>
>> Edk2 commit 85588389222a3636baf0f9ed8227f2434af4c3f9 stands for the latest
>> "stable tag", namely "edk2-stable201811".
>>
>> The edk2 repository tracks some binary files that should not be removed by
>> QEMU's top-level "make clean"; exempt the full pathnames from the "find"
>> command.
>>
>> Cc: "Michael S. Tsirkin" <mst@redhat.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Gerd Hoffmann <kraxel@redhat.com>
>> Cc: Igor Mammedov <imammedo@redhat.com>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
>
> Already reviewed v2 ;)
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg592311.html
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Ugh, my bad, for not picking up those. I was so relieved Friday (?)
night about the "+" that I failed to focus on anything else. My apologies.
Thank you!
Laszlo
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH v3 2/5] roms: build the EfiRom utility from the roms/edk2 submodule
2019-02-04 16:03 [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule Laszlo Ersek
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 1/5] roms: add the edk2 project as a git submodule Laszlo Ersek
@ 2019-02-04 16:03 ` Laszlo Ersek
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 3/5] tests: introduce "uefi-test-tools" with the BiosTablesTest UEFI app Laszlo Ersek
` (4 subsequent siblings)
6 siblings, 0 replies; 23+ messages in thread
From: Laszlo Ersek @ 2019-02-04 16:03 UTC (permalink / raw)
To: qemu devel list
Cc: Michael S. Tsirkin, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Philippe Mathieu-Daudé, Shannon Zhao
Building the EfiRom utility from "roms/edk2/BaseTools" should make
"roms/Makefile" more self-contained. Otherwise, we'd call the system-wide
EfiRom for building the combined iPXE option ROMs, but call the sibling
utilities from "roms/edk2/BaseTools" for building "roms/edk2" content.
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Notes:
v3:
- no change
v2:
- pick up R-b / T-b [Gerd, Phil]
roms/Makefile | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/roms/Makefile b/roms/Makefile
index a6043eff37e9..78d5dd18c301 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -47,10 +47,7 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu.org"
# We need that to combine multiple images (legacy bios,
# efi ia32, efi x64) into a single rom binary.
#
-# We try to find it in the path. You can also pass the location on
-# the command line, i.e. "make EFIROM=/path/to/EfiRom efirom"
-#
-EFIROM ?= $(shell which EfiRom 2>/dev/null)
+EFIROM = edk2/BaseTools/Source/C/bin/EfiRom
default:
@echo "nothing is build by default"
@@ -59,8 +56,7 @@ default:
@echo " vgabios -- update vgabios binaries (seabios)"
@echo " sgabios -- update sgabios binaries"
@echo " pxerom -- update nic roms (bios only)"
- @echo " efirom -- update nic roms (bios+efi, this needs"
- @echo " the EfiRom utility from edk2 / tianocore)"
+ @echo " efirom -- update nic roms (bios+efi)"
@echo " slof -- update slof.bin"
@echo " skiboot -- update skiboot.lid"
@echo " u-boot.e500 -- update u-boot.e500"
@@ -106,7 +102,7 @@ pxe-rom-%: build-pxe-roms
efirom: $(patsubst %,efi-rom-%,$(pxerom_variants))
-efi-rom-%: build-pxe-roms build-efi-roms
+efi-rom-%: build-pxe-roms build-efi-roms $(EFIROM)
$(EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \
-b ipxe/src/bin/$(VID)$(DID).rom \
-ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \
@@ -124,6 +120,8 @@ build-efi-roms: build-pxe-roms
$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
+$(EFIROM):
+ $(MAKE) -C edk2/BaseTools
slof:
$(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
@@ -150,6 +148,7 @@ clean:
$(MAKE) -C sgabios clean
rm -f sgabios/.depend
$(MAKE) -C ipxe/src veryclean
+ $(MAKE) -C edk2/BaseTools clean
$(MAKE) -C SLOF clean
rm -rf u-boot/build.e500
$(MAKE) -C u-boot-sam460ex distclean
--
2.19.1.3.g30247aa5d201
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Qemu-devel] [PATCH v3 3/5] tests: introduce "uefi-test-tools" with the BiosTablesTest UEFI app
2019-02-04 16:03 [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule Laszlo Ersek
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 1/5] roms: add the edk2 project as a git submodule Laszlo Ersek
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 2/5] roms: build the EfiRom utility from the roms/edk2 submodule Laszlo Ersek
@ 2019-02-04 16:03 ` Laszlo Ersek
2019-02-04 16:57 ` Philippe Mathieu-Daudé
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts Laszlo Ersek
` (3 subsequent siblings)
6 siblings, 1 reply; 23+ messages in thread
From: Laszlo Ersek @ 2019-02-04 16:03 UTC (permalink / raw)
To: qemu devel list
Cc: Michael S. Tsirkin, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Philippe Mathieu-Daudé, Shannon Zhao
The "bios-tables-test" program in QEMU's test suite locates the RSD PTR
ACPI table in guest RAM, and (chasing pointers to other ACPI tables)
performs various sanity checks on the QEMU-generated and
firmware-installed tables.
Currently this set of test cases doesn't work with UEFI guests. The ACPI
spec defines distinct methods for OSPM to locate the RSD PTR on
traditional BIOS vs. UEFI platforms, and the UEFI method is more difficult
to implement from the hypervisor side with just raw guest memory access.
Add a UEFI application (to be booted in the UEFI guest) that populates a
small, MB-aligned structure in guest RAM. The structure begins with a
signature GUID. The hypervisor should loop over all MB-aligned pages in
guest RAM until one matches the signature GUID at offset 0, at which point
the hypervisor can fetch the RSDP address field(s) from the structure.
QEMU's test logic currently spins on a pre-determined guest address, until
that address assumes a magic value. The method described in this patch is
conceptually the same ("busy loop until match is found"), except there is
no hard-coded address. This plays a lot more nicely with UEFI guest
firmware (we'll be able to use the normal page allocation UEFI service).
Given the size of EFI_GUID (16 bytes -- 128 bits), mismatches should be
astronomically unlikely. In addition, given the typical guest RAM size for
such tests (128 MB), there are 128 locations to check in one iteration of
the "outer" loop, which shouldn't introduce an intolerable delay after the
guest stores the RSDP address(es), and then the GUID.
The GUID that the hypervisor should search for is
AB87A6B1-2034-BDA0-71BD-375007757785
Expressed as a byte array:
{
0xb1, 0xa6, 0x87, 0xab,
0x34, 0x20,
0xa0, 0xbd,
0x71, 0xbd, 0x37, 0x50, 0x07, 0x75, 0x77, 0x85
}
Note that in the patch, we define "gBiosTablesTestGuid" with all bits
inverted. This is a simple method to prevent the UEFI binary, which
incorporates "gBiosTablesTestGuid", from matching the actual GUID in guest
RAM.
The UEFI application is written against the edk2 framework, which was
introduced earlier as a git submodule. The next patch will provide build
scripts for maintainers.
The source code follows the edk2 coding style, and is licensed under the
2-clause BSDL (in case someone would like to include UefiTestToolsPkg
content in a different edk2 platform).
The "UefiTestToolsPkg.dsc" platform description file resolves the used
edk2 library classes to instances (= library implementations) such that
the UEFI binaries inherit no platform dependencies. They are expected to
run on any system that conforms to the UEFI-2.3.1 spec (which was released
in 2012). The arch-specific build options are carried over from edk2's
ArmVirtPkg and OvmfPkg platforms.
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
Notes:
v3:
- no change
v2:
- no change
v1:
- If that's necessary, I'd be glad to be designated as Maintainer or
Reviewer in "MAINTAINERS" for "tests/uefi-test-tools/", I just
couldn't figure out under what subsystem I should add the magic lines.
"MAINTAINERS" needs a Table of Contents! :)
tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec | 27 ++++
tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc | 69 +++++++++++
tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf | 41 ++++++
tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h | 67 ++++++++++
tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c | 130 ++++++++++++++++++++
tests/uefi-test-tools/LICENSE | 25 ++++
6 files changed, 359 insertions(+)
diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
new file mode 100644
index 000000000000..ed3a2fe11084
--- /dev/null
+++ b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
@@ -0,0 +1,27 @@
+## @file
+# edk2 package declaration for the test helper UEFI applications that run in
+# guests.
+#
+# Copyright (C) 2019, Red Hat, Inc.
+#
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License that accompanies this
+# distribution. The full text of the license may be found at
+# <http://opensource.org/licenses/bsd-license.php>.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+##
+
+[Defines]
+ DEC_SPECIFICATION = 1.27
+ PACKAGE_NAME = UefiTestToolsPkg
+ PACKAGE_GUID = 7b3f1794-0c85-4b27-a536-44dbf0b0669c
+ PACKAGE_VERSION = 0.1
+
+[Includes]
+ Include
+
+[Guids]
+ gBiosTablesTestGuid = {0x5478594e, 0xdfcb, 0x425f, {0x8e, 0x42, 0xc8, 0xaf, 0xf8, 0x8a, 0x88, 0x7a}}
+
diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
new file mode 100644
index 000000000000..c8511cd732bc
--- /dev/null
+++ b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
@@ -0,0 +1,69 @@
+## @file
+# edk2 platform description for the test helper UEFI applications that run in
+# guests.
+#
+# Copyright (C) 2019, Red Hat, Inc.
+#
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License that accompanies this
+# distribution. The full text of the license may be found at
+# <http://opensource.org/licenses/bsd-license.php>.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+##
+
+[Defines]
+ DSC_SPECIFICATION = 1.28
+ PLATFORM_GUID = 6750ccc1-8365-49f0-8437-948e516a9f55
+ PLATFORM_VERSION = 0.1
+ PLATFORM_NAME = UefiTestTools
+ SKUID_IDENTIFIER = DEFAULT
+ SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64
+ BUILD_TARGETS = DEBUG
+
+[BuildOptions.IA32]
+ GCC:*_*_IA32_CC_FLAGS = -mno-mmx -mno-sse
+
+[BuildOptions.X64]
+ GCC:*_*_X64_CC_FLAGS = -mno-mmx -mno-sse
+
+[BuildOptions.ARM.EDKII.UEFI_APPLICATION]
+ GCC:*_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000
+
+[BuildOptions.AARCH64.EDKII.UEFI_APPLICATION]
+ GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x1000
+
+[BuildOptions]
+ GCC:*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+
+[SkuIds]
+ 0|DEFAULT
+
+[LibraryClasses]
+ BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
+ DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
+ DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
+ DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
+ MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
+ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
+ PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
+ UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
+ UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
+ UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
+ UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
+
+[LibraryClasses.ARM, LibraryClasses.AARCH64]
+ BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
+ NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+ NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
+
+[LibraryClasses.IA32, LibraryClasses.X64]
+ BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
+
+[PcdsFixedAtBuild]
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
+
+[Components]
+ UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
new file mode 100644
index 000000000000..924d8a80d00b
--- /dev/null
+++ b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
@@ -0,0 +1,41 @@
+## @file
+# Populate the BIOS_TABLES_TEST structure.
+#
+# Copyright (C) 2019, Red Hat, Inc.
+#
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License that accompanies this
+# distribution. The full text of the license may be found at
+# <http://opensource.org/licenses/bsd-license.php>.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+##
+
+[Defines]
+ INF_VERSION = 1.27
+ BASE_NAME = BiosTablesTest
+ UEFI_SPECIFICATION_VERSION = 2.31
+ FILE_GUID = 87f00433-3b7c-45c3-ae78-a56495bd4e62
+ MODULE_TYPE = UEFI_APPLICATION
+ ENTRY_POINT = BiosTablesTestMain
+
+[Sources]
+ BiosTablesTest.c
+
+[LibraryClasses]
+ BaseLib
+ BaseMemoryLib
+ MemoryAllocationLib
+ UefiApplicationEntryPoint
+ UefiBootServicesTableLib
+ UefiLib
+
+[Guids]
+ gBiosTablesTestGuid
+ gEfiAcpi10TableGuid
+ gEfiAcpi20TableGuid
+
+[Packages]
+ MdePkg/MdePkg.dec
+ UefiTestToolsPkg/UefiTestToolsPkg.dec
diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
new file mode 100644
index 000000000000..0b72c61254af
--- /dev/null
+++ b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
@@ -0,0 +1,67 @@
+/** @file
+ Expose the address(es) of the ACPI RSD PTR table(s) in a MB-aligned structure
+ to the hypervisor.
+
+ The hypervisor locates the MB-aligned structure based on the signature GUID
+ that is at offset 0 in the structure. Once the RSD PTR address(es) are
+ retrieved, the hypervisor may perform various ACPI checks.
+
+ This feature is a development aid, for supporting ACPI table unit tests in
+ hypervisors. Do not enable in production builds.
+
+ Copyright (C) 2019, Red Hat, Inc.
+
+ This program and the accompanying materials are licensed and made available
+ under the terms and conditions of the BSD License that accompanies this
+ distribution. The full text of the license may be found at
+ <http://opensource.org/licenses/bsd-license.php>.
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+ WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+
+#ifndef __BIOS_TABLES_TEST_H__
+#define __BIOS_TABLES_TEST_H__
+
+#include <Uefi/UefiBaseType.h>
+
+#define BIOS_TABLES_TEST_GUID \
+ { \
+ 0x5478594e, \
+ 0xdfcb, \
+ 0x425f, \
+ { 0x8e, 0x42, 0xc8, 0xaf, 0xf8, 0x8a, 0x88, 0x7a } \
+ }
+
+extern EFI_GUID gBiosTablesTestGuid;
+
+//
+// The following structure must be allocated in Boot Services Data type memory,
+// aligned at a 1MB boundary.
+//
+#pragma pack (1)
+typedef struct {
+ //
+ // The signature GUID is written to the MB-aligned structure from
+ // gBiosTablesTestGuid, but with all bits inverted. That's the actual GUID
+ // value that the hypervisor should look for at each MB boundary, looping
+ // over all guest RAM pages with that alignment, until a match is found. The
+ // bit-flipping occurs in order not to store the actual GUID in any UEFI
+ // executable, which might confuse guest memory analysis. Note that EFI_GUID
+ // has little endian representation.
+ //
+ EFI_GUID InverseSignatureGuid;
+ //
+ // The Rsdp10 and Rsdp20 fields may be read when the signature GUID matches.
+ // Rsdp10 is the guest-physical address of the ACPI 1.0 specification RSD PTR
+ // table, in 8-byte little endian representation. Rsdp20 is the same, for the
+ // ACPI 2.0 or later specification RSD PTR table. Each of these fields may be
+ // zero (independently of the other) if the UEFI System Table does not
+ // provide the corresponding UEFI Configuration Table.
+ //
+ EFI_PHYSICAL_ADDRESS Rsdp10;
+ EFI_PHYSICAL_ADDRESS Rsdp20;
+} BIOS_TABLES_TEST;
+#pragma pack ()
+
+#endif // __BIOS_TABLES_TEST_H__
diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
new file mode 100644
index 000000000000..b208e17fb00f
--- /dev/null
+++ b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
@@ -0,0 +1,130 @@
+/** @file
+ Populate the BIOS_TABLES_TEST structure.
+
+ Copyright (C) 2019, Red Hat, Inc.
+
+ This program and the accompanying materials are licensed and made available
+ under the terms and conditions of the BSD License that accompanies this
+ distribution. The full text of the license may be found at
+ <http://opensource.org/licenses/bsd-license.php>.
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+ WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+
+#include <Guid/Acpi.h>
+#include <Guid/BiosTablesTest.h>
+#include <Library/BaseLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
+
+/**
+ Wait for a keypress with a message that the application is about to exit.
+**/
+STATIC
+VOID
+WaitForExitKeyPress (
+ VOID
+ )
+{
+ EFI_STATUS Status;
+ UINTN Idx;
+ EFI_INPUT_KEY Key;
+
+ if (gST->ConIn == NULL) {
+ return;
+ }
+ AsciiPrint ("%a: press any key to exit\n", gEfiCallerBaseName);
+ Status = gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &Idx);
+ if (EFI_ERROR (Status)) {
+ return;
+ }
+ gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
+}
+
+EFI_STATUS
+EFIAPI
+BiosTablesTestMain (
+ IN EFI_HANDLE ImageHandle,
+ IN EFI_SYSTEM_TABLE *SystemTable
+ )
+{
+ VOID *Pages;
+ volatile BIOS_TABLES_TEST *BiosTablesTest;
+ CONST VOID *Rsdp10;
+ CONST VOID *Rsdp20;
+ CONST EFI_CONFIGURATION_TABLE *ConfigTable;
+ CONST EFI_CONFIGURATION_TABLE *ConfigTablesEnd;
+ volatile EFI_GUID *InverseSignature;
+ UINTN Idx;
+
+ Pages = AllocateAlignedPages (EFI_SIZE_TO_PAGES (sizeof *BiosTablesTest),
+ SIZE_1MB);
+ if (Pages == NULL) {
+ AsciiErrorPrint ("%a: AllocateAlignedPages() failed\n",
+ gEfiCallerBaseName);
+ //
+ // Assuming the application was launched by the boot manager as a boot
+ // loader, exiting with error will cause the boot manager to proceed with
+ // the remaining boot options. If there are no other boot options, the boot
+ // manager menu will be pulled up. Give the user a chance to read the error
+ // message.
+ //
+ WaitForExitKeyPress ();
+ return EFI_OUT_OF_RESOURCES;
+ }
+
+ //
+ // Locate both gEfiAcpi10TableGuid and gEfiAcpi20TableGuid config tables in
+ // one go.
+ //
+ Rsdp10 = NULL;
+ Rsdp20 = NULL;
+ ConfigTable = gST->ConfigurationTable;
+ ConfigTablesEnd = gST->ConfigurationTable + gST->NumberOfTableEntries;
+ while ((Rsdp10 == NULL || Rsdp20 == NULL) && ConfigTable < ConfigTablesEnd) {
+ if (CompareGuid (&ConfigTable->VendorGuid, &gEfiAcpi10TableGuid)) {
+ Rsdp10 = ConfigTable->VendorTable;
+ } else if (CompareGuid (&ConfigTable->VendorGuid, &gEfiAcpi20TableGuid)) {
+ Rsdp20 = ConfigTable->VendorTable;
+ }
+ ++ConfigTable;
+ }
+
+ AsciiPrint ("%a: BiosTablesTest=%p Rsdp10=%p Rsdp20=%p\n",
+ gEfiCallerBaseName, Pages, Rsdp10, Rsdp20);
+
+ //
+ // Store the RSD PTR address(es) first, then the signature second.
+ //
+ BiosTablesTest = Pages;
+ BiosTablesTest->Rsdp10 = (UINTN)Rsdp10;
+ BiosTablesTest->Rsdp20 = (UINTN)Rsdp20;
+
+ MemoryFence();
+
+ InverseSignature = &BiosTablesTest->InverseSignatureGuid;
+ InverseSignature->Data1 = gBiosTablesTestGuid.Data1;
+ InverseSignature->Data1 ^= MAX_UINT32;
+ InverseSignature->Data2 = gBiosTablesTestGuid.Data2;
+ InverseSignature->Data2 ^= MAX_UINT16;
+ InverseSignature->Data3 = gBiosTablesTestGuid.Data3;
+ InverseSignature->Data3 ^= MAX_UINT16;
+ for (Idx = 0; Idx < sizeof InverseSignature->Data4; ++Idx) {
+ InverseSignature->Data4[Idx] = gBiosTablesTestGuid.Data4[Idx];
+ InverseSignature->Data4[Idx] ^= MAX_UINT8;
+ }
+
+ //
+ // The wait below has dual purpose. First, it blocks the application without
+ // wasting VCPU cycles while the hypervisor is scanning guest RAM. Second,
+ // assuming the application was launched by the boot manager as a boot
+ // loader, exiting the app with success causes the boot manager to pull up
+ // the boot manager menu at once (regardless of other boot options); the wait
+ // gives the user a chance to read the info printed above.
+ //
+ WaitForExitKeyPress ();
+ return EFI_SUCCESS;
+}
diff --git a/tests/uefi-test-tools/LICENSE b/tests/uefi-test-tools/LICENSE
new file mode 100644
index 000000000000..38b78aecdb0e
--- /dev/null
+++ b/tests/uefi-test-tools/LICENSE
@@ -0,0 +1,25 @@
+All the files in this directory and subdirectories are released under the
+2-Clause BSD License (see header in each file).
+
+Copyright (C) 2019, Red Hat, Inc.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
2.19.1.3.g30247aa5d201
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 3/5] tests: introduce "uefi-test-tools" with the BiosTablesTest UEFI app
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 3/5] tests: introduce "uefi-test-tools" with the BiosTablesTest UEFI app Laszlo Ersek
@ 2019-02-04 16:57 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-02-04 16:57 UTC (permalink / raw)
To: Laszlo Ersek, qemu devel list
Cc: Michael S. Tsirkin, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Shannon Zhao
On 2/4/19 5:03 PM, Laszlo Ersek wrote:
> The "bios-tables-test" program in QEMU's test suite locates the RSD PTR
> ACPI table in guest RAM, and (chasing pointers to other ACPI tables)
> performs various sanity checks on the QEMU-generated and
> firmware-installed tables.
>
> Currently this set of test cases doesn't work with UEFI guests. The ACPI
> spec defines distinct methods for OSPM to locate the RSD PTR on
> traditional BIOS vs. UEFI platforms, and the UEFI method is more difficult
> to implement from the hypervisor side with just raw guest memory access.
>
> Add a UEFI application (to be booted in the UEFI guest) that populates a
> small, MB-aligned structure in guest RAM. The structure begins with a
> signature GUID. The hypervisor should loop over all MB-aligned pages in
> guest RAM until one matches the signature GUID at offset 0, at which point
> the hypervisor can fetch the RSDP address field(s) from the structure.
>
> QEMU's test logic currently spins on a pre-determined guest address, until
> that address assumes a magic value. The method described in this patch is
> conceptually the same ("busy loop until match is found"), except there is
> no hard-coded address. This plays a lot more nicely with UEFI guest
> firmware (we'll be able to use the normal page allocation UEFI service).
> Given the size of EFI_GUID (16 bytes -- 128 bits), mismatches should be
> astronomically unlikely. In addition, given the typical guest RAM size for
> such tests (128 MB), there are 128 locations to check in one iteration of
> the "outer" loop, which shouldn't introduce an intolerable delay after the
> guest stores the RSDP address(es), and then the GUID.
>
> The GUID that the hypervisor should search for is
>
> AB87A6B1-2034-BDA0-71BD-375007757785
>
> Expressed as a byte array:
>
> {
> 0xb1, 0xa6, 0x87, 0xab,
> 0x34, 0x20,
> 0xa0, 0xbd,
> 0x71, 0xbd, 0x37, 0x50, 0x07, 0x75, 0x77, 0x85
> }
>
> Note that in the patch, we define "gBiosTablesTestGuid" with all bits
> inverted. This is a simple method to prevent the UEFI binary, which
> incorporates "gBiosTablesTestGuid", from matching the actual GUID in guest
> RAM.
>
> The UEFI application is written against the edk2 framework, which was
> introduced earlier as a git submodule. The next patch will provide build
> scripts for maintainers.
>
> The source code follows the edk2 coding style, and is licensed under the
> 2-clause BSDL (in case someone would like to include UefiTestToolsPkg
> content in a different edk2 platform).
>
> The "UefiTestToolsPkg.dsc" platform description file resolves the used
> edk2 library classes to instances (= library implementations) such that
> the UEFI binaries inherit no platform dependencies. They are expected to
> run on any system that conforms to the UEFI-2.3.1 spec (which was released
> in 2012). The arch-specific build options are carried over from edk2's
> ArmVirtPkg and OvmfPkg platforms.
>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed here,
https://www.mail-archive.com/qemu-devel@nongnu.org/msg592330.html
So:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
I simply checked it builds smoothly, no BiosTables test run:
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>
> Notes:
> v3:
> - no change
>
> v2:
> - no change
>
> v1:
> - If that's necessary, I'd be glad to be designated as Maintainer or
> Reviewer in "MAINTAINERS" for "tests/uefi-test-tools/", I just
> couldn't figure out under what subsystem I should add the magic lines.
> "MAINTAINERS" needs a Table of Contents! :)
>
> tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec | 27 ++++
> tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc | 69 +++++++++++
> tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf | 41 ++++++
> tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h | 67 ++++++++++
> tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c | 130 ++++++++++++++++++++
> tests/uefi-test-tools/LICENSE | 25 ++++
> 6 files changed, 359 insertions(+)
>
> diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
> new file mode 100644
> index 000000000000..ed3a2fe11084
> --- /dev/null
> +++ b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
> @@ -0,0 +1,27 @@
> +## @file
> +# edk2 package declaration for the test helper UEFI applications that run in
> +# guests.
> +#
> +# Copyright (C) 2019, Red Hat, Inc.
> +#
> +# This program and the accompanying materials are licensed and made available
> +# under the terms and conditions of the BSD License that accompanies this
> +# distribution. The full text of the license may be found at
> +# <http://opensource.org/licenses/bsd-license.php>.
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +##
> +
> +[Defines]
> + DEC_SPECIFICATION = 1.27
> + PACKAGE_NAME = UefiTestToolsPkg
> + PACKAGE_GUID = 7b3f1794-0c85-4b27-a536-44dbf0b0669c
> + PACKAGE_VERSION = 0.1
> +
> +[Includes]
> + Include
> +
> +[Guids]
> + gBiosTablesTestGuid = {0x5478594e, 0xdfcb, 0x425f, {0x8e, 0x42, 0xc8, 0xaf, 0xf8, 0x8a, 0x88, 0x7a}}
> +
> diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
> new file mode 100644
> index 000000000000..c8511cd732bc
> --- /dev/null
> +++ b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
> @@ -0,0 +1,69 @@
> +## @file
> +# edk2 platform description for the test helper UEFI applications that run in
> +# guests.
> +#
> +# Copyright (C) 2019, Red Hat, Inc.
> +#
> +# This program and the accompanying materials are licensed and made available
> +# under the terms and conditions of the BSD License that accompanies this
> +# distribution. The full text of the license may be found at
> +# <http://opensource.org/licenses/bsd-license.php>.
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +##
> +
> +[Defines]
> + DSC_SPECIFICATION = 1.28
> + PLATFORM_GUID = 6750ccc1-8365-49f0-8437-948e516a9f55
> + PLATFORM_VERSION = 0.1
> + PLATFORM_NAME = UefiTestTools
> + SKUID_IDENTIFIER = DEFAULT
> + SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64
> + BUILD_TARGETS = DEBUG
> +
> +[BuildOptions.IA32]
> + GCC:*_*_IA32_CC_FLAGS = -mno-mmx -mno-sse
> +
> +[BuildOptions.X64]
> + GCC:*_*_X64_CC_FLAGS = -mno-mmx -mno-sse
> +
> +[BuildOptions.ARM.EDKII.UEFI_APPLICATION]
> + GCC:*_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000
> +
> +[BuildOptions.AARCH64.EDKII.UEFI_APPLICATION]
> + GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x1000
> +
> +[BuildOptions]
> + GCC:*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +
> +[SkuIds]
> + 0|DEFAULT
> +
> +[LibraryClasses]
> + BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
> + DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
> + DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
> + DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
> + MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
> + PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> + UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
> + UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
> + UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
> + UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
> +
> +[LibraryClasses.ARM, LibraryClasses.AARCH64]
> + BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> + NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
> + NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
> +
> +[LibraryClasses.IA32, LibraryClasses.X64]
> + BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
> +
> +[PcdsFixedAtBuild]
> + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
> + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
> +
> +[Components]
> + UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
> diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
> new file mode 100644
> index 000000000000..924d8a80d00b
> --- /dev/null
> +++ b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
> @@ -0,0 +1,41 @@
> +## @file
> +# Populate the BIOS_TABLES_TEST structure.
> +#
> +# Copyright (C) 2019, Red Hat, Inc.
> +#
> +# This program and the accompanying materials are licensed and made available
> +# under the terms and conditions of the BSD License that accompanies this
> +# distribution. The full text of the license may be found at
> +# <http://opensource.org/licenses/bsd-license.php>.
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +##
> +
> +[Defines]
> + INF_VERSION = 1.27
> + BASE_NAME = BiosTablesTest
> + UEFI_SPECIFICATION_VERSION = 2.31
> + FILE_GUID = 87f00433-3b7c-45c3-ae78-a56495bd4e62
> + MODULE_TYPE = UEFI_APPLICATION
> + ENTRY_POINT = BiosTablesTestMain
> +
> +[Sources]
> + BiosTablesTest.c
> +
> +[LibraryClasses]
> + BaseLib
> + BaseMemoryLib
> + MemoryAllocationLib
> + UefiApplicationEntryPoint
> + UefiBootServicesTableLib
> + UefiLib
> +
> +[Guids]
> + gBiosTablesTestGuid
> + gEfiAcpi10TableGuid
> + gEfiAcpi20TableGuid
> +
> +[Packages]
> + MdePkg/MdePkg.dec
> + UefiTestToolsPkg/UefiTestToolsPkg.dec
> diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
> new file mode 100644
> index 000000000000..0b72c61254af
> --- /dev/null
> +++ b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
> @@ -0,0 +1,67 @@
> +/** @file
> + Expose the address(es) of the ACPI RSD PTR table(s) in a MB-aligned structure
> + to the hypervisor.
> +
> + The hypervisor locates the MB-aligned structure based on the signature GUID
> + that is at offset 0 in the structure. Once the RSD PTR address(es) are
> + retrieved, the hypervisor may perform various ACPI checks.
> +
> + This feature is a development aid, for supporting ACPI table unit tests in
> + hypervisors. Do not enable in production builds.
> +
> + Copyright (C) 2019, Red Hat, Inc.
> +
> + This program and the accompanying materials are licensed and made available
> + under the terms and conditions of the BSD License that accompanies this
> + distribution. The full text of the license may be found at
> + <http://opensource.org/licenses/bsd-license.php>.
> +
> + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> + WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +**/
> +
> +#ifndef __BIOS_TABLES_TEST_H__
> +#define __BIOS_TABLES_TEST_H__
> +
> +#include <Uefi/UefiBaseType.h>
> +
> +#define BIOS_TABLES_TEST_GUID \
> + { \
> + 0x5478594e, \
> + 0xdfcb, \
> + 0x425f, \
> + { 0x8e, 0x42, 0xc8, 0xaf, 0xf8, 0x8a, 0x88, 0x7a } \
> + }
> +
> +extern EFI_GUID gBiosTablesTestGuid;
> +
> +//
> +// The following structure must be allocated in Boot Services Data type memory,
> +// aligned at a 1MB boundary.
> +//
> +#pragma pack (1)
> +typedef struct {
> + //
> + // The signature GUID is written to the MB-aligned structure from
> + // gBiosTablesTestGuid, but with all bits inverted. That's the actual GUID
> + // value that the hypervisor should look for at each MB boundary, looping
> + // over all guest RAM pages with that alignment, until a match is found. The
> + // bit-flipping occurs in order not to store the actual GUID in any UEFI
> + // executable, which might confuse guest memory analysis. Note that EFI_GUID
> + // has little endian representation.
> + //
> + EFI_GUID InverseSignatureGuid;
> + //
> + // The Rsdp10 and Rsdp20 fields may be read when the signature GUID matches.
> + // Rsdp10 is the guest-physical address of the ACPI 1.0 specification RSD PTR
> + // table, in 8-byte little endian representation. Rsdp20 is the same, for the
> + // ACPI 2.0 or later specification RSD PTR table. Each of these fields may be
> + // zero (independently of the other) if the UEFI System Table does not
> + // provide the corresponding UEFI Configuration Table.
> + //
> + EFI_PHYSICAL_ADDRESS Rsdp10;
> + EFI_PHYSICAL_ADDRESS Rsdp20;
> +} BIOS_TABLES_TEST;
> +#pragma pack ()
> +
> +#endif // __BIOS_TABLES_TEST_H__
> diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
> new file mode 100644
> index 000000000000..b208e17fb00f
> --- /dev/null
> +++ b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
> @@ -0,0 +1,130 @@
> +/** @file
> + Populate the BIOS_TABLES_TEST structure.
> +
> + Copyright (C) 2019, Red Hat, Inc.
> +
> + This program and the accompanying materials are licensed and made available
> + under the terms and conditions of the BSD License that accompanies this
> + distribution. The full text of the license may be found at
> + <http://opensource.org/licenses/bsd-license.php>.
> +
> + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> + WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +**/
> +
> +#include <Guid/Acpi.h>
> +#include <Guid/BiosTablesTest.h>
> +#include <Library/BaseLib.h>
> +#include <Library/BaseMemoryLib.h>
> +#include <Library/MemoryAllocationLib.h>
> +#include <Library/UefiBootServicesTableLib.h>
> +#include <Library/UefiLib.h>
> +
> +/**
> + Wait for a keypress with a message that the application is about to exit.
> +**/
> +STATIC
> +VOID
> +WaitForExitKeyPress (
> + VOID
> + )
> +{
> + EFI_STATUS Status;
> + UINTN Idx;
> + EFI_INPUT_KEY Key;
> +
> + if (gST->ConIn == NULL) {
> + return;
> + }
> + AsciiPrint ("%a: press any key to exit\n", gEfiCallerBaseName);
> + Status = gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &Idx);
> + if (EFI_ERROR (Status)) {
> + return;
> + }
> + gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
> +}
> +
> +EFI_STATUS
> +EFIAPI
> +BiosTablesTestMain (
> + IN EFI_HANDLE ImageHandle,
> + IN EFI_SYSTEM_TABLE *SystemTable
> + )
> +{
> + VOID *Pages;
> + volatile BIOS_TABLES_TEST *BiosTablesTest;
> + CONST VOID *Rsdp10;
> + CONST VOID *Rsdp20;
> + CONST EFI_CONFIGURATION_TABLE *ConfigTable;
> + CONST EFI_CONFIGURATION_TABLE *ConfigTablesEnd;
> + volatile EFI_GUID *InverseSignature;
> + UINTN Idx;
> +
> + Pages = AllocateAlignedPages (EFI_SIZE_TO_PAGES (sizeof *BiosTablesTest),
> + SIZE_1MB);
> + if (Pages == NULL) {
> + AsciiErrorPrint ("%a: AllocateAlignedPages() failed\n",
> + gEfiCallerBaseName);
> + //
> + // Assuming the application was launched by the boot manager as a boot
> + // loader, exiting with error will cause the boot manager to proceed with
> + // the remaining boot options. If there are no other boot options, the boot
> + // manager menu will be pulled up. Give the user a chance to read the error
> + // message.
> + //
> + WaitForExitKeyPress ();
> + return EFI_OUT_OF_RESOURCES;
> + }
> +
> + //
> + // Locate both gEfiAcpi10TableGuid and gEfiAcpi20TableGuid config tables in
> + // one go.
> + //
> + Rsdp10 = NULL;
> + Rsdp20 = NULL;
> + ConfigTable = gST->ConfigurationTable;
> + ConfigTablesEnd = gST->ConfigurationTable + gST->NumberOfTableEntries;
> + while ((Rsdp10 == NULL || Rsdp20 == NULL) && ConfigTable < ConfigTablesEnd) {
> + if (CompareGuid (&ConfigTable->VendorGuid, &gEfiAcpi10TableGuid)) {
> + Rsdp10 = ConfigTable->VendorTable;
> + } else if (CompareGuid (&ConfigTable->VendorGuid, &gEfiAcpi20TableGuid)) {
> + Rsdp20 = ConfigTable->VendorTable;
> + }
> + ++ConfigTable;
> + }
> +
> + AsciiPrint ("%a: BiosTablesTest=%p Rsdp10=%p Rsdp20=%p\n",
> + gEfiCallerBaseName, Pages, Rsdp10, Rsdp20);
> +
> + //
> + // Store the RSD PTR address(es) first, then the signature second.
> + //
> + BiosTablesTest = Pages;
> + BiosTablesTest->Rsdp10 = (UINTN)Rsdp10;
> + BiosTablesTest->Rsdp20 = (UINTN)Rsdp20;
> +
> + MemoryFence();
> +
> + InverseSignature = &BiosTablesTest->InverseSignatureGuid;
> + InverseSignature->Data1 = gBiosTablesTestGuid.Data1;
> + InverseSignature->Data1 ^= MAX_UINT32;
> + InverseSignature->Data2 = gBiosTablesTestGuid.Data2;
> + InverseSignature->Data2 ^= MAX_UINT16;
> + InverseSignature->Data3 = gBiosTablesTestGuid.Data3;
> + InverseSignature->Data3 ^= MAX_UINT16;
> + for (Idx = 0; Idx < sizeof InverseSignature->Data4; ++Idx) {
> + InverseSignature->Data4[Idx] = gBiosTablesTestGuid.Data4[Idx];
> + InverseSignature->Data4[Idx] ^= MAX_UINT8;
> + }
> +
> + //
> + // The wait below has dual purpose. First, it blocks the application without
> + // wasting VCPU cycles while the hypervisor is scanning guest RAM. Second,
> + // assuming the application was launched by the boot manager as a boot
> + // loader, exiting the app with success causes the boot manager to pull up
> + // the boot manager menu at once (regardless of other boot options); the wait
> + // gives the user a chance to read the info printed above.
> + //
> + WaitForExitKeyPress ();
> + return EFI_SUCCESS;
> +}
> diff --git a/tests/uefi-test-tools/LICENSE b/tests/uefi-test-tools/LICENSE
> new file mode 100644
> index 000000000000..38b78aecdb0e
> --- /dev/null
> +++ b/tests/uefi-test-tools/LICENSE
> @@ -0,0 +1,25 @@
> +All the files in this directory and subdirectories are released under the
> +2-Clause BSD License (see header in each file).
> +
> +Copyright (C) 2019, Red Hat, Inc.
> +
> +Redistribution and use in source and binary forms, with or without
> +modification, are permitted provided that the following conditions are met:
> +
> +1. Redistributions of source code must retain the above copyright notice, this
> + list of conditions and the following disclaimer.
> +
> +2. Redistributions in binary form must reproduce the above copyright notice,
> + this list of conditions and the following disclaimer in the documentation
> + and/or other materials provided with the distribution.
> +
> +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
> +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
> +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
> +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
> +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
> +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts
2019-02-04 16:03 [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule Laszlo Ersek
` (2 preceding siblings ...)
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 3/5] tests: introduce "uefi-test-tools" with the BiosTablesTest UEFI app Laszlo Ersek
@ 2019-02-04 16:03 ` Laszlo Ersek
2019-02-04 17:00 ` Philippe Mathieu-Daudé
2019-02-04 17:47 ` Michael S. Tsirkin
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 5/5] tests/data: introduce "uefi-boot-images" with the "bios-tables-test" ISOs Laszlo Ersek
` (2 subsequent siblings)
6 siblings, 2 replies; 23+ messages in thread
From: Laszlo Ersek @ 2019-02-04 16:03 UTC (permalink / raw)
To: qemu devel list
Cc: Michael S. Tsirkin, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Philippe Mathieu-Daudé, Shannon Zhao
Introduce the following build scripts under "tests/uefi-test-tools":
* "build.sh" builds a single module (a UEFI application) from
UefiTestToolsPkg, for a single QEMU emulation target.
"build.sh" relies on cross-compilers when the emulation target and the
build host architecture don't match. The cross-compiler prefix is
computed according to a fixed, Linux-specific pattern. No attempt is
made to copy or reimplement the GNU Make magic from "qemu/roms/Makefile"
for cross-compiler prefix determination. The reason is that the build
host OSes that are officially supported by edk2, and those that are
supported by QEMU, intersect only in Linux. (Note that the UNIXGCC
toolchain is being removed from edk2,
<https://bugzilla.tianocore.org/show_bug.cgi?id=1377>.)
* "Makefile" currently builds the "UefiTestToolsPkg/BiosTablesTest"
application, for arm, aarch64, i386, and x86_64, with the help of
"build.sh".
"Makefile" turns each resultant UEFI executable into a UEFI-bootable,
qcow2-compressed ISO image. The ISO images are output as
"tests/data/uefi-boot-images/bios-tables-test.<TARGET>.iso.qcow2".
Each ISO image should be passed to QEMU as follows:
-drive id=boot-cd,if=none,readonly,format=qcow2,file=$ISO \
-device virtio-scsi-pci,id=scsi0 \
-device scsi-cd,drive=boot-cd,bus=scsi0.0,bootindex=0 \
"Makefile" assumes that "mkdosfs", "mtools", and "genisoimage" are
present.
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Notes:
v3:
- explicitly mark the "./build.sh" recipe as recursive, with the "+"
indicator; document it in a comment [Phil]
- pick up R-b, T-b [Phil]
v2:
- add the .NOTPARALLEL target [Phil, help-make, edk2-devel]
tests/uefi-test-tools/Makefile | 106 ++++++++++++++
tests/uefi-test-tools/.gitignore | 3 +
tests/uefi-test-tools/build.sh | 145 ++++++++++++++++++++
3 files changed, 254 insertions(+)
diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
new file mode 100644
index 000000000000..1d78bc14d51a
--- /dev/null
+++ b/tests/uefi-test-tools/Makefile
@@ -0,0 +1,106 @@
+# Makefile for the test helper UEFI applications that run in guests.
+#
+# Copyright (C) 2019, Red Hat, Inc.
+#
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License that accompanies this
+# distribution. The full text of the license may be found at
+# <http://opensource.org/licenses/bsd-license.php>.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+edk2_dir := ../../roms/edk2
+images_dir := ../data/uefi-boot-images
+emulation_targets := arm aarch64 i386 x86_64
+uefi_binaries := bios-tables-test
+intermediate_suffixes := .efi .fat .iso.raw
+
+images: $(foreach binary,$(uefi_binaries), \
+ $(foreach target,$(emulation_targets), \
+ $(images_dir)/$(binary).$(target).iso.qcow2))
+
+# Preserve all intermediate targets if the build succeeds.
+# - Intermediate targets help with development & debugging.
+# - Preserving intermediate targets also keeps spurious changes out of the
+# final build products, in case the user re-runs "make" without any changes
+# to the UEFI source code. Normally, the intermediate files would have been
+# removed by the last "make" invocation, hence the re-run would rebuild them
+# from the unchanged UEFI sources. Unfortunately, the "mkdosfs" and
+# "genisoimage" utilities embed timestamp-based information in their outputs,
+# which causes git to report differences for the tracked qcow2 ISO images.
+.SECONDARY: $(foreach binary,$(uefi_binaries), \
+ $(foreach target,$(emulation_targets), \
+ $(foreach suffix,$(intermediate_suffixes), \
+ Build/$(binary).$(target)$(suffix))))
+
+# In the pattern rules below, the stem (%, $*) stands for
+# "$(binary).$(target)".
+
+# Convert the raw ISO image to a qcow2 one, enabling compression, and using a
+# small cluster size. This allows for small binary files under git control,
+# hence for small binary patches.
+$(images_dir)/%.iso.qcow2: Build/%.iso.raw
+ mkdir -p -- $(images_dir)
+ $${QTEST_QEMU_IMG:-qemu-img} convert -f raw -O qcow2 -c \
+ -o cluster_size=512 -- $< $@
+
+# Embed the "UEFI system partition" into an ISO9660 file system as an ElTorito
+# boot image.
+Build/%.iso.raw: Build/%.fat
+ genisoimage -input-charset ASCII -efi-boot $(notdir $<) -no-emul-boot \
+ -quiet -o $@ -- $<
+
+# Define chained macros in order to map QEMU system emulation targets to
+# *short* UEFI architecture identifiers. Periods are allowed in, and ultimately
+# stripped from, the argument.
+map_arm_to_uefi = $(subst arm,ARM,$(1))
+map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1)))
+map_i386_to_uefi = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1)))
+map_x86_64_to_uefi = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1)))
+map_to_uefi = $(subst .,,$(call map_x86_64_to_uefi,$(1)))
+
+# Format a "UEFI system partition", using the UEFI binary as the default boot
+# loader. Add 10% size for filesystem metadata, round up to the next KB, and
+# make sure the size is large enough for a FAT filesystem. Name the filesystem
+# after the UEFI binary. (Excess characters are automatically dropped from the
+# filesystem label.)
+Build/%.fat: Build/%.efi
+ rm -f -- $@
+ uefi_bin_b=$$(stat --format=%s -- $<) && \
+ uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \
+ uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \
+ mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb
+ MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI
+ MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT
+ MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \
+ ::EFI/BOOT/BOOT$(call map_to_uefi,$(suffix $*)).EFI
+
+# In the pattern rules below, the stem (%, $*) stands for "$(target)" only. The
+# association between the UEFI binary (such as "bios-tables-test") and the
+# component name from the edk2 platform DSC file (such as "BiosTablesTest") is
+# explicit in each rule.
+
+# "build.sh" invokes the "build" utility of edk2 BaseTools. In any given edk2
+# workspace, at most one "build" instance may be operating at a time. Therefore
+# we must serialize the rebuilding of targets in this Makefile.
+.NOTPARALLEL:
+
+# In turn, the "build" utility of edk2 BaseTools invokes another "make".
+# Although the outer "make" process advertizes its job server to all child
+# processes via MAKEFLAGS in the environment, the outer "make" closes the job
+# server file descriptors (exposed in MAKEFLAGS) before executing a recipe --
+# unless the recipe is recognized as a recursive "make" recipe. Recipes that
+# call $(MAKE) are classified automatically as recursive; for "build.sh" below,
+# we must mark the recipe manually as recursive, by using the "+" indicator.
+# This way, when the inner "make" starts a parallel build of the target edk2
+# module, it can communicate with the outer "make"'s job server.
+Build/bios-tables-test.%.efi: build-edk2-tools
+ +./build.sh $(edk2_dir) BiosTablesTest $* $@
+
+build-edk2-tools:
+ $(MAKE) -C $(edk2_dir)/BaseTools
+
+clean:
+ rm -rf Build Conf log
+ $(MAKE) -C $(edk2_dir)/BaseTools clean
diff --git a/tests/uefi-test-tools/.gitignore b/tests/uefi-test-tools/.gitignore
new file mode 100644
index 000000000000..9f246701dea1
--- /dev/null
+++ b/tests/uefi-test-tools/.gitignore
@@ -0,0 +1,3 @@
+Build
+Conf
+log
diff --git a/tests/uefi-test-tools/build.sh b/tests/uefi-test-tools/build.sh
new file mode 100755
index 000000000000..155cb75c4ddb
--- /dev/null
+++ b/tests/uefi-test-tools/build.sh
@@ -0,0 +1,145 @@
+#!/bin/bash
+
+# Build script that determines the edk2 toolchain to use, invokes the edk2
+# "build" utility, and copies the built UEFI binary to the requested location.
+#
+# Copyright (C) 2019, Red Hat, Inc.
+#
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License that accompanies this
+# distribution. The full text of the license may be found at
+# <http://opensource.org/licenses/bsd-license.php>.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+set -e -u -C
+
+# Save the command line arguments. We need to reset $# to 0 before sourcing
+# "edksetup.sh", as it will inherit $@.
+program_name=$(basename -- "$0")
+edk2_dir=$1
+dsc_component=$2
+emulation_target=$3
+uefi_binary=$4
+shift 4
+
+# Set up the environment for edk2 building.
+export PACKAGES_PATH=$(realpath -- "$edk2_dir")
+export WORKSPACE=$PWD
+mkdir -p Conf
+
+# Source "edksetup.sh" carefully.
+set +e +u +C
+source "$PACKAGES_PATH/edksetup.sh"
+ret=$?
+set -e -u -C
+if [ $ret -ne 0 ]; then
+ exit $ret
+fi
+
+# Map the QEMU system emulation target to the following types of architecture
+# identifiers:
+# - edk2,
+# - gcc cross-compilation.
+# Cover only those targets that are supported by the UEFI spec and edk2.
+case "$emulation_target" in
+ (arm)
+ edk2_arch=ARM
+ gcc_arch=arm
+ ;;
+ (aarch64)
+ edk2_arch=AARCH64
+ gcc_arch=aarch64
+ ;;
+ (i386)
+ edk2_arch=IA32
+ gcc_arch=i686
+ ;;
+ (x86_64)
+ edk2_arch=X64
+ gcc_arch=x86_64
+ ;;
+ (*)
+ printf '%s: unknown/unsupported QEMU system emulation target "%s"\n' \
+ "$program_name" "$emulation_target" >&2
+ exit 1
+ ;;
+esac
+
+# Check if cross-compilation is needed.
+host_arch=$(uname -m)
+if [ "$gcc_arch" == "$host_arch" ] ||
+ ( [ "$gcc_arch" == i686 ] && [ "$host_arch" == x86_64 ] ); then
+ cross_prefix=
+else
+ cross_prefix=${gcc_arch}-linux-gnu-
+fi
+
+# Expose cross_prefix (which is possibly empty) to the edk2 tools. While at it,
+# determine the suitable edk2 toolchain as well.
+# - For ARM and AARCH64, edk2 only offers the GCC5 toolchain tag, which covers
+# the gcc-5+ releases.
+# - For IA32 and X64, edk2 offers the GCC44 through GCC49 toolchain tags, in
+# addition to GCC5. Unfortunately, the mapping between the toolchain tags and
+# the actual gcc releases isn't entirely trivial. Run "git-blame" on
+# "OvmfPkg/build.sh" in edk2 for more information.
+# And, because the above is too simple, we have to assign cross_prefix to an
+# edk2 build variable that is specific to both the toolchain tag and the target
+# architecture.
+case "$edk2_arch" in
+ (ARM)
+ edk2_toolchain=GCC5
+ export GCC5_ARM_PREFIX=$cross_prefix
+ ;;
+ (AARCH64)
+ edk2_toolchain=GCC5
+ export GCC5_AARCH64_PREFIX=$cross_prefix
+ ;;
+ (IA32|X64)
+ gcc_version=$("${cross_prefix}gcc" -v 2>&1 | tail -1 | awk '{print $3}')
+ case "$gcc_version" in
+ ([1-3].*|4.[0-3].*)
+ printf '%s: unsupported gcc version "%s"\n' \
+ "$program_name" "$gcc_version" >&2
+ exit 1
+ ;;
+ (4.4.*)
+ edk2_toolchain=GCC44
+ ;;
+ (4.5.*)
+ edk2_toolchain=GCC45
+ ;;
+ (4.6.*)
+ edk2_toolchain=GCC46
+ ;;
+ (4.7.*)
+ edk2_toolchain=GCC47
+ ;;
+ (4.8.*)
+ edk2_toolchain=GCC48
+ ;;
+ (4.9.*|6.[0-2].*)
+ edk2_toolchain=GCC49
+ ;;
+ (*)
+ edk2_toolchain=GCC5
+ ;;
+ esac
+ eval "export ${edk2_toolchain}_BIN=\$cross_prefix"
+ ;;
+esac
+
+# Build the UEFI binary
+mkdir -p log
+build \
+ --arch="$edk2_arch" \
+ --buildtarget=DEBUG \
+ --platform=UefiTestToolsPkg/UefiTestToolsPkg.dsc \
+ --tagname="$edk2_toolchain" \
+ --module="UefiTestToolsPkg/$dsc_component/$dsc_component.inf" \
+ --log="log/$dsc_component.$edk2_arch.log" \
+ --report-file="log/$dsc_component.$edk2_arch.report"
+cp -a -- \
+ "Build/UefiTestTools/DEBUG_${edk2_toolchain}/$edk2_arch/$dsc_component.efi" \
+ "$uefi_binary"
--
2.19.1.3.g30247aa5d201
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts Laszlo Ersek
@ 2019-02-04 17:00 ` Philippe Mathieu-Daudé
2019-02-04 17:47 ` Michael S. Tsirkin
1 sibling, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-02-04 17:00 UTC (permalink / raw)
To: Laszlo Ersek, qemu devel list
Cc: Michael S. Tsirkin, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Shannon Zhao
On 2/4/19 5:03 PM, Laszlo Ersek wrote:
> Introduce the following build scripts under "tests/uefi-test-tools":
>
> * "build.sh" builds a single module (a UEFI application) from
> UefiTestToolsPkg, for a single QEMU emulation target.
>
> "build.sh" relies on cross-compilers when the emulation target and the
> build host architecture don't match. The cross-compiler prefix is
> computed according to a fixed, Linux-specific pattern. No attempt is
> made to copy or reimplement the GNU Make magic from "qemu/roms/Makefile"
> for cross-compiler prefix determination. The reason is that the build
> host OSes that are officially supported by edk2, and those that are
> supported by QEMU, intersect only in Linux. (Note that the UNIXGCC
> toolchain is being removed from edk2,
> <https://bugzilla.tianocore.org/show_bug.cgi?id=1377>.)
>
> * "Makefile" currently builds the "UefiTestToolsPkg/BiosTablesTest"
> application, for arm, aarch64, i386, and x86_64, with the help of
> "build.sh".
>
> "Makefile" turns each resultant UEFI executable into a UEFI-bootable,
> qcow2-compressed ISO image. The ISO images are output as
> "tests/data/uefi-boot-images/bios-tables-test.<TARGET>.iso.qcow2".
>
> Each ISO image should be passed to QEMU as follows:
>
> -drive id=boot-cd,if=none,readonly,format=qcow2,file=$ISO \
> -device virtio-scsi-pci,id=scsi0 \
> -device scsi-cd,drive=boot-cd,bus=scsi0.0,bootindex=0 \
>
> "Makefile" assumes that "mkdosfs", "mtools", and "genisoimage" are
> present.
>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>
> Notes:
> v3:
> - explicitly mark the "./build.sh" recipe as recursive, with the "+"
> indicator; document it in a comment [Phil]
> - pick up R-b, T-b [Phil]
>
> v2:
> - add the .NOTPARALLEL target [Phil, help-make, edk2-devel]
>
> tests/uefi-test-tools/Makefile | 106 ++++++++++++++
> tests/uefi-test-tools/.gitignore | 3 +
> tests/uefi-test-tools/build.sh | 145 ++++++++++++++++++++
> 3 files changed, 254 insertions(+)
>
> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
> new file mode 100644
> index 000000000000..1d78bc14d51a
> --- /dev/null
> +++ b/tests/uefi-test-tools/Makefile
> @@ -0,0 +1,106 @@
> +# Makefile for the test helper UEFI applications that run in guests.
> +#
> +# Copyright (C) 2019, Red Hat, Inc.
> +#
> +# This program and the accompanying materials are licensed and made available
> +# under the terms and conditions of the BSD License that accompanies this
> +# distribution. The full text of the license may be found at
> +# <http://opensource.org/licenses/bsd-license.php>.
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +
> +edk2_dir := ../../roms/edk2
> +images_dir := ../data/uefi-boot-images
> +emulation_targets := arm aarch64 i386 x86_64
> +uefi_binaries := bios-tables-test
> +intermediate_suffixes := .efi .fat .iso.raw
> +
> +images: $(foreach binary,$(uefi_binaries), \
> + $(foreach target,$(emulation_targets), \
> + $(images_dir)/$(binary).$(target).iso.qcow2))
> +
> +# Preserve all intermediate targets if the build succeeds.
> +# - Intermediate targets help with development & debugging.
> +# - Preserving intermediate targets also keeps spurious changes out of the
> +# final build products, in case the user re-runs "make" without any changes
> +# to the UEFI source code. Normally, the intermediate files would have been
> +# removed by the last "make" invocation, hence the re-run would rebuild them
> +# from the unchanged UEFI sources. Unfortunately, the "mkdosfs" and
> +# "genisoimage" utilities embed timestamp-based information in their outputs,
> +# which causes git to report differences for the tracked qcow2 ISO images.
> +.SECONDARY: $(foreach binary,$(uefi_binaries), \
> + $(foreach target,$(emulation_targets), \
> + $(foreach suffix,$(intermediate_suffixes), \
> + Build/$(binary).$(target)$(suffix))))
> +
> +# In the pattern rules below, the stem (%, $*) stands for
> +# "$(binary).$(target)".
> +
> +# Convert the raw ISO image to a qcow2 one, enabling compression, and using a
> +# small cluster size. This allows for small binary files under git control,
> +# hence for small binary patches.
> +$(images_dir)/%.iso.qcow2: Build/%.iso.raw
> + mkdir -p -- $(images_dir)
> + $${QTEST_QEMU_IMG:-qemu-img} convert -f raw -O qcow2 -c \
> + -o cluster_size=512 -- $< $@
> +
> +# Embed the "UEFI system partition" into an ISO9660 file system as an ElTorito
> +# boot image.
> +Build/%.iso.raw: Build/%.fat
> + genisoimage -input-charset ASCII -efi-boot $(notdir $<) -no-emul-boot \
> + -quiet -o $@ -- $<
> +
> +# Define chained macros in order to map QEMU system emulation targets to
> +# *short* UEFI architecture identifiers. Periods are allowed in, and ultimately
> +# stripped from, the argument.
> +map_arm_to_uefi = $(subst arm,ARM,$(1))
> +map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1)))
> +map_i386_to_uefi = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1)))
> +map_x86_64_to_uefi = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1)))
> +map_to_uefi = $(subst .,,$(call map_x86_64_to_uefi,$(1)))
> +
> +# Format a "UEFI system partition", using the UEFI binary as the default boot
> +# loader. Add 10% size for filesystem metadata, round up to the next KB, and
> +# make sure the size is large enough for a FAT filesystem. Name the filesystem
> +# after the UEFI binary. (Excess characters are automatically dropped from the
> +# filesystem label.)
> +Build/%.fat: Build/%.efi
> + rm -f -- $@
> + uefi_bin_b=$$(stat --format=%s -- $<) && \
> + uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \
> + uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \
> + mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb
> + MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI
> + MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT
> + MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \
> + ::EFI/BOOT/BOOT$(call map_to_uefi,$(suffix $*)).EFI
> +
> +# In the pattern rules below, the stem (%, $*) stands for "$(target)" only. The
> +# association between the UEFI binary (such as "bios-tables-test") and the
> +# component name from the edk2 platform DSC file (such as "BiosTablesTest") is
> +# explicit in each rule.
> +
> +# "build.sh" invokes the "build" utility of edk2 BaseTools. In any given edk2
> +# workspace, at most one "build" instance may be operating at a time. Therefore
> +# we must serialize the rebuilding of targets in this Makefile.
> +.NOTPARALLEL:
> +
> +# In turn, the "build" utility of edk2 BaseTools invokes another "make".
> +# Although the outer "make" process advertizes its job server to all child
> +# processes via MAKEFLAGS in the environment, the outer "make" closes the job
> +# server file descriptors (exposed in MAKEFLAGS) before executing a recipe --
> +# unless the recipe is recognized as a recursive "make" recipe. Recipes that
> +# call $(MAKE) are classified automatically as recursive; for "build.sh" below,
> +# we must mark the recipe manually as recursive, by using the "+" indicator.
> +# This way, when the inner "make" starts a parallel build of the target edk2
> +# module, it can communicate with the outer "make"'s job server.
Clearer than the make 'POSIX jobserver interaction' man page :)
> +Build/bios-tables-test.%.efi: build-edk2-tools
> + +./build.sh $(edk2_dir) BiosTablesTest $* $@
> +
> +build-edk2-tools:
> + $(MAKE) -C $(edk2_dir)/BaseTools
> +
> +clean:
> + rm -rf Build Conf log
> + $(MAKE) -C $(edk2_dir)/BaseTools clean
> diff --git a/tests/uefi-test-tools/.gitignore b/tests/uefi-test-tools/.gitignore
> new file mode 100644
> index 000000000000..9f246701dea1
> --- /dev/null
> +++ b/tests/uefi-test-tools/.gitignore
> @@ -0,0 +1,3 @@
> +Build
> +Conf
> +log
> diff --git a/tests/uefi-test-tools/build.sh b/tests/uefi-test-tools/build.sh
> new file mode 100755
> index 000000000000..155cb75c4ddb
> --- /dev/null
> +++ b/tests/uefi-test-tools/build.sh
> @@ -0,0 +1,145 @@
> +#!/bin/bash
> +
> +# Build script that determines the edk2 toolchain to use, invokes the edk2
> +# "build" utility, and copies the built UEFI binary to the requested location.
> +#
> +# Copyright (C) 2019, Red Hat, Inc.
> +#
> +# This program and the accompanying materials are licensed and made available
> +# under the terms and conditions of the BSD License that accompanies this
> +# distribution. The full text of the license may be found at
> +# <http://opensource.org/licenses/bsd-license.php>.
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +
> +set -e -u -C
> +
> +# Save the command line arguments. We need to reset $# to 0 before sourcing
> +# "edksetup.sh", as it will inherit $@.
> +program_name=$(basename -- "$0")
> +edk2_dir=$1
> +dsc_component=$2
> +emulation_target=$3
> +uefi_binary=$4
> +shift 4
> +
> +# Set up the environment for edk2 building.
> +export PACKAGES_PATH=$(realpath -- "$edk2_dir")
> +export WORKSPACE=$PWD
> +mkdir -p Conf
> +
> +# Source "edksetup.sh" carefully.
> +set +e +u +C
> +source "$PACKAGES_PATH/edksetup.sh"
> +ret=$?
> +set -e -u -C
> +if [ $ret -ne 0 ]; then
> + exit $ret
> +fi
> +
> +# Map the QEMU system emulation target to the following types of architecture
> +# identifiers:
> +# - edk2,
> +# - gcc cross-compilation.
> +# Cover only those targets that are supported by the UEFI spec and edk2.
> +case "$emulation_target" in
> + (arm)
> + edk2_arch=ARM
> + gcc_arch=arm
> + ;;
> + (aarch64)
> + edk2_arch=AARCH64
> + gcc_arch=aarch64
> + ;;
> + (i386)
> + edk2_arch=IA32
> + gcc_arch=i686
> + ;;
> + (x86_64)
> + edk2_arch=X64
> + gcc_arch=x86_64
> + ;;
> + (*)
> + printf '%s: unknown/unsupported QEMU system emulation target "%s"\n' \
> + "$program_name" "$emulation_target" >&2
> + exit 1
> + ;;
> +esac
> +
> +# Check if cross-compilation is needed.
> +host_arch=$(uname -m)
> +if [ "$gcc_arch" == "$host_arch" ] ||
> + ( [ "$gcc_arch" == i686 ] && [ "$host_arch" == x86_64 ] ); then
> + cross_prefix=
> +else
> + cross_prefix=${gcc_arch}-linux-gnu-
> +fi
> +
> +# Expose cross_prefix (which is possibly empty) to the edk2 tools. While at it,
> +# determine the suitable edk2 toolchain as well.
> +# - For ARM and AARCH64, edk2 only offers the GCC5 toolchain tag, which covers
> +# the gcc-5+ releases.
> +# - For IA32 and X64, edk2 offers the GCC44 through GCC49 toolchain tags, in
> +# addition to GCC5. Unfortunately, the mapping between the toolchain tags and
> +# the actual gcc releases isn't entirely trivial. Run "git-blame" on
> +# "OvmfPkg/build.sh" in edk2 for more information.
> +# And, because the above is too simple, we have to assign cross_prefix to an
> +# edk2 build variable that is specific to both the toolchain tag and the target
> +# architecture.
> +case "$edk2_arch" in
> + (ARM)
> + edk2_toolchain=GCC5
> + export GCC5_ARM_PREFIX=$cross_prefix
> + ;;
> + (AARCH64)
> + edk2_toolchain=GCC5
> + export GCC5_AARCH64_PREFIX=$cross_prefix
> + ;;
> + (IA32|X64)
> + gcc_version=$("${cross_prefix}gcc" -v 2>&1 | tail -1 | awk '{print $3}')
> + case "$gcc_version" in
> + ([1-3].*|4.[0-3].*)
> + printf '%s: unsupported gcc version "%s"\n' \
> + "$program_name" "$gcc_version" >&2
> + exit 1
> + ;;
> + (4.4.*)
> + edk2_toolchain=GCC44
> + ;;
> + (4.5.*)
> + edk2_toolchain=GCC45
> + ;;
> + (4.6.*)
> + edk2_toolchain=GCC46
> + ;;
> + (4.7.*)
> + edk2_toolchain=GCC47
> + ;;
> + (4.8.*)
> + edk2_toolchain=GCC48
> + ;;
> + (4.9.*|6.[0-2].*)
> + edk2_toolchain=GCC49
> + ;;
> + (*)
> + edk2_toolchain=GCC5
> + ;;
> + esac
> + eval "export ${edk2_toolchain}_BIN=\$cross_prefix"
> + ;;
> +esac
> +
> +# Build the UEFI binary
> +mkdir -p log
> +build \
> + --arch="$edk2_arch" \
> + --buildtarget=DEBUG \
> + --platform=UefiTestToolsPkg/UefiTestToolsPkg.dsc \
> + --tagname="$edk2_toolchain" \
> + --module="UefiTestToolsPkg/$dsc_component/$dsc_component.inf" \
> + --log="log/$dsc_component.$edk2_arch.log" \
> + --report-file="log/$dsc_component.$edk2_arch.report"
> +cp -a -- \
> + "Build/UefiTestTools/DEBUG_${edk2_toolchain}/$edk2_arch/$dsc_component.efi" \
> + "$uefi_binary"
>
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts Laszlo Ersek
2019-02-04 17:00 ` Philippe Mathieu-Daudé
@ 2019-02-04 17:47 ` Michael S. Tsirkin
2019-02-04 18:41 ` Laszlo Ersek
1 sibling, 1 reply; 23+ messages in thread
From: Michael S. Tsirkin @ 2019-02-04 17:47 UTC (permalink / raw)
To: Laszlo Ersek
Cc: qemu devel list, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Philippe Mathieu-Daudé, Shannon Zhao
On Mon, Feb 04, 2019 at 05:03:24PM +0100, Laszlo Ersek wrote:
> Introduce the following build scripts under "tests/uefi-test-tools":
>
> * "build.sh" builds a single module (a UEFI application) from
> UefiTestToolsPkg, for a single QEMU emulation target.
>
> "build.sh" relies on cross-compilers when the emulation target and the
> build host architecture don't match. The cross-compiler prefix is
> computed according to a fixed, Linux-specific pattern. No attempt is
> made to copy or reimplement the GNU Make magic from "qemu/roms/Makefile"
> for cross-compiler prefix determination. The reason is that the build
> host OSes that are officially supported by edk2, and those that are
> supported by QEMU, intersect only in Linux. (Note that the UNIXGCC
> toolchain is being removed from edk2,
> <https://bugzilla.tianocore.org/show_bug.cgi?id=1377>.)
>
> * "Makefile" currently builds the "UefiTestToolsPkg/BiosTablesTest"
> application, for arm, aarch64, i386, and x86_64, with the help of
> "build.sh".
>
> "Makefile" turns each resultant UEFI executable into a UEFI-bootable,
> qcow2-compressed ISO image. The ISO images are output as
> "tests/data/uefi-boot-images/bios-tables-test.<TARGET>.iso.qcow2".
>
> Each ISO image should be passed to QEMU as follows:
>
> -drive id=boot-cd,if=none,readonly,format=qcow2,file=$ISO \
> -device virtio-scsi-pci,id=scsi0 \
> -device scsi-cd,drive=boot-cd,bus=scsi0.0,bootindex=0 \
>
> "Makefile" assumes that "mkdosfs", "mtools", and "genisoimage" are
> present.
>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>
> Notes:
> v3:
> - explicitly mark the "./build.sh" recipe as recursive, with the "+"
> indicator; document it in a comment [Phil]
> - pick up R-b, T-b [Phil]
>
> v2:
> - add the .NOTPARALLEL target [Phil, help-make, edk2-devel]
>
> tests/uefi-test-tools/Makefile | 106 ++++++++++++++
> tests/uefi-test-tools/.gitignore | 3 +
> tests/uefi-test-tools/build.sh | 145 ++++++++++++++++++++
> 3 files changed, 254 insertions(+)
>
> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
> new file mode 100644
> index 000000000000..1d78bc14d51a
> --- /dev/null
> +++ b/tests/uefi-test-tools/Makefile
> @@ -0,0 +1,106 @@
> +# Makefile for the test helper UEFI applications that run in guests.
> +#
> +# Copyright (C) 2019, Red Hat, Inc.
> +#
> +# This program and the accompanying materials are licensed and made available
> +# under the terms and conditions of the BSD License that accompanies this
> +# distribution. The full text of the license may be found at
> +# <http://opensource.org/licenses/bsd-license.php>.
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +
> +edk2_dir := ../../roms/edk2
> +images_dir := ../data/uefi-boot-images
> +emulation_targets := arm aarch64 i386 x86_64
> +uefi_binaries := bios-tables-test
> +intermediate_suffixes := .efi .fat .iso.raw
> +
> +images: $(foreach binary,$(uefi_binaries), \
> + $(foreach target,$(emulation_targets), \
> + $(images_dir)/$(binary).$(target).iso.qcow2))
> +
> +# Preserve all intermediate targets if the build succeeds.
> +# - Intermediate targets help with development & debugging.
> +# - Preserving intermediate targets also keeps spurious changes out of the
> +# final build products, in case the user re-runs "make" without any changes
> +# to the UEFI source code. Normally, the intermediate files would have been
> +# removed by the last "make" invocation, hence the re-run would rebuild them
> +# from the unchanged UEFI sources. Unfortunately, the "mkdosfs" and
> +# "genisoimage" utilities embed timestamp-based information in their outputs,
> +# which causes git to report differences for the tracked qcow2 ISO images.
> +.SECONDARY: $(foreach binary,$(uefi_binaries), \
> + $(foreach target,$(emulation_targets), \
> + $(foreach suffix,$(intermediate_suffixes), \
> + Build/$(binary).$(target)$(suffix))))
> +
> +# In the pattern rules below, the stem (%, $*) stands for
> +# "$(binary).$(target)".
> +
> +# Convert the raw ISO image to a qcow2 one, enabling compression, and using a
> +# small cluster size. This allows for small binary files under git control,
> +# hence for small binary patches.
> +$(images_dir)/%.iso.qcow2: Build/%.iso.raw
> + mkdir -p -- $(images_dir)
> + $${QTEST_QEMU_IMG:-qemu-img} convert -f raw -O qcow2 -c \
> + -o cluster_size=512 -- $< $@
> +
> +# Embed the "UEFI system partition" into an ISO9660 file system as an ElTorito
> +# boot image.
> +Build/%.iso.raw: Build/%.fat
> + genisoimage -input-charset ASCII -efi-boot $(notdir $<) -no-emul-boot \
> + -quiet -o $@ -- $<
> +
> +# Define chained macros in order to map QEMU system emulation targets to
> +# *short* UEFI architecture identifiers. Periods are allowed in, and ultimately
> +# stripped from, the argument.
> +map_arm_to_uefi = $(subst arm,ARM,$(1))
> +map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1)))
> +map_i386_to_uefi = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1)))
> +map_x86_64_to_uefi = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1)))
> +map_to_uefi = $(subst .,,$(call map_x86_64_to_uefi,$(1)))
> +
> +# Format a "UEFI system partition", using the UEFI binary as the default boot
> +# loader. Add 10% size for filesystem metadata, round up to the next KB, and
> +# make sure the size is large enough for a FAT filesystem. Name the filesystem
> +# after the UEFI binary. (Excess characters are automatically dropped from the
> +# filesystem label.)
> +Build/%.fat: Build/%.efi
> + rm -f -- $@
> + uefi_bin_b=$$(stat --format=%s -- $<) && \
> + uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \
> + uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \
> + mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb
> + MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI
> + MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT
> + MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \
> + ::EFI/BOOT/BOOT$(call map_to_uefi,$(suffix $*)).EFI
> +
> +# In the pattern rules below, the stem (%, $*) stands for "$(target)" only. The
> +# association between the UEFI binary (such as "bios-tables-test") and the
> +# component name from the edk2 platform DSC file (such as "BiosTablesTest") is
> +# explicit in each rule.
> +
> +# "build.sh" invokes the "build" utility of edk2 BaseTools. In any given edk2
> +# workspace, at most one "build" instance may be operating at a time. Therefore
> +# we must serialize the rebuilding of targets in this Makefile.
> +.NOTPARALLEL:
> +
> +# In turn, the "build" utility of edk2 BaseTools invokes another "make".
> +# Although the outer "make" process advertizes its job server to all child
> +# processes via MAKEFLAGS in the environment, the outer "make" closes the job
> +# server file descriptors (exposed in MAKEFLAGS) before executing a recipe --
> +# unless the recipe is recognized as a recursive "make" recipe. Recipes that
> +# call $(MAKE) are classified automatically as recursive; for "build.sh" below,
> +# we must mark the recipe manually as recursive, by using the "+" indicator.
> +# This way, when the inner "make" starts a parallel build of the target edk2
> +# module, it can communicate with the outer "make"'s job server.
> +Build/bios-tables-test.%.efi: build-edk2-tools
> + +./build.sh $(edk2_dir) BiosTablesTest $* $@
Does this actually work with an out of tree build?
Shouldn't this be SRC_PATH/tests/uefi-test-tools/ ?
> +
> +build-edk2-tools:
> + $(MAKE) -C $(edk2_dir)/BaseTools
> +
> +clean:
> + rm -rf Build Conf log
> + $(MAKE) -C $(edk2_dir)/BaseTools clean
> diff --git a/tests/uefi-test-tools/.gitignore b/tests/uefi-test-tools/.gitignore
> new file mode 100644
> index 000000000000..9f246701dea1
> --- /dev/null
> +++ b/tests/uefi-test-tools/.gitignore
> @@ -0,0 +1,3 @@
> +Build
> +Conf
> +log
> diff --git a/tests/uefi-test-tools/build.sh b/tests/uefi-test-tools/build.sh
> new file mode 100755
> index 000000000000..155cb75c4ddb
> --- /dev/null
> +++ b/tests/uefi-test-tools/build.sh
> @@ -0,0 +1,145 @@
> +#!/bin/bash
> +
> +# Build script that determines the edk2 toolchain to use, invokes the edk2
> +# "build" utility, and copies the built UEFI binary to the requested location.
> +#
> +# Copyright (C) 2019, Red Hat, Inc.
> +#
> +# This program and the accompanying materials are licensed and made available
> +# under the terms and conditions of the BSD License that accompanies this
> +# distribution. The full text of the license may be found at
> +# <http://opensource.org/licenses/bsd-license.php>.
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +
> +set -e -u -C
> +
> +# Save the command line arguments. We need to reset $# to 0 before sourcing
> +# "edksetup.sh", as it will inherit $@.
> +program_name=$(basename -- "$0")
> +edk2_dir=$1
> +dsc_component=$2
> +emulation_target=$3
> +uefi_binary=$4
> +shift 4
> +
> +# Set up the environment for edk2 building.
> +export PACKAGES_PATH=$(realpath -- "$edk2_dir")
> +export WORKSPACE=$PWD
> +mkdir -p Conf
> +
> +# Source "edksetup.sh" carefully.
> +set +e +u +C
> +source "$PACKAGES_PATH/edksetup.sh"
> +ret=$?
> +set -e -u -C
> +if [ $ret -ne 0 ]; then
> + exit $ret
> +fi
> +
> +# Map the QEMU system emulation target to the following types of architecture
> +# identifiers:
> +# - edk2,
> +# - gcc cross-compilation.
> +# Cover only those targets that are supported by the UEFI spec and edk2.
> +case "$emulation_target" in
> + (arm)
> + edk2_arch=ARM
> + gcc_arch=arm
> + ;;
> + (aarch64)
> + edk2_arch=AARCH64
> + gcc_arch=aarch64
> + ;;
> + (i386)
> + edk2_arch=IA32
> + gcc_arch=i686
> + ;;
> + (x86_64)
> + edk2_arch=X64
> + gcc_arch=x86_64
> + ;;
> + (*)
> + printf '%s: unknown/unsupported QEMU system emulation target "%s"\n' \
> + "$program_name" "$emulation_target" >&2
> + exit 1
> + ;;
> +esac
> +
> +# Check if cross-compilation is needed.
> +host_arch=$(uname -m)
> +if [ "$gcc_arch" == "$host_arch" ] ||
> + ( [ "$gcc_arch" == i686 ] && [ "$host_arch" == x86_64 ] ); then
> + cross_prefix=
> +else
> + cross_prefix=${gcc_arch}-linux-gnu-
> +fi
> +
> +# Expose cross_prefix (which is possibly empty) to the edk2 tools. While at it,
> +# determine the suitable edk2 toolchain as well.
> +# - For ARM and AARCH64, edk2 only offers the GCC5 toolchain tag, which covers
> +# the gcc-5+ releases.
> +# - For IA32 and X64, edk2 offers the GCC44 through GCC49 toolchain tags, in
> +# addition to GCC5. Unfortunately, the mapping between the toolchain tags and
> +# the actual gcc releases isn't entirely trivial. Run "git-blame" on
> +# "OvmfPkg/build.sh" in edk2 for more information.
> +# And, because the above is too simple, we have to assign cross_prefix to an
> +# edk2 build variable that is specific to both the toolchain tag and the target
> +# architecture.
> +case "$edk2_arch" in
> + (ARM)
> + edk2_toolchain=GCC5
> + export GCC5_ARM_PREFIX=$cross_prefix
> + ;;
> + (AARCH64)
> + edk2_toolchain=GCC5
> + export GCC5_AARCH64_PREFIX=$cross_prefix
> + ;;
> + (IA32|X64)
> + gcc_version=$("${cross_prefix}gcc" -v 2>&1 | tail -1 | awk '{print $3}')
> + case "$gcc_version" in
> + ([1-3].*|4.[0-3].*)
> + printf '%s: unsupported gcc version "%s"\n' \
> + "$program_name" "$gcc_version" >&2
> + exit 1
> + ;;
> + (4.4.*)
> + edk2_toolchain=GCC44
> + ;;
> + (4.5.*)
> + edk2_toolchain=GCC45
> + ;;
> + (4.6.*)
> + edk2_toolchain=GCC46
> + ;;
> + (4.7.*)
> + edk2_toolchain=GCC47
> + ;;
> + (4.8.*)
> + edk2_toolchain=GCC48
> + ;;
> + (4.9.*|6.[0-2].*)
> + edk2_toolchain=GCC49
> + ;;
> + (*)
> + edk2_toolchain=GCC5
> + ;;
> + esac
> + eval "export ${edk2_toolchain}_BIN=\$cross_prefix"
> + ;;
> +esac
> +
> +# Build the UEFI binary
> +mkdir -p log
> +build \
> + --arch="$edk2_arch" \
> + --buildtarget=DEBUG \
> + --platform=UefiTestToolsPkg/UefiTestToolsPkg.dsc \
> + --tagname="$edk2_toolchain" \
> + --module="UefiTestToolsPkg/$dsc_component/$dsc_component.inf" \
> + --log="log/$dsc_component.$edk2_arch.log" \
> + --report-file="log/$dsc_component.$edk2_arch.report"
> +cp -a -- \
> + "Build/UefiTestTools/DEBUG_${edk2_toolchain}/$edk2_arch/$dsc_component.efi" \
> + "$uefi_binary"
> --
> 2.19.1.3.g30247aa5d201
>
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts
2019-02-04 17:47 ` Michael S. Tsirkin
@ 2019-02-04 18:41 ` Laszlo Ersek
2019-02-04 19:32 ` Michael S. Tsirkin
0 siblings, 1 reply; 23+ messages in thread
From: Laszlo Ersek @ 2019-02-04 18:41 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: qemu devel list, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Philippe Mathieu-Daudé, Shannon Zhao
On 02/04/19 18:47, Michael S. Tsirkin wrote:
> On Mon, Feb 04, 2019 at 05:03:24PM +0100, Laszlo Ersek wrote:
>> Introduce the following build scripts under "tests/uefi-test-tools":
>>
>> * "build.sh" builds a single module (a UEFI application) from
>> UefiTestToolsPkg, for a single QEMU emulation target.
>>
>> "build.sh" relies on cross-compilers when the emulation target and the
>> build host architecture don't match. The cross-compiler prefix is
>> computed according to a fixed, Linux-specific pattern. No attempt is
>> made to copy or reimplement the GNU Make magic from "qemu/roms/Makefile"
>> for cross-compiler prefix determination. The reason is that the build
>> host OSes that are officially supported by edk2, and those that are
>> supported by QEMU, intersect only in Linux. (Note that the UNIXGCC
>> toolchain is being removed from edk2,
>> <https://bugzilla.tianocore.org/show_bug.cgi?id=1377>.)
>>
>> * "Makefile" currently builds the "UefiTestToolsPkg/BiosTablesTest"
>> application, for arm, aarch64, i386, and x86_64, with the help of
>> "build.sh".
>>
>> "Makefile" turns each resultant UEFI executable into a UEFI-bootable,
>> qcow2-compressed ISO image. The ISO images are output as
>> "tests/data/uefi-boot-images/bios-tables-test.<TARGET>.iso.qcow2".
>>
>> Each ISO image should be passed to QEMU as follows:
>>
>> -drive id=boot-cd,if=none,readonly,format=qcow2,file=$ISO \
>> -device virtio-scsi-pci,id=scsi0 \
>> -device scsi-cd,drive=boot-cd,bus=scsi0.0,bootindex=0 \
>>
>> "Makefile" assumes that "mkdosfs", "mtools", and "genisoimage" are
>> present.
>>
>> Cc: "Michael S. Tsirkin" <mst@redhat.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Gerd Hoffmann <kraxel@redhat.com>
>> Cc: Igor Mammedov <imammedo@redhat.com>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>>
>> Notes:
>> v3:
>> - explicitly mark the "./build.sh" recipe as recursive, with the "+"
>> indicator; document it in a comment [Phil]
>> - pick up R-b, T-b [Phil]
>>
>> v2:
>> - add the .NOTPARALLEL target [Phil, help-make, edk2-devel]
>>
>> tests/uefi-test-tools/Makefile | 106 ++++++++++++++
>> tests/uefi-test-tools/.gitignore | 3 +
>> tests/uefi-test-tools/build.sh | 145 ++++++++++++++++++++
>> 3 files changed, 254 insertions(+)
>>
>> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
>> new file mode 100644
>> index 000000000000..1d78bc14d51a
>> --- /dev/null
>> +++ b/tests/uefi-test-tools/Makefile
>> @@ -0,0 +1,106 @@
>> +# Makefile for the test helper UEFI applications that run in guests.
>> +#
>> +# Copyright (C) 2019, Red Hat, Inc.
>> +#
>> +# This program and the accompanying materials are licensed and made available
>> +# under the terms and conditions of the BSD License that accompanies this
>> +# distribution. The full text of the license may be found at
>> +# <http://opensource.org/licenses/bsd-license.php>.
>> +#
>> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
>> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +
>> +edk2_dir := ../../roms/edk2
>> +images_dir := ../data/uefi-boot-images
>> +emulation_targets := arm aarch64 i386 x86_64
>> +uefi_binaries := bios-tables-test
>> +intermediate_suffixes := .efi .fat .iso.raw
>> +
>> +images: $(foreach binary,$(uefi_binaries), \
>> + $(foreach target,$(emulation_targets), \
>> + $(images_dir)/$(binary).$(target).iso.qcow2))
>> +
>> +# Preserve all intermediate targets if the build succeeds.
>> +# - Intermediate targets help with development & debugging.
>> +# - Preserving intermediate targets also keeps spurious changes out of the
>> +# final build products, in case the user re-runs "make" without any changes
>> +# to the UEFI source code. Normally, the intermediate files would have been
>> +# removed by the last "make" invocation, hence the re-run would rebuild them
>> +# from the unchanged UEFI sources. Unfortunately, the "mkdosfs" and
>> +# "genisoimage" utilities embed timestamp-based information in their outputs,
>> +# which causes git to report differences for the tracked qcow2 ISO images.
>> +.SECONDARY: $(foreach binary,$(uefi_binaries), \
>> + $(foreach target,$(emulation_targets), \
>> + $(foreach suffix,$(intermediate_suffixes), \
>> + Build/$(binary).$(target)$(suffix))))
>> +
>> +# In the pattern rules below, the stem (%, $*) stands for
>> +# "$(binary).$(target)".
>> +
>> +# Convert the raw ISO image to a qcow2 one, enabling compression, and using a
>> +# small cluster size. This allows for small binary files under git control,
>> +# hence for small binary patches.
>> +$(images_dir)/%.iso.qcow2: Build/%.iso.raw
>> + mkdir -p -- $(images_dir)
>> + $${QTEST_QEMU_IMG:-qemu-img} convert -f raw -O qcow2 -c \
>> + -o cluster_size=512 -- $< $@
>> +
>> +# Embed the "UEFI system partition" into an ISO9660 file system as an ElTorito
>> +# boot image.
>> +Build/%.iso.raw: Build/%.fat
>> + genisoimage -input-charset ASCII -efi-boot $(notdir $<) -no-emul-boot \
>> + -quiet -o $@ -- $<
>> +
>> +# Define chained macros in order to map QEMU system emulation targets to
>> +# *short* UEFI architecture identifiers. Periods are allowed in, and ultimately
>> +# stripped from, the argument.
>> +map_arm_to_uefi = $(subst arm,ARM,$(1))
>> +map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1)))
>> +map_i386_to_uefi = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1)))
>> +map_x86_64_to_uefi = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1)))
>> +map_to_uefi = $(subst .,,$(call map_x86_64_to_uefi,$(1)))
>> +
>> +# Format a "UEFI system partition", using the UEFI binary as the default boot
>> +# loader. Add 10% size for filesystem metadata, round up to the next KB, and
>> +# make sure the size is large enough for a FAT filesystem. Name the filesystem
>> +# after the UEFI binary. (Excess characters are automatically dropped from the
>> +# filesystem label.)
>> +Build/%.fat: Build/%.efi
>> + rm -f -- $@
>> + uefi_bin_b=$$(stat --format=%s -- $<) && \
>> + uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \
>> + uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \
>> + mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb
>> + MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI
>> + MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT
>> + MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \
>> + ::EFI/BOOT/BOOT$(call map_to_uefi,$(suffix $*)).EFI
>> +
>> +# In the pattern rules below, the stem (%, $*) stands for "$(target)" only. The
>> +# association between the UEFI binary (such as "bios-tables-test") and the
>> +# component name from the edk2 platform DSC file (such as "BiosTablesTest") is
>> +# explicit in each rule.
>> +
>> +# "build.sh" invokes the "build" utility of edk2 BaseTools. In any given edk2
>> +# workspace, at most one "build" instance may be operating at a time. Therefore
>> +# we must serialize the rebuilding of targets in this Makefile.
>> +.NOTPARALLEL:
>> +
>> +# In turn, the "build" utility of edk2 BaseTools invokes another "make".
>> +# Although the outer "make" process advertizes its job server to all child
>> +# processes via MAKEFLAGS in the environment, the outer "make" closes the job
>> +# server file descriptors (exposed in MAKEFLAGS) before executing a recipe --
>> +# unless the recipe is recognized as a recursive "make" recipe. Recipes that
>> +# call $(MAKE) are classified automatically as recursive; for "build.sh" below,
>> +# we must mark the recipe manually as recursive, by using the "+" indicator.
>> +# This way, when the inner "make" starts a parallel build of the target edk2
>> +# module, it can communicate with the outer "make"'s job server.
>> +Build/bios-tables-test.%.efi: build-edk2-tools
>> + +./build.sh $(edk2_dir) BiosTablesTest $* $@
>
> Does this actually work with an out of tree build?
It's not supposed to.
Again, it's not something that a normal QEMU build includes. It is only
for maintainers to rebuild when there is a reason to do so. The output
binaries are tracked by git, and will be used as-is (in binary form) by
the ACPI test suite. If there are updates to the UEFI source code, the
binaries will have to be rebuilt by a maintainer (or by me, if I submit
the UEFI code changes), and the refreshed blobs are to be checked into
git. Think iPXE oproms for an analogy.
> Shouldn't this be SRC_PATH/tests/uefi-test-tools/ ?
No; nothing under roms/ is built like that, and the same applies to this
patch as well.
*Conceptually*, this patch is for roms/. However, in earlier discussion,
it was suggested that roms/ be kept dedicated to external git submodules
only, and that we not add such ROM source to roms/ whose master repo is
genuinely the QEMU repo. Please see the sub-thread at:
Re: [PATCH 10/14] tests: acpi: ignore SMBIOS tests when UEFI firmware is used
http://mid.mail-archive.com/20190116115217.jduhqrwbjhuibmoq@sirius.home.kraxel.org
The last idea was that the UEFI source code should be kept in a direct
subdirectory of tests/ (rather than in roms/). And the binaries should
go under tests/data/uefi-boot-images/ (rather than pc-bios/).
Thanks
Laszlo
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts
2019-02-04 18:41 ` Laszlo Ersek
@ 2019-02-04 19:32 ` Michael S. Tsirkin
2019-02-04 19:46 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 23+ messages in thread
From: Michael S. Tsirkin @ 2019-02-04 19:32 UTC (permalink / raw)
To: Laszlo Ersek
Cc: qemu devel list, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Philippe Mathieu-Daudé, Shannon Zhao
On Mon, Feb 04, 2019 at 07:41:38PM +0100, Laszlo Ersek wrote:
> On 02/04/19 18:47, Michael S. Tsirkin wrote:
> > On Mon, Feb 04, 2019 at 05:03:24PM +0100, Laszlo Ersek wrote:
> >> Introduce the following build scripts under "tests/uefi-test-tools":
> >>
> >> * "build.sh" builds a single module (a UEFI application) from
> >> UefiTestToolsPkg, for a single QEMU emulation target.
> >>
> >> "build.sh" relies on cross-compilers when the emulation target and the
> >> build host architecture don't match. The cross-compiler prefix is
> >> computed according to a fixed, Linux-specific pattern. No attempt is
> >> made to copy or reimplement the GNU Make magic from "qemu/roms/Makefile"
> >> for cross-compiler prefix determination. The reason is that the build
> >> host OSes that are officially supported by edk2, and those that are
> >> supported by QEMU, intersect only in Linux. (Note that the UNIXGCC
> >> toolchain is being removed from edk2,
> >> <https://bugzilla.tianocore.org/show_bug.cgi?id=1377>.)
> >>
> >> * "Makefile" currently builds the "UefiTestToolsPkg/BiosTablesTest"
> >> application, for arm, aarch64, i386, and x86_64, with the help of
> >> "build.sh".
> >>
> >> "Makefile" turns each resultant UEFI executable into a UEFI-bootable,
> >> qcow2-compressed ISO image. The ISO images are output as
> >> "tests/data/uefi-boot-images/bios-tables-test.<TARGET>.iso.qcow2".
> >>
> >> Each ISO image should be passed to QEMU as follows:
> >>
> >> -drive id=boot-cd,if=none,readonly,format=qcow2,file=$ISO \
> >> -device virtio-scsi-pci,id=scsi0 \
> >> -device scsi-cd,drive=boot-cd,bus=scsi0.0,bootindex=0 \
> >>
> >> "Makefile" assumes that "mkdosfs", "mtools", and "genisoimage" are
> >> present.
> >>
> >> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> >> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >> Cc: Gerd Hoffmann <kraxel@redhat.com>
> >> Cc: Igor Mammedov <imammedo@redhat.com>
> >> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> >> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
> >> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> >> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >> ---
> >>
> >> Notes:
> >> v3:
> >> - explicitly mark the "./build.sh" recipe as recursive, with the "+"
> >> indicator; document it in a comment [Phil]
> >> - pick up R-b, T-b [Phil]
> >>
> >> v2:
> >> - add the .NOTPARALLEL target [Phil, help-make, edk2-devel]
> >>
> >> tests/uefi-test-tools/Makefile | 106 ++++++++++++++
> >> tests/uefi-test-tools/.gitignore | 3 +
> >> tests/uefi-test-tools/build.sh | 145 ++++++++++++++++++++
> >> 3 files changed, 254 insertions(+)
> >>
> >> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
> >> new file mode 100644
> >> index 000000000000..1d78bc14d51a
> >> --- /dev/null
> >> +++ b/tests/uefi-test-tools/Makefile
> >> @@ -0,0 +1,106 @@
> >> +# Makefile for the test helper UEFI applications that run in guests.
> >> +#
> >> +# Copyright (C) 2019, Red Hat, Inc.
> >> +#
> >> +# This program and the accompanying materials are licensed and made available
> >> +# under the terms and conditions of the BSD License that accompanies this
> >> +# distribution. The full text of the license may be found at
> >> +# <http://opensource.org/licenses/bsd-license.php>.
> >> +#
> >> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> >> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> >> +
> >> +edk2_dir := ../../roms/edk2
> >> +images_dir := ../data/uefi-boot-images
> >> +emulation_targets := arm aarch64 i386 x86_64
> >> +uefi_binaries := bios-tables-test
> >> +intermediate_suffixes := .efi .fat .iso.raw
> >> +
> >> +images: $(foreach binary,$(uefi_binaries), \
> >> + $(foreach target,$(emulation_targets), \
> >> + $(images_dir)/$(binary).$(target).iso.qcow2))
> >> +
> >> +# Preserve all intermediate targets if the build succeeds.
> >> +# - Intermediate targets help with development & debugging.
> >> +# - Preserving intermediate targets also keeps spurious changes out of the
> >> +# final build products, in case the user re-runs "make" without any changes
> >> +# to the UEFI source code. Normally, the intermediate files would have been
> >> +# removed by the last "make" invocation, hence the re-run would rebuild them
> >> +# from the unchanged UEFI sources. Unfortunately, the "mkdosfs" and
> >> +# "genisoimage" utilities embed timestamp-based information in their outputs,
> >> +# which causes git to report differences for the tracked qcow2 ISO images.
> >> +.SECONDARY: $(foreach binary,$(uefi_binaries), \
> >> + $(foreach target,$(emulation_targets), \
> >> + $(foreach suffix,$(intermediate_suffixes), \
> >> + Build/$(binary).$(target)$(suffix))))
> >> +
> >> +# In the pattern rules below, the stem (%, $*) stands for
> >> +# "$(binary).$(target)".
> >> +
> >> +# Convert the raw ISO image to a qcow2 one, enabling compression, and using a
> >> +# small cluster size. This allows for small binary files under git control,
> >> +# hence for small binary patches.
> >> +$(images_dir)/%.iso.qcow2: Build/%.iso.raw
> >> + mkdir -p -- $(images_dir)
> >> + $${QTEST_QEMU_IMG:-qemu-img} convert -f raw -O qcow2 -c \
> >> + -o cluster_size=512 -- $< $@
> >> +
> >> +# Embed the "UEFI system partition" into an ISO9660 file system as an ElTorito
> >> +# boot image.
> >> +Build/%.iso.raw: Build/%.fat
> >> + genisoimage -input-charset ASCII -efi-boot $(notdir $<) -no-emul-boot \
> >> + -quiet -o $@ -- $<
> >> +
> >> +# Define chained macros in order to map QEMU system emulation targets to
> >> +# *short* UEFI architecture identifiers. Periods are allowed in, and ultimately
> >> +# stripped from, the argument.
> >> +map_arm_to_uefi = $(subst arm,ARM,$(1))
> >> +map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1)))
> >> +map_i386_to_uefi = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1)))
> >> +map_x86_64_to_uefi = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1)))
> >> +map_to_uefi = $(subst .,,$(call map_x86_64_to_uefi,$(1)))
> >> +
> >> +# Format a "UEFI system partition", using the UEFI binary as the default boot
> >> +# loader. Add 10% size for filesystem metadata, round up to the next KB, and
> >> +# make sure the size is large enough for a FAT filesystem. Name the filesystem
> >> +# after the UEFI binary. (Excess characters are automatically dropped from the
> >> +# filesystem label.)
> >> +Build/%.fat: Build/%.efi
> >> + rm -f -- $@
> >> + uefi_bin_b=$$(stat --format=%s -- $<) && \
> >> + uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \
> >> + uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \
> >> + mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb
> >> + MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI
> >> + MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT
> >> + MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \
> >> + ::EFI/BOOT/BOOT$(call map_to_uefi,$(suffix $*)).EFI
> >> +
> >> +# In the pattern rules below, the stem (%, $*) stands for "$(target)" only. The
> >> +# association between the UEFI binary (such as "bios-tables-test") and the
> >> +# component name from the edk2 platform DSC file (such as "BiosTablesTest") is
> >> +# explicit in each rule.
> >> +
> >> +# "build.sh" invokes the "build" utility of edk2 BaseTools. In any given edk2
> >> +# workspace, at most one "build" instance may be operating at a time. Therefore
> >> +# we must serialize the rebuilding of targets in this Makefile.
> >> +.NOTPARALLEL:
> >> +
> >> +# In turn, the "build" utility of edk2 BaseTools invokes another "make".
> >> +# Although the outer "make" process advertizes its job server to all child
> >> +# processes via MAKEFLAGS in the environment, the outer "make" closes the job
> >> +# server file descriptors (exposed in MAKEFLAGS) before executing a recipe --
> >> +# unless the recipe is recognized as a recursive "make" recipe. Recipes that
> >> +# call $(MAKE) are classified automatically as recursive; for "build.sh" below,
> >> +# we must mark the recipe manually as recursive, by using the "+" indicator.
> >> +# This way, when the inner "make" starts a parallel build of the target edk2
> >> +# module, it can communicate with the outer "make"'s job server.
> >> +Build/bios-tables-test.%.efi: build-edk2-tools
> >> + +./build.sh $(edk2_dir) BiosTablesTest $* $@
> >
> > Does this actually work with an out of tree build?
>
> It's not supposed to.
>
> Again, it's not something that a normal QEMU build includes. It is only
> for maintainers to rebuild when there is a reason to do so. The output
> binaries are tracked by git, and will be used as-is (in binary form) by
> the ACPI test suite. If there are updates to the UEFI source code, the
> binaries will have to be rebuilt by a maintainer (or by me, if I submit
> the UEFI code changes), and the refreshed blobs are to be checked into
> git. Think iPXE oproms for an analogy.
>
> > Shouldn't this be SRC_PATH/tests/uefi-test-tools/ ?
>
> No; nothing under roms/ is built like that, and the same applies to this
> patch as well.
>
> *Conceptually*, this patch is for roms/. However, in earlier discussion,
> it was suggested that roms/ be kept dedicated to external git submodules
> only, and that we not add such ROM source to roms/ whose master repo is
> genuinely the QEMU repo. Please see the sub-thread at:
>
> Re: [PATCH 10/14] tests: acpi: ignore SMBIOS tests when UEFI firmware is used
> http://mid.mail-archive.com/20190116115217.jduhqrwbjhuibmoq@sirius.home.kraxel.org
>
> The last idea was that the UEFI source code should be kept in a direct
> subdirectory of tests/ (rather than in roms/). And the binaries should
> go under tests/data/uefi-boot-images/ (rather than pc-bios/).
>
> Thanks
> Laszlo
Hmm I see. You see rebuild-expected-aml.sh does not work
like this at all. It works fine with an out of tree build:
check it out.
So I try to keep it all out of tree.
And question would be what if someone wanted a reproducible
build of QEMU, what would be the right way to do it?
Yes right now roms seems to be broken for an out of
tree build but is that by design and should we
add more examples of this?
--
MST
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts
2019-02-04 19:32 ` Michael S. Tsirkin
@ 2019-02-04 19:46 ` Philippe Mathieu-Daudé
2019-02-04 21:55 ` Michael S. Tsirkin
0 siblings, 1 reply; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-02-04 19:46 UTC (permalink / raw)
To: Michael S. Tsirkin, Laszlo Ersek
Cc: qemu devel list, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Shannon Zhao
Hi Michael,
On 2/4/19 8:32 PM, Michael S. Tsirkin wrote:
> On Mon, Feb 04, 2019 at 07:41:38PM +0100, Laszlo Ersek wrote:
>> On 02/04/19 18:47, Michael S. Tsirkin wrote:
>>> On Mon, Feb 04, 2019 at 05:03:24PM +0100, Laszlo Ersek wrote:
>>>> Introduce the following build scripts under "tests/uefi-test-tools":
>>>>
>>>> * "build.sh" builds a single module (a UEFI application) from
>>>> UefiTestToolsPkg, for a single QEMU emulation target.
>>>>
>>>> "build.sh" relies on cross-compilers when the emulation target and the
>>>> build host architecture don't match. The cross-compiler prefix is
>>>> computed according to a fixed, Linux-specific pattern. No attempt is
>>>> made to copy or reimplement the GNU Make magic from "qemu/roms/Makefile"
>>>> for cross-compiler prefix determination. The reason is that the build
>>>> host OSes that are officially supported by edk2, and those that are
>>>> supported by QEMU, intersect only in Linux. (Note that the UNIXGCC
>>>> toolchain is being removed from edk2,
>>>> <https://bugzilla.tianocore.org/show_bug.cgi?id=1377>.)
>>>>
>>>> * "Makefile" currently builds the "UefiTestToolsPkg/BiosTablesTest"
>>>> application, for arm, aarch64, i386, and x86_64, with the help of
>>>> "build.sh".
>>>>
>>>> "Makefile" turns each resultant UEFI executable into a UEFI-bootable,
>>>> qcow2-compressed ISO image. The ISO images are output as
>>>> "tests/data/uefi-boot-images/bios-tables-test.<TARGET>.iso.qcow2".
>>>>
>>>> Each ISO image should be passed to QEMU as follows:
>>>>
>>>> -drive id=boot-cd,if=none,readonly,format=qcow2,file=$ISO \
>>>> -device virtio-scsi-pci,id=scsi0 \
>>>> -device scsi-cd,drive=boot-cd,bus=scsi0.0,bootindex=0 \
>>>>
>>>> "Makefile" assumes that "mkdosfs", "mtools", and "genisoimage" are
>>>> present.
>>>>
>>>> Cc: "Michael S. Tsirkin" <mst@redhat.com>
>>>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>>> Cc: Gerd Hoffmann <kraxel@redhat.com>
>>>> Cc: Igor Mammedov <imammedo@redhat.com>
>>>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
>>>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>> ---
>>>>
>>>> Notes:
>>>> v3:
>>>> - explicitly mark the "./build.sh" recipe as recursive, with the "+"
>>>> indicator; document it in a comment [Phil]
>>>> - pick up R-b, T-b [Phil]
>>>>
>>>> v2:
>>>> - add the .NOTPARALLEL target [Phil, help-make, edk2-devel]
>>>>
>>>> tests/uefi-test-tools/Makefile | 106 ++++++++++++++
>>>> tests/uefi-test-tools/.gitignore | 3 +
>>>> tests/uefi-test-tools/build.sh | 145 ++++++++++++++++++++
>>>> 3 files changed, 254 insertions(+)
>>>>
>>>> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
>>>> new file mode 100644
>>>> index 000000000000..1d78bc14d51a
>>>> --- /dev/null
>>>> +++ b/tests/uefi-test-tools/Makefile
>>>> @@ -0,0 +1,106 @@
>>>> +# Makefile for the test helper UEFI applications that run in guests.
>>>> +#
>>>> +# Copyright (C) 2019, Red Hat, Inc.
>>>> +#
>>>> +# This program and the accompanying materials are licensed and made available
>>>> +# under the terms and conditions of the BSD License that accompanies this
>>>> +# distribution. The full text of the license may be found at
>>>> +# <http://opensource.org/licenses/bsd-license.php>.
>>>> +#
>>>> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
>>>> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>>>> +
>>>> +edk2_dir := ../../roms/edk2
>>>> +images_dir := ../data/uefi-boot-images
>>>> +emulation_targets := arm aarch64 i386 x86_64
>>>> +uefi_binaries := bios-tables-test
>>>> +intermediate_suffixes := .efi .fat .iso.raw
>>>> +
>>>> +images: $(foreach binary,$(uefi_binaries), \
>>>> + $(foreach target,$(emulation_targets), \
>>>> + $(images_dir)/$(binary).$(target).iso.qcow2))
>>>> +
>>>> +# Preserve all intermediate targets if the build succeeds.
>>>> +# - Intermediate targets help with development & debugging.
>>>> +# - Preserving intermediate targets also keeps spurious changes out of the
>>>> +# final build products, in case the user re-runs "make" without any changes
>>>> +# to the UEFI source code. Normally, the intermediate files would have been
>>>> +# removed by the last "make" invocation, hence the re-run would rebuild them
>>>> +# from the unchanged UEFI sources. Unfortunately, the "mkdosfs" and
>>>> +# "genisoimage" utilities embed timestamp-based information in their outputs,
>>>> +# which causes git to report differences for the tracked qcow2 ISO images.
>>>> +.SECONDARY: $(foreach binary,$(uefi_binaries), \
>>>> + $(foreach target,$(emulation_targets), \
>>>> + $(foreach suffix,$(intermediate_suffixes), \
>>>> + Build/$(binary).$(target)$(suffix))))
>>>> +
>>>> +# In the pattern rules below, the stem (%, $*) stands for
>>>> +# "$(binary).$(target)".
>>>> +
>>>> +# Convert the raw ISO image to a qcow2 one, enabling compression, and using a
>>>> +# small cluster size. This allows for small binary files under git control,
>>>> +# hence for small binary patches.
>>>> +$(images_dir)/%.iso.qcow2: Build/%.iso.raw
>>>> + mkdir -p -- $(images_dir)
>>>> + $${QTEST_QEMU_IMG:-qemu-img} convert -f raw -O qcow2 -c \
>>>> + -o cluster_size=512 -- $< $@
>>>> +
>>>> +# Embed the "UEFI system partition" into an ISO9660 file system as an ElTorito
>>>> +# boot image.
>>>> +Build/%.iso.raw: Build/%.fat
>>>> + genisoimage -input-charset ASCII -efi-boot $(notdir $<) -no-emul-boot \
>>>> + -quiet -o $@ -- $<
>>>> +
>>>> +# Define chained macros in order to map QEMU system emulation targets to
>>>> +# *short* UEFI architecture identifiers. Periods are allowed in, and ultimately
>>>> +# stripped from, the argument.
>>>> +map_arm_to_uefi = $(subst arm,ARM,$(1))
>>>> +map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1)))
>>>> +map_i386_to_uefi = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1)))
>>>> +map_x86_64_to_uefi = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1)))
>>>> +map_to_uefi = $(subst .,,$(call map_x86_64_to_uefi,$(1)))
>>>> +
>>>> +# Format a "UEFI system partition", using the UEFI binary as the default boot
>>>> +# loader. Add 10% size for filesystem metadata, round up to the next KB, and
>>>> +# make sure the size is large enough for a FAT filesystem. Name the filesystem
>>>> +# after the UEFI binary. (Excess characters are automatically dropped from the
>>>> +# filesystem label.)
>>>> +Build/%.fat: Build/%.efi
>>>> + rm -f -- $@
>>>> + uefi_bin_b=$$(stat --format=%s -- $<) && \
>>>> + uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \
>>>> + uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \
>>>> + mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb
>>>> + MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI
>>>> + MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT
>>>> + MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \
>>>> + ::EFI/BOOT/BOOT$(call map_to_uefi,$(suffix $*)).EFI
>>>> +
>>>> +# In the pattern rules below, the stem (%, $*) stands for "$(target)" only. The
>>>> +# association between the UEFI binary (such as "bios-tables-test") and the
>>>> +# component name from the edk2 platform DSC file (such as "BiosTablesTest") is
>>>> +# explicit in each rule.
>>>> +
>>>> +# "build.sh" invokes the "build" utility of edk2 BaseTools. In any given edk2
>>>> +# workspace, at most one "build" instance may be operating at a time. Therefore
>>>> +# we must serialize the rebuilding of targets in this Makefile.
>>>> +.NOTPARALLEL:
>>>> +
>>>> +# In turn, the "build" utility of edk2 BaseTools invokes another "make".
>>>> +# Although the outer "make" process advertizes its job server to all child
>>>> +# processes via MAKEFLAGS in the environment, the outer "make" closes the job
>>>> +# server file descriptors (exposed in MAKEFLAGS) before executing a recipe --
>>>> +# unless the recipe is recognized as a recursive "make" recipe. Recipes that
>>>> +# call $(MAKE) are classified automatically as recursive; for "build.sh" below,
>>>> +# we must mark the recipe manually as recursive, by using the "+" indicator.
>>>> +# This way, when the inner "make" starts a parallel build of the target edk2
>>>> +# module, it can communicate with the outer "make"'s job server.
>>>> +Build/bios-tables-test.%.efi: build-edk2-tools
>>>> + +./build.sh $(edk2_dir) BiosTablesTest $* $@
>>>
>>> Does this actually work with an out of tree build?
>>
>> It's not supposed to.
>>
>> Again, it's not something that a normal QEMU build includes. It is only
>> for maintainers to rebuild when there is a reason to do so. The output
>> binaries are tracked by git, and will be used as-is (in binary form) by
>> the ACPI test suite. If there are updates to the UEFI source code, the
>> binaries will have to be rebuilt by a maintainer (or by me, if I submit
>> the UEFI code changes), and the refreshed blobs are to be checked into
>> git. Think iPXE oproms for an analogy.
>>
>>> Shouldn't this be SRC_PATH/tests/uefi-test-tools/ ?
>>
>> No; nothing under roms/ is built like that, and the same applies to this
>> patch as well.
>>
>> *Conceptually*, this patch is for roms/. However, in earlier discussion,
>> it was suggested that roms/ be kept dedicated to external git submodules
>> only, and that we not add such ROM source to roms/ whose master repo is
>> genuinely the QEMU repo. Please see the sub-thread at:
>>
>> Re: [PATCH 10/14] tests: acpi: ignore SMBIOS tests when UEFI firmware is used
>> http://mid.mail-archive.com/20190116115217.jduhqrwbjhuibmoq@sirius.home.kraxel.org
>>
>> The last idea was that the UEFI source code should be kept in a direct
>> subdirectory of tests/ (rather than in roms/). And the binaries should
>> go under tests/data/uefi-boot-images/ (rather than pc-bios/).
>>
>> Thanks
>> Laszlo
>
> Hmm I see. You see rebuild-expected-aml.sh does not work
> like this at all. It works fine with an out of tree build:
> check it out.
But rebuild-expected-aml.sh does not depend of roms/.
>
> So I try to keep it all out of tree.
Patch 5/5 add the bios-tables-test blobs under tests/data/ (as other
submodules in roms/ do, adding blobs in pc-bios/).
>
> And question would be what if someone wanted a reproducible
> build of QEMU, what would be the right way to do it?
This question deserves his own thread :)
> Yes right now roms seems to be broken for an out of
> tree build but is that by design and should we
> add more examples of this?
IMO having these tests build out-of-tree is easier than trying to build
various of the projects in roms/ out-of-tree.
This would be a good effort, but I'm not sure it is worth it with this
series.
Eventually once we have a qtest using the bios-tables, we could spend
some time to make this script work out-of-tree.
Regards,
Phil.
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts
2019-02-04 19:46 ` Philippe Mathieu-Daudé
@ 2019-02-04 21:55 ` Michael S. Tsirkin
2019-02-05 0:23 ` Philippe Mathieu-Daudé
2019-02-05 8:49 ` Laszlo Ersek
0 siblings, 2 replies; 23+ messages in thread
From: Michael S. Tsirkin @ 2019-02-04 21:55 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Laszlo Ersek, qemu devel list, Ard Biesheuvel, Gerd Hoffmann,
Igor Mammedov, Shannon Zhao
On Mon, Feb 04, 2019 at 08:46:33PM +0100, Philippe Mathieu-Daudé wrote:
> Hi Michael,
>
> On 2/4/19 8:32 PM, Michael S. Tsirkin wrote:
> > On Mon, Feb 04, 2019 at 07:41:38PM +0100, Laszlo Ersek wrote:
> >> On 02/04/19 18:47, Michael S. Tsirkin wrote:
> >>> On Mon, Feb 04, 2019 at 05:03:24PM +0100, Laszlo Ersek wrote:
> >>>> Introduce the following build scripts under "tests/uefi-test-tools":
> >>>>
> >>>> * "build.sh" builds a single module (a UEFI application) from
> >>>> UefiTestToolsPkg, for a single QEMU emulation target.
> >>>>
> >>>> "build.sh" relies on cross-compilers when the emulation target and the
> >>>> build host architecture don't match. The cross-compiler prefix is
> >>>> computed according to a fixed, Linux-specific pattern. No attempt is
> >>>> made to copy or reimplement the GNU Make magic from "qemu/roms/Makefile"
> >>>> for cross-compiler prefix determination. The reason is that the build
> >>>> host OSes that are officially supported by edk2, and those that are
> >>>> supported by QEMU, intersect only in Linux. (Note that the UNIXGCC
> >>>> toolchain is being removed from edk2,
> >>>> <https://bugzilla.tianocore.org/show_bug.cgi?id=1377>.)
> >>>>
> >>>> * "Makefile" currently builds the "UefiTestToolsPkg/BiosTablesTest"
> >>>> application, for arm, aarch64, i386, and x86_64, with the help of
> >>>> "build.sh".
> >>>>
> >>>> "Makefile" turns each resultant UEFI executable into a UEFI-bootable,
> >>>> qcow2-compressed ISO image. The ISO images are output as
> >>>> "tests/data/uefi-boot-images/bios-tables-test.<TARGET>.iso.qcow2".
> >>>>
> >>>> Each ISO image should be passed to QEMU as follows:
> >>>>
> >>>> -drive id=boot-cd,if=none,readonly,format=qcow2,file=$ISO \
> >>>> -device virtio-scsi-pci,id=scsi0 \
> >>>> -device scsi-cd,drive=boot-cd,bus=scsi0.0,bootindex=0 \
> >>>>
> >>>> "Makefile" assumes that "mkdosfs", "mtools", and "genisoimage" are
> >>>> present.
> >>>>
> >>>> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> >>>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >>>> Cc: Gerd Hoffmann <kraxel@redhat.com>
> >>>> Cc: Igor Mammedov <imammedo@redhat.com>
> >>>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> >>>> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
> >>>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> >>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >>>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >>>> ---
> >>>>
> >>>> Notes:
> >>>> v3:
> >>>> - explicitly mark the "./build.sh" recipe as recursive, with the "+"
> >>>> indicator; document it in a comment [Phil]
> >>>> - pick up R-b, T-b [Phil]
> >>>>
> >>>> v2:
> >>>> - add the .NOTPARALLEL target [Phil, help-make, edk2-devel]
> >>>>
> >>>> tests/uefi-test-tools/Makefile | 106 ++++++++++++++
> >>>> tests/uefi-test-tools/.gitignore | 3 +
> >>>> tests/uefi-test-tools/build.sh | 145 ++++++++++++++++++++
> >>>> 3 files changed, 254 insertions(+)
> >>>>
> >>>> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
> >>>> new file mode 100644
> >>>> index 000000000000..1d78bc14d51a
> >>>> --- /dev/null
> >>>> +++ b/tests/uefi-test-tools/Makefile
> >>>> @@ -0,0 +1,106 @@
> >>>> +# Makefile for the test helper UEFI applications that run in guests.
> >>>> +#
> >>>> +# Copyright (C) 2019, Red Hat, Inc.
> >>>> +#
> >>>> +# This program and the accompanying materials are licensed and made available
> >>>> +# under the terms and conditions of the BSD License that accompanies this
> >>>> +# distribution. The full text of the license may be found at
> >>>> +# <http://opensource.org/licenses/bsd-license.php>.
> >>>> +#
> >>>> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> >>>> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> >>>> +
> >>>> +edk2_dir := ../../roms/edk2
> >>>> +images_dir := ../data/uefi-boot-images
> >>>> +emulation_targets := arm aarch64 i386 x86_64
> >>>> +uefi_binaries := bios-tables-test
> >>>> +intermediate_suffixes := .efi .fat .iso.raw
> >>>> +
> >>>> +images: $(foreach binary,$(uefi_binaries), \
> >>>> + $(foreach target,$(emulation_targets), \
> >>>> + $(images_dir)/$(binary).$(target).iso.qcow2))
> >>>> +
> >>>> +# Preserve all intermediate targets if the build succeeds.
> >>>> +# - Intermediate targets help with development & debugging.
> >>>> +# - Preserving intermediate targets also keeps spurious changes out of the
> >>>> +# final build products, in case the user re-runs "make" without any changes
> >>>> +# to the UEFI source code. Normally, the intermediate files would have been
> >>>> +# removed by the last "make" invocation, hence the re-run would rebuild them
> >>>> +# from the unchanged UEFI sources. Unfortunately, the "mkdosfs" and
> >>>> +# "genisoimage" utilities embed timestamp-based information in their outputs,
> >>>> +# which causes git to report differences for the tracked qcow2 ISO images.
> >>>> +.SECONDARY: $(foreach binary,$(uefi_binaries), \
> >>>> + $(foreach target,$(emulation_targets), \
> >>>> + $(foreach suffix,$(intermediate_suffixes), \
> >>>> + Build/$(binary).$(target)$(suffix))))
> >>>> +
> >>>> +# In the pattern rules below, the stem (%, $*) stands for
> >>>> +# "$(binary).$(target)".
> >>>> +
> >>>> +# Convert the raw ISO image to a qcow2 one, enabling compression, and using a
> >>>> +# small cluster size. This allows for small binary files under git control,
> >>>> +# hence for small binary patches.
> >>>> +$(images_dir)/%.iso.qcow2: Build/%.iso.raw
> >>>> + mkdir -p -- $(images_dir)
> >>>> + $${QTEST_QEMU_IMG:-qemu-img} convert -f raw -O qcow2 -c \
> >>>> + -o cluster_size=512 -- $< $@
> >>>> +
> >>>> +# Embed the "UEFI system partition" into an ISO9660 file system as an ElTorito
> >>>> +# boot image.
> >>>> +Build/%.iso.raw: Build/%.fat
> >>>> + genisoimage -input-charset ASCII -efi-boot $(notdir $<) -no-emul-boot \
> >>>> + -quiet -o $@ -- $<
> >>>> +
> >>>> +# Define chained macros in order to map QEMU system emulation targets to
> >>>> +# *short* UEFI architecture identifiers. Periods are allowed in, and ultimately
> >>>> +# stripped from, the argument.
> >>>> +map_arm_to_uefi = $(subst arm,ARM,$(1))
> >>>> +map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1)))
> >>>> +map_i386_to_uefi = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1)))
> >>>> +map_x86_64_to_uefi = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1)))
> >>>> +map_to_uefi = $(subst .,,$(call map_x86_64_to_uefi,$(1)))
> >>>> +
> >>>> +# Format a "UEFI system partition", using the UEFI binary as the default boot
> >>>> +# loader. Add 10% size for filesystem metadata, round up to the next KB, and
> >>>> +# make sure the size is large enough for a FAT filesystem. Name the filesystem
> >>>> +# after the UEFI binary. (Excess characters are automatically dropped from the
> >>>> +# filesystem label.)
> >>>> +Build/%.fat: Build/%.efi
> >>>> + rm -f -- $@
> >>>> + uefi_bin_b=$$(stat --format=%s -- $<) && \
> >>>> + uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \
> >>>> + uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \
> >>>> + mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb
> >>>> + MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI
> >>>> + MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT
> >>>> + MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \
> >>>> + ::EFI/BOOT/BOOT$(call map_to_uefi,$(suffix $*)).EFI
> >>>> +
> >>>> +# In the pattern rules below, the stem (%, $*) stands for "$(target)" only. The
> >>>> +# association between the UEFI binary (such as "bios-tables-test") and the
> >>>> +# component name from the edk2 platform DSC file (such as "BiosTablesTest") is
> >>>> +# explicit in each rule.
> >>>> +
> >>>> +# "build.sh" invokes the "build" utility of edk2 BaseTools. In any given edk2
> >>>> +# workspace, at most one "build" instance may be operating at a time. Therefore
> >>>> +# we must serialize the rebuilding of targets in this Makefile.
> >>>> +.NOTPARALLEL:
> >>>> +
> >>>> +# In turn, the "build" utility of edk2 BaseTools invokes another "make".
> >>>> +# Although the outer "make" process advertizes its job server to all child
> >>>> +# processes via MAKEFLAGS in the environment, the outer "make" closes the job
> >>>> +# server file descriptors (exposed in MAKEFLAGS) before executing a recipe --
> >>>> +# unless the recipe is recognized as a recursive "make" recipe. Recipes that
> >>>> +# call $(MAKE) are classified automatically as recursive; for "build.sh" below,
> >>>> +# we must mark the recipe manually as recursive, by using the "+" indicator.
> >>>> +# This way, when the inner "make" starts a parallel build of the target edk2
> >>>> +# module, it can communicate with the outer "make"'s job server.
> >>>> +Build/bios-tables-test.%.efi: build-edk2-tools
> >>>> + +./build.sh $(edk2_dir) BiosTablesTest $* $@
> >>>
> >>> Does this actually work with an out of tree build?
> >>
> >> It's not supposed to.
> >>
> >> Again, it's not something that a normal QEMU build includes. It is only
> >> for maintainers to rebuild when there is a reason to do so. The output
> >> binaries are tracked by git, and will be used as-is (in binary form) by
> >> the ACPI test suite. If there are updates to the UEFI source code, the
> >> binaries will have to be rebuilt by a maintainer (or by me, if I submit
> >> the UEFI code changes), and the refreshed blobs are to be checked into
> >> git. Think iPXE oproms for an analogy.
> >>
> >>> Shouldn't this be SRC_PATH/tests/uefi-test-tools/ ?
> >>
> >> No; nothing under roms/ is built like that, and the same applies to this
> >> patch as well.
> >>
> >> *Conceptually*, this patch is for roms/. However, in earlier discussion,
> >> it was suggested that roms/ be kept dedicated to external git submodules
> >> only, and that we not add such ROM source to roms/ whose master repo is
> >> genuinely the QEMU repo. Please see the sub-thread at:
> >>
> >> Re: [PATCH 10/14] tests: acpi: ignore SMBIOS tests when UEFI firmware is used
> >> http://mid.mail-archive.com/20190116115217.jduhqrwbjhuibmoq@sirius.home.kraxel.org
> >>
> >> The last idea was that the UEFI source code should be kept in a direct
> >> subdirectory of tests/ (rather than in roms/). And the binaries should
> >> go under tests/data/uefi-boot-images/ (rather than pc-bios/).
> >>
> >> Thanks
> >> Laszlo
> >
> > Hmm I see. You see rebuild-expected-aml.sh does not work
> > like this at all. It works fine with an out of tree build:
> > check it out.
>
> But rebuild-expected-aml.sh does not depend of roms/.
It absolutely depends on pc-bios/bios.bin
> >
> > So I try to keep it all out of tree.
>
> Patch 5/5 add the bios-tables-test blobs under tests/data/ (as other
> submodules in roms/ do, adding blobs in pc-bios/).
>
> >
> > And question would be what if someone wanted a reproducible
> > build of QEMU, what would be the right way to do it?
>
> This question deserves his own thread :)
Sure.
> > Yes right now roms seems to be broken for an out of
> > tree build but is that by design and should we
> > add more examples of this?
>
> IMO having these tests build out-of-tree is easier than trying to build
> various of the projects in roms/ out-of-tree.
> This would be a good effort, but I'm not sure it is worth it with this
> series.
> Eventually once we have a qtest using the bios-tables, we could spend
> some time to make this script work out-of-tree.
>
> Regards,
>
> Phil.
I'm not saying it's a blocker.
--
MST
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts
2019-02-04 21:55 ` Michael S. Tsirkin
@ 2019-02-05 0:23 ` Philippe Mathieu-Daudé
2019-02-05 8:49 ` Laszlo Ersek
1 sibling, 0 replies; 23+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-02-05 0:23 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Laszlo Ersek, qemu devel list, Ard Biesheuvel, Gerd Hoffmann,
Igor Mammedov, Shannon Zhao
On 2/4/19 10:55 PM, Michael S. Tsirkin wrote:
> On Mon, Feb 04, 2019 at 08:46:33PM +0100, Philippe Mathieu-Daudé wrote:
>> On 2/4/19 8:32 PM, Michael S. Tsirkin wrote:
>>> On Mon, Feb 04, 2019 at 07:41:38PM +0100, Laszlo Ersek wrote:
>>>> On 02/04/19 18:47, Michael S. Tsirkin wrote:
>>>>> On Mon, Feb 04, 2019 at 05:03:24PM +0100, Laszlo Ersek wrote:
>>>>>> Introduce the following build scripts under "tests/uefi-test-tools":
[...]>>>>>> +# In turn, the "build" utility of edk2 BaseTools invokes
another "make".
>>>>>> +# Although the outer "make" process advertizes its job server to all child
>>>>>> +# processes via MAKEFLAGS in the environment, the outer "make" closes the job
>>>>>> +# server file descriptors (exposed in MAKEFLAGS) before executing a recipe --
>>>>>> +# unless the recipe is recognized as a recursive "make" recipe. Recipes that
>>>>>> +# call $(MAKE) are classified automatically as recursive; for "build.sh" below,
>>>>>> +# we must mark the recipe manually as recursive, by using the "+" indicator.
>>>>>> +# This way, when the inner "make" starts a parallel build of the target edk2
>>>>>> +# module, it can communicate with the outer "make"'s job server.
>>>>>> +Build/bios-tables-test.%.efi: build-edk2-tools
>>>>>> + +./build.sh $(edk2_dir) BiosTablesTest $* $@
>>>>>
>>>>> Does this actually work with an out of tree build?
>>>>
>>>> It's not supposed to.
>>>>
>>>> Again, it's not something that a normal QEMU build includes. It is only
>>>> for maintainers to rebuild when there is a reason to do so. The output
>>>> binaries are tracked by git, and will be used as-is (in binary form) by
>>>> the ACPI test suite. If there are updates to the UEFI source code, the
>>>> binaries will have to be rebuilt by a maintainer (or by me, if I submit
>>>> the UEFI code changes), and the refreshed blobs are to be checked into
>>>> git. Think iPXE oproms for an analogy.
>>>>
>>>>> Shouldn't this be SRC_PATH/tests/uefi-test-tools/ ?
>>>>
>>>> No; nothing under roms/ is built like that, and the same applies to this
>>>> patch as well.
>>>>
>>>> *Conceptually*, this patch is for roms/. However, in earlier discussion,
>>>> it was suggested that roms/ be kept dedicated to external git submodules
>>>> only, and that we not add such ROM source to roms/ whose master repo is
>>>> genuinely the QEMU repo. Please see the sub-thread at:
>>>>
>>>> Re: [PATCH 10/14] tests: acpi: ignore SMBIOS tests when UEFI firmware is used
>>>> http://mid.mail-archive.com/20190116115217.jduhqrwbjhuibmoq@sirius.home.kraxel.org
>>>>
>>>> The last idea was that the UEFI source code should be kept in a direct
>>>> subdirectory of tests/ (rather than in roms/). And the binaries should
>>>> go under tests/data/uefi-boot-images/ (rather than pc-bios/).
>>>>
>>>> Thanks
>>>> Laszlo
>>>
>>> Hmm I see. You see rebuild-expected-aml.sh does not work
>>> like this at all. It works fine with an out of tree build:
>>> check it out.
>>
>> But rebuild-expected-aml.sh does not depend of roms/.
>
> It absolutely depends on pc-bios/bios.bin
Oh you are right!
I'm taking notes for an eventual future cleanup.
Regards,
Phil.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts
2019-02-04 21:55 ` Michael S. Tsirkin
2019-02-05 0:23 ` Philippe Mathieu-Daudé
@ 2019-02-05 8:49 ` Laszlo Ersek
2019-02-05 16:36 ` Michael S. Tsirkin
1 sibling, 1 reply; 23+ messages in thread
From: Laszlo Ersek @ 2019-02-05 8:49 UTC (permalink / raw)
To: Michael S. Tsirkin, Philippe Mathieu-Daudé
Cc: qemu devel list, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Shannon Zhao
On 02/04/19 22:55, Michael S. Tsirkin wrote:
> On Mon, Feb 04, 2019 at 08:46:33PM +0100, Philippe Mathieu-Daudé
> wrote:
>> Hi Michael,
>>
>> On 2/4/19 8:32 PM, Michael S. Tsirkin wrote:
>>> And question would be what if someone wanted a reproducible
>>> build of QEMU, what would be the right way to do it?
>>
>> This question deserves his own thread :)
>
> Sure.
(I don't know enough to comment on this sensibly; so I'm only following
up to show that I'm not willfully ignoring the topic.)
What constitutes a "QEMU build" in this context?
If it means the sum of artifacts that get installed by "make install",
then the current patch set doesn't factor into that at all.
If it means something else, then "it depends". For example,
"genisoimage" and "mkdosfs" place pseudo-random / timestamp-based
identifiers into the images that they generate, and there's no way to
prevent at least "genisoimage" from doing that. Thus, if we consider
UEFI-bootable ISO images, rebuilt from zero, a part of a "reproducible
build", then the answer is "there's no right way until someone extends
genisoimage with some new cmdline options".
>>> Yes right now roms seems to be broken for an out of tree build but
>>> is that by design and should we add more examples of this?
>>
>> IMO having these tests build out-of-tree is easier than trying to
>> build various of the projects in roms/ out-of-tree. This would be a
>> good effort, but I'm not sure it is worth it with this series.
>> Eventually once we have a qtest using the bios-tables, we could spend
>> some time to make this script work out-of-tree.
>
> I'm not saying it's a blocker.
Regarding roms/edk2, we have to distinguish two sets of source code,
wrt. building out-of-tree.
- The firmware modules build just fine outside of the tree, and this
patch set already puts that feature to use. (Namely, all the
dependencies that the
tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
application pulls in from roms/edk2 are compiled outside of
roms/edk2.)
- However, the native build utilities (in the
roms/edk2/BaseTools
subdirectory) that first have to be built natively, so that they can
help produce the firmware executables from the firmware source, don't
themselves build outside of that subdirectory. This is a genuine
limitation of upstream edk2, as far as I can tell.
Thanks,
Laszlo
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts
2019-02-05 8:49 ` Laszlo Ersek
@ 2019-02-05 16:36 ` Michael S. Tsirkin
0 siblings, 0 replies; 23+ messages in thread
From: Michael S. Tsirkin @ 2019-02-05 16:36 UTC (permalink / raw)
To: Laszlo Ersek
Cc: Philippe Mathieu-Daudé, qemu devel list, Ard Biesheuvel,
Gerd Hoffmann, Igor Mammedov, Shannon Zhao
On Tue, Feb 05, 2019 at 09:49:57AM +0100, Laszlo Ersek wrote:
> On 02/04/19 22:55, Michael S. Tsirkin wrote:
> > On Mon, Feb 04, 2019 at 08:46:33PM +0100, Philippe Mathieu-Daudé
> > wrote:
> >> Hi Michael,
> >>
> >> On 2/4/19 8:32 PM, Michael S. Tsirkin wrote:
>
> >>> And question would be what if someone wanted a reproducible
> >>> build of QEMU, what would be the right way to do it?
> >>
> >> This question deserves his own thread :)
> >
> > Sure.
>
> (I don't know enough to comment on this sensibly; so I'm only following
> up to show that I'm not willfully ignoring the topic.)
Thanks!
> What constitutes a "QEMU build" in this context?
>
> If it means the sum of artifacts that get installed by "make install",
> then the current patch set doesn't factor into that at all.
That's true in that it's just a test.
> If it means something else, then "it depends". For example,
> "genisoimage" and "mkdosfs" place pseudo-random / timestamp-based
> identifiers into the images that they generate, and there's no way to
> prevent at least "genisoimage" from doing that. Thus, if we consider
> UEFI-bootable ISO images, rebuilt from zero, a part of a "reproducible
> build", then the answer is "there's no right way until someone extends
> genisoimage with some new cmdline options".
Yep that's true too.
> >>> Yes right now roms seems to be broken for an out of tree build but
> >>> is that by design and should we add more examples of this?
> >>
> >> IMO having these tests build out-of-tree is easier than trying to
> >> build various of the projects in roms/ out-of-tree. This would be a
> >> good effort, but I'm not sure it is worth it with this series.
> >> Eventually once we have a qtest using the bios-tables, we could spend
> >> some time to make this script work out-of-tree.
> >
> > I'm not saying it's a blocker.
>
> Regarding roms/edk2, we have to distinguish two sets of source code,
> wrt. building out-of-tree.
>
> - The firmware modules build just fine outside of the tree, and this
> patch set already puts that feature to use. (Namely, all the
> dependencies that the
>
> tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
>
> application pulls in from roms/edk2 are compiled outside of
> roms/edk2.)
>
> - However, the native build utilities (in the
>
> roms/edk2/BaseTools
>
> subdirectory) that first have to be built natively, so that they can
> help produce the firmware executables from the firmware source, don't
> themselves build outside of that subdirectory. This is a genuine
> limitation of upstream edk2, as far as I can tell.
>
> Thanks,
> Laszlo
Interesting, thanks for sharing.
--
MST
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH v3 5/5] tests/data: introduce "uefi-boot-images" with the "bios-tables-test" ISOs
2019-02-04 16:03 [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule Laszlo Ersek
` (3 preceding siblings ...)
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 4/5] tests/uefi-test-tools: add build scripts Laszlo Ersek
@ 2019-02-04 16:03 ` Laszlo Ersek
2019-02-05 15:07 ` [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule Igor Mammedov
2019-02-06 10:14 ` Igor Mammedov
6 siblings, 0 replies; 23+ messages in thread
From: Laszlo Ersek @ 2019-02-04 16:03 UTC (permalink / raw)
To: qemu devel list
Cc: Michael S. Tsirkin, Ard Biesheuvel, Gerd Hoffmann, Igor Mammedov,
Philippe Mathieu-Daudé, Shannon Zhao
Add UEFI-bootable qcow2-compressed ISO images built from:
tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
Notes:
v3:
- refresh the images (should only differ in internal timestamps etc)
v2:
- refresh the images (should only differ in internal timestamps etc)
v1:
- Again, if needed, I'd be happy to be designated as Maintainer for the
files being added in this patch; please let me know the right spot in
"MAINTAINERS".
tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2 | Bin 0 -> 11776 bytes
tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2 | Bin 0 -> 11776 bytes
tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2 | Bin 0 -> 12800 bytes
tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2 | Bin 0 -> 13312 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2 b/tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2
new file mode 100644
index 0000000000000000000000000000000000000000..ac0b7b1b8f8977977afcb1d43f6870d863fd3777
GIT binary patch
literal 11776
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
literal 0
HcmV?d00001
diff --git a/tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2 b/tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2
new file mode 100644
index 0000000000000000000000000000000000000000..d20fa7c819257943577c9b08fa52109f0195343f
GIT binary patch
literal 11776
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
Y**D2boP32rga7T<&wqKl`p-}Q4R4P{o&W#<
literal 0
HcmV?d00001
diff --git a/tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2 b/tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2
new file mode 100644
index 0000000000000000000000000000000000000000..26c882baeababeda291d5aa0cb8b254d3e3af261
GIT binary patch
literal 12800
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
literal 0
HcmV?d00001
diff --git a/tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2 b/tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2
new file mode 100644
index 0000000000000000000000000000000000000000..9ec3c1f20bb2d9d0573a58719b47c2d3389425e0
GIT binary patch
literal 13312
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	mv*_v7>;9rscd0-QSv=EH9r+>frvY(P
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
literal 0
HcmV?d00001
--
2.19.1.3.g30247aa5d201
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule
2019-02-04 16:03 [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule Laszlo Ersek
` (4 preceding siblings ...)
2019-02-04 16:03 ` [Qemu-devel] [PATCH v3 5/5] tests/data: introduce "uefi-boot-images" with the "bios-tables-test" ISOs Laszlo Ersek
@ 2019-02-05 15:07 ` Igor Mammedov
2019-02-05 15:19 ` Laszlo Ersek
2019-02-06 10:14 ` Igor Mammedov
6 siblings, 1 reply; 23+ messages in thread
From: Igor Mammedov @ 2019-02-05 15:07 UTC (permalink / raw)
To: Laszlo Ersek
Cc: qemu devel list, Ard Biesheuvel, Michael S. Tsirkin, Shannon Zhao,
Gerd Hoffmann, Philippe Mathieu-Daudé
On Mon, 4 Feb 2019 17:03:20 +0100
Laszlo Ersek <lersek@redhat.com> wrote:
Am I to greedy to ask for prebuilt AVMF image in QEMU repo on top of
this App (while you still remember all Makefile magic foo) so test won't
have to fish out distro provided firmware or skip testing if firmware
is not available?
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule
2019-02-05 15:07 ` [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule Igor Mammedov
@ 2019-02-05 15:19 ` Laszlo Ersek
2019-02-06 10:30 ` Igor Mammedov
0 siblings, 1 reply; 23+ messages in thread
From: Laszlo Ersek @ 2019-02-05 15:19 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu devel list, Ard Biesheuvel, Michael S. Tsirkin, Shannon Zhao,
Gerd Hoffmann, Philippe Mathieu-Daudé
On 02/05/19 16:07, Igor Mammedov wrote:
> On Mon, 4 Feb 2019 17:03:20 +0100
> Laszlo Ersek <lersek@redhat.com> wrote:
>
> Am I to greedy to ask for prebuilt AVMF image in QEMU repo on top of
> this App (while you still remember all Makefile magic foo) so test won't
> have to fish out distro provided firmware or skip testing if firmware
> is not available?
>
No, not too greedy :) I think that's a reasonable idea; we intended
bundling "reasonably-built" edk2 firmware binaries with QEMU anyway. I
can work on that once this series is merged. (I wouldn't like to work on
these assignments simultaneously.)
Thanks,
Laszlo
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule
2019-02-05 15:19 ` Laszlo Ersek
@ 2019-02-06 10:30 ` Igor Mammedov
2019-02-12 18:34 ` Michael S. Tsirkin
0 siblings, 1 reply; 23+ messages in thread
From: Igor Mammedov @ 2019-02-06 10:30 UTC (permalink / raw)
To: Laszlo Ersek
Cc: qemu devel list, Ard Biesheuvel, Michael S. Tsirkin, Shannon Zhao,
Gerd Hoffmann, Philippe Mathieu-Daudé
On Tue, 5 Feb 2019 16:19:50 +0100
Laszlo Ersek <lersek@redhat.com> wrote:
> On 02/05/19 16:07, Igor Mammedov wrote:
> > On Mon, 4 Feb 2019 17:03:20 +0100
> > Laszlo Ersek <lersek@redhat.com> wrote:
> >
> > Am I to greedy to ask for prebuilt AVMF image in QEMU repo on top of
> > this App (while you still remember all Makefile magic foo) so test won't
> > have to fish out distro provided firmware or skip testing if firmware
> > is not available?
> >
>
> No, not too greedy :) I think that's a reasonable idea; we intended
> bundling "reasonably-built" edk2 firmware binaries with QEMU anyway.
Thanks, I'll postpone ARM's acpi tests respin till we have AVMF blobs
in QEMU tree.
> can work on that once this series is merged. (I wouldn't like to work on
> these assignments simultaneously.)
I think series is practically ready to be merged
(I can live without out of tree builds for blobs that's hardly ever would be rebuilt),
Michael do you concur?
>
> Thanks,
> Laszlo
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule
2019-02-06 10:30 ` Igor Mammedov
@ 2019-02-12 18:34 ` Michael S. Tsirkin
0 siblings, 0 replies; 23+ messages in thread
From: Michael S. Tsirkin @ 2019-02-12 18:34 UTC (permalink / raw)
To: Igor Mammedov
Cc: Laszlo Ersek, qemu devel list, Ard Biesheuvel, Shannon Zhao,
Gerd Hoffmann, Philippe Mathieu-Daudé
On Wed, Feb 06, 2019 at 11:30:13AM +0100, Igor Mammedov wrote:
> On Tue, 5 Feb 2019 16:19:50 +0100
> Laszlo Ersek <lersek@redhat.com> wrote:
>
> > On 02/05/19 16:07, Igor Mammedov wrote:
> > > On Mon, 4 Feb 2019 17:03:20 +0100
> > > Laszlo Ersek <lersek@redhat.com> wrote:
> > >
> > > Am I to greedy to ask for prebuilt AVMF image in QEMU repo on top of
> > > this App (while you still remember all Makefile magic foo) so test won't
> > > have to fish out distro provided firmware or skip testing if firmware
> > > is not available?
> > >
> >
> > No, not too greedy :) I think that's a reasonable idea; we intended
> > bundling "reasonably-built" edk2 firmware binaries with QEMU anyway.
> Thanks, I'll postpone ARM's acpi tests respin till we have AVMF blobs
> in QEMU tree.
>
> > can work on that once this series is merged. (I wouldn't like to work on
> > these assignments simultaneously.)
> I think series is practically ready to be merged
> (I can live without out of tree builds for blobs that's hardly ever would be rebuilt),
> Michael do you concur?
Yes I have it tagged for the next pull.
> >
> > Thanks,
> > Laszlo
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule
2019-02-04 16:03 [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule Laszlo Ersek
` (5 preceding siblings ...)
2019-02-05 15:07 ` [Qemu-devel] [PATCH v3 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule Igor Mammedov
@ 2019-02-06 10:14 ` Igor Mammedov
6 siblings, 0 replies; 23+ messages in thread
From: Igor Mammedov @ 2019-02-06 10:14 UTC (permalink / raw)
To: Laszlo Ersek
Cc: qemu devel list, Ard Biesheuvel, Michael S. Tsirkin, Shannon Zhao,
Gerd Hoffmann, Philippe Mathieu-Daudé
On Mon, 4 Feb 2019 17:03:20 +0100
Laszlo Ersek <lersek@redhat.com> wrote:
> Previous version (v2):
> http://mid.mail-archive.com/20190124203959.30875-1-lersek@redhat.com
>
> Updates in v3 have been noted on each patch in the series.
>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
For series:
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
>
> Thanks
> Laszlo
>
> Laszlo Ersek (5):
> roms: add the edk2 project as a git submodule
> roms: build the EfiRom utility from the roms/edk2 submodule
> tests: introduce "uefi-test-tools" with the BiosTablesTest UEFI app
> tests/uefi-test-tools: add build scripts
> tests/data: introduce "uefi-boot-images" with the "bios-tables-test"
> ISOs
>
> .gitmodules | 3 +
> Makefile | 6 +-
> roms/Makefile | 13 +-
> roms/edk2 | 1 +
> tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2 | Bin 0 -> 11776 bytes
> tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2 | Bin 0 -> 11776 bytes
> tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2 | Bin 0 -> 12800 bytes
> tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2 | Bin 0 -> 13312 bytes
> tests/uefi-test-tools/.gitignore | 3 +
> tests/uefi-test-tools/LICENSE | 25 ++++
> tests/uefi-test-tools/Makefile | 106 ++++++++++++++
> tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c | 130 ++++++++++++++++++
> tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf | 41 ++++++
> tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h | 67 +++++++++
> tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec | 27 ++++
> tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc | 69 ++++++++++
> tests/uefi-test-tools/build.sh | 145 ++++++++++++++++++++
> 17 files changed, 628 insertions(+), 8 deletions(-)
> create mode 160000 roms/edk2
> create mode 100644 tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2
> create mode 100644 tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2
> create mode 100644 tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2
> create mode 100644 tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2
> create mode 100644 tests/uefi-test-tools/.gitignore
> create mode 100644 tests/uefi-test-tools/LICENSE
> create mode 100644 tests/uefi-test-tools/Makefile
> create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
> create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
> create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
> create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
> create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
> create mode 100755 tests/uefi-test-tools/build.sh
>
^ permalink raw reply [flat|nested] 23+ messages in thread