Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <marc.zyngier@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Dave Martin <Dave.Martin@arm.com>
Reviewed-by: James Morse <james.morse@arm.com>
Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>

authored by

Zenghui Yu and committed by
Marc Zyngier
6701c619 1a8248c7

+5 -3
+4 -3
arch/arm64/include/asm/kvm_arm.h
··· 316 316 317 317 #define kvm_arm_exception_class \ 318 318 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), \ 322 323 ECN(SP_ALIGN), ECN(FP_EXC32), ECN(FP_EXC64), ECN(SERROR), \ 323 324 ECN(BREAKPT_LOW), ECN(BREAKPT_CUR), ECN(SOFTSTP_LOW), \ 324 325 ECN(SOFTSTP_CUR), ECN(WATCHPT_LOW), ECN(WATCHPT_CUR), \
+1
arch/arm64/kernel/traps.c
··· 734 734 [ESR_ELx_EC_CP14_LS] = "CP14 LDC/STC", 735 735 [ESR_ELx_EC_FP_ASIMD] = "ASIMD", 736 736 [ESR_ELx_EC_CP10_ID] = "CP10 MRC/VMRS", 737 + [ESR_ELx_EC_PAC] = "PAC", 737 738 [ESR_ELx_EC_CP14_64] = "CP14 MCRR/MRRC", 738 739 [ESR_ELx_EC_ILL] = "PSTATE.IL", 739 740 [ESR_ELx_EC_SVC32] = "SVC (AArch32)",