Commit e0eb7fc0 authored by Marc Zyngier's avatar Marc Zyngier Committed by Junhao He
Browse files

KVM: arm64: nv: Drop VCPU_HYP_CONTEXT flag 

mainline inclusion
from mainline-v6.9-rc1
commit 6f57c6be2a0889cc0fd32b0cd2eb25dfee20dde3
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8EC9K
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6f57c6be2a0889cc0fd32b0cd2eb25dfee20dde3



--------------------------------

It has become obvious that HCR_EL2.NV serves the exact same use
as VCPU_HYP_CONTEXT, only in an architectural way. So just drop
the flag for good.

Reviewed-by: default avatarJoey Gouly <joey.gouly@arm.com>
Reviewed-by: default avatarOliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20240419102935.1935571-5-maz@kernel.org


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
parent 4abc8108

arch/arm64/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -768,8 +768,6 @@ struct kvm_vcpu_arch { 
#define DEBUG_STATE_SAVE_SPE	__vcpu_single_flag(iflags, BIT(5))

/* Save TRBE context if active  */

#define DEBUG_STATE_SAVE_TRBE	__vcpu_single_flag(iflags, BIT(6))

/* vcpu running in HYP context */

#define VCPU_HYP_CONTEXT	__vcpu_single_flag(iflags, BIT(7))



/* SVE enabled for host EL0 */

#define HOST_SVE_ENABLED	__vcpu_single_flag(sflags, BIT(0))

arch/arm64/kvm/hyp/vhe/switch.c

+1 −6
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void early_exit_filter(struct kvm_vcpu *vcpu, u64 *exit_code) 
	 * If we were in HYP context on entry, adjust the PSTATE view

	 * so that the usual helpers work correctly.

	 */

	if (unlikely(vcpu_get_flag(vcpu, VCPU_HYP_CONTEXT))) {

	if (vcpu_has_nv(vcpu) && (read_sysreg(hcr_el2) & HCR_NV)) {

		u64 mode = *vcpu_cpsr(vcpu) & (PSR_MODE_MASK | PSR_MODE32_BIT);



		switch (mode) {
@@ -232,11 +232,6 @@ static int __kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) 
	sysreg_restore_guest_state_vhe(guest_ctxt);

	__debug_switch_to_guest(vcpu);



	if (is_hyp_ctxt(vcpu))

		vcpu_set_flag(vcpu, VCPU_HYP_CONTEXT);

	else

		vcpu_clear_flag(vcpu, VCPU_HYP_CONTEXT);



	do {

		/* Jump in the fire! */

		exit_code = __guest_enter(vcpu);