KVM: arm64: Flush/sync debug state in protected mode
PATCH 1/1 KVM: arm64: Flush/sync debug state in protected mode
The recent changes to debug state management broke self-hosted debug for guests when running in protected mode, since both the debug owner and the debug state itself aren't shared with the hyp's view of the vcpu.
Fix it by flushing/syncing the relevant bits with the hyp vcpu.
--- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
arch/arm64/kvm/hyp/nvhe/hyp-main.c +24 -0
@@ -91,11 +91,34 @@ static void fpsimd_sve_sync(struct kvm_vcpu *vcpu) *host_data_ptr (fp_owner) =FP_STATE_HOST_OWNED ; } +static void flush_debug_state (struct pkvm_hyp_vcpu *hyp_vcpu) +{ +struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu; + + hyp_vcpu->vcpu.arch.debug_owner = host_vcpu->arch.debug_owner; + +if (kvm_guest_owns_debug_regs (&hyp_vcpu->vcpu)) + hyp_vcpu->vcpu.arch.vcpu_debug_state = host_vcpu->arch.vcpu_debug_state; +else if (kvm_host_owns_debug_regs (&hyp_vcpu->vcpu)) + hyp_vcpu->vcpu.arch.external_debug_state = host_vcpu->arch.external_debug_state; +} + +static void sync_debug_state (struct pkvm_hyp_vcpu *hyp_vcpu) +{ +struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu; + +if (kvm_guest_owns_debug_regs (&hyp_vcpu->vcpu)) + host_vcpu->arch.vcpu_debug_state = hyp_vcpu->vcpu.arch.vcpu_debug_state; +else if (kvm_host_owns_debug_regs (&hyp_vcpu->vcpu)) + host_vcpu->arch.external_debug_state = hyp_vcpu->vcpu.arch.external_debug_state; +} +static void flush_hyp_vcpu (struct pkvm_hyp_vcpu *hyp_vcpu) {struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu;fpsimd_sve_flush (); +flush_debug_state (hyp_vcpu); hyp_vcpu->vcpu.arch.ctxt = host_vcpu->arch.ctxt;
@@ -123,6 +146,7 @@ static void sync_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu)unsigned int i;fpsimd_sve_sync (&hyp_vcpu->vcpu); +sync_debug_state (hyp_vcpu); host_vcpu->arch.ctxt = hyp_vcpu->vcpu.arch.ctxt;
base-commit: 9bcbb6104a344d3526e185ee1e7b985509914e90
Signature · 1 line
2.48.1.362.g079036d154-goog
Quoted 8 lines · Oliver Upton
The recent changes to debug state management broke self-hosted debug for guests when running in protected mode, since both the debug owner and the debug state itself aren't shared with the hyp's view of the vcpu.
Fix it by flushing/syncing the relevant bits with the hyp vcpu.
[...]
Applied to fixes, thanks!
[1/1] KVM: arm64: Flush/sync debug state in protected mode
commit: 0f1a6c5c9784eff7e31e4915e17285fb89ad3644
Cheers,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.