[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 24/31] target/arm: Implement pauth_strip
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v3 24/31] target/arm: Implement pauth_strip |
Date: |
Wed, 9 Jan 2019 08:31:22 +1000 |
Stripping out the authentication data does not require any crypto,
it merely requires the virtual address parameters.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/arm/pauth_helper.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c
index 902f68a24c..e02376a2d0 100644
--- a/target/arm/pauth_helper.c
+++ b/target/arm/pauth_helper.c
@@ -38,6 +38,15 @@ static uint64_t pauth_addpac(CPUARMState *env, uint64_t ptr,
uint64_t modifier,
g_assert_not_reached(); /* FIXME */
}
+static uint64_t pauth_original_ptr(uint64_t ptr, ARMVAParameters param)
+{
+ uint64_t extfield = -param.select;
+ int bot_pac_bit = 64 - param.tsz;
+ int top_pac_bit = 64 - 8 * param.tbi;
+
+ return deposit64(ptr, bot_pac_bit, top_pac_bit - bot_pac_bit, extfield);
+}
+
static uint64_t pauth_auth(CPUARMState *env, uint64_t ptr, uint64_t modifier,
ARMPACKey *key, bool data, int keynumber)
{
@@ -46,7 +55,10 @@ static uint64_t pauth_auth(CPUARMState *env, uint64_t ptr,
uint64_t modifier,
static uint64_t pauth_strip(CPUARMState *env, uint64_t ptr, bool data)
{
- g_assert_not_reached(); /* FIXME */
+ ARMMMUIdx mmu_idx = arm_stage1_mmu_idx(env);
+ ARMVAParameters param = aa64_va_parameters(env, ptr, mmu_idx, data);
+
+ return pauth_original_ptr(ptr, param);
}
static void QEMU_NORETURN pauth_trap(CPUARMState *env, int target_el,
--
2.17.2
- Re: [Qemu-devel] [PATCH v3 19/31] target/arm: Merge TBFLAG_AA_TB{0, 1} to TBII, (continued)
- [Qemu-devel] [PATCH v3 18/31] target/arm: Create ARMVAParameters and helpers, Richard Henderson, 2019/01/08
- [Qemu-devel] [PATCH v3 21/31] target/arm: Add aa64_va_parameters_both, Richard Henderson, 2019/01/08
- [Qemu-devel] [PATCH v3 22/31] target/arm: Decode TBID from TCR, Richard Henderson, 2019/01/08
- [Qemu-devel] [PATCH v3 23/31] target/arm: Reuse aa64_va_parameters for setting tbflags, Richard Henderson, 2019/01/08
- [Qemu-devel] [PATCH v3 24/31] target/arm: Implement pauth_strip,
Richard Henderson <=
- [Qemu-devel] [PATCH v3 25/31] target/arm: Implement pauth_auth, Richard Henderson, 2019/01/08
- [Qemu-devel] [PATCH v3 26/31] target/arm: Implement pauth_addpac, Richard Henderson, 2019/01/08
- [Qemu-devel] [PATCH v3 27/31] target/arm: Implement pauth_computepac, Richard Henderson, 2019/01/08
- [Qemu-devel] [PATCH v3 29/31] target/arm: Enable PAuth for -cpu max, Richard Henderson, 2019/01/08
- [Qemu-devel] [PATCH v3 28/31] target/arm: Add PAuth system registers, Richard Henderson, 2019/01/08
- [Qemu-devel] [PATCH v3 31/31] target/arm: Tidy TBI handling in gen_a64_set_pc, Richard Henderson, 2019/01/08
- [Qemu-devel] [PATCH v3 30/31] target/arm: Enable PAuth for user-only, Richard Henderson, 2019/01/08
- Re: [Qemu-devel] [PATCH v3 00/31] target/arm: Implement ARMv8.3-PAuth, no-reply, 2019/01/08