From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4B70C43334 for ; Wed, 22 Jun 2022 13:53:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357659AbiFVNwt (ORCPT ); Wed, 22 Jun 2022 09:52:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357640AbiFVNws (ORCPT ); Wed, 22 Jun 2022 09:52:48 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E0A2931532 for ; Wed, 22 Jun 2022 06:52:47 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D4D1F1042; Wed, 22 Jun 2022 06:52:47 -0700 (PDT) Received: from [10.1.39.31] (Q2TWYV475D.cambridge.arm.com [10.1.39.31]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CFFF73F792; Wed, 22 Jun 2022 06:52:46 -0700 (PDT) Message-ID: <6d90fcae-354f-6e76-f39c-db0eefc36a88@arm.com> Date: Wed, 22 Jun 2022 14:52:45 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [kvm-unit-tests PATCH v2 22/23] arm64: Add support for efi in Makefile Content-Language: en-GB To: Ricardo Koller Cc: kvm@vger.kernel.org, drjones@redhat.com, pbonzini@redhat.com, jade.alglave@arm.com, alexandru.elisei@arm.com References: <20220506205605.359830-1-nikos.nikoleris@arm.com> <20220506205605.359830-23-nikos.nikoleris@arm.com> From: Nikos Nikoleris In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 21/06/2022 23:51, Ricardo Koller wrote: > On Fri, May 06, 2022 at 09:56:04PM +0100, Nikos Nikoleris wrote: >> Users can now build kvm-unit-tests as efi apps by supplying an extra >> argument when invoking configure: >> >> $> ./configure --enable-efi >> >> This patch is based on an earlier version by >> Andrew Jones >> >> Signed-off-by: Nikos Nikoleris >> --- >> configure | 15 ++++++++++++--- >> arm/Makefile.arm | 6 ++++++ >> arm/Makefile.arm64 | 18 ++++++++++++++---- >> arm/Makefile.common | 45 ++++++++++++++++++++++++++++++++++----------- >> 4 files changed, 66 insertions(+), 18 deletions(-) >> >> diff --git a/configure b/configure >> index 86c3095..beef655 100755 >> --- a/configure >> +++ b/configure >> @@ -195,14 +195,19 @@ else >> fi >> fi >> >> -if [ "$efi" ] && [ "$arch" != "x86_64" ]; then >> +if [ "$efi" ] && [ "$arch" != "x86_64" ] && [ "$arch" != "arm64" ]; then >> echo "--[enable|disable]-efi is not supported for $arch" >> usage >> fi >> >> if [ -z "$page_size" ]; then >> - [ "$arch" = "arm64" ] && page_size="65536" >> - [ "$arch" = "arm" ] && page_size="4096" >> + if [ "$efi" = 'y' ] && [ "$arch" = "arm64" ]; then >> + page_size="4096" >> + elif [ "$arch" = "arm64" ]; then >> + page_size="65536" >> + elif [ "$arch" = "arm" ]; then >> + page_size="4096" >> + fi >> else >> if [ "$arch" != "arm64" ]; then >> echo "--page-size is not supported for $arch" >> @@ -217,6 +222,10 @@ else >> echo "arm64 doesn't support page size of $page_size" >> usage >> fi >> + if [ "$efi" = 'y' ] && [ "$page_size" != "4096" ]; then >> + echo "efi must use 4K pages" >> + exit 1 >> + fi > > nit: not really needed as x86 doesn't allow other page sizes, arm64 > already forces 4096 above, and arm32 doesn't support efi. > I might be missing something but without this nothing prevents me from doing: $> ./configure --enable-efi --page-size=16k Which we need to catch. Thanks, Nikos >> fi >> >> [ -z "$processor" ] && processor="$arch" >> diff --git a/arm/Makefile.arm b/arm/Makefile.arm >> index 01fd4c7..2ce00f5 100644 >> --- a/arm/Makefile.arm >> +++ b/arm/Makefile.arm >> @@ -7,6 +7,10 @@ bits = 32 >> ldarch = elf32-littlearm >> machine = -marm -mfpu=vfp >> >> +ifeq ($(CONFIG_EFI),y) >> +$(error Cannot build arm32 tests as EFI apps) >> +endif >> + >> # stack.o relies on frame pointers. >> KEEP_FRAME_POINTER := y >> >> @@ -32,6 +36,8 @@ cflatobjs += lib/arm/stack.o >> cflatobjs += lib/ldiv32.o >> cflatobjs += lib/arm/ldivmod.o >> >> +exe = flat >> + >> # arm specific tests >> tests = >> >> diff --git a/arm/Makefile.arm64 b/arm/Makefile.arm64 >> index 6feac76..550e1b2 100644 >> --- a/arm/Makefile.arm64 >> +++ b/arm/Makefile.arm64 >> @@ -27,11 +27,21 @@ cflatobjs += lib/arm64/gic-v3-its.o lib/arm64/gic-v3-its-cmd.o >> >> OBJDIRS += lib/arm64 >> >> +ifeq ($(CONFIG_EFI),y) >> +# avoid jump tables before all relocations have been processed >> +arm/efi/reloc_aarch64.o: CFLAGS += -fno-jump-tables >> +cflatobjs += arm/efi/reloc_aarch64.o >> + >> +exe = efi >> +else >> +exe = flat >> +endif >> + >> # arm64 specific tests >> -tests = $(TEST_DIR)/timer.flat >> -tests += $(TEST_DIR)/micro-bench.flat >> -tests += $(TEST_DIR)/cache.flat >> -tests += $(TEST_DIR)/debug.flat >> +tests = $(TEST_DIR)/timer.$(exe) >> +tests += $(TEST_DIR)/micro-bench.$(exe) >> +tests += $(TEST_DIR)/cache.$(exe) >> +tests += $(TEST_DIR)/debug.$(exe) >> >> include $(SRCDIR)/$(TEST_DIR)/Makefile.common >> >> diff --git a/arm/Makefile.common b/arm/Makefile.common >> index 5be42c0..a8007f4 100644 >> --- a/arm/Makefile.common >> +++ b/arm/Makefile.common >> @@ -4,14 +4,14 @@ >> # Authors: Andrew Jones >> # >> >> -tests-common = $(TEST_DIR)/selftest.flat >> -tests-common += $(TEST_DIR)/spinlock-test.flat >> -tests-common += $(TEST_DIR)/pci-test.flat >> -tests-common += $(TEST_DIR)/pmu.flat >> -tests-common += $(TEST_DIR)/gic.flat >> -tests-common += $(TEST_DIR)/psci.flat >> -tests-common += $(TEST_DIR)/sieve.flat >> -tests-common += $(TEST_DIR)/pl031.flat >> +tests-common = $(TEST_DIR)/selftest.$(exe) >> +tests-common += $(TEST_DIR)/spinlock-test.$(exe) >> +tests-common += $(TEST_DIR)/pci-test.$(exe) >> +tests-common += $(TEST_DIR)/pmu.$(exe) >> +tests-common += $(TEST_DIR)/gic.$(exe) >> +tests-common += $(TEST_DIR)/psci.$(exe) >> +tests-common += $(TEST_DIR)/sieve.$(exe) >> +tests-common += $(TEST_DIR)/pl031.$(exe) >> >> tests-all = $(tests-common) $(tests) >> all: directories $(tests-all) >> @@ -54,6 +54,9 @@ cflatobjs += lib/arm/smp.o >> cflatobjs += lib/arm/delay.o >> cflatobjs += lib/arm/gic.o lib/arm/gic-v2.o lib/arm/gic-v3.o >> cflatobjs += lib/arm/timer.o >> +ifeq ($(CONFIG_EFI),y) >> +cflatobjs += lib/efi.o >> +endif >> >> OBJDIRS += lib/arm >> >> @@ -61,6 +64,25 @@ libeabi = lib/arm/libeabi.a >> eabiobjs = lib/arm/eabi_compat.o >> >> FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libeabi) >> + >> +ifeq ($(CONFIG_EFI),y) >> +%.so: EFI_LDFLAGS += -defsym=EFI_SUBSYSTEM=0xa --no-undefined >> +%.so: %.o $(FLATLIBS) $(SRCDIR)/arm/efi/elf_aarch64_efi.lds $(cstart.o) >> + $(CC) $(CFLAGS) -c -o $(@:.so=.aux.o) $(SRCDIR)/lib/auxinfo.c \ >> + -DPROGNAME=\"$(@:.so=.efi)\" -DAUXFLAGS=$(AUXFLAGS) >> + $(LD) $(EFI_LDFLAGS) -o $@ -T $(SRCDIR)/arm/efi/elf_aarch64_efi.lds \ >> + $(filter %.o, $^) $(FLATLIBS) $(@:.so=.aux.o) \ >> + $(EFI_LIBS) >> + $(RM) $(@:.so=.aux.o) >> + >> +%.efi: %.so >> + $(call arch_elf_check, $^) >> + $(OBJCOPY) \ >> + -j .text -j .sdata -j .data -j .dynamic -j .dynsym \ >> + -j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \ >> + -j .reloc \ >> + -O binary $^ $@ >> +else >> %.elf: LDFLAGS = -nostdlib $(arch_LDFLAGS) >> %.elf: %.o $(FLATLIBS) $(SRCDIR)/arm/flat.lds $(cstart.o) >> $(CC) $(CFLAGS) -c -o $(@:.elf=.aux.o) $(SRCDIR)/lib/auxinfo.c \ >> @@ -74,13 +96,14 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libeabi) >> $(call arch_elf_check, $^) >> $(OBJCOPY) -O binary $^ $@ >> @chmod a-x $@ >> +endif >> >> $(libeabi): $(eabiobjs) >> $(AR) rcs $@ $^ >> >> arm_clean: asm_offsets_clean >> - $(RM) $(TEST_DIR)/*.{o,flat,elf} $(libeabi) $(eabiobjs) \ >> - $(TEST_DIR)/.*.d lib/arm/.*.d >> + $(RM) $(TEST_DIR)/*.{o,flat,elf,so,efi} $(libeabi) $(eabiobjs) \ >> + $(TEST_DIR)/.*.d $(TEST_DIR)/efi/.*.d lib/arm/.*.d >> >> generated-files = $(asm-offsets) >> -$(tests-all:.flat=.o) $(cstart.o) $(cflatobjs): $(generated-files) >> +$(tests-all:.$(exe)=.o) $(cstart.o) $(cflatobjs): $(generated-files) >> -- >> 2.25.1 >>