From: Stafford Horne <shorne@gmail.com> To: qemu-devel@nongnu.org Cc: openrisc@lists.librecores.org, Stafford Horne <shorne@gmail.com> Subject: [Qemu-devel] [PATCH 7/7] target/openrisc: Implement full vmstate serialization Date: Mon, 17 Apr 2017 08:23:56 +0900 [thread overview] Message-ID: <fae2ac85b7226ec28c8419f488cd9947bb6142a0.1492384862.git.shorne@gmail.com> (raw) In-Reply-To: <cover.1492384862.git.shorne@gmail.com> In-Reply-To: <cover.1492384862.git.shorne@gmail.com> Previously serialization did not persist the tlb, timer, pic and other key state items. This meant snapshotting and restoring a running os would crash. After adding these I am able to take snapshots of a running linux os and restore at a later time. I am currently not trying to maintain capatibility with older versions as I do not believe this really worked before or anyone used it. Signed-off-by: Stafford Horne <shorne@gmail.com> --- target/openrisc/machine.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c index 27cc751..2adcda8 100644 --- a/target/openrisc/machine.c +++ b/target/openrisc/machine.c @@ -30,9 +30,59 @@ static int env_post_load(void *opaque, int version_id) env->gpr = env->shadow_gpr[0]; + /* Restore MMU handlers */ + if (env->sr & SR_DME) { + env->tlb->cpu_openrisc_map_address_data = + &cpu_openrisc_get_phys_data; + } else { + env->tlb->cpu_openrisc_map_address_data = + &cpu_openrisc_get_phys_nommu; + } + + if (env->sr & SR_IME) { + env->tlb->cpu_openrisc_map_address_code = + &cpu_openrisc_get_phys_code; + } else { + env->tlb->cpu_openrisc_map_address_code = + &cpu_openrisc_get_phys_nommu; + } + + return 0; } +static const VMStateDescription vmstate_tlb_entry = { + .name = "tlb_entry", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField[]) { + VMSTATE_UINTTL(mr, OpenRISCTLBEntry), + VMSTATE_UINTTL(tr, OpenRISCTLBEntry), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_cpu_tlb = { + .name = "cpu_tlb", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField[]) { + VMSTATE_STRUCT_2DARRAY(itlb, CPUOpenRISCTLBContext, + ITLB_WAYS, ITLB_SIZE, 0, + vmstate_tlb_entry, OpenRISCTLBEntry), + VMSTATE_STRUCT_2DARRAY(dtlb, CPUOpenRISCTLBContext, + DTLB_WAYS, DTLB_SIZE, 0, + vmstate_tlb_entry, OpenRISCTLBEntry), + VMSTATE_END_OF_LIST() + } +}; + +#define VMSTATE_CPU_TLB(_f, _s) \ + VMSTATE_STRUCT_POINTER(_f, _s, vmstate_cpu_tlb, CPUOpenRISCTLBContext) + + static int get_sr(QEMUFile *f, void *opaque, size_t size, VMStateField *field) { CPUOpenRISCState *env = opaque; @@ -92,6 +142,16 @@ static const VMStateDescription vmstate_env = { VMSTATE_UINT32(esr, CPUOpenRISCState), VMSTATE_UINT32(fpcsr, CPUOpenRISCState), VMSTATE_UINT64(mac, CPUOpenRISCState), + + VMSTATE_CPU_TLB(tlb, CPUOpenRISCState), + + VMSTATE_TIMER_PTR(timer, CPUOpenRISCState), + VMSTATE_UINT32(ttmr, CPUOpenRISCState), + VMSTATE_UINT32(ttcr, CPUOpenRISCState), + + VMSTATE_UINT32(picmr, CPUOpenRISCState), + VMSTATE_UINT32(picsr, CPUOpenRISCState), + VMSTATE_END_OF_LIST() } }; -- 2.9.3
WARNING: multiple messages have this Message-ID (diff)
From: Stafford Horne <shorne@gmail.com> To: openrisc@lists.librecores.org Subject: [OpenRISC] [PATCH 7/7] target/openrisc: Implement full vmstate serialization Date: Mon, 17 Apr 2017 08:23:56 +0900 [thread overview] Message-ID: <fae2ac85b7226ec28c8419f488cd9947bb6142a0.1492384862.git.shorne@gmail.com> (raw) In-Reply-To: <cover.1492384862.git.shorne@gmail.com> Previously serialization did not persist the tlb, timer, pic and other key state items. This meant snapshotting and restoring a running os would crash. After adding these I am able to take snapshots of a running linux os and restore at a later time. I am currently not trying to maintain capatibility with older versions as I do not believe this really worked before or anyone used it. Signed-off-by: Stafford Horne <shorne@gmail.com> --- target/openrisc/machine.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c index 27cc751..2adcda8 100644 --- a/target/openrisc/machine.c +++ b/target/openrisc/machine.c @@ -30,9 +30,59 @@ static int env_post_load(void *opaque, int version_id) env->gpr = env->shadow_gpr[0]; + /* Restore MMU handlers */ + if (env->sr & SR_DME) { + env->tlb->cpu_openrisc_map_address_data = + &cpu_openrisc_get_phys_data; + } else { + env->tlb->cpu_openrisc_map_address_data = + &cpu_openrisc_get_phys_nommu; + } + + if (env->sr & SR_IME) { + env->tlb->cpu_openrisc_map_address_code = + &cpu_openrisc_get_phys_code; + } else { + env->tlb->cpu_openrisc_map_address_code = + &cpu_openrisc_get_phys_nommu; + } + + return 0; } +static const VMStateDescription vmstate_tlb_entry = { + .name = "tlb_entry", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField[]) { + VMSTATE_UINTTL(mr, OpenRISCTLBEntry), + VMSTATE_UINTTL(tr, OpenRISCTLBEntry), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_cpu_tlb = { + .name = "cpu_tlb", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField[]) { + VMSTATE_STRUCT_2DARRAY(itlb, CPUOpenRISCTLBContext, + ITLB_WAYS, ITLB_SIZE, 0, + vmstate_tlb_entry, OpenRISCTLBEntry), + VMSTATE_STRUCT_2DARRAY(dtlb, CPUOpenRISCTLBContext, + DTLB_WAYS, DTLB_SIZE, 0, + vmstate_tlb_entry, OpenRISCTLBEntry), + VMSTATE_END_OF_LIST() + } +}; + +#define VMSTATE_CPU_TLB(_f, _s) \ + VMSTATE_STRUCT_POINTER(_f, _s, vmstate_cpu_tlb, CPUOpenRISCTLBContext) + + static int get_sr(QEMUFile *f, void *opaque, size_t size, VMStateField *field) { CPUOpenRISCState *env = opaque; @@ -92,6 +142,16 @@ static const VMStateDescription vmstate_env = { VMSTATE_UINT32(esr, CPUOpenRISCState), VMSTATE_UINT32(fpcsr, CPUOpenRISCState), VMSTATE_UINT64(mac, CPUOpenRISCState), + + VMSTATE_CPU_TLB(tlb, CPUOpenRISCState), + + VMSTATE_TIMER_PTR(timer, CPUOpenRISCState), + VMSTATE_UINT32(ttmr, CPUOpenRISCState), + VMSTATE_UINT32(ttcr, CPUOpenRISCState), + + VMSTATE_UINT32(picmr, CPUOpenRISCState), + VMSTATE_UINT32(picsr, CPUOpenRISCState), + VMSTATE_END_OF_LIST() } }; -- 2.9.3
next prev parent reply other threads:[~2017-04-16 23:24 UTC|newest] Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-16 23:23 [Qemu-devel] [PATCH 0/7] Openrisc misc features / fixes Stafford Horne 2017-04-16 23:23 ` [OpenRISC] " Stafford Horne 2017-04-16 23:23 ` [Qemu-devel] [PATCH 1/7] target/openrisc: Fixes for memory debugging Stafford Horne 2017-04-16 23:23 ` [OpenRISC] " Stafford Horne 2017-04-18 7:47 ` [Qemu-devel] " Richard Henderson 2017-04-18 7:47 ` [OpenRISC] " Richard Henderson 2017-04-18 14:18 ` Stafford Horne 2017-04-18 14:18 ` [OpenRISC] " Stafford Horne 2017-04-18 15:00 ` Richard Henderson 2017-04-18 15:00 ` [OpenRISC] " Richard Henderson 2017-04-19 20:06 ` Stafford Horne 2017-04-19 20:06 ` [OpenRISC] " Stafford Horne 2017-04-16 23:23 ` [Qemu-devel] [PATCH 2/7] target/openrisc: add shutdown logic Stafford Horne 2017-04-16 23:23 ` [OpenRISC] " Stafford Horne 2017-04-18 7:52 ` [Qemu-devel] " Richard Henderson 2017-04-18 7:52 ` [OpenRISC] " Richard Henderson 2017-04-18 14:20 ` Stafford Horne 2017-04-18 14:20 ` [OpenRISC] " Stafford Horne 2017-04-22 10:09 ` Stafford Horne 2017-04-22 10:09 ` [OpenRISC] " Stafford Horne 2017-04-22 15:25 ` Richard Henderson 2017-04-22 15:25 ` [OpenRISC] " Richard Henderson 2017-04-23 21:28 ` [OpenRISC] [PATCH PMR] target/openrisc: Support non-busy idle state using PMR SPR Stafford Horne 2017-04-23 21:54 ` [Qemu-devel] [PATCH RFC] " Stafford Horne 2017-04-23 21:54 ` [OpenRISC] " Stafford Horne 2017-04-25 10:11 ` [Qemu-devel] " Richard Henderson 2017-04-25 10:11 ` [OpenRISC] " Richard Henderson 2017-04-25 14:10 ` [Qemu-devel] [PATCH RFC v2] " Stafford Horne 2017-04-25 14:10 ` [OpenRISC] " Stafford Horne 2017-04-25 14:18 ` [Qemu-devel] [PATCH RFC] " Stafford Horne 2017-04-25 14:18 ` [OpenRISC] " Stafford Horne 2017-04-25 14:51 ` [Qemu-devel] " Richard Henderson 2017-04-25 14:51 ` [OpenRISC] " Richard Henderson 2022-04-27 17:44 ` [Qemu-devel] [PATCH 2/7] target/openrisc: add shutdown logic Jason A. Donenfeld 2022-04-27 17:44 ` [OpenRISC] " Jason A. Donenfeld 2022-04-27 18:47 ` Peter Maydell 2022-04-27 18:47 ` [OpenRISC] " Peter Maydell 2022-04-27 21:48 ` Stafford Horne 2022-04-27 21:48 ` [OpenRISC] " Stafford Horne 2022-04-28 0:04 ` Jason A. Donenfeld 2022-04-28 0:04 ` [OpenRISC] " Jason A. Donenfeld 2022-04-28 11:16 ` Jason A. Donenfeld 2022-04-28 11:16 ` [OpenRISC] " Jason A. Donenfeld 2022-04-28 11:47 ` Stafford Horne 2022-04-28 11:47 ` [OpenRISC] " Stafford Horne 2022-04-28 9:19 ` Peter Maydell 2022-04-28 9:19 ` [OpenRISC] " Peter Maydell 2017-04-16 23:23 ` [Qemu-devel] [PATCH 3/7] target/openrisc: add numcores and coreid support Stafford Horne 2017-04-16 23:23 ` [OpenRISC] " Stafford Horne 2017-04-18 8:01 ` [Qemu-devel] " Richard Henderson 2017-04-18 8:01 ` [OpenRISC] " Richard Henderson 2017-04-16 23:23 ` [Qemu-devel] [PATCH 4/7] target/openrisc: implement shadow registers Stafford Horne 2017-04-16 23:23 ` [OpenRISC] " Stafford Horne 2017-04-18 8:11 ` [Qemu-devel] " Richard Henderson 2017-04-18 8:11 ` [OpenRISC] " Richard Henderson 2017-04-18 14:26 ` Stafford Horne 2017-04-18 14:26 ` [OpenRISC] " Stafford Horne 2017-04-16 23:23 ` [Qemu-devel] [PATCH 5/7] migration: Add VMSTATE_UINTTL_2DARRAY() Stafford Horne 2017-04-16 23:23 ` [OpenRISC] " Stafford Horne 2017-04-16 23:23 ` [Qemu-devel] [PATCH 6/7] migration: Add VMSTATE_STRUCT_2DARRAY() Stafford Horne 2017-04-16 23:23 ` [OpenRISC] " Stafford Horne 2017-04-16 23:23 ` Stafford Horne [this message] 2017-04-16 23:23 ` [OpenRISC] [PATCH 7/7] target/openrisc: Implement full vmstate serialization Stafford Horne 2017-04-18 8:14 ` [Qemu-devel] " Richard Henderson 2017-04-18 8:14 ` [OpenRISC] " Richard Henderson 2017-04-18 14:27 ` Stafford Horne 2017-04-18 14:27 ` [OpenRISC] " Stafford Horne 2017-04-16 23:33 ` [Qemu-devel] [PATCH 0/7] Openrisc misc features / fixes no-reply 2017-04-16 23:33 ` [OpenRISC] " no-reply
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=fae2ac85b7226ec28c8419f488cd9947bb6142a0.1492384862.git.shorne@gmail.com \ --to=shorne@gmail.com \ --cc=openrisc@lists.librecores.org \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.