Skip to contentSkip to conversation

KVM: arm64: nv: Write ESR_EL2 for injected nested SError exceptions

PATCH Applied Fuad Tabba 2 participants 2 messages Jun 15 – Jun 17

Subsystems (2)
lore
Share & tools
lore

Fuad Tabba

author
#0 lore raw

PATCH 1/1 KVM: arm64: nv: Write ESR_EL2 for injected nested SError exceptions

kvm_inject_el2_exception() writes ESR_EL2 for synchronous exceptions but not for SError. enter_exception64() does not write ESR_ELx for any exception type, so the constructed syndrome is dropped. A guest L2 hypervisor taking a nested SError observes stale ESR_EL2.

This affects both kvm_inject_nested_serror() and the EASE path in kvm_inject_nested_sea().

Write ESR_EL2 for except_type_serror, matching except_type_sync.

Fixes 77ee70a07357 ("KVM: arm64: nv: Honor SError exception routing / masking")
---
 arch/arm64/kvm/emulate-nested.c | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/kvm/emulate-nested.c +1 -0
index 22d497554c94..c2580d40197e 100644
@@ -2750,6 +2750,7 @@ static void kvm_inject_el2_exception(struct kvm_vcpu *vcpu, u64 esr_el2,
 		break;
 	case except_type_serror:
 		kvm_pend_exception(vcpu, EXCEPT_AA64_EL2_SERR);
+		vcpu_write_sys_reg(vcpu, esr_el2, ESR_EL2);
 		break;
 	default:
 		WARN_ONCE(1, "Unsupported EL2 exception injection %d\n", type);
Signature · 1 line
2.54.0.1136.gdb2ca164c4-goog
maintainer Applied
#1 lore raw
Quoted 9 lines · Fuad Tabba

kvm_inject_el2_exception() writes ESR_EL2 for synchronous exceptions but not for SError. enter_exception64() does not write ESR_ELx for any exception type, so the constructed syndrome is dropped. A guest L2 hypervisor taking a nested SError observes stale ESR_EL2.

This affects both kvm_inject_nested_serror() and the EASE path in kvm_inject_nested_sea().

[...]

Applied to fixes, thanks!

[1/1] KVM: arm64: nv: Write ESR_EL2 for injected nested SError exceptions

      commit: e2cb1f4578625e71f461d5c1ce70984193389cbb

Cheers,

	M.
Signature · 1 line
Without deviation from the norm, progress is not possible.