Re: [Qemu-devel] [PATCH V3 2/2] tests: Add migration test for aarch64
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 0x4000. 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
> ---
> 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,
[Qemu-devel] [PATCH V3 2/2] tests: Add migration test for aarch64
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 0x4000. 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
---
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 0x4000 */
+start_address += 0x4000;
+end_address += 0x4000;
} 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/Make
