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

!13827 LoongArch: KVM: Mark hrtimer to expire in hard interrupt context 

Merge Pull Request from: @ci-robot 
 
PR sync from: Luo Gengkun <luogengkun2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HSIXINEH4RP5E4PE6VCUAO4CWHDQUUS5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB67YA 
 
Link:https://gitee.com/openeuler/kernel/pulls/13827

 

Reviewed-by: default avatarMao Bibo <maobibo@loongson.cn>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents da4c6158 6ffc0064

arch/loongarch/kvm/timer.c

+4 −3
Original line number Diff line number Diff line
@@ -161,10 +161,11 @@ static void _kvm_save_timer(struct kvm_vcpu *vcpu) 
	if (kvm_vcpu_is_blocking(vcpu)) {



		/*

		 * HRTIMER_MODE_PINNED is suggested since vcpu may run in

		 * the same physical cpu in next time

		 * HRTIMER_MODE_PINNED_HARD is suggested since vcpu may run in

		 * the same physical cpu in next time, and the timer should run

		 * in hardirq context even in the PREEMPT_RT case.

		 */

		hrtimer_start(&vcpu->arch.swtimer, expire, HRTIMER_MODE_ABS_PINNED);

		hrtimer_start(&vcpu->arch.swtimer, expire, HRTIMER_MODE_ABS_PINNED_HARD);

	}

}

arch/loongarch/kvm/vcpu.c

+1 −1
Original line number Diff line number Diff line
@@ -1283,7 +1283,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) 


	vcpu->arch.vpid = 0;



	hrtimer_init(&vcpu->arch.swtimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED);

	hrtimer_init(&vcpu->arch.swtimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED_HARD);

	vcpu->arch.swtimer.function = kvm_swtimer_wakeup;



	vcpu->arch.handle_exit = kvm_handle_exit;