KVM: arm64: nv: Enable vSErrors when HCRX_EL2.TMEA is set

oupton · oupton · commit 1f1c08d9896c · 2025-07-08T11:36:35.000-07:00
Per R_CDCKC, vSErrors are enabled if HCRX_EL2.TMEA is set, regardless of HCR_EL2.AMO. Reviewed-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20250708172532.1699409-21-oliver.upton@linux.dev Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
@@ -259,7 +259,11 @@ static inline bool is_nested_ctxt(struct kvm_vcpu *vcpu)
 
 static inline bool vserror_state_is_nested(struct kvm_vcpu *vcpu)
 {
-	return is_nested_ctxt(vcpu) && vcpu_el2_amo_is_set(vcpu);
+	if (!is_nested_ctxt(vcpu))
+		return false;
+
+	return vcpu_el2_amo_is_set(vcpu) ||
+	       (__vcpu_sys_reg(vcpu, HCRX_EL2) & HCRX_EL2_TMEA);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,11 @@ static inline bool is_nested_ctxt(struct kvm_vcpu *vcpu)`
`259`	`259`
`260`	`260`	`static inline bool vserror_state_is_nested(struct kvm_vcpu *vcpu)`
`261`	`261`	`{`
`262`		`- return is_nested_ctxt(vcpu) && vcpu_el2_amo_is_set(vcpu);`
	`262`	`+ if (!is_nested_ctxt(vcpu))`
	`263`	`+ return false;`
	`264`	`+`
	`265`	`+ return vcpu_el2_amo_is_set(vcpu) \|\|`
	`266`	`+ (__vcpu_sys_reg(vcpu, HCRX_EL2) & HCRX_EL2_TMEA);`
`263`	`267`	`}`
`264`	`268`
`265`	`269`	`/*`