From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: Nicholas Miehlbradt <nicholas@linux.ibm.com>, qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au,
groug@kaod.org, victor.colombo@eldorado.org.br
Subject: Re: [PATCH 2/2] target/ppc: Check DEXCR on hash{st, chk} instructions
Date: Mon, 28 Nov 2022 17:35:49 -0300 [thread overview]
Message-ID: <bd0febd5-2ee5-e0af-77f4-85fe1bb4699f@gmail.com> (raw)
In-Reply-To: <20221124055143.752601-3-nicholas@linux.ibm.com>
On 11/24/22 02:51, Nicholas Miehlbradt wrote:
> Adds checks to the hashst and hashchk instructions to only execute if
> enabled by the relevant aspect in the DEXCR and HDEXCR.
>
> This behaviour is guarded behind TARGET_PPC64 since Power10 is
> currently the only implementation which has the DEXCR.
>
> Signed-off-by: Nicholas Miehlbradt <nicholas@linux.ibm.com>
> ---
LGTM
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
> target/ppc/excp_helper.c | 58 +++++++++++++++++++++++++++++-----------
> 1 file changed, 43 insertions(+), 15 deletions(-)
>
> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
> index 94adcb766b..add4d54ae7 100644
> --- a/target/ppc/excp_helper.c
> +++ b/target/ppc/excp_helper.c
> @@ -2902,29 +2902,57 @@ static uint64_t hash_digest(uint64_t ra, uint64_t rb, uint64_t key)
> return stage1_h ^ stage1_l;
> }
>
> +static void do_hash(CPUPPCState *env, target_ulong ea, target_ulong ra,
> + target_ulong rb, uint64_t key, bool store)
> +{
> + uint64_t calculated_hash = hash_digest(ra, rb, key), loaded_hash;
> +
> + if (store) {
> + cpu_stq_data_ra(env, ea, calculated_hash, GETPC());
> + } else {
> + loaded_hash = cpu_ldq_data_ra(env, ea, GETPC());
> + if (loaded_hash != calculated_hash) {
> + raise_exception_err_ra(env, POWERPC_EXCP_PROGRAM,
> + POWERPC_EXCP_TRAP, GETPC());
> + }
> + }
> +}
> +
> #include "qemu/guest-random.h"
>
> -#define HELPER_HASH(op, key, store) \
> +#ifdef TARGET_PPC64
> +#define HELPER_HASH(op, key, store, dexcr_aspect) \
> void helper_##op(CPUPPCState *env, target_ulong ea, target_ulong ra, \
> target_ulong rb) \
> { \
> - uint64_t calculated_hash = hash_digest(ra, rb, key), loaded_hash; \
> - \
> - if (store) { \
> - cpu_stq_data_ra(env, ea, calculated_hash, GETPC()); \
> - } else { \
> - loaded_hash = cpu_ldq_data_ra(env, ea, GETPC()); \
> - if (loaded_hash != calculated_hash) { \
> - raise_exception_err_ra(env, POWERPC_EXCP_PROGRAM, \
> - POWERPC_EXCP_TRAP, GETPC()); \
> - } \
> + if (env->msr & R_MSR_PR_MASK) { \
> + if (!(env->spr[SPR_DEXCR] & R_DEXCR_PRO_##dexcr_aspect##_MASK || \
> + env->spr[SPR_HDEXCR] & R_HDEXCR_ENF_##dexcr_aspect##_MASK)) \
> + return; \
> + } else if (!(env->msr & R_MSR_HV_MASK)) { \
> + if (!(env->spr[SPR_DEXCR] & R_DEXCR_PNH_##dexcr_aspect##_MASK || \
> + env->spr[SPR_HDEXCR] & R_HDEXCR_ENF_##dexcr_aspect##_MASK)) \
> + return; \
> + } else if (!(env->msr & R_MSR_S_MASK)) { \
> + if (!(env->spr[SPR_HDEXCR] & R_HDEXCR_HNU_##dexcr_aspect##_MASK)) \
> + return; \
> } \
> + \
> + do_hash(env, ea, ra, rb, key, store); \
> +}
> +#else
> +#define HELPER_HASH(op, key, store, dexcr_aspect) \
> +void helper_##op(CPUPPCState *env, target_ulong ea, target_ulong ra, \
> + target_ulong rb) \
> +{ \
> + do_hash(env, ea, ra, rb, key, store); \
> }
> +#endif /* TARGET_PPC64 */
>
> -HELPER_HASH(HASHST, env->spr[SPR_HASHKEYR], true)
> -HELPER_HASH(HASHCHK, env->spr[SPR_HASHKEYR], false)
> -HELPER_HASH(HASHSTP, env->spr[SPR_HASHPKEYR], true)
> -HELPER_HASH(HASHCHKP, env->spr[SPR_HASHPKEYR], false)
> +HELPER_HASH(HASHST, env->spr[SPR_HASHKEYR], true, NPHIE)
> +HELPER_HASH(HASHCHK, env->spr[SPR_HASHKEYR], false, NPHIE)
> +HELPER_HASH(HASHSTP, env->spr[SPR_HASHPKEYR], true, PHIE)
> +HELPER_HASH(HASHCHKP, env->spr[SPR_HASHPKEYR], false, PHIE)
> #endif /* CONFIG_TCG */
>
> #if !defined(CONFIG_USER_ONLY)
next prev parent reply other threads:[~2022-11-28 20:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-24 5:51 [PATCH 0/2] target/ppc: Implement Dynamic Execution Control Registers Nicholas Miehlbradt
2022-11-24 5:51 ` [PATCH 1/2] target/ppc: Implement the DEXCR and HDEXCR Nicholas Miehlbradt
2022-11-28 20:33 ` Daniel Henrique Barboza
2022-11-24 5:51 ` [PATCH 2/2] target/ppc: Check DEXCR on hash{st, chk} instructions Nicholas Miehlbradt
2022-11-28 20:35 ` Daniel Henrique Barboza [this message]
2022-11-25 5:48 ` [PATCH 0/2] target/ppc: Implement Dynamic Execution Control Registers Joel Stanley
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=bd0febd5-2ee5-e0af-77f4-85fe1bb4699f@gmail.com \
--to=danielhb413@gmail.com \
--cc=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=groug@kaod.org \
--cc=nicholas@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=victor.colombo@eldorado.org.br \
/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).