Commit 5513394d authored by Marc Zyngier's avatar Marc Zyngier

KVM: arm64: nv: Work around lack of pauth support in old toolchains

We still support GCC 8.x, and it appears that this toolchain
usually comes with an assembler that does not understand "pauth"
as a valid architectural extension.

This results in the NV ERETAx code breaking the build, as it relies
on this extention to make use of the PACGA instruction (required
by assemblers such as LLVM's).

Work around it by hand-assembling the instruction, which removes the
requirement for any assembler directive.

Fixes: 6ccc971e ("KVM: arm64: nv: Add emulation for ERETAx instructions")
Reported-by: default avatarLinaro Kernel Functional Testing <lkft@linaro.org>
Suggested-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 814ad8f9
......@@ -14,9 +14,20 @@
#include <linux/kvm_host.h>
#include <asm/gpr-num.h>
#include <asm/kvm_emulate.h>
#include <asm/pointer_auth.h>
/* PACGA Xd, Xn, Xm */
#define PACGA(d,n,m) \
asm volatile(__DEFINE_ASM_GPR_NUMS \
".inst 0x9AC03000 |" \
"(.L__gpr_num_%[Rd] << 0) |" \
"(.L__gpr_num_%[Rn] << 5) |" \
"(.L__gpr_num_%[Rm] << 16)\n" \
: [Rd] "=r" ((d)) \
: [Rn] "r" ((n)), [Rm] "r" ((m)))
static u64 compute_pac(struct kvm_vcpu *vcpu, u64 ptr,
struct ptrauth_key ikey)
{
......@@ -36,8 +47,7 @@ static u64 compute_pac(struct kvm_vcpu *vcpu, u64 ptr,
__ptrauth_key_install_nosync(APGA, ikey);
isb();
asm volatile(ARM64_ASM_PREAMBLE ".arch_extension pauth\n"
"pacga %0, %1, %2" : "=r" (pac) : "r" (ptr), "r" (mod));
PACGA(pac, ptr, mod);
isb();
__ptrauth_key_install_nosync(APGA, gkey);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment