From patchwork Thu Feb 22 04:44:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Huang X-Patchwork-Id: 10234613 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE2EF60349 for ; Thu, 22 Feb 2018 04:45:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA74D287B4 for ; Thu, 22 Feb 2018 04:45:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C993C287B5; Thu, 22 Feb 2018 04:45:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0599A287B2 for ; Thu, 22 Feb 2018 04:45:39 +0000 (UTC) Received: from localhost ([::1]:36042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoilG-0001ty-7V for patchwork-qemu-devel@patchwork.kernel.org; Wed, 21 Feb 2018 23:45:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoik6-0000xB-6v for qemu-devel@nongnu.org; Wed, 21 Feb 2018 23:44:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eoik2-0006XL-Nt for qemu-devel@nongnu.org; Wed, 21 Feb 2018 23:44:26 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34662 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eoik2-0006XC-DD for qemu-devel@nongnu.org; Wed, 21 Feb 2018 23:44:22 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C868B80401C1; Thu, 22 Feb 2018 04:44:21 +0000 (UTC) Received: from weilaptop.redhat.com (ovpn-120-117.rdu2.redhat.com [10.10.120.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D43E10A971F; Thu, 22 Feb 2018 04:44:21 +0000 (UTC) From: Wei Huang To: qemu-devel@nongnu.org Date: Wed, 21 Feb 2018 22:44:17 -0600 Message-Id: <20180222044417.15561-4-wei@redhat.com> In-Reply-To: <20180222044417.15561-1-wei@redhat.com> References: <20180222044417.15561-1-wei@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 22 Feb 2018 04:44:21 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 22 Feb 2018 04:44:21 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'wei@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH V4 3/3] 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: wei@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- tests/Makefile.include | 1 + tests/migration-test.c | 47 +++++++++++++++++++++--- tests/migration/Makefile | 12 +++++- tests/migration/aarch64-a-b-kernel.S | 71 ++++++++++++++++++++++++++++++++++++ tests/migration/aarch64-a-b-kernel.h | 19 ++++++++++ tests/migration/migration-test.h | 5 +++ 6 files changed, 147 insertions(+), 8 deletions(-) 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 a1bcbffe12..df9f64438f 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/boot-serial-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 e2e06ed337..a4f6732a59 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include #include "libqtest.h" #include "qapi/qmp/qdict.h" @@ -23,8 +24,8 @@ #include "migration/migration-test.h" -const unsigned start_address = TEST_MEM_START; -const unsigned end_address = TEST_MEM_END; +unsigned start_address = TEST_MEM_START; +unsigned end_address = TEST_MEM_END; bool got_stop; #if defined(__linux__) @@ -81,12 +82,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); } @@ -393,7 +395,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" @@ -422,6 +424,39 @@ 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; + const char *gic_ver; + struct utsname utsname; + + /* kvm and tcg need different cpu and gic-version configs */ + if (access("/dev/kvm", F_OK) == 0 && uname(&utsname) == 0 && + strcmp(utsname.machine, "aarch64") == 0) { + accel = "kvm"; + cpu = "host"; + gic_ver = "host"; + } else { + accel = "tcg"; + cpu = "cortex-a57"; + gic_ver = "2"; + } + + init_bootfile(bootpath, aarch64_kernel); + cmd_src = g_strdup_printf("-machine virt,accel=%s,gic-version=%s " + "-name vmsource,debug-threads=on -cpu %s " + "-m 150M -serial file:%s/src_serial " + "-kernel %s ", + accel, gic_ver, cpu, tmpfs, bootpath); + cmd_dst = g_strdup_printf("-machine virt,accel=%s,gic-version=%s " + "-name vmdest,debug-threads=on -cpu %s " + "-m 150M -serial file:%s/dest_serial " + "-kernel %s " + "-incoming %s ", + accel, gic_ver, cpu, tmpfs, bootpath, uri); + + /* aarch64 virt machine physical memory starts at 0x40000000 */ + start_address = ARM_TEST_MEM_START; + end_address = ARM_TEST_MEM_END; } else { g_assert_not_reached(); } @@ -506,7 +541,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 b768d0729d..b72d41367f 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)gcc -m32 -march=i486 -c $< -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 -f *.bootsect *.boot *.o + rm -f *.bootsect *.boot *.o *.elf *.kernel diff --git a/tests/migration/aarch64-a-b-kernel.S b/tests/migration/aarch64-a-b-kernel.S new file mode 100644 index 0000000000..deadcbbdc6 --- /dev/null +++ b/tests/migration/aarch64-a-b-kernel.S @@ -0,0 +1,71 @@ +# +# 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. + +#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 1M-100M */ + 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 4KB 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] + + bl mainloop diff --git a/tests/migration/aarch64-a-b-kernel.h b/tests/migration/aarch64-a-b-kernel.h new file mode 100644 index 0000000000..a3dab67aed --- /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/migration-test.h b/tests/migration/migration-test.h index a618fe069e..8c3fef3a0c 100644 --- a/tests/migration/migration-test.h +++ b/tests/migration/migration-test.h @@ -15,5 +15,10 @@ /* PPC */ #define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */ +/* AArch64 */ +#define ARM_MACH_VIRT_UART 0x09000000 +#define ARM_TEST_MEM_START (0x40000000 + TEST_MEM_START) +#define ARM_TEST_MEM_END (0x40000000 + TEST_MEM_END) + #endif /* _TEST_MIGRATION_H_ */