[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v18 3/7] target/ppc: Handle NMI guest exit
From: |
Greg Kurz |
Subject: |
Re: [PATCH v18 3/7] target/ppc: Handle NMI guest exit |
Date: |
Mon, 6 Jan 2020 10:45:33 +0100 |
On Thu, 2 Jan 2020 13:21:07 +0530
Ganesh Goudar <address@hidden> wrote:
> From: Aravinda Prasad <address@hidden>
>
> Memory error such as bit flips that cannot be corrected
> by hardware are passed on to the kernel for handling.
> If the memory address in error belongs to guest then
> the guest kernel is responsible for taking suitable action.
> Patch [1] enhances KVM to exit guest with exit reason
> set to KVM_EXIT_NMI in such cases. This patch handles
> KVM_EXIT_NMI exit.
>
> [1] https://www.spinics.net/lists/kvm-ppc/msg12637.html
> (e20bbd3d and related commits)
>
> Signed-off-by: Aravinda Prasad <address@hidden>
> Reviewed-by: David Gibson <address@hidden>
> Reviewed-by: Greg Kurz <address@hidden>
> ---
Missing S-o-b.
> hw/ppc/spapr.c | 8 ++++++++
> hw/ppc/spapr_events.c | 37 +++++++++++++++++++++++++++++++++++++
> include/hw/ppc/spapr.h | 10 ++++++++++
> target/ppc/kvm.c | 14 ++++++++++++++
> target/ppc/kvm_ppc.h | 2 ++
> target/ppc/trace-events | 1 +
> 6 files changed, 72 insertions(+)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index c91e64aad0..975d7da734 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1679,6 +1679,12 @@ static void spapr_machine_reset(MachineState *machine)
> first_ppc_cpu->env.gpr[5] = 0;
>
> spapr->cas_reboot = false;
> +
> + spapr->mc_status = -1;
> + spapr->guest_machine_check_addr = -1;
> +
> + /* Signal all vCPUs waiting on this condition */
> + qemu_cond_broadcast(&spapr->mc_delivery_cond);
> }
>
> static void spapr_create_nvram(SpaprMachineState *spapr)
> @@ -2973,6 +2979,8 @@ static void spapr_machine_init(MachineState *machine)
>
> kvmppc_spapr_enable_inkernel_multitce();
> }
> +
> + qemu_cond_init(&spapr->mc_delivery_cond);
> }
>
> static int spapr_kvm_type(MachineState *machine, const char *vm_type)
> diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
> index e355e000d0..dfc0de840a 100644
> --- a/hw/ppc/spapr_events.c
> +++ b/hw/ppc/spapr_events.c
> @@ -40,6 +40,7 @@
> #include "hw/ppc/spapr_drc.h"
> #include "qemu/help_option.h"
> #include "qemu/bcd.h"
> +#include "qemu/main-loop.h"
> #include "hw/ppc/spapr_ovec.h"
> #include <libfdt.h>
>
> @@ -622,6 +623,42 @@ void
> spapr_hotplug_req_remove_by_count_indexed(SpaprDrcType drc_type,
> RTAS_LOG_V6_HP_ACTION_REMOVE, drc_type, &drc_id);
> }
>
> +void spapr_mce_req_event(PowerPCCPU *cpu)
> +{
> + SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());
> + CPUState *cs = CPU(cpu);
> +
> + if (spapr->guest_machine_check_addr == -1) {
> + /*
> + * This implies that we have hit a machine check either when the
> + * guest has not registered FWNMI (i.e., "ibm,nmi-register" not
> + * called) or between system reset and "ibm,nmi-register".
> + * Fall back to the old machine check behavior in such cases.
> + */
> + cs->exception_index = POWERPC_EXCP_MCHECK;
> + ppc_cpu_do_interrupt(cs);
> + return;
> + }
> +
> + while (spapr->mc_status != -1) {
> + /*
> + * Check whether the same CPU got machine check error
> + * while still handling the mc error (i.e., before
> + * that CPU called "ibm,nmi-interlock")
> + */
> + if (spapr->mc_status == cpu->vcpu_id) {
> + qemu_system_guest_panicked(NULL);
> + return;
> + }
> + qemu_cond_wait_iothread(&spapr->mc_delivery_cond);
> + /* Meanwhile if the system is reset, then just return */
> + if (spapr->guest_machine_check_addr == -1) {
> + return;
> + }
> + }
> + spapr->mc_status = cpu->vcpu_id;
> +}
> +
> static void check_exception(PowerPCCPU *cpu, SpaprMachineState *spapr,
> uint32_t token, uint32_t nargs,
> target_ulong args,
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index 7bc5fc3a9e..909d3976f9 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -191,6 +191,15 @@ struct SpaprMachineState {
> * occurs during the unplug process. */
> QTAILQ_HEAD(, SpaprDimmState) pending_dimm_unplugs;
>
> + /* State related to "ibm,nmi-register" and "ibm,nmi-interlock" calls */
> + target_ulong guest_machine_check_addr;
> + /*
> + * mc_status is set to -1 if mc is not in progress, else is set to the
> CPU
> + * handling the mc.
> + */
> + int mc_status;
> + QemuCond mc_delivery_cond;
> +
> /*< public >*/
> char *kvm_type;
> char *host_model;
> @@ -804,6 +813,7 @@ void spapr_clear_pending_events(SpaprMachineState *spapr);
> int spapr_max_server_number(SpaprMachineState *spapr);
> void spapr_store_hpte(PowerPCCPU *cpu, hwaddr ptex,
> uint64_t pte0, uint64_t pte1);
> +void spapr_mce_req_event(PowerPCCPU *cpu);
>
> /* DRC callbacks. */
> void spapr_core_release(DeviceState *dev);
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index 518de7e4b7..2aebb44e2f 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -1708,6 +1708,11 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run
> *run)
> ret = 0;
> break;
>
> + case KVM_EXIT_NMI:
> + trace_kvm_handle_nmi_exception();
> + ret = kvm_handle_nmi(cpu, run);
> + break;
> +
> default:
> fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason);
> ret = -1;
> @@ -2803,6 +2808,15 @@ int kvm_arch_msi_data_to_gsi(uint32_t data)
> return data & 0xffff;
> }
>
> +int kvm_handle_nmi(PowerPCCPU *cpu, struct kvm_run *run)
> +{
> + cpu_synchronize_state(CPU(cpu));
> +
> + spapr_mce_req_event(cpu);
> +
> + return 0;
> +}
> +
> int kvmppc_enable_hwrng(void)
> {
> if (!kvm_enabled() || !kvm_check_extension(kvm_state,
> KVM_CAP_PPC_HWRNG)) {
> diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
> index eedb15d48e..bd2a0edf43 100644
> --- a/target/ppc/kvm_ppc.h
> +++ b/target/ppc/kvm_ppc.h
> @@ -83,6 +83,8 @@ void kvm_check_mmu(PowerPCCPU *cpu, Error **errp);
> void kvmppc_set_reg_ppc_online(PowerPCCPU *cpu, unsigned int online);
> void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset);
>
> +int kvm_handle_nmi(PowerPCCPU *cpu, struct kvm_run *run);
> +
> #else
>
> static inline uint32_t kvmppc_get_tbfreq(void)
> diff --git a/target/ppc/trace-events b/target/ppc/trace-events
> index 3dc6740706..6d15aa90b4 100644
> --- a/target/ppc/trace-events
> +++ b/target/ppc/trace-events
> @@ -28,3 +28,4 @@ kvm_handle_papr_hcall(void) "handle PAPR hypercall"
> kvm_handle_epr(void) "handle epr"
> kvm_handle_watchdog_expiry(void) "handle watchdog expiry"
> kvm_handle_debug_exception(void) "handle debug exception"
> +kvm_handle_nmi_exception(void) "handle NMI exception"
- [PATCH v18 0/7] target-ppc/spapr: Add FWNMI support in QEMU for PowerKM guests, Ganesh Goudar, 2020/01/02
- [PATCH v18 1/7] Wrapper function to wait on condition for the main loop mutex, Ganesh Goudar, 2020/01/02
- [PATCH v18 2/7] ppc: spapr: Introduce FWNMI capability, Ganesh Goudar, 2020/01/02
- [PATCH v18 3/7] target/ppc: Handle NMI guest exit, Ganesh Goudar, 2020/01/02
- Re: [PATCH v18 3/7] target/ppc: Handle NMI guest exit,
Greg Kurz <=
- [PATCH v18 4/7] target/ppc: Build rtas error log upon an MCE, Ganesh Goudar, 2020/01/02
- [PATCH v18 5/7] ppc: spapr: Handle "ibm, nmi-register" and "ibm, nmi-interlock" RTAS calls, Ganesh Goudar, 2020/01/02
- Re: [PATCH v18 5/7] ppc: spapr: Handle "ibm,nmi-register" and "ibm,nmi-interlock" RTAS calls, David Gibson, 2020/01/02
- Re: [PATCH v18 5/7] ppc: spapr: Handle "ibm,nmi-register" and "ibm,nmi-interlock" RTAS calls, Ganesh, 2020/01/07
- Re: [PATCH v18 5/7] ppc: spapr: Handle "ibm,nmi-register" and "ibm,nmi-interlock" RTAS calls, David Gibson, 2020/01/07
- Re: [PATCH v18 5/7] ppc: spapr: Handle "ibm,nmi-register" and "ibm,nmi-interlock" RTAS calls, Ganesh, 2020/01/08
- Re: [PATCH v18 5/7] ppc: spapr: Handle "ibm,nmi-register" and "ibm,nmi-interlock" RTAS calls, David Gibson, 2020/01/08
[PATCH v18 6/7] migration: Include migration support for machine check handling, Ganesh Goudar, 2020/01/02