From nobody Fri May 3 00:25:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600788155; cv=none; d=zohomail.com; s=zohoarc; b=AnYCdea8JAvOqX0tguemmEtIZg1PX5draiydStqB+O/4O9FF+vYaoT/4ihn0RGkv6aaCW1O94R485/bD8uZcLMiLMNNCQOyPsjn1+mwvxYeWyCWq9t9f88WdsFoIbXmT9I9h09J9FyCFTVmbAMtnqADVFeemmoUnzh2JyIOmmAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600788155; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=hxahp7jlcV8KWl44LwjwrRaKzzX7zcc0K4C9kwUJ3qI=; b=PkbQ4oHBKf/FHd7mvgXXJ4AG6logjSs+Kr54kt9p+7wzrz/4AlnY9t0zqXNOEHmXQktKD/fjXEXKI4EOt8qjRRTJKdrX90v/6eDXB0yodj3CpoSqoamZ3xFHr/fBZu2Cu/QDjTBcG93KJrz1RL8ab3C13FQjuLtKDyrIP4EOETc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600788155868361.4534485289771; Tue, 22 Sep 2020 08:22:35 -0700 (PDT) Received: from localhost ([::1]:48674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kKk7m-00028f-Kr for importer@patchew.org; Tue, 22 Sep 2020 11:22:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKk53-0000jt-MZ for qemu-devel@nongnu.org; Tue, 22 Sep 2020 11:19:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kKk50-0006XD-GQ for qemu-devel@nongnu.org; Tue, 22 Sep 2020 11:19:45 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-9-laZ-QeasMrq61p0yVjdIiQ-1; Tue, 22 Sep 2020 11:19:39 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED9C71018721; Tue, 22 Sep 2020 15:19:37 +0000 (UTC) Received: from vitty.brq.redhat.com (unknown [10.40.193.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19E6D60C05; Tue, 22 Sep 2020 15:19:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600787981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hxahp7jlcV8KWl44LwjwrRaKzzX7zcc0K4C9kwUJ3qI=; b=LUDapqRgZkAVAEYQUCQHOBzu5BcQMWxq29IE+CgSZFY9LZghMZFD0UQblQBLojlrZUuSvd sjyZRoNLi2yEUOl5fsuOul54cikfCch+mn6kX+APPkP7DxVGcszyFrsqtvJGX7Gx7/wNft UN1uS/xrvNwD+mO4cTu7cHluxfib04I= X-MC-Unique: laZ-QeasMrq61p0yVjdIiQ-1 From: Vitaly Kuznetsov To: qemu-devel@nongnu.org Subject: [PATCH v2] target/i386: always create kvmclock device Date: Tue, 22 Sep 2020 17:19:34 +0200 Message-Id: <20200922151934.899555-1-vkuznets@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vkuznets@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=vkuznets@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/22 00:31:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.455, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Antoine Damhet , Paolo Bonzini , Marcelo Tosatti , Eduardo Habkost , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" QEMU's kvmclock device is only created when KVM PV feature bits for kvmclock (KVM_FEATURE_CLOCKSOURCE/KVM_FEATURE_CLOCKSOURCE2) are exposed to the guest. With 'kvm=3Doff' cpu flag the device is not created and we don't call KVM_GET_CLOCK/KVM_SET_CLOCK upon migration. It was reported that without these call at least Hyper-V TSC page clocksouce (which can be enabled independently) gets broken after migration. Switch to creating kvmclock QEMU device unconditionally, it seems to always make sense to call KVM_GET_CLOCK/KVM_SET_CLOCK on migration. Use KVM_CAP_ADJUST_CLOCK check instead of CPUID feature bits. Reported-by: Antoine Damhet Suggested-by: Paolo Bonzini Signed-off-by: Vitaly Kuznetsov Tested-by: Antoine Damhet --- hw/i386/kvm/clock.c | 7 +++++-- hw/i386/microvm.c | 2 +- hw/i386/pc.c | 1 + hw/i386/pc_piix.c | 7 +++++-- hw/i386/pc_q35.c | 5 ++++- include/hw/i386/pc.h | 3 +++ include/hw/kvm/clock.h | 4 ++-- target/i386/kvm.c | 5 +++++ target/i386/kvm_i386.h | 1 + 9 files changed, 27 insertions(+), 8 deletions(-) diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index 64283358f91d..30cf53393ee1 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -328,11 +328,14 @@ static const TypeInfo kvmclock_info =3D { }; =20 /* Note: Must be called after VCPU initialization. */ -void kvmclock_create(void) +void kvmclock_create(bool create_always) { X86CPU *cpu =3D X86_CPU(first_cpu); =20 - if (kvm_enabled() && + if (!kvm_enabled() || !kvm_has_adjust_clock()) + return; + + if (create_always || cpu->env.features[FEAT_KVM] & ((1ULL << KVM_FEATURE_CLOCKSOURCE) | (1ULL << KVM_FEATURE_CLOCKSOURCE2))= ) { sysbus_create_simple(TYPE_KVM_CLOCK, -1, NULL); diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 81d0888930d1..fd0b84109154 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -119,7 +119,7 @@ static void microvm_devices_init(MicrovmMachineState *m= ms) =20 ioapic_init_gsi(gsi_state, "machine"); =20 - kvmclock_create(); + kvmclock_create(true); =20 for (i =3D 0; i < VIRTIO_NUM_TRANSPORTS; i++) { sysbus_create_simple("virtio-mmio", diff --git a/hw/i386/pc.c b/hw/i386/pc.c index d11daacc23cf..0e036ef9c15f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1956,6 +1956,7 @@ static void pc_machine_class_init(ObjectClass *oc, vo= id *data) pcmc->acpi_data_size =3D 0x20000 + 0x8000; pcmc->linuxboot_dma_enabled =3D true; pcmc->pvh_enabled =3D true; + pcmc->kvmclock_create_always =3D true; assert(!mc->get_hotplug_handler); mc->get_hotplug_handler =3D pc_get_hotplug_handler; mc->hotplug_allowed =3D pc_hotplug_allowed; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 32b1453e6a82..1a68338c737b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -158,8 +158,8 @@ static void pc_init1(MachineState *machine, =20 x86_cpus_init(x86ms, pcmc->default_cpu_version); =20 - if (kvm_enabled() && pcmc->kvmclock_enabled) { - kvmclock_create(); + if (pcmc->kvmclock_enabled) { + kvmclock_create(pcmc->kvmclock_create_always); } =20 if (pcmc->pci_enabled) { @@ -440,11 +440,14 @@ DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL, =20 static void pc_i440fx_5_1_machine_options(MachineClass *m) { + PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); + pc_i440fx_5_2_machine_options(m); m->alias =3D NULL; m->is_default =3D false; compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); + pcmc->kvmclock_create_always =3D false; } =20 DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 0cb9c18cd44d..0dd59bd765b1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -185,7 +185,7 @@ static void pc_q35_init(MachineState *machine) =20 x86_cpus_init(x86ms, pcmc->default_cpu_version); =20 - kvmclock_create(); + kvmclock_create(pcmc->kvmclock_create_always); =20 /* pci enabled */ if (pcmc->pci_enabled) { @@ -366,10 +366,13 @@ DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL, =20 static void pc_q35_5_1_machine_options(MachineClass *m) { + PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); + pc_q35_5_2_machine_options(m); m->alias =3D NULL; compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); + pcmc->kvmclock_create_always =3D false; } =20 DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL, diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index fe52e165b27c..6b22671434b9 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -118,6 +118,9 @@ typedef struct PCMachineClass { =20 /* use PVH to load kernels that support this feature */ bool pvh_enabled; + + /* create kvmclock device even when KVM PV features are not exposed */ + bool kvmclock_create_always; } PCMachineClass; =20 #define TYPE_PC_MACHINE "generic-pc-machine" diff --git a/include/hw/kvm/clock.h b/include/hw/kvm/clock.h index 81c66b230207..7994071c4fee 100644 --- a/include/hw/kvm/clock.h +++ b/include/hw/kvm/clock.h @@ -15,11 +15,11 @@ =20 #ifdef CONFIG_KVM =20 -void kvmclock_create(void); +void kvmclock_create(bool create_always); =20 #else /* CONFIG_KVM */ =20 -static inline void kvmclock_create(void) +static inline void kvmclock_create(bool create_always) { } =20 diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 4a8b3a41c1bc..20b31b65307b 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -143,6 +143,11 @@ bool kvm_has_adjust_clock_stable(void) return (ret =3D=3D KVM_CLOCK_TSC_STABLE); } =20 +bool kvm_has_adjust_clock(void) +{ + return kvm_check_extension(kvm_state, KVM_CAP_ADJUST_CLOCK); +} + bool kvm_has_exception_payload(void) { return has_exception_payload; diff --git a/target/i386/kvm_i386.h b/target/i386/kvm_i386.h index 064b8798a26c..0fce4e51d2d6 100644 --- a/target/i386/kvm_i386.h +++ b/target/i386/kvm_i386.h @@ -34,6 +34,7 @@ =20 bool kvm_allows_irq0_override(void); bool kvm_has_smm(void); +bool kvm_has_adjust_clock(void); bool kvm_has_adjust_clock_stable(void); bool kvm_has_exception_payload(void); void kvm_synchronize_all_tsc(void); --=20 2.25.4