Skip to content

Commit 6701c61

Browse files
Zenghui YuMarc Zyngier
authored andcommitted
KVM: arm64: Update kvm_arm_exception_class and esr_class_str for new EC
We've added two ESR exception classes for new ARM hardware extensions: ESR_ELx_EC_PAC and ESR_ELx_EC_SVE, but failed to update the strings used in tracing and other debug. Let's update "kvm_arm_exception_class" for these two EC, which the new EC will be visible to user-space via kvm_exit trace events Also update to "esr_class_str" for ESR_ELx_EC_PAC, by which we can get more readable debug info. Cc: Marc Zyngier <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Will Deacon <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Dave Martin <[email protected]> Reviewed-by: James Morse <[email protected]> Signed-off-by: Zenghui Yu <[email protected]> Signed-off-by: Marc Zyngier <[email protected]>
1 parent 1a8248c commit 6701c61

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

arch/arm64/include/asm/kvm_arm.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,10 @@
316316

317317
#define kvm_arm_exception_class \
318318
ECN(UNKNOWN), ECN(WFx), ECN(CP15_32), ECN(CP15_64), ECN(CP14_MR), \
319-
ECN(CP14_LS), ECN(FP_ASIMD), ECN(CP10_ID), ECN(CP14_64), ECN(SVC64), \
320-
ECN(HVC64), ECN(SMC64), ECN(SYS64), ECN(IMP_DEF), ECN(IABT_LOW), \
321-
ECN(IABT_CUR), ECN(PC_ALIGN), ECN(DABT_LOW), ECN(DABT_CUR), \
319+
ECN(CP14_LS), ECN(FP_ASIMD), ECN(CP10_ID), ECN(PAC), ECN(CP14_64), \
320+
ECN(SVC64), ECN(HVC64), ECN(SMC64), ECN(SYS64), ECN(SVE), \
321+
ECN(IMP_DEF), ECN(IABT_LOW), ECN(IABT_CUR), \
322+
ECN(PC_ALIGN), ECN(DABT_LOW), ECN(DABT_CUR), \
322323
ECN(SP_ALIGN), ECN(FP_EXC32), ECN(FP_EXC64), ECN(SERROR), \
323324
ECN(BREAKPT_LOW), ECN(BREAKPT_CUR), ECN(SOFTSTP_LOW), \
324325
ECN(SOFTSTP_CUR), ECN(WATCHPT_LOW), ECN(WATCHPT_CUR), \

arch/arm64/kernel/traps.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,7 @@ static const char *esr_class_str[] = {
734734
[ESR_ELx_EC_CP14_LS] = "CP14 LDC/STC",
735735
[ESR_ELx_EC_FP_ASIMD] = "ASIMD",
736736
[ESR_ELx_EC_CP10_ID] = "CP10 MRC/VMRS",
737+
[ESR_ELx_EC_PAC] = "PAC",
737738
[ESR_ELx_EC_CP14_64] = "CP14 MCRR/MRRC",
738739
[ESR_ELx_EC_ILL] = "PSTATE.IL",
739740
[ESR_ELx_EC_SVC32] = "SVC (AArch32)",

0 commit comments

Comments
 (0)