Received: from eggs.gnu.org ([209.51.188.92]:33675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gnHpd-0004SI-2R for qemu-devel@nongnu.org; Sat, 26 Jan 2019 01:52:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gnHpb-0001PD-1Y for qemu-devel@nongnu.org; Sat, 26 Jan 2019 01:52:43 -0500 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 26 Jan 2019 08:52:11 +0200 Message-Id: <20190126065211.3587-2-remi@remlab.net> In-Reply-To: <1648289.tQCHxfjYn9@basile.remlab.net> References: <1648289.tQCHxfjYn9@basile.remlab.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCHv2 2/3] target/arm: actually enable PAuth in user mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org From: Remi Denis-Courmont This always enables IA, IB, DA and DB keys in user mode on the maximum CPU, in a manner that is consistent with the other CPUs. That is to say redefining the reset value of SCTLR_ELx registers. Without this patch, the PAC* and AUT* instructions have no effects (except PACGA of course). Signed-off-by: Remi Denis-Courmont --- target/arm/cpu64.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index e9bc461c36..c8ed943c65 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -287,7 +287,7 @@ static void cpu_max_get_packey(Object *obj, Visitor *= v, const char *name, { ARMCPU *cpu =3D ARM_CPU(obj); const uint64_t *bit =3D opaque; - bool enabled =3D (cpu->env.cp15.sctlr_el[1] & *bit) !=3D 0; + bool enabled =3D (cpu->reset_sctlr & *bit) !=3D 0; =20 visit_type_bool(v, name, &enabled, errp); } @@ -304,9 +304,9 @@ static void cpu_max_set_packey(Object *obj, Visitor *= v, const char *name, =20 if (!err) { if (enabled) { - cpu->env.cp15.sctlr_el[1] |=3D *bit; + cpu->reset_sctlr |=3D *bit; } else { - cpu->env.cp15.sctlr_el[1] &=3D ~*bit; + cpu->reset_sctlr &=3D ~*bit; } } error_propagate(errp, err); @@ -413,8 +413,8 @@ static void aarch64_max_initfn(Object *obj) (void *)&apdb_bit, &error_fatal); =20 /* Enable all PAC keys by default. */ - cpu->env.cp15.sctlr_el[1] |=3D SCTLR_EnIA | SCTLR_EnIB; - cpu->env.cp15.sctlr_el[1] |=3D SCTLR_EnDA | SCTLR_EnDB; + cpu->reset_sctlr |=3D SCTLR_EnIA | SCTLR_EnIB; + cpu->reset_sctlr |=3D SCTLR_EnDA | SCTLR_EnDB; } #endif =20 --=20 2.20.1