[v2,21/27] target/arm: Implement pauth_auth

Message ID	20181214052410.11863-22-richard.henderson@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 23:24:04 -0600 Message-Id: <20181214052410.11863-22-richard.henderson@linaro.org> In-Reply-To: <20181214052410.11863-1-richard.henderson@linaro.org> References: <20181214052410.11863-1-richard.henderson@linaro.org> Subject: [Qemu-devel] [PATCH v2 21/27] target/arm: Implement pauth_auth Precedence: list Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	target/arm: Implement ARMv8.3-PAuth \| expand [v2,00/27] target/arm: Implement ARMv8.3-PAuth [v2,01/27] target/arm: Add state for the ARMv8.3-PAuth extension [v2,02/27] target/arm: Add SCTLR bits through ARMv8.5 [v2,03/27] target/arm: Add PAuth active bit to tbflags [v2,04/27] target/arm: Add PAuth helpers [v2,05/27] target/arm: Decode PAuth within system hint space [v2,06/27] target/arm: Rearrange decode in disas_data_proc_1src [v2,07/27] target/arm: Decode PAuth within disas_data_proc_1src [v2,08/27] target/arm: Decode PAuth within disas_data_proc_2src [v2,09/27] target/arm: Move helper_exception_return to helper-a64.c [v2,10/27] target/arm: Add new_pc argument to helper_exception_return [v2,11/27] target/arm: Rearrange decode in disas_uncond_b_reg [v2,12/27] target/arm: Decode PAuth within disas_uncond_b_reg [v2,13/27] target/arm: Decode Load/store register (pac) [v2,14/27] target/arm: Move cpu_mmu_index out of line [v2,15/27] target/arm: Introduce arm_mmu_idx [v2,16/27] target/arm: Introduce arm_stage1_mmu_idx [v2,17/27] target/arm: Create ARMVAParameters and helpers [v2,18/27] target/arm: Reuse aa64_va_parameters for setting tbflags [v2,19/27] target/arm: Export aa64_va_parameters to internals.h [v2,20/27] target/arm: Implement pauth_strip [v2,21/27] target/arm: Implement pauth_auth [v2,22/27] target/arm: Implement pauth_addpac [v2,23/27] target/arm: Implement pauth_computepac [v2,24/27] target/arm: Add PAuth system registers [v2,25/27] target/arm: Enable PAuth for -cpu max [v2,26/27] target/arm: Enable PAuth for user-only, part 2 [v2,27/27] target/arm: Tidy TBI handling in gen_a64_set_pc

Message ID

20181214052410.11863-22-richard.henderson@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	208.118.235.17 as permitted sender) client-ip=208.118.235.17; 
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Date: Thu, 13 Dec 2018 23:24:04 -0600
Message-Id: <20181214052410.11863-22-richard.henderson@linaro.org>
In-Reply-To: <20181214052410.11863-1-richard.henderson@linaro.org>
References: <20181214052410.11863-1-richard.henderson@linaro.org>
Subject: [Qemu-devel] [PATCH v2 21/27] target/arm: Implement pauth_auth
Precedence: list
Cc: peter.maydell@linaro.org
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

target/arm: Implement ARMv8.3-PAuth | expand

Commit Message

Richard Henderson Dec. 14, 2018, 5:24 a.m. UTC

This is not really functional yet, because the crypto is not yet
implemented.  This, however follows the Auth pseudo function.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 target/arm/helper-a64.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

-- 
2.17.2

Comments

Peter Maydell Jan. 7, 2019, 11:58 a.m. UTC | #1

On Fri, 14 Dec 2018 at 05:24, Richard Henderson
<richard.henderson@linaro.org> wrote:
>

> This is not really functional yet, because the crypto is not yet

> implemented.  This, however follows the Auth pseudo function.

>

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

> ---

>  target/arm/helper-a64.c | 21 ++++++++++++++++++++-

>  1 file changed, 20 insertions(+), 1 deletion(-)


Reviewed-by: Peter Maydell <peter.maydell@linaro.org>


thanks
-- PMM

diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c
index 329af51232..87cff7d96a 100644
--- a/target/arm/helper-a64.c
+++ b/target/arm/helper-a64.c
@@ -1081,7 +1081,26 @@  static uint64_t pauth_original_ptr(uint64_t ptr, ARMVAParameters param)
 static uint64_t pauth_auth(CPUARMState *env, uint64_t ptr, uint64_t modifier,
                            ARMPACKey *key, bool data, int keynumber)
 {
-    g_assert_not_reached(); /* FIXME */
+    ARMMMUIdx mmu_idx = arm_stage1_mmu_idx(env);
+    ARMVAParameters param = aa64_va_parameters(env, ptr, mmu_idx, data);
+    int bot_bit, top_bit;
+    uint64_t pac, orig_ptr, test;
+
+    orig_ptr = pauth_original_ptr(ptr, param);
+    pac = pauth_computepac(orig_ptr, modifier, *key);
+    bot_bit = 64 - param.tsz;
+    top_bit = 64 - 8 * param.tbi;
+
+    test = (pac ^ ptr) & ~MAKE_64BIT_MASK(55, 1);
+    if (unlikely(extract64(test, bot_bit, top_bit - bot_bit))) {
+        int error_code = (keynumber << 1) | (keynumber ^ 1);
+        if (param.tbi) {
+            return deposit64(ptr, 53, 2, error_code);
+        } else {
+            return deposit64(ptr, 61, 2, error_code);
+        }
+    }
+    return orig_ptr;
 }
 
 static uint64_t pauth_strip(CPUARMState *env, uint64_t ptr, bool data)

[v2,21/27] target/arm: Implement pauth_auth

Commit Message

Comments

Patch