[PATCH v2 00/12] arm64: ARMv8.5-A: Branch Target Identification support · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
[PATCH v2 01/12] ELF: UAPI and Kconfig additions for ELF program properties · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
[PATCH v2 02/12] ELF: Add ELF program property parsing support · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
[PATCH v2 03/12] mm: Reserve asm-generic prot flag 0x10 for arch use · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
[PATCH v2 04/12] arm64: docs: cpu-feature-registers: Document ID_AA64PFR1_EL1 · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
Re: [PATCH v2 04/12] arm64: docs: cpu-feature-registers: Document ID_AA64PFR1_EL1 · Alex Bennée <hidden> · 2019-10-11
Re: [PATCH v2 04/12] arm64: docs: cpu-feature-registers: Document ID_AA64PFR1_EL1 · Dave Martin <Dave.Martin@arm.com> · 2019-10-11
Re: [PATCH v2 04/12] arm64: docs: cpu-feature-registers: Document ID_AA64PFR1_EL1 · Mark Brown <broonie@kernel.org> · 2019-10-21
Re: [PATCH v2 04/12] arm64: docs: cpu-feature-registers: Document ID_AA64PFR1_EL1 · Will Deacon <will@kernel.org> · 2019-10-22
[PATCH v2 05/12] arm64: Basic Branch Target Identification support · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
[FIXUP 0/2] Fixups to patch 5 · Dave Martin <Dave.Martin@arm.com> · 2019-10-11
[FIXUP 1/2] squash! arm64: Basic Branch Target Identification support · Dave Martin <Dave.Martin@arm.com> · 2019-10-11
[FIXUP 2/2] squash! arm64: Basic Branch Target Identification support · Dave Martin <Dave.Martin@arm.com> · 2019-10-11
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Mark Rutland <mark.rutland@arm.com> · 2019-10-11
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Richard Henderson <richard.henderson@linaro.org> · 2019-10-11
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Dave Martin <Dave.Martin@arm.com> · 2019-10-11
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Mark Rutland <mark.rutland@arm.com> · 2019-10-11
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Dave Martin <Dave.Martin@arm.com> · 2019-10-11
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Dave Martin <Dave.Martin@arm.com> · 2019-10-11
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Dave Martin <Dave.Martin@arm.com> · 2019-10-11
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Mark Rutland <mark.rutland@arm.com> · 2019-10-18
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Dave Martin <Dave.Martin@arm.com> · 2019-10-18
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Dave Martin <Dave.Martin@arm.com> · 2019-10-11
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Mark Rutland <mark.rutland@arm.com> · 2019-10-18
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Dave Martin <Dave.Martin@arm.com> · 2019-10-18
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Mark Rutland <mark.rutland@arm.com> · 2019-10-18
Re: [PATCH v2 05/12] arm64: Basic Branch Target Identification support · Dave Martin <Dave.Martin@arm.com> · 2019-10-18
[PATCH v2 06/12] elf: Allow arch to tweak initial mmap prot flags · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
[PATCH v2 07/12] arm64: elf: Enable BTI at exec based on ELF program properties · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
[PATCH v2 08/12] arm64: BTI: Decode BYTPE bits when printing PSTATE · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
Re: [PATCH v2 08/12] arm64: BTI: Decode BYTPE bits when printing PSTATE · Richard Henderson <richard.henderson@linaro.org> · 2019-10-11
Re: [PATCH v2 08/12] arm64: BTI: Decode BYTPE bits when printing PSTATE · Dave Martin <Dave.Martin@arm.com> · 2019-10-11
[PATCH v2 09/12] arm64: traps: Fix inconsistent faulting instruction skipping · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
Re: [PATCH v2 09/12] arm64: traps: Fix inconsistent faulting instruction skipping · Mark Rutland <mark.rutland@arm.com> · 2019-10-11
Re: [PATCH v2 09/12] arm64: traps: Fix inconsistent faulting instruction skipping · Dave Martin <Dave.Martin@arm.com> · 2019-10-15
Re: [PATCH v2 09/12] arm64: traps: Fix inconsistent faulting instruction skipping · Mark Rutland <mark.rutland@arm.com> · 2019-10-15
Re: [PATCH v2 09/12] arm64: traps: Fix inconsistent faulting instruction skipping · Dave Martin <Dave.Martin@arm.com> · 2019-10-15
Re: [PATCH v2 09/12] arm64: traps: Fix inconsistent faulting instruction skipping · Dave Martin <Dave.Martin@arm.com> · 2019-10-18
Re: [PATCH v2 09/12] arm64: traps: Fix inconsistent faulting instruction skipping · Robin Murphy <robin.murphy@arm.com> · 2019-10-22
[PATCH v2 10/12] arm64: traps: Shuffle code to eliminate forward declarations · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
[PATCH v2 11/12] arm64: BTI: Reset BTYPE when skipping emulated instructions · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
Re: [PATCH v2 11/12] arm64: BTI: Reset BTYPE when skipping emulated instructions · Mark Rutland <mark.rutland@arm.com> · 2019-10-11
Re: [PATCH v2 11/12] arm64: BTI: Reset BTYPE when skipping emulated instructions · Dave Martin <Dave.Martin@arm.com> · 2019-10-11
Re: [PATCH v2 11/12] arm64: BTI: Reset BTYPE when skipping emulated instructions · Mark Rutland <mark.rutland@arm.com> · 2019-10-18
Re: [PATCH v2 11/12] arm64: BTI: Reset BTYPE when skipping emulated instructions · Dave Martin <Dave.Martin@arm.com> · 2019-10-18
[PATCH v2 12/12] KVM: arm64: BTI: Reset BTYPE when skipping emulated instructions · Dave Martin <Dave.Martin@arm.com> · 2019-10-10
Re: [PATCH v2 12/12] KVM: arm64: BTI: Reset BTYPE when skipping emulated instructions · Mark Rutland <mark.rutland@arm.com> · 2019-10-11
Re: [PATCH v2 12/12] KVM: arm64: BTI: Reset BTYPE when skipping emulated instructions · Dave Martin <Dave.Martin@arm.com> · 2019-10-11

