From patchwork Fri Jan 20 14:11:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Dennis-Jordan X-Patchwork-Id: 9528583 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 E26C260113 for ; Fri, 20 Jan 2017 14:23:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2D9028686 for ; Fri, 20 Jan 2017 14:23:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C77C02868C; Fri, 20 Jan 2017 14:23:57 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 20DD828686 for ; Fri, 20 Jan 2017 14:23:57 +0000 (UTC) Received: from localhost ([::1]:55094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUa6e-00058x-4t for patchwork-qemu-devel@patchwork.kernel.org; Fri, 20 Jan 2017 09:23:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUZvG-0004Cz-LR for qemu-devel@nongnu.org; Fri, 20 Jan 2017 09:12:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUZvC-00031R-2N for qemu-devel@nongnu.org; Fri, 20 Jan 2017 09:12:10 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:34216) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUZvB-00030k-Si for qemu-devel@nongnu.org; Fri, 20 Jan 2017 09:12:06 -0500 Received: by mail-wm0-x242.google.com with SMTP id c85so6981383wmi.1 for ; Fri, 20 Jan 2017 06:12:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philjordan-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eBR913wYdFG1lSf451xQMHHOVii+97OyBmd1OF8zQqs=; b=OHTfF8Tp7vE8FRJOYCYEyJMS8dyjLKw6KGrRz/MFbtoXNeoXfI9ySjZySinuTRw6WA 3ZrQxhc7bJVzgkVXB+AyShUpqz8j8k3wVsxCH9vJFl0M4PcD8vc8DzWEK/Qws8lXRU6b hceRtcOOtKlzeHNGC0RPgF4EC0vMJ8vUYXms7IvE1EDH5F/hQ6PUsmdnF+gfi4BcXYEA vhSBhkFwwO8EZS59ZRvC2bBgfqFxRfXxAaEcSS2YnMV0BdX7Wu6CL/F6krKCmewbeFOS ckUCTyavgXs+scbjin0Pxe5+9Z/I3dOtRlC5bh9iJfZIrrZpXaispiRzZ1cpJI9epDkZ QsLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eBR913wYdFG1lSf451xQMHHOVii+97OyBmd1OF8zQqs=; b=atS9SFUJSTiIAxPV1nEIo9/5iGWPE7P/ZAOh7gckQJb1NxM/V+8kLPVz2fAZVMHF/p uAN/ltrUSQYQG8/iNK6s/5pCw2c76paJm9MyzpHPP6N430wrf7DICy7ZrmO1EwiIH7Rx ZfpuupRcoVlONicHiBTjR8yWolFJz9dETpKGU4bIxYSSSN+ka7D1GfYzUX4KjAn2qyq0 uErCizc9coyqCFZtUgTmyukwOHuCvkKScepqWXUm3GELTkpOGkDlhLvkWpWGCM4FM0LU xz+VEn84zOxQuMICwxlXGbNobcKLFqaECMggVw2m0Lb2pmKFIlwyIERH0SXfLjQIqcI7 xD7w== X-Gm-Message-State: AIkVDXLy/U8/nKaOuCp1zjVg5LcJrVyoI+GobTZDoituOaQQcy7W/RQGOgbmgf+htfvvDg== X-Received: by 10.28.189.134 with SMTP id n128mr3332958wmf.77.1484921524881; Fri, 20 Jan 2017 06:12:04 -0800 (PST) Received: from Phils-MacBook-Pro-57025.local.eu (37-186-10-86.ip.as39912.net. [37.186.10.86]) by smtp.gmail.com with ESMTPSA id 191sm6339827wmo.21.2017.01.20.06.12.03 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 20 Jan 2017 06:12:04 -0800 (PST) From: Phil Dennis-Jordan To: qemu-devel@nongnu.org Date: Fri, 20 Jan 2017 15:11:34 +0100 Message-Id: <1484921496-11257-2-git-send-email-phil@philjordan.eu> X-Mailer: git-send-email 2.3.2 (Apple Git-55) In-Reply-To: <1484921496-11257-1-git-send-email-phil@philjordan.eu> References: <1484921496-11257-1-git-send-email-phil@philjordan.eu> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH v2 1/3] x86-KVM: Supply TSC and APIC clock rates to guest like VMWare X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Phil Dennis-Jordan , Eduardo Habkost , kvm@vger.kernel.org, "Michael S. Tsirkin" , Marcelo Tosatti , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This fixes timekeeping of x86-64 Darwin/OS X/macOS guests when using KVM. Darwin/OS X/macOS for x86-64 uses the TSC for timekeeping; it normally calibrates this by querying various clock frequency scaling MSRs. Details depend on the exact CPU model detected. The local APIC timer frequency is extracted from (EFI) firmware. This is problematic in the presence of virtualisation, as the MSRs in question are typically not handled by the hypervisor. VMWare (Fusion) advertises TSC and APIC frequency via a custom 0x40000010 CPUID leaf, in the eax and ebx registers respectively. This is documented at https://lwn.net/Articles/301888/ among other places. Darwin/OS X/macOS looks for the generic 0x40000000 hypervisor leaf, and if this indicates via eax that leaf 0x40000010 might be available, that is in turn queried for the two frequencies. This adds a CPU option "vmware-cpuid-freq" to enable the same behaviour when running Qemu with KVM acceleration, if the KVM TSC frequency can be determined, and it is stable. (invtsc or user-specified) The virtualised APIC bus cycle is hardcoded to 1GHz in KVM, so ebx of the CPUID leaf is also hardcoded to this value. Signed-off-by: Phil Dennis-Jordan --- target/i386/cpu.c | 1 + target/i386/cpu.h | 4 ++++ target/i386/kvm.c | 36 ++++++++++++++++++++++++++++++------ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index aba11ae..dabad37 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3677,6 +3677,7 @@ static Property x86_cpu_properties[] = { DEFINE_PROP_BOOL("cpuid-0xb", X86CPU, enable_cpuid_0xb, true), DEFINE_PROP_BOOL("lmce", X86CPU, enable_lmce, false), DEFINE_PROP_BOOL("l3-cache", X86CPU, enable_l3_cache, true), + DEFINE_PROP_BOOL("vmware-cpuid-freq", X86CPU, vmware_cpuid_freq, false), DEFINE_PROP_END_OF_LIST() }; diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 6c1902b..d51b892 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1213,6 +1213,10 @@ struct X86CPU { bool host_features; uint32_t apic_id; + /* Enables publishing of TSC increment and Local APIC bus frequencies to + * the guest OS in CPUID page 0x40000010, the same way that VMWare does. */ + bool vmware_cpuid_freq; + /* if true the CPUID code directly forward host cache leaves to the guest */ bool cache_info_passthrough; diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 10a9cd8..6854e76 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -973,12 +973,6 @@ int kvm_arch_init_vcpu(CPUState *cs) vmstate_x86_cpu.unmigratable = 1; } - cpuid_data.cpuid.padding = 0; - r = kvm_vcpu_ioctl(cs, KVM_SET_CPUID2, &cpuid_data); - if (r) { - return r; - } - r = kvm_arch_set_tsc_khz(cs); if (r < 0) { return r; @@ -998,6 +992,36 @@ int kvm_arch_init_vcpu(CPUState *cs) } } + if (cpu->vmware_cpuid_freq + /* Guests depend on 0x40000000 to detect this feature, so only expose + * it if KVM exposes leaf 0x40000000. (Conflicts with Hyper-V) */ + && cpu->expose_kvm + && kvm_base == KVM_CPUID_SIGNATURE + /* TSC clock must be stable and known for this feature. */ + && ((env->features[FEAT_8000_0007_EDX] & CPUID_APM_INVTSC) + || env->user_tsc_khz != 0) + && env->tsc_khz != 0) { + + c = &cpuid_data.entries[cpuid_i++]; + c->function = KVM_CPUID_SIGNATURE | 0x10; + c->eax = env->tsc_khz; + /* LAPIC resolution of 1ns (freq: 1GHz) is hardcoded in KVM's + * APIC_BUS_CYCLE_NS */ + c->ebx = 1000000; + c->ecx = c->edx = 0; + + c = cpuid_find_entry(&cpuid_data.cpuid, kvm_base, 0); + c->eax = MAX(c->eax, KVM_CPUID_SIGNATURE | 0x10); + } + + cpuid_data.cpuid.nent = cpuid_i; + + cpuid_data.cpuid.padding = 0; + r = kvm_vcpu_ioctl(cs, KVM_SET_CPUID2, &cpuid_data); + if (r) { + return r; + } + if (has_xsave) { env->kvm_xsave_buf = qemu_memalign(4096, sizeof(struct kvm_xsave)); }