Unverified Commit 9eaaa8ee authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15121 KVM: arm64: Get rid of userspace_irqchip_in_use 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhao Yipeng <zhaoyipeng5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LVCTML7VOGGFVUB6QR72MVP4HXZTWR7J/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEADT 
 
Link:https://gitee.com/openeuler/kernel/pulls/15121

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents afe8f23a e4ff73f5

arch/arm64/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ enum kvm_mode kvm_get_mode(void); 
static inline enum kvm_mode kvm_get_mode(void) { return KVM_MODE_NONE; };

#endif



DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use);



extern unsigned int __ro_after_init kvm_sve_max_vl;

int __init kvm_arm_init_sve(void);

arch/arm64/kvm/arch_timer.c

+1 −2
Original line number Diff line number Diff line
@@ -291,8 +291,7 @@ void get_timer_map(struct kvm_vcpu *vcpu, struct timer_map *map) 


static inline bool userspace_irqchip(struct kvm *kvm)

{

	return static_branch_unlikely(&userspace_irqchip_in_use) &&

		unlikely(!irqchip_in_kernel(kvm));

	return unlikely(!irqchip_in_kernel(kvm));

}



static void soft_timer_start(struct hrtimer *hrt, u64 ns)

arch/arm64/kvm/arm.c

+3 −18
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ bool kvm_ncsnp_support; 
bool kvm_dvmbm_support;



static DEFINE_PER_CPU(unsigned char, kvm_hyp_initialized);

DEFINE_STATIC_KEY_FALSE(userspace_irqchip_in_use);



bool is_kvm_arm_initialised(void)

{
@@ -521,9 +520,6 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) 


void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)

{

	if (vcpu_has_run_once(vcpu) && unlikely(!irqchip_in_kernel(vcpu->kvm)))

		static_branch_dec(&userspace_irqchip_in_use);



	kvm_mmu_free_memory_cache(&vcpu->arch.mmu_page_cache);

	kvm_timer_vcpu_terminate(vcpu);

	kvm_pmu_vcpu_destroy(vcpu);
@@ -805,17 +801,6 @@ int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu) 
			return ret;

	}



	if (!irqchip_in_kernel(kvm)) {

		/*

		 * Tell the rest of the code that there are userspace irqchip

		 * VMs in the wild.

		 */

#ifdef CONFIG_HISI_VIRTCCA_HOST

	if (!kvm_is_virtcca_cvm(kvm))

#endif

		static_branch_inc(&userspace_irqchip_in_use);

	}



	/*

	 * Initialize traps for protected VMs.

	 * NOTE: Move to run in EL2 directly, rather than via a hypercall, once
@@ -1055,7 +1040,7 @@ static bool kvm_vcpu_exit_request(struct kvm_vcpu *vcpu, int *ret) 
	 * state gets updated in kvm_timer_update_run and

	 * kvm_pmu_update_run below).

	 */

	if (static_branch_unlikely(&userspace_irqchip_in_use)) {

	if (unlikely(!irqchip_in_kernel(vcpu->kvm))) {

		if (kvm_timer_should_notify_user(vcpu) ||

		    kvm_pmu_should_notify_user(vcpu)) {

			*ret = -EINTR;
@@ -1193,7 +1178,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 
			vcpu->mode = OUTSIDE_GUEST_MODE;

			isb(); /* Ensure work in x_flush_hwstate is committed */

			kvm_pmu_sync_hwstate(vcpu);

			if (static_branch_unlikely(&userspace_irqchip_in_use))

			if (unlikely(!irqchip_in_kernel(vcpu->kvm)))

				kvm_timer_sync_user(vcpu);

			kvm_vgic_sync_hwstate(vcpu);

			local_irq_enable();
@@ -1246,7 +1231,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 
		 * we don't want vtimer interrupts to race with syncing the

		 * timer virtual interrupt state.

		 */

		if (static_branch_unlikely(&userspace_irqchip_in_use))

		if (unlikely(!irqchip_in_kernel(vcpu->kvm)))

			kvm_timer_sync_user(vcpu);



		kvm_arch_vcpu_ctxsync_fp(vcpu);