diff options
| author | Will Deacon <will@kernel.org> | 2020-11-13 11:38:41 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-16 10:40:18 +0000 |
| commit | 07cf8aa922db7747cd6e100d2e3f7ca839c7a419 (patch) | |
| tree | 59b8a202e9431e14950b1a57c06d90438f77afbb /arch/arm64/kvm/arm.c | |
| parent | 042c76a9502bf281befc0ae2793ef1de55b65544 (diff) | |
| download | linux-stable-07cf8aa922db7747cd6e100d2e3f7ca839c7a419.tar.gz linux-stable-07cf8aa922db7747cd6e100d2e3f7ca839c7a419.tar.bz2 linux-stable-07cf8aa922db7747cd6e100d2e3f7ca839c7a419.zip | |
KVM: arm64: Make BP hardening globals static instead
Branch predictor hardening of the hyp vectors is partially driven by a
couple of global variables ('__kvm_bp_vect_base' and
'__kvm_harden_el2_vector_slot'). However, these are only used within a
single compilation unit, so internalise them there instead.
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Quentin Perret <qperret@google.com>
Link: https://lore.kernel.org/r/20201113113847.21619-5-will@kernel.org
Diffstat (limited to 'arch/arm64/kvm/arm.c')
| -rw-r--r-- | arch/arm64/kvm/arm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index c63c0b3c9b17..3262c16f0449 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -51,6 +51,14 @@ DECLARE_KVM_HYP_PER_CPU(unsigned long, kvm_hyp_vector); static DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page); unsigned long kvm_arm_hyp_percpu_base[NR_CPUS]; +/* Hypervisor VA of the indirect vector trampoline page */ +static void *__kvm_bp_vect_base; +/* + * Slot in the hyp vector page for use by the indirect vector trampoline + * when mitigation against Spectre-v2 is not required. + */ +static int __kvm_harden_el2_vector_slot; + /* The VMID used in the VTTBR */ static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1); static u32 kvm_next_vmid; |