STALE2467d

Revisions (2)

2019-10-10 v2 current
2019-10-18 v3 [diff vs current]

[PATCH v2 12/12] KVM: arm64: BTI: Reset BTYPE when skipping emulated instructions

From: Dave Martin <Dave.Martin@arm.com>
Date: 2019-10-10 18:46:10
Also in: linux-arch, lkml
Subsystem: arm64 port (aarch64 architecture), kernel virtual machine for arm64 (kvm/arm64), the rest · Maintainers: Catalin Marinas, Will Deacon, Marc Zyngier, Oliver Upton, Linus Torvalds

Since normal execution of any non-branch instruction resets the
PSTATE BTYPE field to 0, so do the same thing when emulating a
trapped instruction.

Branches don't trap directly, so we should never need to assign a
non-zero value to BTYPE here.

Signed-off-by: Dave Martin <Dave.Martin@arm.com>
---
 arch/arm64/include/asm/kvm_emulate.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
index d69c1ef..33957a12 100644
--- a/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h

@@ -452,8 +452,10 @@ static inline void kvm_skip_instr(struct kvm_vcpu *vcpu, bool is_wide_instr)
 {
 	if (vcpu_mode_is_32bit(vcpu))
 		kvm_skip_instr32(vcpu, is_wide_instr);
-	else
+	else {
 		*vcpu_pc(vcpu) += 4;
+		*vcpu_cpsr(vcpu) &= ~(u64)PSR_BTYPE_MASK;
+	}
 
 	/* advance the singlestep state machine */
 	*vcpu_cpsr(vcpu) &= ~DBG_SPSR_SS;

-- 
2.1.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel