From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: Nicholas Piggin <npiggin@gmail.com>, qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, "Cédric Le Goater" <clg@kaod.org>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Greg Kurz" <groug@kaod.org>,
"Harsh Prateek Bora" <harshpb@linux.ibm.com>
Subject: Re: [PATCH v3] target/ppc: Machine check on invalid real address access on POWER9/10
Date: Fri, 7 Jul 2023 04:20:00 -0300 [thread overview]
Message-ID: <bd65b9e8-3307-77c5-a5b9-27b4650aa623@gmail.com> (raw)
In-Reply-To: <20230703120301.45313-1-npiggin@gmail.com>
Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,
Daniel
On 7/3/23 09:03, Nicholas Piggin wrote:
> ppc currently silently accepts invalid real address access. Catch
> these and turn them into machine checks on POWER9/10 machines.
>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> ---
> Since v1:
> - Only implement this for POWER9/10. Seems like previous IBM processors
> may not catch this, trying to get info.
>
> Since v2:
> - Split out from larger series since it is independent.
>
> target/ppc/cpu_init.c | 1 +
> target/ppc/excp_helper.c | 49 ++++++++++++++++++++++++++++++++++++++++
> target/ppc/internal.h | 5 ++++
> 3 files changed, 55 insertions(+)
>
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index 720aad9e05..6ac1765a8d 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -7335,6 +7335,7 @@ static const struct TCGCPUOps ppc_tcg_ops = {
> .cpu_exec_enter = ppc_cpu_exec_enter,
> .cpu_exec_exit = ppc_cpu_exec_exit,
> .do_unaligned_access = ppc_cpu_do_unaligned_access,
> + .do_transaction_failed = ppc_cpu_do_transaction_failed,
> #endif /* !CONFIG_USER_ONLY */
> };
> #endif /* CONFIG_TCG */
> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
> index 354392668e..e49e13a30d 100644
> --- a/target/ppc/excp_helper.c
> +++ b/target/ppc/excp_helper.c
> @@ -1428,7 +1428,9 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp)
> /* machine check exceptions don't have ME set */
> new_msr &= ~((target_ulong)1 << MSR_ME);
>
> + msr |= env->error_code;
> break;
> +
> case POWERPC_EXCP_DSI: /* Data storage exception */
> trace_ppc_excp_dsi(env->spr[SPR_DSISR], env->spr[SPR_DAR]);
> break;
> @@ -3184,5 +3186,52 @@ void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,
> env->error_code = insn & 0x03FF0000;
> cpu_loop_exit(cs);
> }
> +
> +void ppc_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr,
> + vaddr vaddr, unsigned size,
> + MMUAccessType access_type,
> + int mmu_idx, MemTxAttrs attrs,
> + MemTxResult response, uintptr_t retaddr)
> +{
> + CPUPPCState *env = cs->env_ptr;
> +
> + switch (env->excp_model) {
> +#if defined(TARGET_PPC64)
> + case POWERPC_EXCP_POWER9:
> + case POWERPC_EXCP_POWER10:
> + /*
> + * Machine check codes can be found in processor User Manual or
> + * Linux or skiboot source.
> + */
> + if (access_type == MMU_DATA_LOAD) {
> + env->spr[SPR_DAR] = vaddr;
> + env->spr[SPR_DSISR] = PPC_BIT(57);
> + env->error_code = PPC_BIT(42);
> +
> + } else if (access_type == MMU_DATA_STORE) {
> + /*
> + * MCE for stores in POWER is asynchronous so hardware does
> + * not set DAR, but QEMU can do better.
> + */
> + env->spr[SPR_DAR] = vaddr;
> + env->error_code = PPC_BIT(36) | PPC_BIT(43) | PPC_BIT(45);
> + env->error_code |= PPC_BIT(42);
> +
> + } else { /* Fetch */
> + env->error_code = PPC_BIT(36) | PPC_BIT(44) | PPC_BIT(45);
> + }
> + break;
> +#endif
> + default:
> + /*
> + * TODO: Check behaviour for other CPUs, for now do nothing.
> + * Could add a basic MCE even if real hardware ignores.
> + */
> + return;
> + }
> +
> + cs->exception_index = POWERPC_EXCP_MCHECK;
> + cpu_loop_exit_restore(cs, retaddr);
> +}
> #endif /* CONFIG_TCG */
> #endif /* !CONFIG_USER_ONLY */
> diff --git a/target/ppc/internal.h b/target/ppc/internal.h
> index 901bae6d39..57acb3212c 100644
> --- a/target/ppc/internal.h
> +++ b/target/ppc/internal.h
> @@ -296,6 +296,11 @@ bool ppc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
> G_NORETURN void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
> MMUAccessType access_type, int mmu_idx,
> uintptr_t retaddr);
> +void ppc_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr,
> + vaddr addr, unsigned size,
> + MMUAccessType access_type,
> + int mmu_idx, MemTxAttrs attrs,
> + MemTxResult response, uintptr_t retaddr);
> #endif
>
> FIELD(GER_MSK, XMSK, 0, 4)
prev parent reply other threads:[~2023-07-07 7:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-03 12:03 [PATCH v3] target/ppc: Machine check on invalid real address access on POWER9/10 Nicholas Piggin
2023-07-06 7:32 ` Nicholas Piggin
2023-07-06 7:50 ` Cédric Le Goater
2023-07-06 11:43 ` BALATON Zoltan
2023-07-06 11:54 ` BALATON Zoltan
2023-07-06 13:10 ` Cédric Le Goater
2023-07-06 20:50 ` Daniel Henrique Barboza
2023-07-06 20:55 ` Cédric Le Goater
2023-07-07 7:20 ` Daniel Henrique Barboza [this message]
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=bd65b9e8-3307-77c5-a5b9-27b4650aa623@gmail.com \
--to=danielhb413@gmail.com \
--cc=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=groug@kaod.org \
--cc=harshpb@linux.ibm.com \
--cc=npiggin@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).