Migrate the host's debug state from kvm_host_data's context and into the host's vcpu context.
Signed-off-by: Andrew Scull <[email protected]> --- arch/arm64/include/asm/kvm_hyp.h | 5 +++++ arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 16 ++++++---------- arch/arm64/kvm/hyp/nvhe/debug-sr.c | 20 ++++++++++++++++---- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 1 + arch/arm64/kvm/hyp/nvhe/switch.c | 4 ++-- arch/arm64/kvm/hyp/vhe/debug-sr.c | 16 ++++++++++++++-- 6 files changed, 44 insertions(+), 18 deletions(-) diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h index d6915ab60e1f..aec61c9f6017 100644 --- a/arch/arm64/include/asm/kvm_hyp.h +++ b/arch/arm64/include/asm/kvm_hyp.h @@ -81,8 +81,13 @@ void sysreg_save_guest_state_vhe(struct kvm_cpu_context *ctxt); void sysreg_restore_guest_state_vhe(struct kvm_cpu_context *ctxt); #endif +#ifdef __KVM_NVHE_HYPERVISOR__ +void __debug_switch_to_guest(struct kvm_vcpu *host_vcpu, struct kvm_vcpu *vcpu); +void __debug_switch_to_host(struct kvm_vcpu *host_vcpu, struct kvm_vcpu *vcpu); +#else void __debug_switch_to_guest(struct kvm_vcpu *vcpu); void __debug_switch_to_host(struct kvm_vcpu *vcpu); +#endif void __fpsimd_save_state(struct user_fpsimd_state *fp_regs); void __fpsimd_restore_state(struct user_fpsimd_state *fp_regs); diff --git a/arch/arm64/kvm/hyp/include/hyp/debug-sr.h b/arch/arm64/kvm/hyp/include/hyp/debug-sr.h index 50ca5d048017..0d342418d706 100644 --- a/arch/arm64/kvm/hyp/include/hyp/debug-sr.h +++ b/arch/arm64/kvm/hyp/include/hyp/debug-sr.h @@ -125,38 +125,34 @@ static void __debug_restore_state(struct kvm_guest_debug_arch *dbg, write_sysreg(ctxt_sys_reg(ctxt, MDCCINT_EL1), mdccint_el1); } -static inline void __debug_switch_to_guest_common(struct kvm_vcpu *vcpu) +static inline void __debug_switch_to_guest_common(struct kvm_vcpu *vcpu, + struct kvm_guest_debug_arch *host_dbg, + struct kvm_cpu_context *host_ctxt) { - struct kvm_cpu_context *host_ctxt; struct kvm_cpu_context *guest_ctxt; - struct kvm_guest_debug_arch *host_dbg; struct kvm_guest_debug_arch *guest_dbg; if (!(vcpu->arch.flags & KVM_ARM64_DEBUG_DIRTY)) return; - host_ctxt = &__hyp_this_cpu_ptr(kvm_host_data)->host_ctxt; guest_ctxt = &vcpu->arch.ctxt; - host_dbg = &vcpu->arch.host_debug_state.regs; guest_dbg = kern_hyp_va(vcpu->arch.debug_ptr); __debug_save_state(host_dbg, host_ctxt); __debug_restore_state(guest_dbg, guest_ctxt); } -static inline void __debug_switch_to_host_common(struct kvm_vcpu *vcpu) +static inline void __debug_switch_to_host_common(struct kvm_vcpu *vcpu, + struct kvm_guest_debug_arch *host_dbg, + struct kvm_cpu_context *host_ctxt) { - struct kvm_cpu_context *host_ctxt; struct kvm_cpu_context *guest_ctxt; - struct kvm_guest_debug_arch *host_dbg; struct kvm_guest_debug_arch *guest_dbg; if (!(vcpu->arch.flags & KVM_ARM64_DEBUG_DIRTY)) return; - host_ctxt = &__hyp_this_cpu_ptr(kvm_host_data)->host_ctxt; guest_ctxt = &vcpu->arch.ctxt; - host_dbg = &vcpu->arch.host_debug_state.regs; guest_dbg = kern_hyp_va(vcpu->arch.debug_ptr); __debug_save_state(guest_dbg, guest_ctxt); diff --git a/arch/arm64/kvm/hyp/nvhe/debug-sr.c b/arch/arm64/kvm/hyp/nvhe/debug-sr.c index 91a711aa8382..a5fa40c060a8 100644 --- a/arch/arm64/kvm/hyp/nvhe/debug-sr.c +++ b/arch/arm64/kvm/hyp/nvhe/debug-sr.c @@ -58,17 +58,29 @@ static void __debug_restore_spe(u64 pmscr_el1) write_sysreg_s(pmscr_el1, SYS_PMSCR_EL1); } -void __debug_switch_to_guest(struct kvm_vcpu *vcpu) +void __debug_switch_to_guest(struct kvm_vcpu *host_vcpu, struct kvm_vcpu *vcpu) { + struct kvm_cpu_context *host_ctxt; + struct kvm_guest_debug_arch *host_dbg; + + host_ctxt = &host_vcpu->arch.ctxt; + host_dbg = host_vcpu->arch.debug_ptr; + /* Disable and flush SPE data generation */ __debug_save_spe(&vcpu->arch.host_debug_state.pmscr_el1); - __debug_switch_to_guest_common(vcpu); + __debug_switch_to_guest_common(vcpu, host_dbg, host_ctxt); } -void __debug_switch_to_host(struct kvm_vcpu *vcpu) +void __debug_switch_to_host(struct kvm_vcpu *host_vcpu, struct kvm_vcpu *vcpu) { + struct kvm_cpu_context *host_ctxt; + struct kvm_guest_debug_arch *host_dbg; + + host_ctxt = &host_vcpu->arch.ctxt; + host_dbg = host_vcpu->arch.debug_ptr; + __debug_restore_spe(vcpu->arch.host_debug_state.pmscr_el1); - __debug_switch_to_host_common(vcpu); + __debug_switch_to_host_common(vcpu, host_dbg, host_ctxt); } u32 __kvm_get_mdcr_el2(void) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index d013586e3a03..e7601de3b901 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -170,6 +170,7 @@ void __noreturn kvm_hyp_main(void) host_vcpu->arch.flags = KVM_ARM64_HOST_VCPU_FLAGS; host_vcpu->arch.workaround_flags = VCPU_WORKAROUND_2_FLAG; + host_vcpu->arch.debug_ptr = &host_vcpu->arch.vcpu_debug_state; /* * The first time entering the host is seen by the host as the return diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c index ae830a9ef9d9..629fea722de1 100644 --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -181,7 +181,7 @@ static void __kvm_vcpu_switch_to_guest(struct kvm_vcpu *host_vcpu, __hyp_vgic_restore_state(vcpu); __timer_enable_traps(vcpu); - __debug_switch_to_guest(vcpu); + __debug_switch_to_guest(host_vcpu, vcpu); } static void __kvm_vcpu_switch_to_host(struct kvm_vcpu *host_vcpu, @@ -206,7 +206,7 @@ static void __kvm_vcpu_switch_to_host(struct kvm_vcpu *host_vcpu, * This must come after restoring the host sysregs, since a non-VHE * system may enable SPE here and make use of the TTBRs. */ - __debug_switch_to_host(vcpu); + __debug_switch_to_host(host_vcpu, vcpu); __pmu_switch_to_host(); diff --git a/arch/arm64/kvm/hyp/vhe/debug-sr.c b/arch/arm64/kvm/hyp/vhe/debug-sr.c index f1e2e5a00933..6225c6cdfbca 100644 --- a/arch/arm64/kvm/hyp/vhe/debug-sr.c +++ b/arch/arm64/kvm/hyp/vhe/debug-sr.c @@ -12,12 +12,24 @@ void __debug_switch_to_guest(struct kvm_vcpu *vcpu) { - __debug_switch_to_guest_common(vcpu); + struct kvm_cpu_context *host_ctxt; + struct kvm_guest_debug_arch *host_dbg; + + host_ctxt = &__hyp_this_cpu_ptr(kvm_host_data)->host_ctxt; + host_dbg = &vcpu->arch.host_debug_state.regs; + + __debug_switch_to_guest_common(vcpu, host_dbg, host_ctxt); } void __debug_switch_to_host(struct kvm_vcpu *vcpu) { - __debug_switch_to_host_common(vcpu); + struct kvm_cpu_context *host_ctxt; + struct kvm_guest_debug_arch *host_dbg; + + host_ctxt = &__hyp_this_cpu_ptr(kvm_host_data)->host_ctxt; + host_dbg = &vcpu->arch.host_debug_state.regs; + + __debug_switch_to_host_common(vcpu, host_dbg, host_ctxt); } u32 __kvm_get_mdcr_el2(void) -- 2.27.0.389.gc38d7665816-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
