[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64 |
Date: |
Thu, 25 Jan 2018 20:05:25 +0000 |
User-agent: |
Mutt/1.9.1 (2017-09-22) |
* Wei Huang (address@hidden) wrote:
> This patch adds the migration test support for aarch64. The test code,
> which implements the same functionality as x86, is compiled into a binary
> and booted as a kernel in qemu. Here are the design ideas:
>
> * We choose this -kernel design 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.
>
> 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
>
> Note that the test code is as the following:
>
> .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
>
> /* output char 'A' to PL011 */
> mov w4, #65
> mov x5, #0x9000000
> strb w4, [x5]
>
> /* w6 keeps a counter so we can limit the output speed */
> mov w6, #0
>
> /* phys mem base addr = 0x40000000 */
> mov x3, #(0x40000000 + 100 *1024*1024) /* traverse 1M-100M */
> mov x2, #(0x40000000 + 1 * 1024*1024)
>
> /* clean up memory first */
> mov w1, #0
> clean:
> strb w1, [x2]
> add x2, x2, #(4096)
> cmp x2, x3
> ble clean
>
> /* main body */
> mainloop:
> mov x2, #(0x40000000 + 1 * 1024*1024)
>
> innerloop:
> /* clean cache because el2 might still cache guest data under KVM */
> dc civac, x2
Can you explain a bit more about that please; if it's guest
visible acorss migration, doesn't that suggest we need the cache clear
in KVM or QEMU?
Dave
> ldrb w1, [x2]
> add w1, w1, #1
> and w1, w1, #(0xff)
> strb w1, [x2]
>
> add x2, x2, #(4096)
> cmp x2, x3
> blt innerloop
>
> add w6, w6, #1
> and w6, w6, #(0xff)
> cmp w6, #0
> bne mainloop
>
> /* output char 'B' to PL011 */
> mov w4, #66
> mov x5, #0x9000000
> strb w4, [x5]
>
> bl mainloop
>
> The code is compiled with the following commands:
> > gcc -c -o fill.o fill.s
> > gcc -O2 -o fill.elf -Wl,-T,/tmp/flat.lds,--build-id=none,-Ttext=40080000 \
> -nostdlib fill.o
> > objcopy -O binary fill.elf fill.flat
> > truncate -c -s 144 ./fill.flat
> > xxd -g 4 -c 24 -e fill.flat | awk '{print "0x"$2 ", " "0x"$3 ", " "0x"C$4
> ", " "0x"C$5 ", " "0x"$6 ", " "0x"C$7 "," }'
>
> The linker file (borrowed from KVM unit test) is defined as:
>
> SECTIONS
> {
> .text : { *(.init) *(.text) *(.text.*) }
> . = ALIGN(64K);
> etext = .;
> .data : {
> *(.data)
> }
> . = ALIGN(16);
> .rodata : { *(.rodata) }
> . = ALIGN(16);
> .bss : { *(.bss) }
> . = ALIGN(64K);
> edata = .;
> . += 64K;
> . = ALIGN(64K);
> /*
> * stack depth is 16K for arm and PAGE_SIZE for arm64, see THREAD_SIZE
> * sp must be 16 byte aligned for arm64, and 8 byte aligned for arm
> * sp must always be strictly less than the true stacktop
> */
> stackptr = . - 16;
> stacktop = .;
> }
>
> ENTRY(start)
>
> Signed-off-by: Wei Huang <address@hidden>
> ---
> tests/Makefile.include | 1 +
> tests/migration-test.c | 37 +++++++++++++++++++++++++++++++------
> 2 files changed, 32 insertions(+), 6 deletions(-)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index b4bcc872f2..2a520e53ab 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -357,6 +357,7 @@ check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF)
> gcov-files-arm-y += hw/timer/arm_mptimer.c
>
> check-qtest-aarch64-y = tests/numa-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 be598d3257..3237fe93b2 100644
> --- a/tests/migration-test.c
> +++ b/tests/migration-test.c
> @@ -22,8 +22,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__)
> @@ -79,7 +79,7 @@ static const char *tmpfs;
> /* A simple PC boot sector that modifies memory (1-100MB) quickly
> * outputing a 'B' every so often if it's still running.
> */
> -unsigned char bootsect[] = {
> +unsigned char x86_bootsect[] = {
> 0xfa, 0x0f, 0x01, 0x16, 0x74, 0x7c, 0x66, 0xb8, 0x01, 0x00, 0x00, 0x00,
> 0x0f, 0x22, 0xc0, 0x66, 0xea, 0x20, 0x7c, 0x00, 0x00, 0x08, 0x00, 0x00,
> 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x92, 0x0c, 0x02,
> @@ -125,11 +125,20 @@ unsigned char bootsect[] = {
> 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xaa
> };
>
> -static void init_bootfile_x86(const char *bootpath)
> +uint32_t aarch64_kernel[] = {
> + 0xd5381000, 0x927ff800, 0xd5181000, 0xd5033fdf, 0x52800824, 0xd2a12005,
> + 0x390000a4, 0x52800006, 0xd2a8c803, 0xd2a80202, 0x52800001, 0x39000041,
> + 0x91400442, 0xeb03005f, 0x54ffffad, 0xd2a80202, 0xd50b7e22, 0x39400041,
> + 0x11000421, 0x12001c21, 0x39000041, 0x91400442, 0xeb03005f, 0x54ffff2b,
> + 0x110004c6, 0x12001cc6, 0x710000df, 0x54fffe81, 0x52800844, 0xd2a12005,
> + 0x390000a4, 0x97fffff0, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
> +};
> +
> +static void init_bootfile(const char *bootpath, void *content)
> {
> FILE *bootfile = fopen(bootpath, "wb");
>
> - g_assert_cmpint(fwrite(bootsect, 512, 1, bootfile), ==, 1);
> + g_assert_cmpint(fwrite(content, 512, 1, bootfile), ==, 1);
> fclose(bootfile);
> }
>
> @@ -442,7 +451,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=kvm:tcg -m 150M"
> " -name pcsource,debug-threads=on"
> " -serial file:%s/src_serial"
> @@ -470,6 +479,22 @@ 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) {
> + init_bootfile(bootpath, aarch64_kernel);
> + cmd_src = g_strdup_printf("-machine virt,accel=kvm:tcg -m 150M "
> + "-name vmsource,debug-threads=on -cpu host
> "
> + "-serial file:%s/src_serial "
> + "-kernel %s ",
> + tmpfs, bootpath);
> + cmd_dst = g_strdup_printf("-machine virt,accel=kvm:tcg -m 150M "
> + "-name vmdest,debug-threads=on -cpu host "
> + "-serial file:%s/dest_serial "
> + "-kernel %s "
> + "-incoming %s ",
> + tmpfs, bootpath, uri);
> + /* aarch64 virt machine physical mem started from 0x40000000 */
> + start_address += 0x40000000;
> + end_address += 0x40000000;
> } else {
> g_assert_not_reached();
> }
> --
> 2.14.3
>
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK
- [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64, Wei Huang, 2018/01/24
- Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64,
Dr. David Alan Gilbert <=
- Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64, Wei Huang, 2018/01/26
- Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64, Peter Maydell, 2018/01/26
- Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64, Wei Huang, 2018/01/26
- Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64, Dr. David Alan Gilbert, 2018/01/26
- Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64, Peter Maydell, 2018/01/28
- Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64, Dr. David Alan Gilbert, 2018/01/29
- Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64, Peter Maydell, 2018/01/29
- Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64, Dr. David Alan Gilbert, 2018/01/29
- Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64, Marc Zyngier, 2018/01/29
- Re: [Qemu-devel] [PATCH V1 1/1] tests: Add migration test for aarch64, Christoffer Dall, 2018/01/31