From patchwork Mon Dec 28 15:27:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smetanin X-Patchwork-Id: 561308 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7E052140C75 for ; Tue, 29 Dec 2015 02:28:27 +1100 (AEDT) Received: from localhost ([::1]:44828 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDZij-0004kp-7U for incoming@patchwork.ozlabs.org; Mon, 28 Dec 2015 10:28:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDZiH-0003xa-PY for qemu-devel@nongnu.org; Mon, 28 Dec 2015 10:27:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aDZiG-0003Xj-3j for qemu-devel@nongnu.org; Mon, 28 Dec 2015 10:27:57 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:47208 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDZiF-0003XJ-Lf for qemu-devel@nongnu.org; Mon, 28 Dec 2015 10:27:56 -0500 Received: from asm-pc.sw.ru ([10.30.16.30]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id tBQHuMnH021597; Sat, 26 Dec 2015 20:56:36 +0300 (MSK) From: Andrey Smetanin To: kvm@vger.kernel.org Date: Mon, 28 Dec 2015 18:27:24 +0300 Message-Id: <1451316444-31766-8-git-send-email-asmetanin@virtuozzo.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1451316444-31766-1-git-send-email-asmetanin@virtuozzo.com> References: <1451316444-31766-1-git-send-email-asmetanin@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: Gleb Natapov , Paolo Bonzini , qemu-devel@nongnu.org, Roman Kagan , "Denis V. Lunev" Subject: [Qemu-devel] [PATCH v2 7/7] kvm/x86: Update SynIC timers on guest entry only X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Consolidate updating the Hyper-V SynIC timers in a single place: on guest entry in processing KVM_REQ_HV_STIMER request. This simplifies the overall logic, and makes sure the most current state of msrs and guest clock is used for arming the timers (to achieve that, KVM_REQ_HV_STIMER has to be processed after KVM_REQ_CLOCK_UPDATE). Signed-off-by: Andrey Smetanin Reviewed-by: Roman Kagan CC: Gleb Natapov CC: Paolo Bonzini CC: Roman Kagan CC: Denis V. Lunev CC: qemu-devel@nongnu.org --- arch/x86/kvm/hyperv.c | 38 +++++++++++++++++++------------------- arch/x86/kvm/x86.c | 6 ++++++ 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index ddae13e..101c2e4 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -389,7 +389,7 @@ static u64 get_time_ref_counter(struct kvm *kvm) return div_u64(get_kernel_ns() + kvm->arch.kvmclock_offset, 100); } -static void stimer_mark_expired(struct kvm_vcpu_hv_stimer *stimer, +static void stimer_mark_pending(struct kvm_vcpu_hv_stimer *stimer, bool vcpu_kick) { struct kvm_vcpu *vcpu = stimer_to_vcpu(stimer); @@ -417,7 +417,7 @@ static enum hrtimer_restart stimer_timer_callback(struct hrtimer *timer) struct kvm_vcpu_hv_stimer *stimer; stimer = container_of(timer, struct kvm_vcpu_hv_stimer, timer); - stimer_mark_expired(stimer, true); + stimer_mark_pending(stimer, true); return HRTIMER_NORESTART; } @@ -462,7 +462,7 @@ static int stimer_start(struct kvm_vcpu_hv_stimer *stimer) * "If a one shot is enabled and the specified count is in * the past, it will expire immediately." */ - stimer_mark_expired(stimer, false); + stimer_mark_pending(stimer, false); return 0; } @@ -475,30 +475,24 @@ static int stimer_start(struct kvm_vcpu_hv_stimer *stimer) static int stimer_set_config(struct kvm_vcpu_hv_stimer *stimer, u64 config, bool host) { + stimer_cleanup(stimer); if ((stimer->config & HV_STIMER_ENABLE) && HV_STIMER_SINT(config) == 0) config &= ~HV_STIMER_ENABLE; stimer->config = config; - stimer_cleanup(stimer); - if (stimer->config & HV_STIMER_ENABLE) - if (stimer_start(stimer)) - return 1; + stimer_mark_pending(stimer, false); return 0; } static int stimer_set_count(struct kvm_vcpu_hv_stimer *stimer, u64 count, bool host) { - stimer->count = count; - stimer_cleanup(stimer); + stimer->count = count; if (stimer->count == 0) stimer->config &= ~HV_STIMER_ENABLE; - else if (stimer->config & HV_STIMER_AUTOENABLE) { + else if (stimer->config & HV_STIMER_AUTOENABLE) stimer->config |= HV_STIMER_ENABLE; - if (stimer_start(stimer)) - return 1; - } - + stimer_mark_pending(stimer, false); return 0; } @@ -582,18 +576,24 @@ void kvm_hv_process_stimers(struct kvm_vcpu *vcpu) { struct kvm_vcpu_hv *hv_vcpu = vcpu_to_hv_vcpu(vcpu); struct kvm_vcpu_hv_stimer *stimer; - u64 time_now; + u64 time_now, exp_time; int i; for (i = 0; i < ARRAY_SIZE(hv_vcpu->stimer); i++) if (test_and_clear_bit(i, hv_vcpu->stimer_pending_bitmap)) { stimer = &hv_vcpu->stimer[i]; if (stimer->config & HV_STIMER_ENABLE) { - time_now = get_time_ref_counter(vcpu->kvm); - if (time_now >= stimer->exp_time) - stimer_expiration(stimer); + exp_time = stimer->exp_time; + + if (exp_time) { + time_now = + get_time_ref_counter(vcpu->kvm); + if (time_now >= exp_time) + stimer_expiration(stimer); + } - if (stimer->config & HV_STIMER_ENABLE) + if ((stimer->config & HV_STIMER_ENABLE) && + stimer->count) stimer_start(stimer); else stimer_cleanup(stimer); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index e23137d..9610516 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6491,6 +6491,12 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) r = 0; goto out; } + + /* + * KVM_REQ_HV_STIMER has to be processed after + * KVM_REQ_CLOCK_UPDATE, because Hyper-V SynIC timers + * depend on the guest clock being up-to-date + */ if (kvm_check_request(KVM_REQ_HV_STIMER, vcpu)) kvm_hv_process_stimers(vcpu); }