diff options
| author | Dave Martin <Dave.Martin@arm.com> | 2019-06-07 12:26:28 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2019-11-22 17:48:09 +0000 |
| commit | 74c5e7b2bee69372c63e1a48e7e05ceb81a6ea2c (patch) | |
| tree | 991152ca38fe6a4d18fe5b687621125be8a4e61e | |
| parent | 254cb189b31e326bbd6f0cf30e9a95c24231c15b (diff) | |
| download | kvmtool-74c5e7b2bee69372c63e1a48e7e05ceb81a6ea2c.tar.gz | |
arm/arm64: Factor out ptrauth vcpu feature setup
In the interest of readability, factor out the vcpu feature setup
for ptrauth into a separate function.
Also, because aarch32 doesn't have this feature or the related
command line options anyway, move the actual code into aarch64/.
Since ARM_VCPU_PTRAUTH_FEATURE is only there to make the ptrauth
feature setup code compile on arm, it is no longer needed: inline
and remove it.
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
| -rw-r--r-- | arm/aarch32/include/kvm/kvm-cpu-arch.h | 3 | ||||
| -rw-r--r-- | arm/aarch64/include/kvm/kvm-cpu-arch.h | 3 | ||||
| -rw-r--r-- | arm/aarch64/kvm-cpu.c | 10 | ||||
| -rw-r--r-- | arm/kvm-cpu.c | 5 |
4 files changed, 14 insertions, 7 deletions
diff --git a/arm/aarch32/include/kvm/kvm-cpu-arch.h b/arm/aarch32/include/kvm/kvm-cpu-arch.h index 3ec6f03a..01983f09 100644 --- a/arm/aarch32/include/kvm/kvm-cpu-arch.h +++ b/arm/aarch32/include/kvm/kvm-cpu-arch.h @@ -13,6 +13,7 @@ #define ARM_CPU_ID 0, 0, 0 #define ARM_CPU_ID_MPIDR 5 -#define ARM_VCPU_PTRAUTH_FEATURE 0 +static inline void kvm_cpu__select_features(struct kvm *kvm, + struct kvm_vcpu_init *init) { } #endif /* KVM__KVM_CPU_ARCH_H */ diff --git a/arm/aarch64/include/kvm/kvm-cpu-arch.h b/arm/aarch64/include/kvm/kvm-cpu-arch.h index 9fa99fbc..e6875fc7 100644 --- a/arm/aarch64/include/kvm/kvm-cpu-arch.h +++ b/arm/aarch64/include/kvm/kvm-cpu-arch.h @@ -17,7 +17,6 @@ #define ARM_CPU_CTRL 3, 0, 1, 0 #define ARM_CPU_CTRL_SCTLR_EL1 0 -#define ARM_VCPU_PTRAUTH_FEATURE ((1UL << KVM_ARM_VCPU_PTRAUTH_ADDRESS) \ - | (1UL << KVM_ARM_VCPU_PTRAUTH_GENERIC)) +void kvm_cpu__select_features(struct kvm *kvm, struct kvm_vcpu_init *init); #endif /* KVM__KVM_CPU_ARCH_H */ diff --git a/arm/aarch64/kvm-cpu.c b/arm/aarch64/kvm-cpu.c index 0aaefaf2..8c29a21d 100644 --- a/arm/aarch64/kvm-cpu.c +++ b/arm/aarch64/kvm-cpu.c @@ -128,6 +128,16 @@ static void reset_vcpu_aarch64(struct kvm_cpu *vcpu) } } +void kvm_cpu__select_features(struct kvm *kvm, struct kvm_vcpu_init *init) +{ + /* Enable pointer authentication if available */ + if (kvm__supports_extension(kvm, KVM_CAP_ARM_PTRAUTH_ADDRESS) && + kvm__supports_extension(kvm, KVM_CAP_ARM_PTRAUTH_GENERIC)) { + init->features[0] |= 1UL << KVM_ARM_VCPU_PTRAUTH_ADDRESS; + init->features[0] |= 1UL << KVM_ARM_VCPU_PTRAUTH_GENERIC; + } +} + void kvm_cpu__reset_vcpu(struct kvm_cpu *vcpu) { if (vcpu->kvm->cfg.arch.aarch32_guest) diff --git a/arm/kvm-cpu.c b/arm/kvm-cpu.c index fff8494e..1652f6f6 100644 --- a/arm/kvm-cpu.c +++ b/arm/kvm-cpu.c @@ -68,10 +68,7 @@ struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id) vcpu_init.features[0] |= (1UL << KVM_ARM_VCPU_PSCI_0_2); } - /* Enable pointer authentication if available */ - if (kvm__supports_extension(kvm, KVM_CAP_ARM_PTRAUTH_ADDRESS) && - kvm__supports_extension(kvm, KVM_CAP_ARM_PTRAUTH_GENERIC)) - vcpu_init.features[0] |= ARM_VCPU_PTRAUTH_FEATURE; + kvm_cpu__select_features(kvm, &vcpu_init); /* * If the preferred target ioctl is successful then |