Commit 46f2c307 authored by Bibo Mao's avatar Bibo Mao Committed by Xianglai Li
Browse files

LoongArch: KVM: Remove SW timer switch when vcpu is halt polling 

mainline inclusion
from mainline-v6.8-rc1
commit 161267320158920a601e40d83fdac60bcaa2acb5
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I94LRF


CVE: NA

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

With halt-polling supported, there is checking for pending events or
interrupts when vcpu executes idle instruction. Pending interrupts
include injected SW interrupts and passthrough HW interrupts, such as
HW timer interrupts, since HW timer works still even if vcpu exists from
VM mode.

Since HW timer pending interrupt can be set directly with CSR status
register, and pending HW timer interrupt checking is used in vcpu block
checking function, it is not necessary to switch to SW timer during
halt-polling. This patch adds preemption disabling in function
kvm_cpu_has_pending_timer(), and removes SW timer switching in idle
instruction emulation function.

Signed-off-by: default avatarBibo Mao <maobibo@loongson.cn>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
Signed-off-by: default avatarXianglai Li <lixianglai@loongson.cn>
parent 4ce2b538

arch/loongarch/kvm/exit.c

+2 −11
Original line number Diff line number Diff line
@@ -200,17 +200,8 @@ int kvm_emu_idle(struct kvm_vcpu *vcpu) 
	++vcpu->stat.idle_exits;

	trace_kvm_exit_idle(vcpu, KVM_TRACE_EXIT_IDLE);



	if (!kvm_arch_vcpu_runnable(vcpu)) {

		/*

		 * Switch to the software timer before halt-polling/blocking as

		 * the guest's timer may be a break event for the vCPU, and the

		 * hypervisor timer runs only when the CPU is in guest mode.

		 * Switch before halt-polling so that KVM recognizes an expired

		 * timer before blocking.

		 */

		kvm_save_timer(vcpu);

		kvm_vcpu_block(vcpu);

	}

	if (!kvm_arch_vcpu_runnable(vcpu))

		kvm_vcpu_halt(vcpu);



	return EMULATE_DONE;

}

arch/loongarch/kvm/timer.c

+9 −3
Original line number Diff line number Diff line
@@ -155,11 +155,17 @@ static void _kvm_save_timer(struct kvm_vcpu *vcpu) 
		 */

		hrtimer_cancel(&vcpu->arch.swtimer);

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

	} else

	} else if (vcpu->stat.generic.blocking) {

		/*

		 * Inject timer interrupt so that hall polling can dectect and exit

		 * Inject timer interrupt so that halt polling can dectect and exit.

		 * VCPU is scheduled out already and sleeps in rcuwait queue and

		 * will not poll pending events again. kvm_queue_irq() is not enough,

		 * hrtimer swtimer should be used here.

		 */

		kvm_queue_irq(vcpu, INT_TI);

		expire = ktime_add_ns(ktime_get(), 10);

		vcpu->arch.expire = expire;

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

	}

}



/*

arch/loongarch/kvm/vcpu.c

+8 −1
Original line number Diff line number Diff line
@@ -187,8 +187,15 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, 


int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)

{

	return kvm_pending_timer(vcpu) ||

	int ret;



	/* Protect from TOD sync and vcpu_load/put() */

	preempt_disable();

	ret = kvm_pending_timer(vcpu) ||

		kvm_read_hw_gcsr(LOONGARCH_CSR_ESTAT) & (1 << INT_TI);

	preempt_enable();



	return ret;

}



int kvm_arch_vcpu_dump_regs(struct kvm_vcpu *vcpu)