Commit 0cdeabb1 authored by Andrey Smetanin's avatar Andrey Smetanin Committed by Paolo Bonzini
Browse files

kvm/x86: Reorg stimer_expiration() to better control timer restart 



Split stimer_expiration() into two parts - timer expiration message
sending and timer restart/cleanup based on timer state(config).

This also fixes a bug where a one-shot timer message whose delivery
failed once would get lost for good.

Signed-off-by: default avatarAndrey Smetanin <asmetanin@virtuozzo.com>
Reviewed-by: default avatarRoman Kagan <rkagan@virtuozzo.com>
CC: Gleb Natapov <gleb@kernel.org>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Roman Kagan <rkagan@virtuozzo.com>
CC: Denis V. Lunev <den@openvz.org>
CC: qemu-devel@nongnu.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f808495d

arch/x86/kvm/hyperv.c

+14 −12
Original line number Diff line number Diff line
@@ -554,30 +554,27 @@ static int synic_deliver_msg(struct kvm_vcpu_hv_synic *synic, u32 sint, 
	return r;

}



static void stimer_send_msg(struct kvm_vcpu_hv_stimer *stimer)

static int stimer_send_msg(struct kvm_vcpu_hv_stimer *stimer)

{

	struct kvm_vcpu *vcpu = stimer_to_vcpu(stimer);

	struct hv_message *msg = &stimer->msg;

	struct hv_timer_message_payload *payload =

			(struct hv_timer_message_payload *)&msg->u.payload;

	int r;



	stimer->msg_pending = true;

	payload->expiration_time = stimer->exp_time;

	payload->delivery_time = get_time_ref_counter(vcpu->kvm);

	r = synic_deliver_msg(vcpu_to_synic(vcpu),

	return synic_deliver_msg(vcpu_to_synic(vcpu),

				 HV_STIMER_SINT(stimer->config), msg);

	if (!r)

		stimer->msg_pending = false;

}



static void stimer_expiration(struct kvm_vcpu_hv_stimer *stimer)

{

	stimer_send_msg(stimer);

	stimer->msg_pending = true;

	if (!stimer_send_msg(stimer)) {

		stimer->msg_pending = false;

		if (!(stimer->config & HV_STIMER_PERIODIC))

			stimer->config &= ~HV_STIMER_ENABLE;

	else

		stimer_start(stimer);

	}

}



void kvm_hv_process_stimers(struct kvm_vcpu *vcpu)
@@ -594,6 +591,11 @@ void kvm_hv_process_stimers(struct kvm_vcpu *vcpu) 
				time_now = get_time_ref_counter(vcpu->kvm);

				if (time_now >= stimer->exp_time)

					stimer_expiration(stimer);



				if (stimer->config & HV_STIMER_ENABLE)

					stimer_start(stimer);

				else

					stimer_cleanup(stimer);

			}

		}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE