Change the names from 'guest' and 'host' to terms that can also apply when the host is treated as a vcpu and hyp has its own state.
'guest' becomes 'vcpu' as the host is now also a vcpu. 'host' becomes 'hyp' as the nVHE hyp is gaining indepedent state and the VHE hyp _is_ the host anyway. Signed-off-by: Andrew Scull <[email protected]> --- arch/arm64/kvm/hyp/include/hyp/switch.h | 12 ++++++------ arch/arm64/kvm/hyp/nvhe/switch.c | 4 ++-- arch/arm64/kvm/hyp/vhe/switch.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h index 248f434c5de6..fa62c2b21b4b 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -484,15 +484,15 @@ static inline bool __needs_ssbd_off(struct kvm_vcpu *vcpu) if (!cpus_have_final_cap(ARM64_SSBD)) return false; - return !(vcpu->arch.workaround_flags & VCPU_WORKAROUND_2_FLAG); + return !kvm_arm_get_vcpu_workaround_2_flag(vcpu); } -static inline void __set_guest_arch_workaround_state(struct kvm_vcpu *vcpu) +static inline void __set_vcpu_arch_workaround_state(struct kvm_vcpu *vcpu) { #ifdef CONFIG_ARM64_SSBD /* - * The host runs with the workaround always present. If the - * guest wants it disabled, so be it... + * The hyp runs with the workaround always present. If the + * vpu wants it disabled, so be it... */ if (__needs_ssbd_off(vcpu) && __hyp_this_cpu_read(arm64_ssbd_callback_required)) @@ -500,11 +500,11 @@ static inline void __set_guest_arch_workaround_state(struct kvm_vcpu *vcpu) #endif } -static inline void __set_host_arch_workaround_state(struct kvm_vcpu *vcpu) +static inline void __set_hyp_arch_workaround_state(struct kvm_vcpu *vcpu) { #ifdef CONFIG_ARM64_SSBD /* - * If the guest has disabled the workaround, bring it back on. + * If the vcpu has disabled the workaround, bring it back on. */ if (__needs_ssbd_off(vcpu) && __hyp_this_cpu_read(arm64_ssbd_callback_required)) diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c index d866bff8a142..81cdf33f92bc 100644 --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -200,7 +200,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) __debug_switch_to_guest(vcpu); - __set_guest_arch_workaround_state(vcpu); + __set_vcpu_arch_workaround_state(vcpu); do { /* Jump in the fire! */ @@ -209,7 +209,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) /* And we're baaack! */ } while (fixup_guest_exit(vcpu, &exit_code)); - __set_host_arch_workaround_state(vcpu); + __set_hyp_arch_workaround_state(vcpu); __sysreg_save_state_nvhe(guest_ctxt); __sysreg32_save_state(vcpu); diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c index 366dc386224c..d871e79fceaf 100644 --- a/arch/arm64/kvm/hyp/vhe/switch.c +++ b/arch/arm64/kvm/hyp/vhe/switch.c @@ -131,7 +131,7 @@ static int __kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) sysreg_restore_guest_state_vhe(guest_ctxt); __debug_switch_to_guest(vcpu); - __set_guest_arch_workaround_state(vcpu); + __set_vcpu_arch_workaround_state(vcpu); do { /* Jump in the fire! */ @@ -140,7 +140,7 @@ static int __kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) /* And we're baaack! */ } while (fixup_guest_exit(vcpu, &exit_code)); - __set_host_arch_workaround_state(vcpu); + __set_hyp_arch_workaround_state(vcpu); sysreg_save_guest_state_vhe(guest_ctxt); -- 2.27.0.389.gc38d7665816-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
