From patchwork Fri Jul 21 15:45:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Plotnikov X-Patchwork-Id: 9857187 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6572C60388 for ; Fri, 21 Jul 2017 15:47:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58E6928560 for ; Fri, 21 Jul 2017 15:47:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DA4B28692; Fri, 21 Jul 2017 15:47:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C39D28560 for ; Fri, 21 Jul 2017 15:47:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754589AbdGUPrR (ORCPT ); Fri, 21 Jul 2017 11:47:17 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:13820 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750802AbdGUPpf (ORCPT ); Fri, 21 Jul 2017 11:45:35 -0400 Received: from dptest2.qa.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v6LFjOE7008018; Fri, 21 Jul 2017 18:45:24 +0300 (MSK) From: Denis Plotnikov To: kvm@vger.kernel.org, rkrcmar@redhat.com Cc: pbonzini@redhat.com, den@virtuozzo.com, rkagan@virtuozzo.com Subject: [PATCH v2 11/11] KVM: add pvclock to a list of stable clocks. Date: Fri, 21 Jul 2017 18:45:18 +0300 Message-Id: <1500651918-14156-12-git-send-email-dplotnikov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1500651918-14156-1-git-send-email-dplotnikov@virtuozzo.com> References: <1500651918-14156-1-git-send-email-dplotnikov@virtuozzo.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This means allow to L2 guests to use masterclock when L1 has a stable pvclock (currenly, kvm-clock) Signed-off-by: Denis Plotnikov --- arch/x86/kernel/pvclock.c | 1 + arch/x86/kvm/x86.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c index c73e5a5..d6bef69 100644 --- a/arch/x86/kernel/pvclock.c +++ b/arch/x86/kernel/pvclock.c @@ -73,6 +73,7 @@ u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src) return flags & valid_flags; } +EXPORT_SYMBOL(pvclock_read_flags); static atomic64_t clocksource_stable = ATOMIC64_INIT(0); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ce491bb..9b0f306 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1311,9 +1311,17 @@ static u64 compute_guest_tsc(struct kvm_vcpu *vcpu, s64 kernel_ns) } #ifdef CONFIG_X86_64 +static bool pvclock_stable(void) +{ + return !!(pvclock_read_flags(&pvclock_pvti_cpu0_va()->pvti) + & PVCLOCK_TSC_STABLE_BIT); +} + static bool clocksource_stable(void) { - return get_tk_mono_clock_mode() == VCLOCK_TSC; + return get_tk_mono_clock_mode() == VCLOCK_TSC || + (get_tk_mono_clock_mode() == VCLOCK_PVCLOCK + && pvclock_stable()); } static bool clocksource_stability_check(void)