From nobody Mon May 13 08:55:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536175186945389.21742023971694; Wed, 5 Sep 2018 12:19:46 -0700 (PDT) Received: from localhost ([::1]:57811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxdL7-0000Tu-WC for importer@patchew.org; Wed, 05 Sep 2018 15:19:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxdHE-0006Uh-Ms for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxdHA-00084k-RR for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54178) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxdHA-00082S-E9 for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:40 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 84905356EC; Wed, 5 Sep 2018 19:15:39 +0000 (UTC) Received: from amd-seattle-08.khw.lab.eng.bos.redhat.com (amd-seattle-08.khw.lab.eng.bos.redhat.com [10.16.184.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACDAB60BE5; Wed, 5 Sep 2018 19:15:38 +0000 (UTC) From: Wei Huang To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:15:31 -0400 Message-Id: <1536174934-26022-2-git-send-email-wei@redhat.com> In-Reply-To: <1536174934-26022-1-git-send-email-wei@redhat.com> References: <1536174934-26022-1-git-send-email-wei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 05 Sep 2018 19:15:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH V9 1/4] tests/migration: Convert x86 boot block compilation script into Makefile X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, wei@redhat.com, quintela@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The x86 boot block header currently is generated with a shell script. To better support other CPUs (e.g. aarch64), we convert the script into Makefile. This allows us to 1) support cross-compilation easily, and 2) avoid creating a script file for every architecture. Note that, in the new design, the cross compiler prefix can be specified by setting the CROSS_PREFIX in "make" command. Also to allow gcc pre-processor to include the C-style file correctly, it also renames the x86-a-b-bootblock.s file extension from .s to .S. Reviewed-by: Juan Quintela Signed-off-by: Wei Huang Reviewed-by: Andrew Jones --- tests/migration/Makefile | 31 ++++++++++++++++++= ++ tests/migration/rebuild-x86-bootblock.sh | 33 ------------------= ---- .../{x86-a-b-bootblock.s =3D> x86-a-b-bootblock.S} | 0 3 files changed, 31 insertions(+), 33 deletions(-) create mode 100644 tests/migration/Makefile delete mode 100755 tests/migration/rebuild-x86-bootblock.sh rename tests/migration/{x86-a-b-bootblock.s =3D> x86-a-b-bootblock.S} (100= %) diff --git a/tests/migration/Makefile b/tests/migration/Makefile new file mode 100644 index 0000000..c0824b4 --- /dev/null +++ b/tests/migration/Makefile @@ -0,0 +1,31 @@ +# To specify cross compiler prefix, use CROSS_PREFIX=3D +# $ make CROSS_PREFIX=3Dx86_64-linux-gnu- + +override define __note +/* This file is automatically generated from + * tests/migration/x86-a-b-bootblock.S, edit that and then run + * tests/migration/rebuild-x86-bootblock.sh to update, + * and then remember to send both in your patch submission. + */ +endef +export __note + +.PHONY: all clean +all: x86-a-b-bootblock.h + +x86-a-b-bootblock.h: x86.bootsect + echo "$$__note" > header.tmp + xxd -i $< | sed -e 's/.*int.*//' >> header.tmp + mv header.tmp $@ + +x86.bootsect: x86.boot + dd if=3D$< of=3D$@ bs=3D256 count=3D2 skip=3D124 + +x86.boot: x86.o + $(CROSS_PREFIX)objcopy -O binary $< $@ + +x86.o: x86-a-b-bootblock.S + $(CROSS_PREFIX)gcc -m32 -march=3Di486 -c $< -o $@ + +clean: + @rm -rf *.boot *.o *.bootsect diff --git a/tests/migration/rebuild-x86-bootblock.sh b/tests/migration/reb= uild-x86-bootblock.sh deleted file mode 100755 index 86cec5d..0000000 --- a/tests/migration/rebuild-x86-bootblock.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# Copyright (c) 2016-2018 Red Hat, Inc. and/or its affiliates -# This work is licensed under the terms of the GNU GPL, version 2 or later. -# See the COPYING file in the top-level directory. -# -# Author: dgilbert@redhat.com - -ASMFILE=3D$PWD/tests/migration/x86-a-b-bootblock.s -HEADER=3D$PWD/tests/migration/x86-a-b-bootblock.h - -if [ ! -e "$ASMFILE" ] -then - echo "Couldn't find $ASMFILE" >&2 - exit 1 -fi - -ASM_WORK_DIR=3D$(mktemp -d --tmpdir X86BB.XXXXXX) -cd "$ASM_WORK_DIR" && -as --32 -march=3Di486 "$ASMFILE" -o x86.o && -objcopy -O binary x86.o x86.boot && -dd if=3Dx86.boot of=3Dx86.bootsect bs=3D256 count=3D2 skip=3D124 && -xxd -i x86.bootsect | -sed -e 's/.*int.*//' > x86.hex && -cat - x86.hex < "$HEADER" -/* This file is automatically generated from - * tests/migration/x86-a-b-bootblock.s, edit that and then run - * tests/migration/rebuild-x86-bootblock.sh to update, - * and then remember to send both in your patch submission. - */ -HERE - -rm x86.hex x86.bootsect x86.boot x86.o -cd .. && rmdir "$ASM_WORK_DIR" diff --git a/tests/migration/x86-a-b-bootblock.s b/tests/migration/x86-a-b-= bootblock.S similarity index 100% rename from tests/migration/x86-a-b-bootblock.s rename to tests/migration/x86-a-b-bootblock.S --=20 1.8.3.1 From nobody Mon May 13 08:55:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536175075909415.2678555910968; Wed, 5 Sep 2018 12:17:55 -0700 (PDT) Received: from localhost ([::1]:57803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxdJF-0007QS-Ly for importer@patchew.org; Wed, 05 Sep 2018 15:17:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxdHE-0006Ui-NI for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxdHB-000860-Ht for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43578) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxdHB-00084I-7b for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:41 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A415308212D; Wed, 5 Sep 2018 19:15:40 +0000 (UTC) Received: from amd-seattle-08.khw.lab.eng.bos.redhat.com (amd-seattle-08.khw.lab.eng.bos.redhat.com [10.16.184.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id A270260BE5; Wed, 5 Sep 2018 19:15:39 +0000 (UTC) From: Wei Huang To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:15:32 -0400 Message-Id: <1536174934-26022-3-git-send-email-wei@redhat.com> In-Reply-To: <1536174934-26022-1-git-send-email-wei@redhat.com> References: <1536174934-26022-1-git-send-email-wei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 05 Sep 2018 19:15:40 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH V9 2/4] tests/migration: Support cross compilation in generating boot header file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, wei@redhat.com, quintela@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Recently a new configure option, CROSS_CC_GUEST, was added to $(TARGET)-softmmu/config-target.mak to support TCG-related tests. This patch tries to leverage this option to support cross compilation when the migration boot block file is being re-generated: * The x86 related files are moved to a new sub-dir (named ./i386). * A new top-layer Makefile is created in tests/migration/ directory. This Makefile searches and parses CROSS_CC_GUEST to generate CROSS_PREFI= X. The CROSS_PREFIX, if available, is then passed to migration/$ARCH/Makefi= le. Reviewed-by: Juan Quintela Signed-off-by: Wei Huang --- tests/migration-test.c | 2 +- tests/migration/Makefile | 44 ++++++++++++------= ---- tests/migration/i386/Makefile | 22 +++++++++++ .../{x86-a-b-bootblock.S =3D> i386/a-b-bootblock.S} | 4 -- .../{x86-a-b-bootblock.h =3D> i386/a-b-bootblock.h} | 8 ++-- 5 files changed, 51 insertions(+), 29 deletions(-) create mode 100644 tests/migration/i386/Makefile rename tests/migration/{x86-a-b-bootblock.S =3D> i386/a-b-bootblock.S} (93= %) rename tests/migration/{x86-a-b-bootblock.h =3D> i386/a-b-bootblock.h} (92= %) diff --git a/tests/migration-test.c b/tests/migration-test.c index 0e687b7..fe6b41a 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -83,7 +83,7 @@ static const char *tmpfs; /* A simple PC boot sector that modifies memory (1-100MB) quickly * outputting a 'B' every so often if it's still running. */ -#include "tests/migration/x86-a-b-bootblock.h" +#include "tests/migration/i386/a-b-bootblock.h" =20 static void init_bootfile_x86(const char *bootpath) { diff --git a/tests/migration/Makefile b/tests/migration/Makefile index c0824b4..a9ed875 100644 --- a/tests/migration/Makefile +++ b/tests/migration/Makefile @@ -1,31 +1,35 @@ -# To specify cross compiler prefix, use CROSS_PREFIX=3D -# $ make CROSS_PREFIX=3Dx86_64-linux-gnu- +# +# Copyright (c) 2018 Red Hat, Inc. and/or its affiliates +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. +# + +TARGET_LIST =3D i386 + +SRC_PATH =3D ../.. =20 override define __note -/* This file is automatically generated from - * tests/migration/x86-a-b-bootblock.S, edit that and then run - * tests/migration/rebuild-x86-bootblock.sh to update, - * and then remember to send both in your patch submission. +/* This file is automatically generated from the assembly file in + * tests/migration/$@. Edit that file and then run "make all" + * inside tests/migration to update, and then remember to send both + * the header and the assembler differences in your patch submission. */ endef export __note =20 -.PHONY: all clean -all: x86-a-b-bootblock.h - -x86-a-b-bootblock.h: x86.bootsect - echo "$$__note" > header.tmp - xxd -i $< | sed -e 's/.*int.*//' >> header.tmp - mv header.tmp $@ +find-arch-cross-cc =3D $(lastword $(shell grep -h "CROSS_CC_GUEST=3D" $(wi= ldcard $(SRC_PATH)/$(patsubst i386,*86*,$(1))-softmmu/config-target.mak))) +parse-cross-prefix =3D $(subst gcc,,$(patsubst cc,gcc,$(patsubst CROSS_CC_= GUEST=3D"%",%,$(call find-arch-cross-cc,$(1))))) +gen-cross-prefix =3D $(patsubst %-,CROSS_PREFIX=3D%-,$(call parse-cross-pr= efix,$(1))) =20 -x86.bootsect: x86.boot - dd if=3D$< of=3D$@ bs=3D256 count=3D2 skip=3D124 +.PHONY: all $(TARGET_LIST) =20 -x86.boot: x86.o - $(CROSS_PREFIX)objcopy -O binary $< $@ +all: $(TARGET_LIST) =20 -x86.o: x86-a-b-bootblock.S - $(CROSS_PREFIX)gcc -m32 -march=3Di486 -c $< -o $@ +$(TARGET_LIST): + $(MAKE) -C $@ $(call gen-cross-prefix,$@) =20 clean: - @rm -rf *.boot *.o *.bootsect + for target in $(TARGET_LIST); do \ + $(MAKE) -C $$target clean; \ + done diff --git a/tests/migration/i386/Makefile b/tests/migration/i386/Makefile new file mode 100644 index 0000000..5c03241 --- /dev/null +++ b/tests/migration/i386/Makefile @@ -0,0 +1,22 @@ +# To specify cross compiler prefix, use CROSS_PREFIX=3D +# $ make CROSS_PREFIX=3Dx86_64-linux-gnu- + +.PHONY: all clean +all: a-b-bootblock.h + +a-b-bootblock.h: x86.bootsect + echo "$$__note" > header.tmp + xxd -i $< | sed -e 's/.*int.*//' >> header.tmp + mv header.tmp $@ + +x86.bootsect: x86.boot + dd if=3D$< of=3D$@ bs=3D256 count=3D2 skip=3D124 + +x86.boot: x86.o + $(CROSS_PREFIX)objcopy -O binary $< $@ + +x86.o: a-b-bootblock.S + $(CROSS_PREFIX)gcc -m32 -march=3Di486 -c $< -o $@ + +clean: + @rm -rf *.boot *.o *.bootsect diff --git a/tests/migration/x86-a-b-bootblock.S b/tests/migration/i386/a-b= -bootblock.S similarity index 93% rename from tests/migration/x86-a-b-bootblock.S rename to tests/migration/i386/a-b-bootblock.S index b164264..3f97f28 100644 --- a/tests/migration/x86-a-b-bootblock.S +++ b/tests/migration/i386/a-b-bootblock.S @@ -3,10 +3,6 @@ # range. # Outputs an initial 'A' on serial followed by repeated 'B's # -# run tests/migration/rebuild-x86-bootblock.sh -# to regenerate the hex, and remember to include both the .h and .s -# in any patches. -# # Copyright (c) 2016 Red Hat, Inc. and/or its affiliates # This work is licensed under the terms of the GNU GPL, version 2 or later. # See the COPYING file in the top-level directory. diff --git a/tests/migration/x86-a-b-bootblock.h b/tests/migration/i386/a-b= -bootblock.h similarity index 92% rename from tests/migration/x86-a-b-bootblock.h rename to tests/migration/i386/a-b-bootblock.h index 78a151f..7d459d4 100644 --- a/tests/migration/x86-a-b-bootblock.h +++ b/tests/migration/i386/a-b-bootblock.h @@ -1,7 +1,7 @@ -/* This file is automatically generated from - * tests/migration/x86-a-b-bootblock.s, edit that and then run - * tests/migration/rebuild-x86-bootblock.sh to update, - * and then remember to send both in your patch submission. +/* This file is automatically generated from the assembly file in + * tests/migration/i386. Edit that file and then run "make all" + * inside tests/migration to update, and then remember to send both + * the header and the assembler differences in your patch submission. */ unsigned char x86_bootsect[] =3D { 0xfa, 0x0f, 0x01, 0x16, 0x74, 0x7c, 0x66, 0xb8, 0x01, 0x00, 0x00, 0x00, --=20 1.8.3.1 From nobody Mon May 13 08:55:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536175071764659.1190033319263; Wed, 5 Sep 2018 12:17:51 -0700 (PDT) Received: from localhost ([::1]:57801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxdJC-0007N4-EU for importer@patchew.org; Wed, 05 Sep 2018 15:17:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxdHE-0006Uf-Mj for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxdHC-00086t-9S for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40102) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxdHC-00085w-0k for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:42 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5FFF586668; Wed, 5 Sep 2018 19:15:41 +0000 (UTC) Received: from amd-seattle-08.khw.lab.eng.bos.redhat.com (amd-seattle-08.khw.lab.eng.bos.redhat.com [10.16.184.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87CAF60BE5; Wed, 5 Sep 2018 19:15:40 +0000 (UTC) From: Wei Huang To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:15:33 -0400 Message-Id: <1536174934-26022-4-git-send-email-wei@redhat.com> In-Reply-To: <1536174934-26022-1-git-send-email-wei@redhat.com> References: <1536174934-26022-1-git-send-email-wei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 05 Sep 2018 19:15:41 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH V9 3/4] tests/migration: Add migration-test header file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, wei@redhat.com, quintela@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch moves the settings related migration-test from the migration-test.c file to a new header file. Reviewed-by: Juan Quintela Reviewed-by: Andrew Jones Signed-off-by: Wei Huang --- tests/migration-test.c | 28 ++++++++++++++++++---------- tests/migration/migration-test.h | 21 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 tests/migration/migration-test.h diff --git a/tests/migration-test.c b/tests/migration-test.c index fe6b41a..17c6896 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -21,11 +21,13 @@ #include "chardev/char.h" #include "sysemu/sysemu.h" =20 +#include "migration/migration-test.h" + /* TODO actually test the results and get rid of this */ #define qtest_qmp_discard_response(...) qobject_unref(qtest_qmp(__VA_ARGS_= _)) =20 -const unsigned start_address =3D 1024 * 1024; -const unsigned end_address =3D 100 * 1024 * 1024; +unsigned start_address; +unsigned end_address; bool got_stop; static bool uffd_feature_thread_id; =20 @@ -80,8 +82,8 @@ static bool ufd_version_check(void) =20 static const char *tmpfs; =20 -/* A simple PC boot sector that modifies memory (1-100MB) quickly - * outputting a 'B' every so often if it's still running. +/* The boot file modifies memory area in [start_address, end_address) + * repeatedly. It outputs a 'B' at a fixed rate while it's still running. */ #include "tests/migration/i386/a-b-bootblock.h" =20 @@ -270,11 +272,11 @@ static void wait_for_migration_pass(QTestState *who) static void check_guests_ram(QTestState *who) { /* Our ASM test will have been incrementing one byte from each page fr= om - * 1MB to <100MB in order. - * This gives us a constraint that any page's byte should be equal or = less - * than the previous pages byte (mod 256); and they should all be equal - * except for one transition at the point where we meet the incremente= r. - * (We're running this with the guest stopped). + * start_address to < end_address in order. This gives us a constraint + * that any page's byte should be equal or less than the previous pages + * byte (mod 256); and they should all be equal except for one transit= ion + * at the point where we meet the incrementer. (We're running this with + * the guest stopped). */ unsigned address; uint8_t first_byte; @@ -285,7 +287,8 @@ static void check_guests_ram(QTestState *who) qtest_memread(who, start_address, &first_byte, 1); last_byte =3D first_byte; =20 - for (address =3D start_address + 4096; address < end_address; address = +=3D 4096) + for (address =3D start_address + TEST_MEM_PAGE_SIZE; address < end_add= ress; + address +=3D TEST_MEM_PAGE_SIZE) { uint8_t b; qtest_memread(who, address, &b, 1); @@ -437,6 +440,8 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, " -drive file=3D%s,format=3Draw" " -incoming %s", accel, tmpfs, bootpath, uri); + start_address =3D X86_TEST_MEM_START; + end_address =3D X86_TEST_MEM_END; } else if (strcmp(arch, "ppc64") =3D=3D 0) { cmd_src =3D g_strdup_printf("-machine accel=3D%s -m 256M" " -name source,debug-threads=3Don" @@ -451,6 +456,9 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, " -serial file:%s/dest_serial" " -incoming %s", accel, tmpfs, uri); + + start_address =3D PPC_TEST_MEM_START; + end_address =3D PPC_TEST_MEM_END; } else { g_assert_not_reached(); } diff --git a/tests/migration/migration-test.h b/tests/migration/migration-t= est.h new file mode 100644 index 0000000..c4c0c52 --- /dev/null +++ b/tests/migration/migration-test.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2018 Red Hat, Inc. and/or its affiliates + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ +#ifndef _TEST_MIGRATION_H_ +#define _TEST_MIGRATION_H_ + +/* Common */ +#define TEST_MEM_PAGE_SIZE 4096 + +/* x86 */ +#define X86_TEST_MEM_START (1 * 1024 * 1024) +#define X86_TEST_MEM_END (100 * 1024 * 1024) + +/* PPC */ +#define PPC_TEST_MEM_START (1 * 1024 * 1024) +#define PPC_TEST_MEM_END (100 * 1024 * 1024) + +#endif /* _TEST_MIGRATION_H_ */ --=20 1.8.3.1 From nobody Mon May 13 08:55:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536175264003353.0233564990194; Wed, 5 Sep 2018 12:21:04 -0700 (PDT) Received: from localhost ([::1]:57819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxdMM-00018K-UR for importer@patchew.org; Wed, 05 Sep 2018 15:21:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxdHF-0006Uj-5e for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxdHD-000889-7Q for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59880) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxdHC-000877-V2 for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:43 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E6EE308624C; Wed, 5 Sep 2018 19:15:42 +0000 (UTC) Received: from amd-seattle-08.khw.lab.eng.bos.redhat.com (amd-seattle-08.khw.lab.eng.bos.redhat.com [10.16.184.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E9D060BE5; Wed, 5 Sep 2018 19:15:41 +0000 (UTC) From: Wei Huang To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:15:34 -0400 Message-Id: <1536174934-26022-5-git-send-email-wei@redhat.com> In-Reply-To: <1536174934-26022-1-git-send-email-wei@redhat.com> References: <1536174934-26022-1-git-send-email-wei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 05 Sep 2018 19:15:42 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH V9 4/4] tests: Add migration test for aarch64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, wei@redhat.com, quintela@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch adds migration test support for aarch64. The test code, which implements the same functionality as x86, is booted as a kernel in qemu. Here are the design choices we make for aarch64: * We choose this -kernel approach because aarch64 QEMU doesn't provide a built-in fw like x86 does. So instead of relying on a boot loader, we use -kernel approach for aarch64. * The serial output is sent to PL011 directly. * The physical memory base for mach-virt machine is 0x40000000. We change the start_address and end_address for aarch64. In addition to providing the binary, this patch also includes the source code and the build script in tests/migration/aarch64. So users can change the source and/or re-compile the binary as they wish. Reviewed-by: Juan Quintela Signed-off-by: Wei Huang Reviewed-by: Andrew Jones --- tests/Makefile.include | 1 + tests/migration-test.c | 27 +++++++++++-- tests/migration/Makefile | 2 +- tests/migration/aarch64/Makefile | 20 ++++++++++ tests/migration/aarch64/a-b-kernel.S | 75 ++++++++++++++++++++++++++++++++= ++++ tests/migration/aarch64/a-b-kernel.h | 19 +++++++++ tests/migration/migration-test.h | 9 +++++ 7 files changed, 148 insertions(+), 5 deletions(-) create mode 100644 tests/migration/aarch64/Makefile create mode 100644 tests/migration/aarch64/a-b-kernel.S create mode 100644 tests/migration/aarch64/a-b-kernel.h diff --git a/tests/Makefile.include b/tests/Makefile.include index 87c81d1..fab8fb9 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -390,6 +390,7 @@ check-qtest-arm-y +=3D tests/hexloader-test$(EXESUF) check-qtest-aarch64-y =3D tests/numa-test$(EXESUF) check-qtest-aarch64-$(CONFIG_SDHCI) +=3D tests/sdhci-test$(EXESUF) check-qtest-aarch64-y +=3D tests/boot-serial-test$(EXESUF) +check-qtest-aarch64-y +=3D tests/migration-test$(EXESUF) =20 check-qtest-microblazeel-y =3D $(check-qtest-microblaze-y) =20 diff --git a/tests/migration-test.c b/tests/migration-test.c index 17c6896..ecfae0b 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -86,12 +86,13 @@ static const char *tmpfs; * repeatedly. It outputs a 'B' at a fixed rate while it's still running. */ #include "tests/migration/i386/a-b-bootblock.h" +#include "tests/migration/aarch64/a-b-kernel.h" =20 -static void init_bootfile_x86(const char *bootpath) +static void init_bootfile(const char *bootpath, void *content) { FILE *bootfile =3D fopen(bootpath, "wb"); =20 - g_assert_cmpint(fwrite(x86_bootsect, 512, 1, bootfile), =3D=3D, 1); + g_assert_cmpint(fwrite(content, 512, 1, bootfile), =3D=3D, 1); fclose(bootfile); } =20 @@ -428,7 +429,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, got_stop =3D false; =20 if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - init_bootfile_x86(bootpath); + init_bootfile(bootpath, x86_bootsect); cmd_src =3D g_strdup_printf("-machine accel=3D%s -m 150M" " -name source,debug-threads=3Don" " -serial file:%s/src_serial" @@ -459,6 +460,24 @@ static int test_migrate_start(QTestState **from, QTest= State **to, =20 start_address =3D PPC_TEST_MEM_START; end_address =3D PPC_TEST_MEM_END; + } else if (strcmp(arch, "aarch64") =3D=3D 0) { + init_bootfile(bootpath, aarch64_kernel); + cmd_src =3D g_strdup_printf("-machine virt,accel=3D%s,gic-version= =3Dmax " + "-name vmsource,debug-threads=3Don -cpu = max " + "-m 150M -serial file:%s/src_serial " + "-kernel %s ", + accel, tmpfs, bootpath); + cmd_dst =3D g_strdup_printf("-machine virt,accel=3D%s,gic-version= =3Dmax " + "-name vmdest,debug-threads=3Don -cpu ma= x " + "-m 150M -serial file:%s/dest_serial " + "-kernel %s " + "-incoming %s ", + accel, tmpfs, bootpath, uri); + + start_address =3D ARM_TEST_MEM_START; + end_address =3D ARM_TEST_MEM_END; + + g_assert(sizeof(aarch64_kernel) <=3D ARM_TEST_MAX_KERNEL_SIZE); } else { g_assert_not_reached(); } @@ -545,7 +564,7 @@ static void test_deprecated(void) { QTestState *from; =20 - from =3D qtest_start(""); + from =3D qtest_start("-machine none"); =20 deprecated_set_downtime(from, 0.12345); deprecated_set_speed(from, 12345); diff --git a/tests/migration/Makefile b/tests/migration/Makefile index a9ed875..13af934 100644 --- a/tests/migration/Makefile +++ b/tests/migration/Makefile @@ -5,7 +5,7 @@ # See the COPYING file in the top-level directory. # =20 -TARGET_LIST =3D i386 +TARGET_LIST =3D i386 aarch64 =20 SRC_PATH =3D ../.. =20 diff --git a/tests/migration/aarch64/Makefile b/tests/migration/aarch64/Mak= efile new file mode 100644 index 0000000..d440fa8 --- /dev/null +++ b/tests/migration/aarch64/Makefile @@ -0,0 +1,20 @@ +# To specify cross compiler prefix, use CROSS_PREFIX=3D +# $ make CROSS_PREFIX=3Daarch64-linux-gnu- + +.PHONY: all clean +all: a-b-kernel.h + +a-b-kernel.h: aarch64.kernel + echo "$$__note" > header.tmp + xxd -i $< | sed -e 's/.*int.*//' >> header.tmp + mv header.tmp $@ + +aarch64.kernel: aarch64.elf + $(CROSS_PREFIX)objcopy -O binary $< $@ + +aarch64.elf: a-b-kernel.S + $(CROSS_PREFIX)gcc -o $@ -nostdlib -Wl,--build-id=3Dnone $< + +clean: + @rm -rf *.kernel *.elf + diff --git a/tests/migration/aarch64/a-b-kernel.S b/tests/migration/aarch64= /a-b-kernel.S new file mode 100644 index 0000000..507af30 --- /dev/null +++ b/tests/migration/aarch64/a-b-kernel.S @@ -0,0 +1,75 @@ +# +# Copyright (c) 2018 Red Hat, Inc. and/or its affiliates +# +# Author: +# Wei Huang +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. +# +# Note: Please make sure the compiler compiles the assembly code below with +# pc-relative address. Also the branch instructions should use relative +# addresses only. + +#include "../migration-test.h" + +.section .text + + .globl _start + +_start: + /* disable MMU to use phys mem address */ + mrs x0, sctlr_el1 + bic x0, x0, #(1<<0) + msr sctlr_el1, x0 + isb + + /* traverse test memory region */ + mov x0, #ARM_TEST_MEM_START + mov x1, #ARM_TEST_MEM_END + + /* output char 'A' to PL011 */ + mov w3, 'A' + mov x2, #ARM_MACH_VIRT_UART + strb w3, [x2] + + /* clean up memory */ + mov w3, #0 + mov x4, x0 +clean: + strb w3, [x4] + add x4, x4, #TEST_MEM_PAGE_SIZE + cmp x4, x1 + ble clean + + /* w5 keeps a counter so we can limit the output speed */ + mov w5, #0 + + /* main body */ +mainloop: + mov x4, x0 + +innerloop: + /* clean cache because el2 might still cache guest data under KVM = */ + dc civac, x4 + + /* increment the first byte of each page by 1 */ + ldrb w3, [x4] + add w3, w3, #1 + and w3, w3, #0xff + strb w3, [x4] + + add x4, x4, #TEST_MEM_PAGE_SIZE + cmp x4, x1 + blt innerloop + + add w5, w5, #1 + and w5, w5, #0xff + cmp w5, #0 + bne mainloop + + /* output char 'B' to PL011 */ + mov w3, 'B' + strb w3, [x2] + + b mainloop diff --git a/tests/migration/aarch64/a-b-kernel.h b/tests/migration/aarch64= /a-b-kernel.h new file mode 100644 index 0000000..521125e --- /dev/null +++ b/tests/migration/aarch64/a-b-kernel.h @@ -0,0 +1,19 @@ +/* This file is automatically generated from the assembly file in + * tests/migration/aarch64. Edit that file and then run "make all" + * inside tests/migration to update, and then remember to send both + * the header and the assembler differences in your patch submission. + */ +unsigned char aarch64_kernel[] =3D { + 0x00, 0x10, 0x38, 0xd5, 0x00, 0xf8, 0x7f, 0x92, 0x00, 0x10, 0x18, 0xd5, + 0xdf, 0x3f, 0x03, 0xd5, 0x00, 0x02, 0xa8, 0xd2, 0x01, 0xc8, 0xa8, 0xd2, + 0x23, 0x08, 0x80, 0x52, 0x02, 0x20, 0xa1, 0xd2, 0x43, 0x00, 0x00, 0x39, + 0x03, 0x00, 0x80, 0x52, 0xe4, 0x03, 0x00, 0xaa, 0x83, 0x00, 0x00, 0x39, + 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, 0xad, 0xff, 0xff, 0x54, + 0x05, 0x00, 0x80, 0x52, 0xe4, 0x03, 0x00, 0xaa, 0x24, 0x7e, 0x0b, 0xd5, + 0x83, 0x00, 0x40, 0x39, 0x63, 0x04, 0x00, 0x11, 0x63, 0x1c, 0x00, 0x12, + 0x83, 0x00, 0x00, 0x39, 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, + 0x2b, 0xff, 0xff, 0x54, 0xa5, 0x04, 0x00, 0x11, 0xa5, 0x1c, 0x00, 0x12, + 0xbf, 0x00, 0x00, 0x71, 0x81, 0xfe, 0xff, 0x54, 0x43, 0x08, 0x80, 0x52, + 0x43, 0x00, 0x00, 0x39, 0xf1, 0xff, 0xff, 0x17 +}; + diff --git a/tests/migration/migration-test.h b/tests/migration/migration-t= est.h index c4c0c52..6939a13 100644 --- a/tests/migration/migration-test.h +++ b/tests/migration/migration-test.h @@ -18,4 +18,13 @@ #define PPC_TEST_MEM_START (1 * 1024 * 1024) #define PPC_TEST_MEM_END (100 * 1024 * 1024) =20 +/* ARM */ +#define ARM_TEST_MEM_START (0x40000000 + 1 * 1024 * 1024) +#define ARM_TEST_MEM_END (0x40000000 + 100 * 1024 * 1024) +#define ARM_MACH_VIRT_UART 0x09000000 +/* AArch64 kernel load address is 0x40080000, and the test memory starts at + * 0x40100000. So the maximum allowable kernel size is 512KB. + */ +#define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024) + #endif /* _TEST_MIGRATION_H_ */ --=20 1.8.3.1