Commit dfe028fe authored by Marc Zyngier's avatar Marc Zyngier Committed by chenxiang
Browse files

KVM: arm64: Handle traps of ALLINT 

virt inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I97WGU

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/commit/?h=arm64/nmi&id=88c5b784a0ccd52cc70a59a63dc0454adda80e6c



-----------------------------------------------------------

Although we do force a trap of the ALLINT system register when
FEAT_NMI isn't exposed to the guest, we don't provide any handler.

That's bad. Let's fix that.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarcaijian <caijian11@h-partners.com>
parent e5c5bbf9

arch/arm64/include/asm/sysreg.h

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ 
#define SYS_SPSR_EL1			sys_reg(3, 0, 4, 0, 0)

#define SYS_ELR_EL1			sys_reg(3, 0, 4, 0, 1)



#define SYS_ALLINT			sys_reg(3, 0, 4, 3, 0)



#define SYS_ICC_PMR_EL1			sys_reg(3, 0, 4, 6, 0)



#define SYS_AFSR0_EL1			sys_reg(3, 0, 5, 1, 0)

arch/arm64/kvm/sys_regs.c

+5 −0
Original line number Diff line number Diff line
@@ -1958,6 +1958,9 @@ static bool access_spsr(struct kvm_vcpu *vcpu, 
 * guest...

 */

static const struct sys_reg_desc sys_reg_descs[] = {

	{ SYS_DESC(SYS_ALLINT_CLR), undef_access },

	{ SYS_DESC(SYS_ALLINT_SET), undef_access },



	{ SYS_DESC(SYS_DC_ISW), access_dcsw },

	{ SYS_DESC(SYS_DC_IGSW), access_dcgsw },

	{ SYS_DESC(SYS_DC_IGDSW), access_dcgsw },
@@ -2126,6 +2129,8 @@ static const struct sys_reg_desc sys_reg_descs[] = { 
	{ SYS_DESC(SYS_SPSR_EL1), access_spsr},

	{ SYS_DESC(SYS_ELR_EL1), access_elr},



	{ SYS_DESC(SYS_ALLINT), undef_access },



	{ SYS_DESC(SYS_AFSR0_EL1), access_vm_reg, reset_unknown, AFSR0_EL1 },

	{ SYS_DESC(SYS_AFSR1_EL1), access_vm_reg, reset_unknown, AFSR1_EL1 },

	{ SYS_DESC(SYS_ESR_EL1), access_vm_reg, reset_unknown, ESR_EL1 },