Commit aff3ccd7 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Move vcpu ON_UNSUPPORTED_CPU flag to the state flag set 



The ON_UNSUPPORTED_CPU flag is only there to track the sad fact
that we have ended-up on a CPU where we cannot really run.

Since this is only for the host kernel's use, move it to the state
set.

Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Reviewed-by: default avatarReiji Watanabe <reijiw@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 0affa37f

arch/arm64/include/asm/kvm_host.h

+5 −4
Original line number Diff line number Diff line
@@ -519,6 +519,8 @@ struct kvm_vcpu_arch { 
#define HOST_SVE_ENABLED	__vcpu_single_flag(sflags, BIT(0))

/* SME enabled for EL0 */

#define HOST_SME_ENABLED	__vcpu_single_flag(sflags, BIT(1))

/* Physical CPU not in supported_cpus */

#define ON_UNSUPPORTED_CPU	__vcpu_single_flag(sflags, BIT(2))



/* Pointer to the vcpu's SVE FFR for sve_{save,load}_state() */

#define vcpu_sve_pffr(vcpu) (kern_hyp_va((vcpu)->arch.sve_state) +	\
@@ -541,7 +543,6 @@ struct kvm_vcpu_arch { 
})



/* vcpu_arch flags field values: */

#define KVM_ARM64_ON_UNSUPPORTED_CPU	(1 << 15) /* Physical CPU not in supported_cpus */

#define KVM_ARM64_WFIT			(1 << 17) /* WFIT instruction trapped */

#define KVM_GUESTDBG_VALID_MASK (KVM_GUESTDBG_ENABLE | \

				 KVM_GUESTDBG_USE_SW_BP | \
@@ -561,13 +562,13 @@ struct kvm_vcpu_arch { 
#endif



#define vcpu_on_unsupported_cpu(vcpu)					\

	((vcpu)->arch.flags & KVM_ARM64_ON_UNSUPPORTED_CPU)

	vcpu_get_flag(vcpu, ON_UNSUPPORTED_CPU)



#define vcpu_set_on_unsupported_cpu(vcpu)				\

	((vcpu)->arch.flags |= KVM_ARM64_ON_UNSUPPORTED_CPU)

	vcpu_set_flag(vcpu, ON_UNSUPPORTED_CPU)



#define vcpu_clear_on_unsupported_cpu(vcpu)				\

	((vcpu)->arch.flags &= ~KVM_ARM64_ON_UNSUPPORTED_CPU)

	vcpu_clear_flag(vcpu, ON_UNSUPPORTED_CPU)



#define vcpu_gp_regs(v)		(&(v)->arch.ctxt.regs)