diff options
| author |   Will Deacon <will@kernel.org> | 2020-11-13 11:38:47 +0000 |
|---|---|---|
| committer |   Marc Zyngier <maz@kernel.org> | 2020-11-16 10:43:06 +0000 |
| commit | 4f6a36fed71dfe51df0ae9a282dc87c76d629bff (patch) | |
| tree | aed3048aedda7729595decaf5e615c62b3980d10 /arch/arm64/kvm/hyp/hyp-entry.S | |
| parent | arm64: spectre: Consolidate spectre-v3a detection (diff) | |
| download | linux-dev-4f6a36fed71dfe51df0ae9a282dc87c76d629bff.tar.xz linux-dev-4f6a36fed71dfe51df0ae9a282dc87c76d629bff.zip | |
KVM: arm64: Remove redundant hyp vectors entry
The hyp vectors entry corresponding to HYP_VECTOR_DIRECT (i.e. when
neither Spectre-v2 nor Spectre-v3a are present) is unused, as we can
simply dispatch straight to __kvm_hyp_vector in this case.
Remove the redundant vector, and massage the logic for resolving a slot
to a vectors entry.
Reported-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20201113113847.21619-11-will@kernel.org
Diffstat (limited to 'arch/arm64/kvm/hyp/hyp-entry.S')
| -rw-r--r-- | arch/arm64/kvm/hyp/hyp-entry.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S index e3249e2dda09..d179056e1af8 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S @@ -239,7 +239,6 @@ SYM_CODE_END(__kvm_hyp_vector) .align 11 SYM_CODE_START(__bp_harden_hyp_vecs) - generate_vectors indirect = 0, spectrev2 = 0 // HYP_VECTOR_DIRECT generate_vectors indirect = 0, spectrev2 = 1 // HYP_VECTOR_SPECTRE_DIRECT generate_vectors indirect = 1, spectrev2 = 0 // HYP_VECTOR_INDIRECT generate_vectors indirect = 1, spectrev2 = 1 // HYP_VECTOR_SPECTRE_INDIRECT |