* [Qemu-devel] [PATCH V3 0/2] tests: Add migration test for aarch64
@ 2018-02-15 6:07 Wei Huang
2018-02-15 6:07 ` [Qemu-devel] [PATCH V3 1/2] tests/migration: Convert the boot block compilation script into Makefile Wei Huang
2018-02-15 6:07 ` [Qemu-devel] [PATCH V3 2/2] tests: Add migration test for aarch64 Wei Huang
0 siblings, 2 replies; 4+ messages in thread
From: Wei Huang @ 2018-02-15 6:07 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, peter.maydell, quintela, drjones
This is a new version of migration-test for aarch64. This version needs to
be applied on top of Dave Gilbert's recent patch "[v4] tests/migration: Add
source to PC boot block".
V2->V3:
* Convert build script to Makefile
* Add cross-compilation support
* Fix CPU type for "tcg" machine type
* Revise asm code and the compilation process from asm to header file
V1->V2:
* Similar to Dave Gilbert's recent changes to migration-test, we
provide the test source and a build script in V2.
* aarch64 kernel blob is defined as "unsigned char" because the source
is now provided in V2.
* Add "-machine none" to test_deprecated() because aarch64 doesn't have
a default machine type.
RFC->V1:
* aarch64 kernel blob is defined as an uint32_t array
* The test code is re-written to address a data caching issue under KVM.
Tests passed under both x86 and aarch64.
* Re-use init_bootfile_x86() for both x86 and aarch64
* Other minor fixes
Thanks,
-Wei
Wei Huang (2):
tests/migration: Convert the boot block compilation script into
Makefile
tests: Add migration test for aarch64
tests/Makefile.include | 1 +
tests/migration-test.c | 39 ++++++++++++++---
tests/migration/Makefile | 46 ++++++++++++++++++++
tests/migration/aarch64-a-b-kernel.h | 19 ++++++++
tests/migration/aarch64-a-b-kernel.s | 74 ++++++++++++++++++++++++++++++++
tests/migration/rebuild-x86-bootblock.sh | 34 ---------------
tests/migration/x86-a-b-bootblock.h | 2 +-
7 files changed, 174 insertions(+), 41 deletions(-)
create mode 100644 tests/migration/Makefile
create mode 100644 tests/migration/aarch64-a-b-kernel.h
create mode 100644 tests/migration/aarch64-a-b-kernel.s
delete mode 100755 tests/migration/rebuild-x86-bootblock.sh
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH V3 1/2] tests/migration: Convert the boot block compilation script into Makefile
2018-02-15 6:07 [Qemu-devel] [PATCH V3 0/2] tests: Add migration test for aarch64 Wei Huang
@ 2018-02-15 6:07 ` Wei Huang
2018-02-15 6:07 ` [Qemu-devel] [PATCH V3 2/2] tests: Add migration test for aarch64 Wei Huang
1 sibling, 0 replies; 4+ messages in thread
From: Wei Huang @ 2018-02-15 6:07 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, peter.maydell, quintela, drjones
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; 2)
avoid creating a script file for every architecture.
Signed-off-by: Wei Huang <wei@redhat.com>
---
tests/migration/Makefile | 38 ++++++++++++++++++++++++++++++++
tests/migration/rebuild-x86-bootblock.sh | 34 ----------------------------
tests/migration/x86-a-b-bootblock.h | 2 +-
3 files changed, 39 insertions(+), 35 deletions(-)
create mode 100644 tests/migration/Makefile
delete mode 100755 tests/migration/rebuild-x86-bootblock.sh
diff --git a/tests/migration/Makefile b/tests/migration/Makefile
new file mode 100644
index 0000000..e8e6026
--- /dev/null
+++ b/tests/migration/Makefile
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2016-2018 Red Hat, Inc. and/or its affiliates
+#
+# Authors:
+# Dave Gilbert <dgilbert@redhat.com>
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or later.
+# See the COPYING file in the top-level directory.
+#
+path := $(subst :, ,$(PATH))
+system := $(shell uname -s | tr "A-Z" "a-z")
+
+cross-ld = $(firstword $(wildcard $(patsubst %,%/$(1)-*$(system)*-ld,$(path))))
+cross-gcc = $(firstword $(wildcard $(patsubst %ld,%gcc,$(call cross-ld,$(1)))))
+find-cross-prefix = $(subst gcc,,$(notdir $(call cross-gcc,$(1))))
+
+x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
+
+export __note
+override define __note
+/* This file is automatically generated from
+ * tests/migration/$<, edit that and then run
+ * "make $@" inside tests/migration to update,
+ * and then remember to send both in your patch submission.
+ */
+endef
+
+all: x86-a-b-bootblock.h
+
+x86-a-b-bootblock.h: x86-a-b-bootblock.s
+ $(x86_64_cross_prefix)as --32 -march=i486 $< -o x86.o
+ $(x86_64_cross_prefix)objcopy -O binary x86.o x86.boot
+ dd if=x86.boot of=x86.bootsect bs=256 count=2 skip=124
+ echo "$$__note" > $@
+ xxd -i x86.bootsect | sed -e 's/.*int.*//' >> $@
+
+clean:
+ rm -rf *.bootsect *.boot *.o
diff --git a/tests/migration/rebuild-x86-bootblock.sh b/tests/migration/rebuild-x86-bootblock.sh
deleted file mode 100755
index 05ed9ba..0000000
--- a/tests/migration/rebuild-x86-bootblock.sh
+++ /dev/null
@@ -1,34 +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=$PWD/tests/migration/x86-a-b-bootblock.s
-HEADER=$PWD/tests/migration/x86-a-b-bootblock.h
-
-if [ ! -e "$ASMFILE" ]
-then
- echo "Couldn't find $ASMFILE" >&2
- exit 1
-fi
-
-ASM_WORK_DIR=$(mktemp -d --tmpdir X86BB.XXXXXX)
-cd "$ASM_WORK_DIR" &&
-as --32 -march=i486 "$ASMFILE" -o x86.o &&
-objcopy -O binary x86.o x86.boot &&
-dd if=x86.boot of=x86.bootsect bs=256 count=2 skip=124 &&
-xxd -i x86.bootsect |
-sed -e 's/.*int.*//' > x86.hex &&
-cat - x86.hex <<HERE > "$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.h b/tests/migration/x86-a-b-bootblock.h
index 78a151f..9e8e2e0 100644
--- a/tests/migration/x86-a-b-bootblock.h
+++ b/tests/migration/x86-a-b-bootblock.h
@@ -1,6 +1,6 @@
/* 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,
+ * "make x86-a-b-bootblock.h" inside tests/migration to update,
* and then remember to send both in your patch submission.
*/
unsigned char x86_bootsect[] = {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH V3 2/2] tests: Add migration test for aarch64
2018-02-15 6:07 [Qemu-devel] [PATCH V3 0/2] tests: Add migration test for aarch64 Wei Huang
2018-02-15 6:07 ` [Qemu-devel] [PATCH V3 1/2] tests/migration: Convert the boot block compilation script into Makefile Wei Huang
@ 2018-02-15 6:07 ` Wei Huang
2018-02-15 10:09 ` Andrew Jones
1 sibling, 1 reply; 4+ messages in thread
From: Wei Huang @ 2018-02-15 6:07 UTC (permalink / raw)
To: qemu-devel; +Cc: dgilbert, peter.maydell, quintela, drjones
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/. So users can change the
source and/or re-compile the binary as they wish.
Signed-off-by: Wei Huang <wei@redhat.com>
---
tests/Makefile.include | 1 +
tests/migration-test.c | 39 ++++++++++++++++---
tests/migration/Makefile | 12 +++++-
tests/migration/aarch64-a-b-kernel.h | 19 +++++++++
tests/migration/aarch64-a-b-kernel.s | 74 ++++++++++++++++++++++++++++++++++++
5 files changed, 137 insertions(+), 8 deletions(-)
create mode 100644 tests/migration/aarch64-a-b-kernel.h
create mode 100644 tests/migration/aarch64-a-b-kernel.s
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 278c13a..5b1605a 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -372,6 +372,7 @@ check-qtest-arm-y += tests/sdhci-test$(EXESUF)
check-qtest-aarch64-y = tests/numa-test$(EXESUF)
check-qtest-aarch64-y += tests/sdhci-test$(EXESUF)
+check-qtest-aarch64-y += tests/migration-test$(EXESUF)
check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 97fdb19..0b6ab5c 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -23,8 +23,8 @@
#define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */
-const unsigned start_address = 1024 * 1024;
-const unsigned end_address = 100 * 1024 * 1024;
+unsigned start_address = 1024 * 1024;
+unsigned end_address = 100 * 1024 * 1024;
bool got_stop;
#if defined(__linux__)
@@ -81,12 +81,13 @@ static const char *tmpfs;
* outputting a 'B' every so often if it's still running.
*/
#include "tests/migration/x86-a-b-bootblock.h"
+#include "tests/migration/aarch64-a-b-kernel.h"
-static void init_bootfile_x86(const char *bootpath)
+static void init_bootfile(const char *bootpath, void *content)
{
FILE *bootfile = fopen(bootpath, "wb");
- g_assert_cmpint(fwrite(x86_bootsect, 512, 1, bootfile), ==, 1);
+ g_assert_cmpint(fwrite(content, 512, 1, bootfile), ==, 1);
fclose(bootfile);
}
@@ -392,7 +393,7 @@ static void test_migrate_start(QTestState **from, QTestState **to,
got_stop = false;
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
- init_bootfile_x86(bootpath);
+ init_bootfile(bootpath, x86_bootsect);
cmd_src = g_strdup_printf("-machine accel=%s -m 150M"
" -name source,debug-threads=on"
" -serial file:%s/src_serial"
@@ -421,6 +422,32 @@ static void test_migrate_start(QTestState **from, QTestState **to,
" -serial file:%s/dest_serial"
" -incoming %s",
accel, tmpfs, uri);
+ } else if (strcmp(arch, "aarch64") == 0) {
+ const char *cpu;
+
+ if (access("/dev/kvm", F_OK)) {
+ accel = "kvm";
+ cpu = "host";
+ } else {
+ accel = "tcg";
+ cpu = "cortex-a57";
+ }
+
+ init_bootfile(bootpath, aarch64_kernel);
+ cmd_src = g_strdup_printf("-machine virt,accel=%s -m 150M "
+ "-name vmsource,debug-threads=on -cpu %s "
+ "-serial file:%s/src_serial "
+ "-kernel %s ",
+ accel, cpu, tmpfs, bootpath);
+ cmd_dst = g_strdup_printf("-machine virt,accel=%s -m 150M "
+ "-name vmdest,debug-threads=on -cpu %s "
+ "-serial file:%s/dest_serial "
+ "-kernel %s "
+ "-incoming %s ",
+ accel, cpu, tmpfs, bootpath, uri);
+ /* aarch64 virt machine physical memory starts at 0x40000000 */
+ start_address += 0x40000000;
+ end_address += 0x40000000;
} else {
g_assert_not_reached();
}
@@ -502,7 +529,7 @@ static void test_deprecated(void)
{
QTestState *from;
- from = qtest_start("");
+ from = qtest_start("-machine none");
deprecated_set_downtime(from, 0.12345);
deprecated_set_speed(from, "12345");
diff --git a/tests/migration/Makefile b/tests/migration/Makefile
index e8e6026..00f854b 100644
--- a/tests/migration/Makefile
+++ b/tests/migration/Makefile
@@ -15,6 +15,7 @@ cross-gcc = $(firstword $(wildcard $(patsubst %ld,%gcc,$(call cross-ld,$(1)))))
find-cross-prefix = $(subst gcc,,$(notdir $(call cross-gcc,$(1))))
x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
+aarch64_cross_prefix := $(call find-cross-prefix,aarch64)
export __note
override define __note
@@ -25,7 +26,7 @@ override define __note
*/
endef
-all: x86-a-b-bootblock.h
+all: x86-a-b-bootblock.h aarch64-a-b-kernel.h
x86-a-b-bootblock.h: x86-a-b-bootblock.s
$(x86_64_cross_prefix)as --32 -march=i486 $< -o x86.o
@@ -34,5 +35,12 @@ x86-a-b-bootblock.h: x86-a-b-bootblock.s
echo "$$__note" > $@
xxd -i x86.bootsect | sed -e 's/.*int.*//' >> $@
+aarch64-a-b-kernel.h: aarch64-a-b-kernel.s
+ $(aarch64_cross_prefix)gcc -o aarch64.elf -nostdlib \
+ -Wl,--build-id=none,-Ttext=40080000 $<
+ $(aarch64_cross_prefix)objcopy -O binary aarch64.elf aarch64.kernel
+ echo "$$__note" > $@
+ xxd -i aarch64.kernel | sed -e 's/.*int.*//' >> $@
+
clean:
- rm -rf *.bootsect *.boot *.o
+ rm -rf *.bootsect *.boot *.o *.elf *.kernel
diff --git a/tests/migration/aarch64-a-b-kernel.h b/tests/migration/aarch64-a-b-kernel.h
new file mode 100644
index 0000000..d294cf8
--- /dev/null
+++ b/tests/migration/aarch64-a-b-kernel.h
@@ -0,0 +1,19 @@
+/* This file is automatically generated from
+ * tests/migration/aarch64-a-b-kernel.s, edit that and then run
+ * "make aarch64-a-b-kernel.h" inside tests/migration to update,
+ * and then remember to send both in your patch submission.
+ */
+unsigned char aarch64_kernel[] = {
+ 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, 0x97
+};
+
diff --git a/tests/migration/aarch64-a-b-kernel.s b/tests/migration/aarch64-a-b-kernel.s
new file mode 100644
index 0000000..713e7a8
--- /dev/null
+++ b/tests/migration/aarch64-a-b-kernel.s
@@ -0,0 +1,74 @@
+#
+# Copyright (c) 2018 Red Hat, Inc. and/or its affiliates
+#
+# Author:
+# Wei Huang <wei@redhat.com>
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or later.
+# See the COPYING file in the top-level directory.
+
+.set ARM_MACH_VIRT_UART, 0x09000000
+.set ARM_MACH_VIRT_PHYS_BASE, 0x40000000
+.set ARM_MACH_VIRT_A_B_START, (0x40000000 + 1*1024*1024)
+.set ARM_MACH_VIRT_A_B_END, (0x40000000 + 100*1024*1024)
+
+.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 1M-100M */
+ mov x0, ARM_MACH_VIRT_A_B_START
+ mov x1, ARM_MACH_VIRT_A_B_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, #(4096)
+ 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 4KB page by 1 */
+ ldrb w3, [x4]
+ add w3, w3, #1
+ and w3, w3, #(0xff)
+ strb w3, [x4]
+
+ add x4, x4, #(4096)
+ 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]
+
+ bl mainloop
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH V3 2/2] tests: Add migration test for aarch64
2018-02-15 6:07 ` [Qemu-devel] [PATCH V3 2/2] tests: Add migration test for aarch64 Wei Huang
@ 2018-02-15 10:09 ` Andrew Jones
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Jones @ 2018-02-15 10:09 UTC (permalink / raw)
To: Wei Huang; +Cc: qemu-devel, peter.maydell, dgilbert, quintela
On Thu, Feb 15, 2018 at 01:07:25AM -0500, Wei Huang wrote:
> 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/. So users can change the
> source and/or re-compile the binary as they wish.
>
> Signed-off-by: Wei Huang <wei@redhat.com>
> ---
> tests/Makefile.include | 1 +
> tests/migration-test.c | 39 ++++++++++++++++---
> tests/migration/Makefile | 12 +++++-
> tests/migration/aarch64-a-b-kernel.h | 19 +++++++++
> tests/migration/aarch64-a-b-kernel.s | 74 ++++++++++++++++++++++++++++++++++++
> 5 files changed, 137 insertions(+), 8 deletions(-)
> create mode 100644 tests/migration/aarch64-a-b-kernel.h
> create mode 100644 tests/migration/aarch64-a-b-kernel.s
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 278c13a..5b1605a 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -372,6 +372,7 @@ check-qtest-arm-y += tests/sdhci-test$(EXESUF)
>
> check-qtest-aarch64-y = tests/numa-test$(EXESUF)
> check-qtest-aarch64-y += tests/sdhci-test$(EXESUF)
> +check-qtest-aarch64-y += tests/migration-test$(EXESUF)
>
> check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
>
> diff --git a/tests/migration-test.c b/tests/migration-test.c
> index 97fdb19..0b6ab5c 100644
> --- a/tests/migration-test.c
> +++ b/tests/migration-test.c
> @@ -23,8 +23,8 @@
>
> #define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */
>
> -const unsigned start_address = 1024 * 1024;
> -const unsigned end_address = 100 * 1024 * 1024;
> +unsigned start_address = 1024 * 1024;
> +unsigned end_address = 100 * 1024 * 1024;
> bool got_stop;
>
> #if defined(__linux__)
> @@ -81,12 +81,13 @@ static const char *tmpfs;
> * outputting a 'B' every so often if it's still running.
> */
> #include "tests/migration/x86-a-b-bootblock.h"
> +#include "tests/migration/aarch64-a-b-kernel.h"
>
> -static void init_bootfile_x86(const char *bootpath)
> +static void init_bootfile(const char *bootpath, void *content)
> {
> FILE *bootfile = fopen(bootpath, "wb");
>
> - g_assert_cmpint(fwrite(x86_bootsect, 512, 1, bootfile), ==, 1);
> + g_assert_cmpint(fwrite(content, 512, 1, bootfile), ==, 1);
> fclose(bootfile);
> }
>
> @@ -392,7 +393,7 @@ static void test_migrate_start(QTestState **from, QTestState **to,
> got_stop = false;
>
> if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
> - init_bootfile_x86(bootpath);
> + init_bootfile(bootpath, x86_bootsect);
> cmd_src = g_strdup_printf("-machine accel=%s -m 150M"
> " -name source,debug-threads=on"
> " -serial file:%s/src_serial"
> @@ -421,6 +422,32 @@ static void test_migrate_start(QTestState **from, QTestState **to,
> " -serial file:%s/dest_serial"
> " -incoming %s",
> accel, tmpfs, uri);
> + } else if (strcmp(arch, "aarch64") == 0) {
> + const char *cpu;
> +
> + if (access("/dev/kvm", F_OK)) {
> + accel = "kvm";
> + cpu = "host";
This won't work. I have /dev/kvm on my x86 notebook, but I can't
run aarch64 kvm guests there. You also need to check if the host
is aarch64. You can do that with uname(3), checking uname.machine.
> + } else {
> + accel = "tcg";
> + cpu = "cortex-a57";
> + }
> +
> + init_bootfile(bootpath, aarch64_kernel);
> + cmd_src = g_strdup_printf("-machine virt,accel=%s -m 150M "
You should also add ,gic-version=%s, where %s is either 'host' when kvm
is in use, or 2 or 3 (whichever) when tcg is in use.
> + "-name vmsource,debug-threads=on -cpu %s "
> + "-serial file:%s/src_serial "
> + "-kernel %s ",
> + accel, cpu, tmpfs, bootpath);
> + cmd_dst = g_strdup_printf("-machine virt,accel=%s -m 150M "
> + "-name vmdest,debug-threads=on -cpu %s "
> + "-serial file:%s/dest_serial "
> + "-kernel %s "
> + "-incoming %s ",
> + accel, cpu, tmpfs, bootpath, uri);
> + /* aarch64 virt machine physical memory starts at 0x40000000 */
> + start_address += 0x40000000;
> + end_address += 0x40000000;
> } else {
> g_assert_not_reached();
> }
> @@ -502,7 +529,7 @@ static void test_deprecated(void)
> {
> QTestState *from;
>
> - from = qtest_start("");
> + from = qtest_start("-machine none");
>
> deprecated_set_downtime(from, 0.12345);
> deprecated_set_speed(from, "12345");
> diff --git a/tests/migration/Makefile b/tests/migration/Makefile
> index e8e6026..00f854b 100644
> --- a/tests/migration/Makefile
> +++ b/tests/migration/Makefile
> @@ -15,6 +15,7 @@ cross-gcc = $(firstword $(wildcard $(patsubst %ld,%gcc,$(call cross-ld,$(1)))))
> find-cross-prefix = $(subst gcc,,$(notdir $(call cross-gcc,$(1))))
>
> x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
> +aarch64_cross_prefix := $(call find-cross-prefix,aarch64)
>
> export __note
> override define __note
> @@ -25,7 +26,7 @@ override define __note
> */
> endef
>
> -all: x86-a-b-bootblock.h
> +all: x86-a-b-bootblock.h aarch64-a-b-kernel.h
>
> x86-a-b-bootblock.h: x86-a-b-bootblock.s
> $(x86_64_cross_prefix)as --32 -march=i486 $< -o x86.o
> @@ -34,5 +35,12 @@ x86-a-b-bootblock.h: x86-a-b-bootblock.s
> echo "$$__note" > $@
> xxd -i x86.bootsect | sed -e 's/.*int.*//' >> $@
>
> +aarch64-a-b-kernel.h: aarch64-a-b-kernel.s
> + $(aarch64_cross_prefix)gcc -o aarch64.elf -nostdlib \
> + -Wl,--build-id=none,-Ttext=40080000 $<
> + $(aarch64_cross_prefix)objcopy -O binary aarch64.elf aarch64.kernel
> + echo "$$__note" > $@
> + xxd -i aarch64.kernel | sed -e 's/.*int.*//' >> $@
> +
> clean:
> - rm -rf *.bootsect *.boot *.o
> + rm -rf *.bootsect *.boot *.o *.elf *.kernel
I'm not sure you want the '-r' in this 'rm'.
> diff --git a/tests/migration/aarch64-a-b-kernel.h b/tests/migration/aarch64-a-b-kernel.h
> new file mode 100644
> index 0000000..d294cf8
> --- /dev/null
> +++ b/tests/migration/aarch64-a-b-kernel.h
> @@ -0,0 +1,19 @@
> +/* This file is automatically generated from
> + * tests/migration/aarch64-a-b-kernel.s, edit that and then run
> + * "make aarch64-a-b-kernel.h" inside tests/migration to update,
> + * and then remember to send both in your patch submission.
> + */
> +unsigned char aarch64_kernel[] = {
> + 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, 0x97
> +};
> +
> diff --git a/tests/migration/aarch64-a-b-kernel.s b/tests/migration/aarch64-a-b-kernel.s
> new file mode 100644
> index 0000000..713e7a8
> --- /dev/null
> +++ b/tests/migration/aarch64-a-b-kernel.s
> @@ -0,0 +1,74 @@
> +#
> +# Copyright (c) 2018 Red Hat, Inc. and/or its affiliates
> +#
> +# Author:
> +# Wei Huang <wei@redhat.com>
> +#
> +# This work is licensed under the terms of the GNU GPL, version 2 or later.
> +# See the COPYING file in the top-level directory.
> +
> +.set ARM_MACH_VIRT_UART, 0x09000000
> +.set ARM_MACH_VIRT_PHYS_BASE, 0x40000000
> +.set ARM_MACH_VIRT_A_B_START, (0x40000000 + 1*1024*1024)
> +.set ARM_MACH_VIRT_A_B_END, (0x40000000 + 100*1024*1024)
These make this file nicer, but it doesn't avoid scattering
0x40000000 in two instead of one new place. I was thinking
a header file that would be included by this file and
tests/migration-test.c would be created.
> +
> +.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 1M-100M */
> + mov x0, ARM_MACH_VIRT_A_B_START
> + mov x1, ARM_MACH_VIRT_A_B_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, #(4096)
> + 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 4KB page by 1 */
> + ldrb w3, [x4]
> + add w3, w3, #1
> + and w3, w3, #(0xff)
> + strb w3, [x4]
> +
> + add x4, x4, #(4096)
> + cmp x4, x1
> + blt innerloop
> +
> + add w5, w5, #1
> + and w5, w5, #(0xff)
> + cmp w5, #0
> + bne mainloop
nit: no need for the () in the immediates.
> +
> + /* output char 'B' to PL011 */
> + mov w3, 'B'
> + strb w3, [x2]
> +
> + bl mainloop
> --
> 1.8.3.1
>
>
Thanks,
drew
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-02-15 10:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-15 6:07 [Qemu-devel] [PATCH V3 0/2] tests: Add migration test for aarch64 Wei Huang
2018-02-15 6:07 ` [Qemu-devel] [PATCH V3 1/2] tests/migration: Convert the boot block compilation script into Makefile Wei Huang
2018-02-15 6:07 ` [Qemu-devel] [PATCH V3 2/2] tests: Add migration test for aarch64 Wei Huang
2018-02-15 10:09 ` Andrew Jones
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.