Unverified Commit 4d88bf76 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14910 KVM:arm64:Add a kvm parameter to control guest wfi trapping 

Merge Pull Request from: @ni-zhiqiang111 
 
virt inclusion
category: performance
bugzilla: https://gitee.com/openeuler/kernel/issues/IBIYSO



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

Currently, on GICv4+ system if a vCPU is only runnable process
on a pCPU and we are using direct injection of interrupts, the
guest WFI trapping will be turn off. So in host view, the vcpu
process's CPU util is almost 100%, which may confuse someone.
Let's add a kvm parameter to control guest wfi trapping.

Signed-off-by: default avatarZhiqiang Ni <nizhiqiang1@huawei.com>
 
 
Link:https://gitee.com/openeuler/kernel/pulls/14910

 

Reviewed-by: default avatarZenghui Yu <yuzenghui@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents be61afaf bc256c2c

arch/arm64/include/asm/kvm_emulate.h

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ static inline void vcpu_clear_wfx_traps(struct kvm_vcpu *vcpu) 
		vcpu->arch.hcr_el2 &= ~HCR_TWI;

	else

		vcpu->arch.hcr_el2 |= HCR_TWI;



	if (force_wfi_trap)

		vcpu->arch.hcr_el2 |= HCR_TWI;

}



static inline void vcpu_set_wfx_traps(struct kvm_vcpu *vcpu)

arch/arm64/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#define KVM_REQ_RELOAD_GICv4	KVM_ARCH_REQ(4)

#define KVM_REQ_RELOAD_PMU	KVM_ARCH_REQ(5)

#define KVM_REQ_RELOAD_DVMBM	KVM_ARCH_REQ(6)

#define KVM_REQ_RELOAD_WFI_TRAPS	KVM_ARCH_REQ(7)



#define KVM_DIRTY_LOG_MANUAL_CAPS   (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE | \

				     KVM_DIRTY_LOG_INITIALLY_SET)
@@ -755,6 +756,7 @@ extern unsigned int twedel; 
#define use_twed() (false)

#endif



extern bool force_wfi_trap;

extern bool kvm_ncsnp_support;

extern bool kvm_dvmbm_support;

arch/arm64/kvm/arm.c

+49 −0
Original line number Diff line number Diff line
@@ -84,6 +84,48 @@ unsigned int twedel = 0; 
module_param(twedel, uint, S_IRUGO | S_IWUSR);

#endif



static int vcpu_req_reload_wfi_traps(const char *val, const struct kernel_param *kp);



static const struct kernel_param_ops force_wfi_trap_ops = {

	.set = vcpu_req_reload_wfi_traps,

	.get = param_get_bool,

};



bool force_wfi_trap;

module_param_cb(force_wfi_trap, &force_wfi_trap_ops, &force_wfi_trap, 0644);



static int vcpu_req_reload_wfi_traps(const char *val, const struct kernel_param *kp)

{

	struct kvm *kvm;

	bool oldvalue;

	int err;



	oldvalue = force_wfi_trap;

	err = param_set_bool(val, kp);

	if (err)

		return err;



	if (oldvalue == force_wfi_trap)

		return err;



	/*

	 * If set the force_wfi_trap from 1 to 0, no need to kick vcpus here.

	 * The HCR_TWI flag will be cleared in kvm_arch_vcpu_load().

	 */

	if (force_wfi_trap == 0)

		return 0;



	/*

	 * We need to kick vcpus out of guest mode here to reload

	 * wfx trapping config when re-enter guest mode.

	 */

	mutex_lock(&kvm_lock);

	list_for_each_entry(kvm, &vm_list, vm_list)

		kvm_make_all_cpus_request(kvm, KVM_REQ_RELOAD_WFI_TRAPS);

	mutex_unlock(&kvm_lock);

	return err;

}



int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_exiting_guest_mode(vcpu) == IN_GUEST_MODE;
@@ -840,6 +882,13 @@ static void check_vcpu_requests(struct kvm_vcpu *vcpu) 
		if (kvm_check_request(KVM_REQ_RELOAD_DVMBM, vcpu))

			kvm_hisi_reload_lsudvmbm(vcpu->kvm);

#endif



		if (kvm_check_request(KVM_REQ_RELOAD_WFI_TRAPS, vcpu)) {

			if (single_task_running())

				vcpu_clear_wfx_traps(vcpu);

			else

				vcpu_set_wfx_traps(vcpu);

		}

	}

}