Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58466766 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm/arm64: KVM: Add ARM_EXCEPTION_IS_TRAP macro 



32 and 64bit use different symbols to identify the traps.
32bit has a fine grained approach (prefetch abort, data abort and HVC),
while 64bit is pretty happy with just "trap".

This has been fine so far, except that we now need to decode some
of that in tracepoints that are common to both architectures.

Introduce ARM_EXCEPTION_IS_TRAP which abstracts the trap symbols
and make the tracepoint use it.

Acked-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent df655b75

arch/arm/include/asm/kvm_asm.h

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 


#define ARM_EXIT_WITH_ABORT_BIT  31

#define ARM_EXCEPTION_CODE(x)	  ((x) & ~(1U << ARM_EXIT_WITH_ABORT_BIT))

#define ARM_EXCEPTION_IS_TRAP(x)					\

	(ARM_EXCEPTION_CODE((x)) == ARM_EXCEPTION_PREF_ABORT	||	\

	 ARM_EXCEPTION_CODE((x)) == ARM_EXCEPTION_DATA_ABORT	||	\

	 ARM_EXCEPTION_CODE((x)) == ARM_EXCEPTION_HVC)

#define ARM_ABORT_PENDING(x)	  !!((x) & (1U << ARM_EXIT_WITH_ABORT_BIT))



#define ARM_EXCEPTION_RESET	  0

arch/arm64/include/asm/kvm_asm.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#define ARM_EXIT_WITH_SERROR_BIT  31

#define ARM_EXCEPTION_CODE(x)	  ((x) & ~(1U << ARM_EXIT_WITH_SERROR_BIT))

#define ARM_EXCEPTION_IS_TRAP(x)  (ARM_EXCEPTION_CODE((x)) == ARM_EXCEPTION_TRAP)

#define ARM_SERROR_PENDING(x)	  !!((x) & (1U << ARM_EXIT_WITH_SERROR_BIT))



#define ARM_EXCEPTION_IRQ	  0

virt/kvm/arm/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ TRACE_EVENT(kvm_exit, 


	TP_fast_assign(

		__entry->ret			= ARM_EXCEPTION_CODE(ret);

		__entry->esr_ec = (ARM_EXCEPTION_CODE(ret) == ARM_EXCEPTION_TRAP) ? esr_ec : 0;

		__entry->esr_ec = ARM_EXCEPTION_IS_TRAP(ret) ? esr_ec : 0;

		__entry->vcpu_pc		= vcpu_pc;

	),