Implement MPIPL for PowerNV
v3 cover Implement MPIPL for PowerNV
Overview
=========
Implemented MPIPL (Memory Preserving IPL, aka fadump) on PowerNV machine in QEMU.
Fadump is an alternative dump mechanism to kdump, in which we the firmware does a memory preserving boot, and the second/crashkernel is booted fresh like a normal system reset, instead of the crashed kernel loading the second/crashkernel in case of kdump.
MPIPL in PowerNV, is similar to fadump in Pseries. The idea is same, memory preserving, where in PowerNV we are assisted by SBE (Self Boot Engine) & Hostboot, while in Pseries we are assisted by PHyp (Power Hypervisor)
For implementing in baremetal/powernv QEMU, we need to export a "ibm,opal/dump" node in the device tree, to tell the kernel we support MPIPL
Once kernel sees the support, and "fadump=on" is passed on commandline, kernel will register memory regions to preserve with Skiboot.
Kernel sends these data using OPAL calls, after which skiboot/opal saves the memory region details to MDST and MDDT tables (S-source, D-destination)
Then in the event of a kernel crash, the kernel initiates MPIPL with another OPAL code (opal_cec_reboot2), this request goes to Skiboot. Skiboot then triggers the "S0 Interrupt" to the SBE (Self Boot Engine), along with OPAL's relocated base address.
SBE then stops all core clocks, and only does particular ISteps for a memory preserving boot.
Then, hostboot comes up, and with help of the relocated base address, it accesses MDST & MDDT tables (S-source and D-destination), and preserves the memory regions according to the data in these tables.
And after preserving, it writes the preserved memory region details to MDRT tables (R-Result), for the kernel to know where/whether a memory region is preserved.
Both SBE's and hostboot responsiblities are implemented in the SBE code in QEMU.
Then in the second kernel/crashkernel boot, OPAL passes the "mpipl-boot" property for the kernel to know that a dump is active, which kernel then exports in /proc/vmcore
Testing
====================
1. Git tree for testing: https://gitlab.com/adi-g15-ibm/qemu/tree/fadump-powernv-v3
2. Gitlab pipeline: https://gitlab.com/adi-g15-ibm/qemu/-/pipelines/2348793709
3. Analysing generated vmcore:
# ls -lh /proc/vmcore -r-------- 1 root root 4.5G Feb 25 07:33 /proc/vmcore # file /proc/vmcore /proc/vmcore: ELF 64-bit LSB core file, 64-bit PowerPC or cisco 7500, OpenPOWER ELF V2 ABI, version 1 (SYSV), SVR4-style
# crash vmlinux vmcore ... KERNEL: vmlinux-38fec10eb60d-network DUMPFILE: vmcore-powernv-25feb26 CPUS: 4 DATE: Thu Jan 1 05:30:00 IST 1970 UPTIME: 00:05:23 LOAD AVERAGE: 0.12, 0.08, 0.03 TASKS: 101 NODENAME: buildroot RELEASE: 6.14.0 VERSION: #1 SMP Thu Apr 3 08:06:13 CDT 2025 MACHINE: ppc64le (1000 Mhz) MEMORY: 6 GB PANIC: "Kernel panic - not syncing: sysrq triggered crash" PID: 257 COMMAND: "sh" TASK: c000000008066600 [THREAD_INFO: c000000008066600] CPU: 2 STATE: TASK_RUNNING (PANIC)
crash> # ps and kmem -i works
Changelog
====================
v2 -> v3:
* rebase to upstream, changes in patches below
* #2/10: no code change. add comment that skiboot triggers S0
* #3/10: stash command: handle invalid skiboot_base sent by guest
* #4/10: s/src_len/data_len/
* #4/10: use TARGET_FMT_lx/PRIx64 instead of %lx to prevent build errors
* #4/10: stop copying chunks once copying a chunk fails
* #5/10: use address_space_{read,write} instead of cpu_physical_memory_{read,write}
* #5/10: add more SPRs to be saved, same set of SPRs as spapr FADump, except CR and FPSCR
* #7/10: only export "mpipl-boot" property if preserving cpu states and writing MDRT was successful, otherwise continue with normal reboot
* #7/10: use address_space_{read,write} instead of cpu_physical_memory_{read,write}
* #8/10: reword commit description to mention fw-load-area, no code change
* #10/10: add entry in MAINTAINERS file
Aditya Gupta (10):
ppc/pnv: Move SBE host doorbell function to top of file ppc/mpipl: Implement S0 SBE interrupt
ppc/pnv: Handle stash command in PowerNV SBE pnv/mpipl: Preserve memory regions as per MDST/MDDT tables pnv/mpipl: Preserve CPU registers after crash pnv/mpipl: Set thread entry size to be allocated by firmware pnv/mpipl: Write the preserved CPU and MDRT state pnv/mpipl: Enable MPIPL support
tests/functional: Add test for MPIPL in PowerNV
MAINTAINERS: Add entry for MPIPL (PowerNV)
MAINTAINERS | 8 + hw/ppc/meson.build | 1 + hw/ppc/pnv.c | 104 ++++++ hw/ppc/pnv_mpipl.c | 482 ++++++++++++++++++++++++++ hw/ppc/pnv_sbe.c | 84 ++++- include/hw/ppc/pnv.h | 7 + include/hw/ppc/pnv_mpipl.h | 168 +++++++++ tests/functional/ppc64/test_fadump.py | 35 +- 8 files changed, 858 insertions(+), 31 deletions(-) create mode 100644 hw/ppc/pnv_mpipl.c create mode 100644 include/hw/ppc/pnv_mpipl.h
Signature · 1 line
2.53.0
PATCH v3 1/10 ppc/pnv: Move SBE host doorbell function to top of file
Moved 'pnv_sbe_set_host_doorbell' as-it-is to above 'pnv_sbe_power9_xscom_ctrl_write'.
This is done since in a future patch, S0 interrupt implementation uses 'pnv_sbe_set_host_doorbell', hence the host doorbell function needs to be declared/defined before 'pnv_sbe_power9_xscom_ctrl_write' where we implement the S0 interrupt.
No functional change.
--- hw/ppc/pnv_sbe.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
hw/ppc/pnv_sbe.c +9 -9
@@ -80,6 +80,15 @@#define SBE_CONTROL_REG_S0 PPC_BIT(14)#define SBE_CONTROL_REG_S1 PPC_BIT(15) +static void pnv_sbe_set_host_doorbell (PnvSBE *sbe,uint64_t val) +{ + val &=SBE_HOST_RESPONSE_MASK ;/* Is this right? What does HW do? */ + sbe->host_doorbell = val; + +trace_pnv_sbe_reg_set_host_doorbell (val); +qemu_set_irq (sbe->psi_irq, !!val); +} +struct sbe_msg {uint64_t reg[4 ]; };
@@ -125,15 +134,6 @@ static const MemoryRegionOps pnv_sbe_power9_xscom_ctrl_ops = { .endianness = DEVICE_BIG_ENDIAN, }; -static void pnv_sbe_set_host_doorbell (PnvSBE *sbe,uint64_t val) -{ - val &=SBE_HOST_RESPONSE_MASK ;/* Is this right? What does HW do? */ - sbe->host_doorbell = val; - -trace_pnv_sbe_reg_set_host_doorbell (val); -qemu_set_irq (sbe->psi_irq, !!val); -} -/* SBE Target Type */ #define SBE_TARGET_TYPE_PROC 0x00#define SBE_TARGET_TYPE_EX 0x01
Signature · 1 line
2.53.0
PATCH v3 2/10 ppc/mpipl: Implement S0 SBE interrupt
In reply to Aditya GuptaDuring MPIPL (aka fadump), after a kernel crash, the kernel does opal_cec_reboot2 opal call, signifying an abnormal termination. When OPAL recieves this opal call, it further triggers SBE S0 interrupt, to trigger a MPIPL boot.
Currently S0 interrupt is unimplemented in QEMU.
Implement S0 interrupt as 'pause_vcpus' + 'guest_reset' in QEMU, as the SBE's implementation of S0 seems to be basically "stop all clocks" and then "host reset".
pause_vcpus is done in a later patch when register preserving support is added
See 'stopClocksS0' in SBE source code for more information.
Also log both S0 and S1 interrupts.
--- hw/ppc/meson.build | 1 + hw/ppc/pnv_mpipl.c | 26 ++++++++++++++++++++++++++ hw/ppc/pnv_sbe.c | 29 +++++++++++++++++++++++++++++ include/hw/ppc/pnv.h | 6 ++++++ include/hw/ppc/pnv_mpipl.h | 19 +++++++++++++++++++ 5 files changed, 81 insertions(+) create mode 100644 hw/ppc/pnv_mpipl.c create mode 100644 include/hw/ppc/pnv_mpipl.h
hw/ppc/meson.build +1 -0
@@ -56,6 +56,7 @@ ppc_ss.add(when: 'CONFIG_POWERNV', if_true: files( 'pnv_pnor.c', 'pnv_nest_pervasive.c', 'pnv_n1_chiplet.c', + 'pnv_mpipl.c', )) # PowerPC 4xx boards ppc_ss.add(when: 'CONFIG_PPC405', if_true: files(
hw/ppc/pnv_mpipl.c new file +26 -0
@@ -0,0 +1,26 @@ +/* +* Emulation of MPIPL (Memory Preserving Initial Program Load), aka fadump +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "system/runstate.h" +#include "hw/ppc/pnv.h" +#include "hw/ppc/pnv_mpipl.h" + +void do_mpipl_preserve (PnvMachineState *pnv) +{ +/* Mark next boot as Memory-preserving boot */ + pnv->mpipl_state.is_next_boot_mpipl = true; + +/* +* Do a guest reset. +* Next reset will see 'is_next_boot_mpipl' as true, and trigger MPIPL +* +* Requirement: +* GUEST_RESET is expected to NOT clear the memory, as is the case when +* this is merged +*/ +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +}
hw/ppc/pnv_sbe.c +29 -0
@@ -26,6 +26,9 @@#include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_sbe.h" +#include "hw/ppc/pnv_mpipl.h" +#include "system/cpus.h" +#include "system/runstate.h" #include "trace.h" /*
@@ -113,11 +116,37 @@ static uint64_t pnv_sbe_power9_xscom_ctrl_read(void *opaque, hwaddr addr,static void pnv_sbe_power9_xscom_ctrl_write (void *opaque,hwaddr addr,uint64_t val,unsigned size) { +PnvMachineState *pnv =PNV_MACHINE (qdev_get_machine ()); +PnvSBE *sbe = opaque;uint32_t offset = addr >>3 ;trace_pnv_sbe_xscom_ctrl_write (addr, val);switch (offset) { +case SBE_CONTROL_REG_RW : +switch (val) { +case SBE_CONTROL_REG_S0 : +qemu_log_mask (LOG_UNIMP ,"SBE: S0 Interrupt triggered\n" ); + +pnv_sbe_set_host_doorbell (sbe, sbe->host_doorbell |SBE_HOST_RESPONSE_MASK ); + +/* Preserve memory regions and CPU state, if MPIPL is registered */ +do_mpipl_preserve (pnv); + +/* +* Control may not come back here as 'do_mpipl_preserve' triggers +* a guest reboot +*/ +break ; +case SBE_CONTROL_REG_S1 : +qemu_log_mask (LOG_UNIMP ,"SBE: S1 Interrupt triggered\n" ); +break ; +default : +qemu_log_mask (LOG_UNIMP , +"SBE: CONTROL_REG_RW: Unknown value: Ox%." + HWADDR_PRIx"\n" , val); + } +break ;default :qemu_log_mask (LOG_UNIMP ,"SBE Unimplemented register: Ox%" HWADDR_PRIx"\n" , addr >>3 );
include/hw/ppc/pnv.h +6 -0
@@ -25,6 +25,7 @@#include "hw/core/sysbus.h" #include "hw/ipmi/ipmi.h" #include "hw/ppc/pnv_pnor.h" +#include "hw/ppc/pnv_mpipl.h" #define TYPE_PNV_CHIP "pnv-chip"
@@ -111,6 +112,8 @@ struct PnvMachineState {bool big_core;bool lpar_per_core; + +MpiplPreservedState mpipl_state; };PnvChip *pnv_get_chip (PnvMachineState *pnv,uint32_t chip_id);
@@ -290,4 +293,7 @@ void pnv_bmc_set_pnor(IPMIBmc *bmc, PnvPnor *pnor);#define PNV11_OCC_SENSOR_BASE (chip) PNV10_OCC_SENSOR_BASE(chip) +/* MPIPL helpers */ +void do_mpipl_preserve (PnvMachineState *pnv); +#endif /* PPC_PNV_H */
include/hw/ppc/pnv_mpipl.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* Emulation of MPIPL (Memory Preserving Initial Program Load), aka fadump +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef PNV_MPIPL_H +#define PNV_MPIPL_H + +#include "qemu/osdep.h" + +typedef struct MpiplPreservedState MpiplPreservedState ; + +/* Preserved state to be saved in PnvMachineState */ +struct MpiplPreservedState { +bool is_next_boot_mpipl; +}; + +#endif
Signature · 1 line
2.53.0
Re: [PATCH v3 02/10] ppc/mpipl: Implement S0 SBE interrupt
Quoted 2 lines · Aditya Gupta
During MPIPL (aka fadump), after a kernel crash, the kernel does
opal_cec_reboot2opal call, signifying an abnormal termination.
Minor nit..
Quoted 1 line
When OPAL recieves this opal call, it further triggers SBE S0 interrupt,
s/recieves/receives/
Quoted 176 lines
to trigger a MPIPL boot.
Currently S0 interrupt is unimplemented in QEMU.
Implement S0 interrupt as '
pause_vcpus' + 'guest_reset' in QEMU, as the SBE's implementation of S0 seems to be basically "stop all clocks" and then "host reset".
pause_vcpusis done in a later patch when register preserving support is addedSee 'stopClocksS0' in SBE source code for more information.
Also log both S0 and S1 interrupts.
Signed-off-by Aditya Gupta <[email protected]>--- hw/ppc/meson.build | 1 + hw/ppc/pnv_mpipl.c | 26 ++++++++++++++++++++++++++ hw/ppc/pnv_sbe.c | 29 +++++++++++++++++++++++++++++ include/hw/ppc/pnv.h | 6 ++++++ include/hw/ppc/pnv_mpipl.h | 19 +++++++++++++++++++ 5 files changed, 81 insertions(+)create mode 100644
hw/ppc/pnv_mpipl.c
create mode 100644include/hw/ppc/pnv_mpipl.hhw/ppc/meson.build +1
-0@@ -56,6 +56,7 @@ ppc_ss.add(when: 'CONFIG_POWERNV', if_true: files( 'pnv_pnor.c', 'pnv_nest_pervasive.c', 'pnv_n1_chiplet.c', + 'pnv_mpipl.c', )) # PowerPC 4xx boards ppc_ss.add(when: 'CONFIG_PPC405', if_true: files(hw/ppc/pnv_mpipl.c new file +26
-0@@ -0,0 +1,26 @@ +/* +* Emulation of MPIPL (Memory Preserving Initial Program Load), aka fadump +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "system/runstate.h" +#include "hw/ppc/pnv.h" +#include "hw/ppc/pnv_mpipl.h" + +void do_mpipl_preserve (PnvMachineState *pnv) +{ +/* Mark next boot as Memory-preserving boot */ + pnv->mpipl_state.is_next_boot_mpipl = true; + +/* +* Do a guest reset. +* Next reset will see 'is_next_boot_mpipl' as true, and trigger MPIPL +* +* Requirement: +* GUEST_RESET is expected to NOT clear the memory, as is the case when +* this is merged +*/ +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +}hw/ppc/pnv_sbe.c +29
-0@@ -26,6 +26,9 @@#include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_sbe.h" +#include "hw/ppc/pnv_mpipl.h" +#include "system/cpus.h" +#include "system/runstate.h" #include "trace.h" /* @@ -113,11 +116,37 @@ static uint64_t pnv_sbe_power9_xscom_ctrl_read(void *opaque, hwaddr addr,static void pnv_sbe_power9_xscom_ctrl_write (void *opaque,hwaddr addr,uint64_t val,unsigned size) { +PnvMachineState *pnv =PNV_MACHINE (qdev_get_machine ()); +PnvSBE *sbe = opaque;uint32_t offset = addr >>3 ;trace_pnv_sbe_xscom_ctrl_write (addr, val);switch (offset) { +case SBE_CONTROL_REG_RW : +switch (val) { +case SBE_CONTROL_REG_S0 : +qemu_log_mask (LOG_UNIMP ,"SBE: S0 Interrupt triggered\n" ); + +pnv_sbe_set_host_doorbell (sbe, sbe->host_doorbell |SBE_HOST_RESPONSE_MASK ); + +/* Preserve memory regions and CPU state, if MPIPL is registered */ +do_mpipl_preserve (pnv); + +/* +* Control may not come back here as 'do_mpipl_preserve' triggers +* a guest reboot +*/ +break ; +case SBE_CONTROL_REG_S1 : +qemu_log_mask (LOG_UNIMP ,"SBE: S1 Interrupt triggered\n" ); +break ; +default : +qemu_log_mask (LOG_UNIMP , +"SBE: CONTROL_REG_RW: Unknown value: Ox%." + HWADDR_PRIx"\n" , val); + } +break ;default :qemu_log_mask (LOG_UNIMP ,"SBE Unimplemented register: Ox%" HWADDR_PRIx"\n" , addr >>3 );include/hw/ppc/pnv.h +6
-0@@ -25,6 +25,7 @@#include "hw/core/sysbus.h" #include "hw/ipmi/ipmi.h" #include "hw/ppc/pnv_pnor.h" +#include "hw/ppc/pnv_mpipl.h" #define TYPE_PNV_CHIP "pnv-chip"@@ -111,6 +112,8 @@ struct PnvMachineState {bool big_core;bool lpar_per_core; + +MpiplPreservedState mpipl_state; };PnvChip *pnv_get_chip (PnvMachineState *pnv,uint32_t chip_id);@@ -290,4 +293,7 @@ void pnv_bmc_set_pnor(IPMIBmc *bmc, PnvPnor *pnor);#define PNV11_OCC_SENSOR_BASE (chip) PNV10_OCC_SENSOR_BASE(chip) +/* MPIPL helpers */ +void do_mpipl_preserve (PnvMachineState *pnv); +#endif /* PPC_PNV_H */ include/hw/ppc/pnv_mpipl.h new file +19
-0@@ -0,0 +1,19 @@ +/* +* Emulation of MPIPL (Memory Preserving Initial Program Load), aka fadump +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef PNV_MPIPL_H +#define PNV_MPIPL_H + +#include "qemu/osdep.h" + +typedef struct MpiplPreservedState MpiplPreservedState ; + +/* Preserved state to be saved in PnvMachineState */ +struct MpiplPreservedState { +bool is_next_boot_mpipl; +}; + +#endif
Re: [PATCH v3 02/10] ppc/mpipl: Implement S0 SBE interrupt
Quoted 10 lines · Hari Bathini
Quoted 2 lines · Aditya Gupta
During MPIPL (aka fadump), after a kernel crash, the kernel does
opal_cec_reboot2opal call, signifying an abnormal termination.Minor nit..
Quoted 1 line
When OPAL recieves this opal call, it further triggers SBE S0 interrupt,
s/recieves/receives/
Sure hari, will fix in v4.
Thanks,
- Aditya G
PATCH v3 3/10 ppc/pnv: Handle stash command in PowerNV SBE
In reply to Aditya GuptaEarlier since the SBE_CMD_STASH_MPIPL_CONFIG command was not handled, so skiboot used to not get any response from SBE:
[ 106.350742821,3] SBE: Message timeout [chip id = 0], cmd = d7, subcmd = 7
[ 106.352067746,3] SBE: Failed to send stash MPIPL config [chip id = 0x0, rc = 254]Fix this by handling the command in PowerNV SBE, and sending a response so skiboot knows SBE has handled the STASH command
The stashed skiboot base is later used to access the relocated MDST/MDDT tables when MPIPL is implemented.
The purpose of stashing relocated base address is explained in following skiboot commit:
author Vasant Hegde <[email protected]> Fri Jul 12 16:47:51 2019 +0530 committer Oliver O'Halloran <[email protected]> Thu Aug 15 17:53:39 2019 +1000
SBE: Send OPAL relocated base address to SBE
OPAL relocates itself during boot. During memory preserving IPL hostboot needs to access relocated OPAL base address to get MDST, MDDT tables. Hence send relocated base address to SBE via 'stash MPIPL config' chip-op. During next IPL SBE will send stashed data to hostboot... so that hostboot can access these data.
--- hw/ppc/pnv_sbe.c | 37 +++++++++++++++++++++++++++++++++++++ include/hw/ppc/pnv_mpipl.h | 3 +++ 2 files changed, 40 insertions(+)
hw/ppc/pnv_sbe.c +37 -0
@@ -233,8 +233,11 @@ static void sbe_timer(void *opaque)static void do_sbe_msg (PnvSBE *sbe) { +PnvMachineState *pnv =PNV_MACHINE (qdev_get_machine ()); +MachineState *machine =MACHINE (pnv);struct sbe_msg msg;uint16_t cmd, ctrl_flags, seq_id; +uint64_t mbox_val;int i;memset (&msg,0 ,sizeof (msg));
@@ -265,6 +268,40 @@ static void do_sbe_msg(PnvSBE *sbe)timer_del (sbe->timer); }break ; +case SBE_CMD_STASH_MPIPL_CONFIG : +/* key = sbe->mbox[1] */ +switch (sbe->mbox[1 ]) { +case SBE_STASH_KEY_SKIBOOT_BASE : + mbox_val = sbe->mbox[2 ]; +if (mbox_val >= machine->ram_size) { +qemu_log_mask (LOG_GUEST_ERROR , +"SBE: skiboot_base 0x%" PRIx64" exceeds RAM size 0x%" PRIx64"\n" , + mbox_val, machine->ram_size); +return ; + } + + pnv->mpipl_state.skiboot_base = mbox_val; +qemu_log_mask (LOG_UNIMP , +"Stashing skiboot base: 0x%" HWADDR_PRIx"\n" , + pnv->mpipl_state.skiboot_base); + +/* +* Set the response register. +* +* Currently setting the same sequence number in +* response as we got in the request. +*/ + sbe->mbox[4 ] = sbe->mbox[0 ];/* sequence number */ +pnv_sbe_set_host_doorbell (sbe, + sbe->host_doorbell |SBE_HOST_RESPONSE_WAITING ); + +break ; +default : +qemu_log_mask (LOG_UNIMP , +"SBE: CMD_STASH_MPIPL_CONFIG: Unimplemented key: 0x" TARGET_FMT_lx"\n" , + sbe->mbox[1 ]); + } +break ;default :qemu_log_mask (LOG_UNIMP ,"SBE Unimplemented command: 0x%x\n" , cmd); }
include/hw/ppc/pnv_mpipl.h +3 -0
@@ -8,11 +8,14 @@#define PNV_MPIPL_H #include "qemu/osdep.h" +#include "exec/hwaddr.h" typedef struct MpiplPreservedState MpiplPreservedState ;/* Preserved state to be saved in PnvMachineState */ struct MpiplPreservedState { +/* skiboot_base will be valid only after OPAL sends relocated base to SBE */ +hwaddr skiboot_base;bool is_next_boot_mpipl; };
Signature · 1 line
2.53.0
PATCH v3 4/10 pnv/mpipl: Preserve memory regions as per MDST/MDDT tables
In reply to Aditya GuptaImplement copying of memory region, as mentioned by MDST and MDDT tables.
Copy the memory regions from source to destination in chunks of 32MB
Note, qemu can fail preserving a particular entry due to any reason, such as:
* region length mis-matching in MDST & MDDT
* failed copy due to access/decode/etc memory issues
HDAT doesn't specify any field in MDRT to notify host about such errors.
Though HDAT section "15.3.1.3 Memory Dump Results Table (MDRT)" says:
The Memory Dump Results Table is a list of the memory ranges that have been included in the dump
Based on above statement, it looks like MDRT should include only those regions which are successfully captured in the dump, hence, regions which qemu fails to dump, just get skipped, and will not have a corresponding entry in MDRT
--- hw/ppc/pnv_mpipl.c | 161 +++++++++++++++++++++++++++++++++++++ include/hw/ppc/pnv_mpipl.h | 86 ++++++++++++++++++++ 2 files changed, 247 insertions(+)
hw/ppc/pnv_mpipl.c +161 -0
@@ -5,12 +5,173 @@*/ #include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/units.h" +#include "system/address-spaces.h" #include "system/runstate.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_mpipl.h" +#include <math.h> + +#define MDST_TABLE_RELOCATED \ + (pnv->mpipl_state.skiboot_base + MDST_TABLE_OFF) +#define MDDT_TABLE_RELOCATED \ + (pnv->mpipl_state.skiboot_base + MDDT_TABLE_OFF) + +/* +* Preserve the memory regions as pointed by MDST table +* +* During this, the memory region pointed by entries in MDST, are 'copied' +* as it is to the memory region pointed by corresponding entry in MDDT +* +* Notes: All reads should consider data coming from skiboot as big-endian, +* and data written should also be in big-endian +*/ +static bool pnv_mpipl_preserve_mem (PnvMachineState *pnv) +{ + g_autofree MdstTableEntry *mdst = g_malloc(MDST_TABLE_SIZE); + g_autofree MddtTableEntry *mddt = g_malloc(MDDT_TABLE_SIZE); + g_autofree MdrtTableEntry *mdrt = g_malloc0(MDRT_TABLE_SIZE); +AddressSpace *default_as = &address_space_memory; +MemTxResult io_result; +MemTxAttrs attrs; +uint64_t src_addr, dest_addr; +uint32_t data_len; +uint64_t num_chunks, chunk_id =0 ; +int mdrt_idx =0 ; + +/* Mark the memory transactions as privileged memory access */ + attrs.user =0 ; + attrs.memory =1 ; + +if (pnv->mpipl_state.mdrt_table) { +/* +* MDRT table allocated from some past crash, free the memory to +* prevent memory leak +*/ +g_free (pnv->mpipl_state.mdrt_table); + pnv->mpipl_state.num_mdrt_entries =0 ; + } + + io_result =address_space_read (default_as,MDST_TABLE_RELOCATED , attrs, + mdst,MDST_TABLE_SIZE ); +if (io_result !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"MPIPL: Failed to read MDST table at: 0x" TARGET_FMT_lx"\n" , +MDST_TABLE_RELOCATED ); + +return false; + } + + io_result =address_space_read (default_as,MDDT_TABLE_RELOCATED , attrs, + mddt,MDDT_TABLE_SIZE ); +if (io_result !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"MPIPL: Failed to read MDDT table at: 0x" TARGET_FMT_lx"\n" , +MDDT_TABLE_RELOCATED ); + +return false; + } + +/* Try to read all entries */ +for (int i =0 ; i <MDST_MAX_ENTRIES ; ++i) { + g_autofree uint8_t *copy_buffer = NULL; +bool is_copy_failed = false; + +/* Considering entry with address and size as 0, as end of table */ +if ((mdst[i].addr ==0 ) && (mdst[i].size ==0 )) { +break ; + } + +if (mdst[i].size != mddt[i].size) { +qemu_log_mask (LOG_TRACE , +"Warning: Invalid entry, size mismatch in MDST & MDDT\n" ); +continue ; + } + +if (mdst[i].data_region != mddt[i].data_region) { +qemu_log_mask (LOG_TRACE , +"Warning: Invalid entry, region mismatch in MDST & MDDT\n" ); +continue ; + } + + src_addr =be64_to_cpu (mdst[i].addr) & ~HRMOR_BIT ; + dest_addr =be64_to_cpu (mddt[i].addr) & ~HRMOR_BIT ; + data_len =be32_to_cpu (mddt[i].size); + +#define COPY_CHUNK_SIZE ((size_t)(32 * MiB)) + is_copy_failed = false; + copy_buffer =g_try_malloc (COPY_CHUNK_SIZE ); +if (copy_buffer ==NULL ) { +qemu_log_mask (LOG_GUEST_ERROR , +"MPIPL: Failed allocating memory (size: %zu) for copying" +" reserved memory regions\n" ,COPY_CHUNK_SIZE ); + is_copy_failed = true; + } + + num_chunks =ceil ((data_len *1.0f ) /COPY_CHUNK_SIZE ); +while ((!is_copy_failed) && (chunk_id < num_chunks)) { +/* Take minimum of bytes left to copy, and chunk size */ +uint64_t copy_len =MIN ( + data_len - (chunk_id *COPY_CHUNK_SIZE ), +COPY_CHUNK_SIZE + ); + +/* Copy the source region to destination */ + io_result =address_space_read (default_as, src_addr, attrs, + copy_buffer, copy_len); +if (io_result !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"MPIPL: Failed to read region at: 0x%" PRIx64"\n" , + src_addr); + is_copy_failed = true; +break ; + } + + io_result =address_space_write (default_as, dest_addr, attrs, + copy_buffer, copy_len); +if (io_result !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"MPIPL: Failed to write region at: 0x%" PRIx64"\n" , + dest_addr); + is_copy_failed = true; +break ; + } + + src_addr +=COPY_CHUNK_SIZE ; + dest_addr +=COPY_CHUNK_SIZE ; + ++chunk_id; + } +#undef COPY_CHUNK_SIZE + +if (is_copy_failed) { +/* +* HDAT doesn't specify an error code in MDRT for failed copy, +* and doesn't specify how this is to be handled +* Hence just skip adding an entry in MDRT, as done for size +* mismatch or other inconsistency between MDST/MDDT +*/ +continue ; + } + +/* Populate entry in MDRT table if preserving successful */ + mdrt[mdrt_idx].src_addr =cpu_to_be64 (src_addr); + mdrt[mdrt_idx].dest_addr =cpu_to_be64 (dest_addr); + mdrt[mdrt_idx].size =cpu_to_be32 (data_len); + mdrt[mdrt_idx].data_region = mdst[i].data_region; + ++mdrt_idx; + } + + pnv->mpipl_state.mdrt_table =g_steal_pointer (&mdrt); + pnv->mpipl_state.num_mdrt_entries = mdrt_idx; + +return true; +}void do_mpipl_preserve (PnvMachineState *pnv) { +pnv_mpipl_preserve_mem (pnv); +/* Mark next boot as Memory-preserving boot */ pnv->mpipl_state.is_next_boot_mpipl = true;
include/hw/ppc/pnv_mpipl.h +86 -0
99 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH v3 5/10 pnv/mpipl: Preserve CPU registers after crash
In reply to Aditya GuptaKernel expects the platform to provide CPU registers after pausing execution of the CPUs.
Currently only exporting the registers, used by Linux, for generating the /proc/vmcore
--- hw/ppc/pnv_mpipl.c | 154 +++++++++++++++++++++++++++++++++++++ include/hw/ppc/pnv_mpipl.h | 60 +++++++++++++++ 2 files changed, 214 insertions(+)
hw/ppc/pnv_mpipl.c +154 -0
@@ -8,6 +8,9 @@#include "qemu/log.h" #include "qemu/units.h" #include "system/address-spaces.h" +#include "system/cpus.h" +#include "system/hw_accel.h" +#include "system/memory.h" #include "system/runstate.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_mpipl.h"
@@ -17,6 +20,8 @@ (pnv->mpipl_state.skiboot_base + MDST_TABLE_OFF)#define MDDT_TABLE_RELOCATED \ (pnv->mpipl_state.skiboot_base + MDDT_TABLE_OFF) +#define PROC_DUMP_RELOCATED \ + (pnv->mpipl_state.skiboot_base + PROC_DUMP_AREA_OFF)/* * Preserve the memory regions as pointed by MDST table
@@ -168,9 +173,158 @@ static bool pnv_mpipl_preserve_mem(PnvMachineState *pnv)return true; } +static void do_store_cpu_regs (CPUState *cpu,MpiplPreservedCPUState *state) +{ +CPUPPCState *env =cpu_env (cpu); +MpiplRegDataHdr *regs_hdr = &state->hdr; +MpiplRegEntry *reg_entries = state->reg_entries; +MpiplRegEntry *curr_reg_entry; +uint32_t num_saved_regs =0 ; + +cpu_synchronize_state (cpu); + + regs_hdr->pir =cpu_to_be32 (env->spr[SPR_PIR ]); + +/* QEMU CPUs are not in Power Saving Mode */ + regs_hdr->core_state =0xff ; + + regs_hdr->off_regentries =0 ; + regs_hdr->num_regentries =cpu_to_be32 (NUM_REGS_PER_CPU ); + + regs_hdr->alloc_size =cpu_to_be32 (sizeof (MpiplRegEntry)); + regs_hdr->act_size =cpu_to_be32 (sizeof (MpiplRegEntry)); + +#define REG_TYPE_GPR 0x1 +#define REG_TYPE_SPR 0x2 +#define REG_TYPE_TIMA 0x3 + +/* +* ID numbers used by f/w while populating certain registers +* +* Copied these defines from the linux kernel +*/ +#define REG_ID_NIP 0x7D0 +#define REG_ID_MSR 0x7D1 +#define REG_ID_CCR 0x7D2 + + curr_reg_entry = reg_entries; + +#define REG_ENTRY (type, num, val) \ + do { \ + curr_reg_entry->reg_type = cpu_to_be32(type); \ + curr_reg_entry->reg_num = cpu_to_be32(num); \ + curr_reg_entry->reg_val = cpu_to_be64(val); \ + ++curr_reg_entry; \ + ++num_saved_regs; \ + } while (0) + +/* Save the GPRs */ +for (int gpr_id =0 ; gpr_id <32 ; ++gpr_id) { +REG_ENTRY (REG_TYPE_GPR , gpr_id, env->gpr[gpr_id]); + } + +REG_ENTRY (REG_TYPE_SPR ,SPR_ACOP , env->spr[SPR_ACOP ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_AMR , env->spr[SPR_AMR ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_BESCR , env->spr[SPR_BESCR ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_CFAR , env->spr[SPR_CFAR ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_CIABR , env->spr[SPR_CIABR ]); + +REG_ENTRY (REG_TYPE_SPR ,SPR_CTR , env->spr[SPR_CTR ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_CTRL , env->spr[SPR_CTRL ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_DABR , env->spr[SPR_DABR ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_DABRX , env->spr[SPR_DABRX ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_DAR , env->spr[SPR_DAR ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_DAWR0 , env->spr[SPR_DAWR0 ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_DAWR1 , env->spr[SPR_DAWR1 ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_DAWRX0 , env->spr[SPR_DAWRX0 ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_DAWRX1 , env->spr[SPR_DAWRX1 ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_DPDES , env->spr[SPR_DPDES ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_DSCR , env->spr[SPR_DSCR ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_DSISR , env->spr[SPR_DSISR ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_EBBHR , env->spr[SPR_EBBHR ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_EBBRR , env->spr[SPR_EBBRR ]); + +REG_ENTRY (REG_TYPE_SPR ,SPR_FSCR , env->spr[SPR_FSCR ]); + +REG_ENTRY (REG_TYPE_SPR ,SPR_CTR , env->ctr); +REG_ENTRY (REG_TYPE_SPR ,SPR_DAR , env->spr[SPR_DAR ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_DSISR , env->spr[SPR_DSISR ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_LR , env->lr); +REG_ENTRY (REG_TYPE_SPR ,REG_ID_MSR , env->msr); +REG_ENTRY (REG_TYPE_SPR ,REG_ID_NIP , env->nip); +REG_ENTRY (REG_TYPE_SPR ,SPR_XER , env->xer); +REG_ENTRY (REG_TYPE_SPR ,SPR_SRR0 , env->spr[SPR_SRR0 ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_SRR1 , env->spr[SPR_SRR1 ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_HSRR0 , env->spr[SPR_HSRR0 ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_HSRR1 , env->spr[SPR_HSRR1 ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_CFAR , env->spr[SPR_CFAR ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_HMER , env->spr[SPR_HMER ]); +REG_ENTRY (REG_TYPE_SPR ,SPR_HMEER , env->spr[SPR_HMEER ]); + +/* +* Ensure the number of registers saved match the number of +* registers per cpu +* +* This will help catch an error if in future a new register entry +* is added/removed while not modifying NUM_PER_CPU_REGS +*/ +assert (num_saved_regs ==NUM_REGS_PER_CPU ); +} + +static bool pnv_mpipl_preserve_cpu_state (PnvMachineState *pnv) +{ +MachineState *machine =MACHINE (pnv); +uint32_t num_cpus = machine->smp.cpus; +MpiplPreservedCPUState *state; +CPUState *cpu; +AddressSpace *default_as = &address_space_memory; +MemTxResult io_result; +MemTxAttrs attrs; + +/* Mark the memory transactions as privileged memory access */ + attrs.user =0 ; + attrs.memory =1 ; + +if (pnv->mpipl_state.cpu_states) { +/* +* CPU States might have been allocated from some past crash, free the +* memory to preven memory leak +*/ +g_free (pnv->mpipl_state.cpu_states); + pnv->mpipl_state.num_cpu_states =0 ; + } + + pnv->mpipl_state.cpu_states =g_malloc_n (num_cpus, +sizeof (MpiplPreservedCPUState)); + pnv->mpipl_state.num_cpu_states = num_cpus; + + state = pnv->mpipl_state.cpu_states; + +/* Preserve the Processor Dump Area */ + io_result =address_space_read (default_as,PROC_DUMP_RELOCATED , attrs, + &pnv->mpipl_state.proc_area,sizeof (MpiplProcDumpArea)); +if (io_result !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"MPIPL: Failed to read Proc Dump Area at: 0x" TARGET_FMT_lx"\n" , +PROC_DUMP_RELOCATED ); + +return false; + } + +CPU_FOREACH (cpu) { +do_store_cpu_regs (cpu, state); + ++state; + } + +return true; +} +void do_mpipl_preserve (PnvMachineState *pnv) { +pause_all_vcpus (); +pnv_mpipl_preserve_mem (pnv); +pnv_mpipl_preserve_cpu_state (pnv);/* Mark next boot as Memory-preserving boot */ pnv->mpipl_state.is_next_boot_mpipl = true;
include/hw/ppc/pnv_mpipl.h +60 -0
84 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH v3 6/10 pnv/mpipl: Set thread entry size to be allocated by firmware
In reply to Aditya GuptaSet the "Thread Register State Entry Size" that is required by firmware (OPAL), to know size of memory to allocate to capture CPU state, in the event of a crash
--- hw/ppc/pnv.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
hw/ppc/pnv.c +24 -0
@@ -781,6 +781,30 @@ static void pnv_reset(MachineState *machine, ResetType type)_FDT ((fdt_pack (fdt))); } +if (!pnv->mpipl_state.is_next_boot_mpipl) { +/* +* Set the "Thread Register State Entry Size", so that firmware can +* allocate enough memory to capture CPU state in the event of a +* crash +*/ + +MpiplProcDumpArea proc_area; + + proc_area.version =PROC_DUMP_AREA_VERSION_P9 ; + proc_area.thread_size =cpu_to_be32 (sizeof (MpiplPreservedCPUState)); + +/* These are to be allocated & assigned by the firmware */ + proc_area.alloc_addr =0 ; + proc_area.alloc_size =0 ; + +/* These get assigned after crash, when QEMU preserves the registers */ + proc_area.dest_addr =0 ; + proc_area.act_size =0 ; + +cpu_physical_memory_write (PROC_DUMP_AREA_OFF , &proc_area, +sizeof (proc_area)); + } +cpu_physical_memory_write (PNV_FDT_ADDR , fdt,fdt_totalsize (fdt));/* Update machine->fdt with latest fdt */
Signature · 1 line
2.53.0
PATCH v3 7/10 pnv/mpipl: Write the preserved CPU and MDRT state
In reply to Aditya GuptaLogic for preserving the CPU registers and memory regions has been done in previous patches.
Write those data at the relevant memory address, such as PROC_DUMP_AREA for CPU registers, and MDRT for preserved memory regions.
Also export "mpipl-boot" device tree node, for kernel to know that it's a 'dump active' boot
--- hw/ppc/pnv.c | 45 +++++++++++++- hw/ppc/pnv_mpipl.c | 141 +++++++++++++++++++++++++++++++++++++++++++ include/hw/ppc/pnv.h | 1 + 3 files changed, 186 insertions(+), 1 deletion(-)
hw/ppc/pnv.c +44 -1
@@ -751,6 +751,8 @@ static void pnv_reset(MachineState *machine, ResetType type)PnvMachineState *pnv =PNV_MACHINE (machine);IPMIBmc *bmc;void *fdt; +int node_offset; +bool is_next_boot_mpipl = false;qemu_devices_reset (type);
@@ -781,7 +783,48 @@ static void pnv_reset(MachineState *machine, ResetType type)_FDT ((fdt_pack (fdt))); } -if (!pnv->mpipl_state.is_next_boot_mpipl) { +/* +* Only on success of writing MPIPL data will the next boot be provided +* "mpipl-boot" property in device tree +* Otherwise boot like a normal non-MPIPL boot +*/ +if (pnv->mpipl_state.is_next_boot_mpipl) { +/* Write the preserved MDRT and CPU State Data */ +bool mpipl_write_succeeded =do_mpipl_write (pnv); + +if (!mpipl_write_succeeded) { + is_next_boot_mpipl = false; + }else { + is_next_boot_mpipl = true; + } + } + +/* +* If it's a MPIPL boot, add the "mpipl-boot" property, and reset the +* boolean for MPIPL boot for next boot +*/ +if (is_next_boot_mpipl) { +void *fdt_copy =g_malloc0 (FDT_MAX_SIZE ); + +/* Create a writable copy of the fdt */ +_FDT ((fdt_open_into (fdt, fdt_copy,FDT_MAX_SIZE ))); + + node_offset =fdt_path_offset (fdt_copy,"/ibm,opal/dump" ); +_FDT ((fdt_appendprop_u64 (fdt_copy, node_offset,"mpipl-boot" ,1 ))); + +/* Update the fdt, and free the original fdt */ +if (fdt != machine->fdt) { +/* +* Only free the fdt if it's not machine->fdt, to prevent +* double free, since we already free machine->fdt later +*/ +g_free (fdt); + } + fdt = fdt_copy; + +/* This boot is an MPIPL, reset the boolean for next boot */ + pnv->mpipl_state.is_next_boot_mpipl = false; + }else {/* * Set the "Thread Register State Entry Size", so that firmware can * allocate enough memory to capture CPU state in the event of a
hw/ppc/pnv_mpipl.c +141 -0
156 lines not on this page · raw message
include/hw/ppc/pnv.h +1 -0
@@ -295,5 +295,6 @@ void pnv_bmc_set_pnor(IPMIBmc *bmc, PnvPnor *pnor);/* MPIPL helpers */ void do_mpipl_preserve (PnvMachineState *pnv); +bool do_mpipl_write (PnvMachineState *pnv);#endif /* PPC_PNV_H */
Signature · 1 line
2.53.0
Re: [PATCH v3 07/10] pnv/mpipl: Write the preserved CPU and MDRT state
Quoted 233 lines · Aditya Gupta
Logic for preserving the CPU registers and memory regions has been done in previous patches.
Write those data at the relevant memory address, such as
PROC_DUMP_AREAfor CPU registers, and MDRT for preserved memory regions.Also export "mpipl-boot" device tree node, for kernel to know that it's a 'dump active' boot
Signed-off-by Aditya Gupta <[email protected]>--- hw/ppc/pnv.c | 45 +++++++++++++- hw/ppc/pnv_mpipl.c | 141 +++++++++++++++++++++++++++++++++++++++++++ include/hw/ppc/pnv.h | 1 + 3 files changed, 186 insertions(+), 1 deletion(-)hw/ppc/pnv.c +44
-1@@ -751,6 +751,8 @@ static void pnv_reset(MachineState *machine, ResetType type)PnvMachineState *pnv =PNV_MACHINE (machine);IPMIBmc *bmc;void *fdt; +int node_offset; +bool is_next_boot_mpipl = false;qemu_devices_reset (type);@@ -781,7 +783,48 @@ static void pnv_reset(MachineState *machine, ResetType type)_FDT ((fdt_pack (fdt))); } -if (!pnv->mpipl_state.is_next_boot_mpipl) { +/* +* Only on success of writing MPIPL data will the next boot be provided +* "mpipl-boot" property in device tree +* Otherwise boot like a normal non-MPIPL boot +*/ +if (pnv->mpipl_state.is_next_boot_mpipl) { +/* Write the preserved MDRT and CPU State Data */ +bool mpipl_write_succeeded =do_mpipl_write (pnv); + +if (!mpipl_write_succeeded) { + is_next_boot_mpipl = false; + }else { + is_next_boot_mpipl = true; + } + } + +/* +* If it's a MPIPL boot, add the "mpipl-boot" property, and reset the +* boolean for MPIPL boot for next boot +*/ +if (is_next_boot_mpipl) { +void *fdt_copy =g_malloc0 (FDT_MAX_SIZE ); + +/* Create a writable copy of the fdt */ +_FDT ((fdt_open_into (fdt, fdt_copy,FDT_MAX_SIZE ))); + + node_offset =fdt_path_offset (fdt_copy,"/ibm,opal/dump" ); +_FDT ((fdt_appendprop_u64 (fdt_copy, node_offset,"mpipl-boot" ,1 ))); + +/* Update the fdt, and free the original fdt */ +if (fdt != machine->fdt) { +/* +* Only free the fdt if it's not machine->fdt, to prevent +* double free, since we already free machine->fdt later +*/ +g_free (fdt); + } + fdt = fdt_copy; + +/* This boot is an MPIPL, reset the boolean for next boot */ + pnv->mpipl_state.is_next_boot_mpipl = false; + }else {/* * Set the "Thread Register State Entry Size", so that firmware can * allocate enough memory to capture CPU state in the event of a hw/ppc/pnv_mpipl.c +135
-0@@ -20,6 +20,8 @@ (pnv->mpipl_state.skiboot_base + MDST_TABLE_OFF)#define MDDT_TABLE_RELOCATED \ (pnv->mpipl_state.skiboot_base + MDDT_TABLE_OFF) +#define MDRT_TABLE_RELOCATED \ + (pnv->mpipl_state.skiboot_base + MDRT_TABLE_OFF)#define PROC_DUMP_RELOCATED \ (pnv->mpipl_state.skiboot_base + PROC_DUMP_AREA_OFF)@@ -319,6 +321,139 @@ static bool pnv_mpipl_preserve_cpu_state(PnvMachineState *pnv)return true; } +/* +* Write the preserved CPU state data in Processor Dump Area (PROC_DUMP_AREA) +* +* Returns true if everything went fine, else false for any error +*/ +static bool pnv_mpipl_write_cpu_state (PnvMachineState *pnv) +{ +MpiplProcDumpArea *proc_area = &pnv->mpipl_state.proc_area; +MpiplPreservedCPUState *cpu_state = pnv->mpipl_state.cpu_states; +const uint32_t num_cpu_states = pnv->mpipl_state.num_cpu_states; +hwaddr next_regentries_hdr; +AddressSpace *default_as = &address_space_memory; +MemTxResult io_result; +MemTxAttrs attrs; + +/* Mark the memory transactions as privileged memory access */ + attrs.user =0 ; + attrs.memory =1 ; + +if (be32_to_cpu (proc_area->alloc_size) < + (num_cpu_states *sizeof (MpiplPreservedCPUState))) { +qemu_log_mask (LOG_GUEST_ERROR , +"MPIPL: Size of buffer allocate by skiboot (%u bytes) is not" +"enough to save all CPUs registers needed (%zu bytes)" , +be32_to_cpu (proc_area->alloc_size), + num_cpu_states *sizeof (MpiplPreservedCPUState)); + +return false; + } + + proc_area->version =PROC_DUMP_AREA_VERSION_P9 ; + +/* +* This is the stride kernel/firmware should use to jump from a +* register entries header to next CPU's header +*/ + proc_area->thread_size =cpu_to_be32 (sizeof (MpiplPreservedCPUState)); + +/* Write the header and register entries for each CPU */ + next_regentries_hdr =be64_to_cpu (proc_area->alloc_addr) & (~HRMOR_BIT ); +for (int i =0 ; i < num_cpu_states; ++i) { + io_result =address_space_write (default_as, next_regentries_hdr, attrs, + &cpu_state->hdr,sizeof (MpiplRegDataHdr)); +if (io_result !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"MPIPL: Failed to write RegEntries Header\n" ); +return false; + } + + io_result =address_space_write (default_as, + next_regentries_hdr +sizeof (MpiplRegDataHdr), attrs, + &cpu_state->reg_entries, +NUM_REGS_PER_CPU * (sizeof (MpiplRegEntry))); +if (io_result !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"MPIPL: Failed to write Register Entries\n" ); +return false; + } + +/* +* According to HDAT section: +* "15.3.1.5 Architected Register Data content": +* +* The next register entries header will be at current header + +* "Thread Register State Entry size" +* +* Note: proc_area.thread_size == sizeof(MpiplPreservedCPUState) +*/ + next_regentries_hdr +=sizeof (MpiplPreservedCPUState); + ++cpu_state; + } + +/* Point the destination address to the preserved memory region */ + proc_area->dest_addr = proc_area->alloc_addr; + proc_area->act_size =cpu_to_be32 (num_cpu_states * +sizeof (MpiplPreservedCPUState)); + + io_result =address_space_write (default_as,PROC_DUMP_AREA_OFF , attrs, + proc_area,sizeof (MpiplProcDumpArea)); +if (io_result !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"MPIPL: Failed to write Register Entries\n" ); +return false; + } + +return true; +} + +/* +* Write the preserved MDRT table, representing preserved memory regions +* +* Returns true if everything went fine, else false for any error +*/ +static bool pnv_mpipl_write_mdrt (PnvMachineState *pnv) +{ +MpiplPreservedState *state = &pnv->mpipl_state; +AddressSpace *default_as = &address_space_memory; +MemTxResult io_result; +MemTxAttrs attrs; + +/* Mark the memory transactions as privileged memory access */ + attrs.user =0 ; + attrs.memory =1 ; + +/* +* Generally writes from platform during MPIPL don't go to a relocated +* skiboot address +* +* Though for MDRT we are doing so, as this is the address skiboot +* considers by default for MDRT +* +* MDRT/MDST/MDDT base addresses are actually meant to be shared by +* platform in SPIRA structures. +* +* Not implementing SPIRA as it increases complexity for no gains. +* Using the default address skiboot expects for MDRT, which is the +* relocated MDRT, hence writing to it +* +* Other tables like MDST/MDDT should not be written to relocated +* addresses, as skiboot will overwrite anything from SKIBOOT_BASE till +* SKIBOOT_BASE+SKIBOOT_SIZE (which is 0x30000000-0x31c00000 by default) +*/ + io_result =address_space_write (default_as,MDRT_TABLE_RELOCATED , attrs, + state->mdrt_table, + state->num_mdrt_entries *sizeof (MdrtTableEntry)); +if (io_result !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR ,"MPIPL: Failed to write MDRT table\n" ); +return false; + } + +return true; +} +void do_mpipl_preserve (PnvMachineState *pnv) {pause_all_vcpus ();
hw/ppc/pnv_mpipl.c void do_mpipl_preserve(PnvMachineState *pnv) · line 481
Quoted 8 lines
hw/ppc/pnv_mpipl.c +5
-0@@ -339,3 +474,9 @@ void do_mpipl_preserve(PnvMachineState *pnv)*/ qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); } + +bool do_mpipl_write (PnvMachineState *pnv) +{ +return pnv_mpipl_write_mdrt (pnv) &&pnv_mpipl_write_cpu_state (pnv); +}
Another minor nit..
hw/ppc/pnv_mpipl.c void do_mpipl_preserve(PnvMachineState *pnv) · line 482
Quoted 1 line
hw/ppc/pnv_mpipl.c +1
-0+
blank line at EOF.
Quoted 11 lines
include/hw/ppc/pnv.h +1
-0@@ -295,5 +295,6 @@ void pnv_bmc_set_pnor(IPMIBmc *bmc, PnvPnor *pnor);/* MPIPL helpers */ void do_mpipl_preserve (PnvMachineState *pnv); +bool do_mpipl_write (PnvMachineState *pnv);#endif /* PPC_PNV_H */
PATCH v3 8/10 pnv/mpipl: Enable MPIPL support
In reply to Aditya GuptaWith all MPIPL support in place, export a "dump" node in device tree, signifying that PowerNV QEMU platform supports MPIPL
Also, export fw-load-area dt node, which has details about where the kernel & initrd were loaded, so that kernel can verify whether the kernel/initrd images were loaded within the boot memory region. QEMU just exports these details in fw-load-area, the check for boot memory region is done in kernel.
--- hw/ppc/pnv.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
hw/ppc/pnv.c +37 -0
@@ -54,6 +54,7 @@#include "hw/ppc/pnv_chip.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_pnor.h" +#include "hw/ppc/pnv_mpipl.h" #include "hw/isa/isa.h" #include "hw/char/serial-isa.h"
@@ -672,6 +673,39 @@ static void pnv_dt_power_mgt(PnvMachineState *pnv, void *fdt)_FDT (fdt_setprop_cell (fdt, off,"ibm,enabled-stop-levels" ,0xc0000000 )); } +static void pnv_dt_mpipl_dump (PnvMachineState *pnv,void *fdt) +{ +int off; + +/* +* Add "dump" node so kernel knows MPIPL (aka fadump) is supported +* +* Note: This is only needed to be done since we are passing device tree to +* opal +* +* In case HDAT is supported in future, then opal can add these nodes by +* itself based on system attribute having MPIPL_SUPPORTED bit set +*/ + off =fdt_add_subnode (fdt,0 ,"ibm,opal" ); +if (off == -FDT_ERR_EXISTS ) { + off =fdt_path_offset (fdt,"/ibm,opal" ); + } + +_FDT (off); + off =fdt_add_subnode (fdt, off,"dump" ); +_FDT (off); +_FDT ((fdt_setprop_string (fdt, off,"compatible" ,"ibm,opal-dump" ))); + +/* Add kernel and initrd as fw-load-area */ +uint64_t fw_load_area[4 ] = { +cpu_to_be64 (KERNEL_LOAD_ADDR ),cpu_to_be64 (KERNEL_MAX_SIZE ), +cpu_to_be64 (INITRD_LOAD_ADDR ),cpu_to_be64 (INITRD_MAX_SIZE ) + }; + +_FDT ((fdt_setprop (fdt, off,"fw-load-area" , + fw_load_area,sizeof (fw_load_area)))); +} +static void *pnv_dt_create (MachineState *machine) {PnvMachineClass *pmc =PNV_MACHINE_GET_CLASS (machine);
@@ -734,6 +768,9 @@ static void *pnv_dt_create(MachineState *machine) pmc->dt_power_mgt (pnv, fdt); } +/* Advertise support for MPIPL */ +pnv_dt_mpipl_dump (pnv, fdt); +return fdt; }
Signature · 1 line
2.53.0
PATCH v3 9/10 tests/functional: Add test for MPIPL in PowerNV
In reply to Aditya GuptaWith MPIPL support implemented, enable fadump's functional test for PowerNV
Also, current functional test for powernv uses op-build's Linux 5.10 image, which doesn't support adding "fadump=on" in argument due to this:
Kernel is locked down from Kernel configuration; see man kernel_lockdown.7
Hence, instead of op-build's image, use the newer fedora vmlinuz as used in FADump PSeries functional test
Also due to "bash#" string not showing up, rely on sh: no job control to check if testcase has reached till shell
--- tests/functional/ppc64/test_fadump.py | 35 ++++++++++----------------- 1 file changed, 13 insertions(+), 22 deletions(-)
tests/functional/ppc64/test_fadump.py +13 -22
@@ -14,6 +14,7 @@ class QEMUFadump(LinuxKernelTest): 1. test_fadump_pseries: PSeries 2. test_fadump_pseries_kvm: PSeries + KVM + 3. test_fadump_powernv: PowerNV """ timeout = 90
@@ -24,11 +25,6 @@ class QEMUFadump(LinuxKernelTest): msg_registered_failed = '' msg_dump_active = '' - ASSET_EPAPR_KERNEL = Asset( - ('https://github.com/open-power/op-build/releases/download/v2.7/' - 'zImage.epapr'), - '0ab237df661727e5392cee97460e8674057a883c5f74381a128fa772588d45cd') - ASSET_VMLINUZ_KERNEL = Asset( ('https://archives.fedoraproject.org/pub/archive/fedora-secondary/' 'releases/39/Everything/ppc64le/os/ppc/ppc64/vmlinuz'),
@@ -62,16 +58,14 @@ def do_test_fadump(self, is_kvm=False, is_powernv=False): # SLOF takes upto >20s in startup time, use VOF self.set_machine("pseries") self.vm.add_args("-machine", "x-vof=on") - self.vm.add_args("-m", "6G") + + self.vm.add_args("-m", "6G") self.vm.set_console() kernel_path = None - if is_powernv: - kernel_path = self.ASSET_EPAPR_KERNEL.fetch() - else: - kernel_path = self.ASSET_VMLINUZ_KERNEL.fetch() + kernel_path = self.ASSET_VMLINUZ_KERNEL.fetch() initrd_path = self.ASSET_FEDORA_INITRD.fetch()
@@ -102,16 +96,14 @@ def do_test_fadump(self, is_kvm=False, is_powernv=False): timeout=20 ) - # Ensure fadump is registered successfully, if registration - # succeeds, we get a log from rtas fadump: - # - # rtas fadump: Registration is successful! - self.wait_for_console_pattern( - "rtas fadump: Registration is successful!" - ) + # Ensure fadump is registered successfully + if not is_powernv: + self.wait_for_console_pattern( + "rtas fadump: Registration is successful!" + ) # Wait for the shell - self.wait_for_console_pattern("#") + self.wait_for_console_pattern("sh: no job control") # Mount /proc since not available in the initrd used exec_command(self, command="mount -t proc proc /proc")
@@ -135,7 +127,7 @@ def do_test_fadump(self, is_kvm=False, is_powernv=False): # that qemu didn't pass the 'ibm,kernel-dump' device tree node wait_for_console_pattern( test=self, - success_message="rtas fadump: Firmware-assisted dump is active", + success_message="fadump: Firmware-assisted dump is active", failure_message="fadump: Reserved " )
@@ -148,7 +140,7 @@ def do_test_fadump(self, is_kvm=False, is_powernv=False): self.wait_for_console_pattern("preserving crash data") # Wait for prompt - self.wait_for_console_pattern("sh-5.2#") + self.wait_for_console_pattern("Run /bin/sh as init process") # Mount /proc since not available in the initrd used exec_command_and_wait_for_pattern(self,
@@ -166,9 +158,8 @@ def do_test_fadump(self, is_kvm=False, is_powernv=False): def test_fadump_pseries(self): return self.do_test_fadump(is_kvm=False, is_powernv=False) - @skip("PowerNV Fadump not supported yet") def test_fadump_powernv(self): - return + return self.do_test_fadump(is_kvm=False, is_powernv=True) def test_fadump_pseries_kvm(self): """
Signature · 1 line
2.53.0
PATCH v3 10/10 MAINTAINERS: Add entry for MPIPL (PowerNV)
In reply to Aditya GuptaAdd maintainer and reviewer for MPIPL subsystem.
--- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)
MAINTAINERS +8 -0
@@ -3289,6 +3289,14 @@ F: include/hw/ppc/spapr_fadump.h F: hw/ppc/spapr_fadump.c F: tests/functional/ppc64/test_fadump.py +Memory-Preserving Initial Program Load (MPIPL) for PowerNV +M: Aditya Gupta <[email protected]> +R: Hari Bathini <[email protected]> +S: Maintained +F: include/hw/ppc/pnv_mpipl.h +F: hw/ppc/pnv_mpipl.c +F: tests/functional/ppc64/test_fadump.py + GDB stub M: Alex Bennée <[email protected]> R: Philippe Mathieu-Daudé <[email protected]>
Signature · 1 line
2.53.0
Re: [PATCH v3 10/10] MAINTAINERS: Add entry for MPIPL (PowerNV)
Quoted 2 lines · Aditya Gupta
Add maintainer and reviewer for MPIPL subsystem.
Couple of minor nits in patch 2 & 7.
None the less, for the series...
Quoted 24 lines
Signed-off-by Aditya Gupta <[email protected]>--- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)MAINTAINERS +8
-0@@ -3289,6 +3289,14 @@ F: include/hw/ppc/spapr_fadump.h F: hw/ppc/spapr_fadump.c F: tests/functional/ppc64/test_fadump.py +Memory-Preserving Initial Program Load (MPIPL) for PowerNV +M: Aditya Gupta <[email protected]> +R: Hari Bathini <[email protected]> +S: Maintained +F: include/hw/ppc/pnv_mpipl.h +F: hw/ppc/pnv_mpipl.c +F: tests/functional/ppc64/test_fadump.py + GDB stub M: Alex Bennée <[email protected]> R: Philippe Mathieu-Daudé <[email protected]>
Re: [PATCH v3 10/10] MAINTAINERS: Add entry for MPIPL (PowerNV)
Quoted 11 lines · Hari Bathini
Quoted 2 lines · Aditya Gupta
Add maintainer and reviewer for MPIPL subsystem.
Couple of minor nits in patch 2 & 7.
None the less, for the series...Reviewed-by Hari Bathini <[email protected]>
Thanks for the review Hari, will fix the nits in v4.