From nobody Sat May 4 15:16:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1501838415865616.5414876468634; Fri, 4 Aug 2017 02:20:15 -0700 (PDT) Received: from localhost ([::1]:49365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddYmD-0008Rq-3G for importer@patchew.org; Fri, 04 Aug 2017 05:20:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddYlK-0007z3-RT for qemu-devel@nongnu.org; Fri, 04 Aug 2017 05:19:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddYlH-0006L6-NT for qemu-devel@nongnu.org; Fri, 04 Aug 2017 05:19:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60882) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddYlH-0006Ib-Dp for qemu-devel@nongnu.org; Fri, 04 Aug 2017 05:19:15 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5B02E883AE; Fri, 4 Aug 2017 09:14:09 +0000 (UTC) Received: from dhcp-1-107.brq.redhat.com (ovpn-204-166.brq.redhat.com [10.40.204.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id D62987D687; Fri, 4 Aug 2017 09:14:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5B02E883AE Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=lprosek@redhat.com From: Ladi Prosek To: qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Fri, 4 Aug 2017 11:14:01 +0200 Message-Id: <20170804091403.13478-2-lprosek@redhat.com> In-Reply-To: <20170804091403.13478-1-lprosek@redhat.com> References: <20170804091403.13478-1-lprosek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 04 Aug 2017 09:14:09 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] i386/kvm: use a switch statement for MSR detection 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: pbonzini@redhat.com, mtosatti@redhat.com, rkrcmar@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Switch is easier on the eye and might lead to better codegen. Signed-off-by: Ladi Prosek Reviewed-by: David Hildenbrand --- target/i386/kvm.c | 76 +++++++++++++++++++++++----------------------------= ---- 1 file changed, 32 insertions(+), 44 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 6db7783..ed119ca 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -1081,66 +1081,54 @@ static int kvm_get_supported_msrs(KVMState *s) int i; =20 for (i =3D 0; i < kvm_msr_list->nmsrs; i++) { - if (kvm_msr_list->indices[i] =3D=3D MSR_STAR) { + switch (kvm_msr_list->indices[i]) { + case MSR_STAR: has_msr_star =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D MSR_VM_HSAVE_PA) { + break; + case MSR_VM_HSAVE_PA: has_msr_hsave_pa =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D MSR_TSC_AUX) { + break; + case MSR_TSC_AUX: has_msr_tsc_aux =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D MSR_TSC_ADJUST) { + break; + case MSR_TSC_ADJUST: has_msr_tsc_adjust =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D MSR_IA32_TSCDEADLINE) { + break; + case MSR_IA32_TSCDEADLINE: has_msr_tsc_deadline =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D MSR_IA32_SMBASE) { + break; + case MSR_IA32_SMBASE: has_msr_smbase =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D MSR_IA32_MISC_ENABLE) { + break; + case MSR_IA32_MISC_ENABLE: has_msr_misc_enable =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D MSR_IA32_BNDCFGS) { + break; + case MSR_IA32_BNDCFGS: has_msr_bndcfgs =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D MSR_IA32_XSS) { + break; + case MSR_IA32_XSS: has_msr_xss =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D HV_X64_MSR_CRASH_CTL) { + break;; + case HV_X64_MSR_CRASH_CTL: has_msr_hv_crash =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D HV_X64_MSR_RESET) { + break; + case HV_X64_MSR_RESET: has_msr_hv_reset =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D HV_X64_MSR_VP_INDEX) { + break; + case HV_X64_MSR_VP_INDEX: has_msr_hv_vpindex =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D HV_X64_MSR_VP_RUNTIME)= { + break; + case HV_X64_MSR_VP_RUNTIME: has_msr_hv_runtime =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D HV_X64_MSR_SCONTROL) { + break; + case HV_X64_MSR_SCONTROL: has_msr_hv_synic =3D true; - continue; - } - if (kvm_msr_list->indices[i] =3D=3D HV_X64_MSR_STIMER0_CON= FIG) { + break; + case HV_X64_MSR_STIMER0_CONFIG: has_msr_hv_stimer =3D true; - continue; + break; } + } } =20 --=20 2.9.3 From nobody Sat May 4 15:16:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1501838739983960.6873728290984; Fri, 4 Aug 2017 02:25:39 -0700 (PDT) Received: from localhost ([::1]:49804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddYrR-0003ra-T2 for importer@patchew.org; Fri, 04 Aug 2017 05:25:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddYq8-0002aD-9r for qemu-devel@nongnu.org; Fri, 04 Aug 2017 05:24:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddYq5-0001Rm-6T for qemu-devel@nongnu.org; Fri, 04 Aug 2017 05:24:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41272) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddYq5-0001RG-0E for qemu-devel@nongnu.org; Fri, 04 Aug 2017 05:24:13 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3135A883C2; Fri, 4 Aug 2017 09:14:11 +0000 (UTC) Received: from dhcp-1-107.brq.redhat.com (ovpn-204-166.brq.redhat.com [10.40.204.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0AF97D68D; Fri, 4 Aug 2017 09:14:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3135A883C2 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=lprosek@redhat.com From: Ladi Prosek To: qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Fri, 4 Aug 2017 11:14:02 +0200 Message-Id: <20170804091403.13478-3-lprosek@redhat.com> In-Reply-To: <20170804091403.13478-1-lprosek@redhat.com> References: <20170804091403.13478-1-lprosek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 04 Aug 2017 09:14:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] i386/kvm: set tsc_khz before configuring Hyper-V CPUID 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: pbonzini@redhat.com, mtosatti@redhat.com, rkrcmar@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Timing-related Hyper-V enlightenments will benefit from knowing the final tsc_khz value. This commit just moves the code in preparation for further changes. Signed-off-by: Ladi Prosek --- target/i386/kvm.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index ed119ca..77b6373 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -695,6 +695,25 @@ int kvm_arch_init_vcpu(CPUState *cs) =20 cpuid_i =3D 0; =20 + r =3D kvm_arch_set_tsc_khz(cs); + if (r < 0) { + goto fail; + } + + /* vcpu's TSC frequency is either specified by user, or following + * the value used by KVM if the former is not present. In the + * latter case, we query it from KVM and record in env->tsc_khz, + * so that vcpu's TSC frequency can be migrated later via this field. + */ + if (!env->tsc_khz) { + r =3D kvm_check_extension(cs->kvm_state, KVM_CAP_GET_TSC_KHZ) ? + kvm_vcpu_ioctl(cs, KVM_GET_TSC_KHZ) : + -ENOTSUP; + if (r > 0) { + env->tsc_khz =3D r; + } + } + /* Paravirtualization CPUIDs */ if (hyperv_enabled(cpu)) { c =3D &cpuid_data.entries[cpuid_i++]; @@ -961,25 +980,6 @@ int kvm_arch_init_vcpu(CPUState *cs) } } =20 - r =3D kvm_arch_set_tsc_khz(cs); - if (r < 0) { - goto fail; - } - - /* vcpu's TSC frequency is either specified by user, or following - * the value used by KVM if the former is not present. In the - * latter case, we query it from KVM and record in env->tsc_khz, - * so that vcpu's TSC frequency can be migrated later via this field. - */ - if (!env->tsc_khz) { - r =3D kvm_check_extension(cs->kvm_state, KVM_CAP_GET_TSC_KHZ) ? - kvm_vcpu_ioctl(cs, KVM_GET_TSC_KHZ) : - -ENOTSUP; - if (r > 0) { - env->tsc_khz =3D r; - } - } - if (cpu->vmware_cpuid_freq /* Guests depend on 0x40000000 to detect this feature, so only exp= ose * it if KVM exposes leaf 0x40000000. (Conflicts with Hyper-V) */ --=20 2.9.3 From nobody Sat May 4 15:16:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1501838587404460.0540634617264; Fri, 4 Aug 2017 02:23:07 -0700 (PDT) Received: from localhost ([::1]:49598 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddYoz-0001Ot-MM for importer@patchew.org; Fri, 04 Aug 2017 05:23:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddYnl-0000iO-6s for qemu-devel@nongnu.org; Fri, 04 Aug 2017 05:21:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddYni-0008Jr-1l for qemu-devel@nongnu.org; Fri, 04 Aug 2017 05:21:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51202) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddYnh-0008Ip-Rg for qemu-devel@nongnu.org; Fri, 04 Aug 2017 05:21:45 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2791D4A6E8; Fri, 4 Aug 2017 09:14:13 +0000 (UTC) Received: from dhcp-1-107.brq.redhat.com (ovpn-204-166.brq.redhat.com [10.40.204.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89A6952FBC; Fri, 4 Aug 2017 09:14:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2791D4A6E8 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=lprosek@redhat.com From: Ladi Prosek To: qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Fri, 4 Aug 2017 11:14:03 +0200 Message-Id: <20170804091403.13478-4-lprosek@redhat.com> In-Reply-To: <20170804091403.13478-1-lprosek@redhat.com> References: <20170804091403.13478-1-lprosek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 04 Aug 2017 09:14:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/3] i386/kvm: advertise Hyper-V frequency MSRs 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: pbonzini@redhat.com, mtosatti@redhat.com, rkrcmar@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" As of kernel commit eb82feea59d6 ("KVM: hyperv: support HV_X64_MSR_TSC_FREQ= UENCY and HV_X64_MSR_APIC_FREQUENCY"), KVM supports two new MSRs which are requir= ed for nested Hyper-V to read timestamps with RDTSC + TSC page. This commit makes QEMU advertise the MSRs with CPUID.40000003H:EAX[11] and CPUID.40000003H:EDX[8] as specified in the Hyper-V TLFS and experimentally verified on a Hyper-V host. The feature is enabled with the existing hv-tim= e CPU flag, and only if the TSC frequency is stable across migration and known. Signed-off-by: Ladi Prosek --- target/i386/kvm.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 77b6373..7e484a7 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -89,6 +89,7 @@ static bool has_msr_hv_vpindex; static bool has_msr_hv_runtime; static bool has_msr_hv_synic; static bool has_msr_hv_stimer; +static bool has_msr_hv_frequencies; static bool has_msr_xss; =20 static bool has_msr_architectural_pmu; @@ -631,7 +632,17 @@ static int hyperv_handle_properties(CPUState *cs) if (cpu->hyperv_time) { env->features[FEAT_HYPERV_EAX] |=3D HV_X64_MSR_HYPERCALL_AVAILABLE; env->features[FEAT_HYPERV_EAX] |=3D HV_X64_MSR_TIME_REF_COUNT_AVAI= LABLE; - env->features[FEAT_HYPERV_EAX] |=3D 0x200; + env->features[FEAT_HYPERV_EAX] |=3D HV_X64_MSR_REFERENCE_TSC_AVAIL= ABLE; + if (has_msr_hv_frequencies + /* TSC clock must be stable and known for this feature. */ + && ((env->features[FEAT_8000_0007_EDX] & CPUID_APM_INVTSC) + || env->user_tsc_khz !=3D 0) + && env->tsc_khz !=3D 0) { + + env->features[FEAT_HYPERV_EAX] |=3D HV_X64_ACCESS_FREQUENCY_MS= RS; + env->features[FEAT_HYPERV_EDX] |=3D + HV_FEATURE_FREQUENCY_MSRS_AVAILABLE; + } } if (cpu->hyperv_crash && has_msr_hv_crash) { env->features[FEAT_HYPERV_EDX] |=3D HV_X64_GUEST_CRASH_MSR_AVAILAB= LE; @@ -1127,6 +1138,9 @@ static int kvm_get_supported_msrs(KVMState *s) case HV_X64_MSR_STIMER0_CONFIG: has_msr_hv_stimer =3D true; break; + case HV_X64_MSR_TSC_FREQUENCY: + has_msr_hv_frequencies =3D true; + break; } =20 } --=20 2.9.3