From nobody Mon Apr 29 10:09:58 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522429571232468.73136883099426; Fri, 30 Mar 2018 10:06:11 -0700 (PDT) Received: from localhost ([::1]:53701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1xTe-0005Tj-D4 for importer@patchew.org; Fri, 30 Mar 2018 13:06:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1xQ1-0002i5-8k for qemu-devel@nongnu.org; Fri, 30 Mar 2018 13:02:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1xPw-0006wG-Sg for qemu-devel@nongnu.org; Fri, 30 Mar 2018 13:02:25 -0400 Received: from mail-he1eur01on0711.outbound.protection.outlook.com ([2a01:111:f400:fe1e::711]:39856 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f1xPw-0006si-Kg for qemu-devel@nongnu.org; Fri, 30 Mar 2018 13:02:20 -0400 Received: from rkaganb.sw.ru (195.214.232.6) by AM5PR0801MB1970.eurprd08.prod.outlook.com (2603:10a6:203:4b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.10; Fri, 30 Mar 2018 17:02:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=eMIAoanFIv3GSCsNhMuGWy3IDQpgs9UONuqqTpmQujc=; b=hXB0OF42xxrgysh0fkcupqDneS1ixvYC+bD7aqezZr0529P6KVh+C0EGUwEF2u3MqAnxlUXxyAQG9S7MHD3k/7/P2SNCJblqI172CFRdnVQ5F5fsOjk3qhRhONwh91O/hkbHnqSU7/1BMw6/mGbhT8fjXI1382UrOsEj+SBfMkQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rkagan@virtuozzo.com; From: Roman Kagan To: qemu-devel@nongnu.org, Paolo Bonzini , Eduardo Habkost , Vitaly Kuznetsov Date: Fri, 30 Mar 2018 20:02:08 +0300 Message-Id: <20180330170209.20627-2-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180330170209.20627-1-rkagan@virtuozzo.com> References: <20180330170209.20627-1-rkagan@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0501CA0036.eurprd05.prod.outlook.com (2603:10a6:3:1a::46) To AM5PR0801MB1970.eurprd08.prod.outlook.com (2603:10a6:203:4b::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 21b8bafb-03a0-497e-7170-08d5965ffe93 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0801MB1970; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1970; 3:4iB6ZW9uH5m9cxagxyAerBdRHD9mAfTwhG6VJdj1uKNu9jaQkSdo4rBcu1zUvtFIoK3wLJRRKhFx4YMGHqk+vnvNeLVsAWQmK+Lf76949Y88jLQRFxIg8AanaSCqjyYZ0k1AzGHPB4cUn0NsJ9J/+N42ZTUqV43OjgAUgv7Llj6BTatleZuZfu3fzqV1XIOVXllTjlQ85yXNyyzTMI0LUAj3bVbvEN8Gcmu88dduoxwLEbo/QS7saIv8QlnHdXqs; 25:bNbS1hbtVD3i8u+eD07XIc3VfGgG6WALa5w0Kj6n6stuZXDpGJePUYuvQCPp7uW5wf0R/X4nu1UIdNgM0vkge/qiPazQF62OGcilxAkj3wNplDJGrskJkh9IzxwkHKQhuv+7XjNdMcvf4gddx2ismUJesnelw/5MoL6jC6/N9itSpaxWoOPCdeytYEcfxghzscFJHiqjxxIc9/FaUx0PqVijZfPiKWb5CyeZHr2cLMnRgfa1LKLeXSEsahW/cfOM5aI7F64aVkRWGji8mRdWyjWw2Alv5ANS+gcx8YlLj6KwbHbb1YNWjwEET3cOKZ5IiXRSFeldSdgqdLOPIln5fg==; 31:LWUOXlTfslYihi2J5J7f1ksTR5tOm4+0T59ghOXmGLuTxiLHUBEVtPYwZMKbudjNHysQO7en6+Gy3frd595TzD3FfkBPsOGELzkrkorNxw41kwNrQotff6qpsYDWMi2Xbub6fnMDvOz5iIJZdYi1bC8HnDSgcmd0NQKR9v+Xqk1CwqHhs053n8Nz1v/EpUR5q9Gw25mWNS/g/85zb0b43PIfNcv8a+idwFDzQh8KBNE= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1970: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1970; 20:9oKY+95/edc089JHI6drFbE6nw0S/WT91rPbyxNPm7/VCpQFQ5ay8F6754wI0vmri+LSGtm4OcHtclG5XtyzdswikYq7H5jYMOEODatJwd7XUAfc0y92qgnPKNQRjqBFWM9ZpHSgzKGyjHaqrFMnbVA96V77QuN25ppSksOzpjB2F9efiMjABZt3ndQkXxkV2OxpKW3lkKiGJuGzdPZmgWV8npibYG4WoKmwnVylt4xswxphdBAU409X6Hk1OYpu8hDci8CsqUExMS22sE1C5wYT5Ckhs3JBLOGp6AId0F95uakU0dceDn/fube10h1k9VKR0rJxVaVqPYwMnzslRkkeKTXQ3rGCdHoFI1+ESsUvy1jPF0y+s+mFD5UmsOK2PhFxqqpeesE/Y7B5LYGmiLgtNxAMtK6KbYTFrpuR4dmt285R0Zj0suguJ+wB8Tm/BNNYrYd0coDG57cUWSHamt7v53CvMdKzsdxg+yiB22KfXY4w690HXm4xeg9rhSWl; 4:rWLulxW+6eVz+rFK9sQqxIIpMh/YtmAFWMwHcGwK3zukzoNvVu2YeSSLAGerpGzzM+zC9LmWojui+aI059l5mt9L7ExP12AApz+yV1tDXEnqfnMw/upaEBBO3zaeBFtNsCTBgYGV3Y4jo7F1svA8peZFeEjRyauYkS96gDiahH4O3rJu+lJxXg/E4OFCDUPzGqC13Nw2s0vXMqwgwJHcK8WfsbAZGtbtNodPn/tYbzzRgKyo+Hhubm934YP9S7+dT3eedfnKiDyAATqfEweQyg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(10201501046)(93006095)(93001095)(6041310)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM5PR0801MB1970; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0801MB1970; X-Forefront-PRVS: 06274D1C43 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39840400004)(396003)(346002)(366004)(376002)(39380400002)(189003)(199004)(6486002)(478600001)(386003)(59450400001)(52116002)(69596002)(51416003)(53936002)(97736004)(76176011)(68736007)(5660300001)(6506007)(105586002)(81166006)(50466002)(8936002)(1076002)(36756003)(305945005)(106356001)(2906002)(486005)(47776003)(6512007)(66066001)(16586007)(486005)(3846002)(48376002)(7736002)(476003)(11346002)(2616005)(316002)(50226002)(446003)(956004)(8676002)(25786009)(86362001)(110136005)(55236004)(6666003)(53416004)(26005)(6116002)(16526019)(186003)(81156014); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1970; H:rkaganb.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; 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; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1970; 23:KmMv1nZmaS/viYyctNFiipG9uQ9HJZigjd5kojr?= =?us-ascii?Q?/UacfPj2RzDnU2oZKdmdldrLAqMPnhjv3BuXL3pjFYmXHx4jwCJ+mTae/xAo?= =?us-ascii?Q?a+aewYozsLO5gJVFZ/f4bJJGO6T7/MMxFBemxcxtf2/uoDrk9i+mdstNp7e4?= =?us-ascii?Q?B+DBq6CqFhA8U8sutPhhjMktiSwzXF/ZryQHAXf6WEWUIbI1OR7bnNGC84zB?= =?us-ascii?Q?SteOUkOUmgRcNTpdyqHRdST6QnW7BVo9GS7LIQE5uyKU/NzRJun7WEQNnOav?= =?us-ascii?Q?b6GXK0kas5Zr+xdCkP4Uv2/IZGm0uZb+pG6vKN1P+GZx8+dVn7lk2Rm4mmWh?= =?us-ascii?Q?woCzTw33AkDrDv15H2KxLzfAKmxelzu/tr0ldJGcdOse+e5OiYeLXxa3UFl5?= =?us-ascii?Q?eEqGwT3W+j6CjdWZ+CaTnMyCCHgB9RwxhPbu2zsAwgilmkQPGK9DKrCea6Xq?= =?us-ascii?Q?wRy8Gn5bOVWYBbmrFM1VmQiwuYch+ZvNAWyOezxV9P+9CfIpFk3cR+wRfNdz?= =?us-ascii?Q?jYNHhDnRUmM1+1KqKTqa5bUtue4zXHW8k/WMQv5xDdaQXgQaWrkItSA0sCSU?= =?us-ascii?Q?xl0ei7jSSNzSEIg8DS7a19a6un6NraJjBgPdqfJef3Ff9SYEOrRU+/ew0wdj?= =?us-ascii?Q?/nvZIkfC1SNV8Np1ldxI2JukUX3ixd3DFPFgryqFPjjHH5DTcdKvEQSux6BW?= =?us-ascii?Q?lz7VlEylz9iFmQCI67rar7aCm8tTPc/3o3zsa+9cu9F3v0lhPCWroMX7MCt6?= =?us-ascii?Q?rwnsC0KsGWUNLFPTg5DQR4aZCgq5C01DwRgBumL7Tcsgspom1RA+y0jClI40?= =?us-ascii?Q?Z5ycscdpPHwCkcH80pa0f/XZZUNCFwQ80uTJ64O9aZBw/z3lvZ02ITQ2myGP?= =?us-ascii?Q?zq+LQnusTQKtY5BdCr3UHjAHU0cCgAOWRSje33rbJ4ZBZvaKcJf1iB1RvCPv?= =?us-ascii?Q?rS5e8yYritzsWbshSDPJJl68PAUvWf8iRUnd1+VjBvIqQeCZfN1DDVj64kfG?= =?us-ascii?Q?7CMTs6AGd+WU49N6MQvW3tkSZ31yJlE23/RjAsVgXaQdxLvfNvsfx/etTt8S?= =?us-ascii?Q?AWwYWkzSiMOA6XEQr6/FIfEApc5LhpMSYku6srzLxt9VaRFEwgauRgNpO/kx?= =?us-ascii?Q?GMDafPspcUy7Cocj12PDK1jrt/Kwb+Lm/O12QpNoUZazQi9gg2QOHMyMTKwr?= =?us-ascii?Q?XQJbSzFwir8i+TcOtTg5h0gd3Iu10vaEH2d2qgbPWSmj8Xw29m7ssXh5Uvdp?= =?us-ascii?Q?Kmhg2tlzEYVwlVwhCSiqrVRGHhYPF3331pp90ZRH94nVzh8B7vtrOjXBH4wU?= =?us-ascii?Q?DkQ=3D=3D?= X-Microsoft-Antispam-Message-Info: ta15SqaMkYiLlPyQDKI126128Uye78FwZqbxj0BVz5JdP+0VWpc0MBGtMlHehh16Gb+K68FG6u5BgVd5Xly9zS0oWCYQXkmFmTyv7nqrXGoGaIrz5hQyojhpI3YkJQe5uLqPk3CvbmDxyo6HmwAOWdhFOY4Rl4zZiCilvrlb0t8mvLhELqSb31AbjY2CtdR+ X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1970; 6:JchBS6BCg5iNB+KFBD+nBvKcMk09heDZRKINF0nmix42miPz84LZwSVLv3poW2S0rbbL5Uhbm34xpdd9iYZYwhAHPKtHf/DpeUJKFf/lluuStrIf7Sea6ahEoDNjSghOLSeZWtapQxRk8wm+FrJXPEOFUFKQO+XGjk/wUaPP8nlPgi6lcRbXceVbCnYIM6g4KfrjsVIRhnPeKdgkmiyNM+/ggWfnn4cjwODU75I9YAuhGqk8SV6st/o/qixD374e43DThiPGEgp2r2UnGYI5K6eHOaYtYxjkydnKPFv+voIobheK+m1FXEnPqQXy5NJCytTpGnxOq1C0TQcz8p8C5m7A/eUp+iNbT1fh6r9fQRVJBWvo3S0AZHLxdt+U6WgG22uzegtz6Uw1YbeOOCHJ2S41SpnTOaRqDmoSAmg+uHm7E9gQol7YeKMCYQ0Q80miG0roRz6dRvmEeJTmLYJU2g==; 5:Qd90A53WIM8ud3HjuHZORjbdxtwwlWUVNtnfC4+YH/nVSt+rVTIfxfqxaxHnINfEWmF9h49roNNgTo8csS9OZu9LE/UboQdxCKj52PP89emvCxhwioOvWTtifK4sCs/uD8sLsqfc90aw8lGJhfkOF1ByuYSDST81J21wnc96LnU=; 24:jEiby9sWva3loLbd6QBi/X919bow/f8y3s0sz2wsHOUAXwXe+Tf9+MY4Og31rC19b1ACwBgukdFB9hyk9od9jQyu6U73Z06DoJDoeQSkN2k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1970; 7:BizEwJW9A6yOZxVyYfDOFBomNJI1qHQKaXazUELY0lGV80NU5gvuWBjqb3+aYdN52Su36h1Caa6NavHDdPAJjMqvR2FHSmUHrguHcitx0455Y1db2xZ+jL9nUCYKb37X9F9ACLELotV5twel3KX/TZI1Ubk0rFS9mEd/0+Wa7WVqFBNlM9GiK/GcJbPHHE4gJrpGvApCb7nS2JYMoT2ADf4tC7Z5ykvq7RkqB3EYUPv05LAO190MToxT2/0aFIif; 20:dK+H83jjz8d2bTvTlP6YA7CfFo4Ry+NicOjlhl6JUIHIywmKyQO2TxcbsSKyC6AHBz6iGqPR+0n8ahGbwG91qBpen1q1jra5JqOl92/s1Xt9TYJDVQXGPCh/9nWoV3IMdS36jFC68C2rJ3T63H7CpRw8zHNPbQhfcw26ZTtXUdo= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2018 17:02:17.6475 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 21b8bafb-03a0-497e-7170-08d5965ffe93 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1970 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe1e::711 Subject: [Qemu-devel] [PATCH for-2.12 v3 1/2] i386/hyperv: add hv-frequencies cpu property 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In order to guarantee compatibility on migration, QEMU should have complete control over the features it announces to the guest via CPUID. However, the availability of Hyper-V frequency MSRs (HV_X64_MSR_TSC_FREQUENCY and HV_X64_MSR_APIC_FREQUENCY) depends solely on the support for them in the underlying KVM. Introduce "hv-frequencies" cpu property (off by default) which gives QEMU full control over whether these MSRs are announced. While at this, drop the redundant check of the cpu tsc frequency, and decouple this feature from hv-time. Signed-off-by: Roman Kagan Reviewed-by: Eduardo Habkost --- v2 -> v3: - no changes v1 -> v2: - indicate what flag requested the feature that can't be enabled in the error message target/i386/cpu.h | 1 + target/i386/cpu.c | 1 + target/i386/kvm.c | 13 +++++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 78db1b833a..1b219fafc4 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1296,6 +1296,7 @@ struct X86CPU { bool hyperv_runtime; bool hyperv_synic; bool hyperv_stimer; + bool hyperv_frequencies; bool check_cpuid; bool enforce_cpuid; bool expose_kvm; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 555ae79d29..1a6b082b6f 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4761,6 +4761,7 @@ static Property x86_cpu_properties[] =3D { DEFINE_PROP_BOOL("hv-runtime", X86CPU, hyperv_runtime, false), DEFINE_PROP_BOOL("hv-synic", X86CPU, hyperv_synic, false), DEFINE_PROP_BOOL("hv-stimer", X86CPU, hyperv_stimer, false), + DEFINE_PROP_BOOL("hv-frequencies", X86CPU, hyperv_frequencies, false), DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true), DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false), DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true), diff --git a/target/i386/kvm.c b/target/i386/kvm.c index d23fff12f5..b35623ae24 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -648,11 +648,16 @@ static int hyperv_handle_properties(CPUState *cs) env->features[FEAT_HYPERV_EAX] |=3D HV_HYPERCALL_AVAILABLE; env->features[FEAT_HYPERV_EAX] |=3D HV_TIME_REF_COUNT_AVAILABLE; env->features[FEAT_HYPERV_EAX] |=3D HV_REFERENCE_TSC_AVAILABLE; - - if (has_msr_hv_frequencies && tsc_is_stable_and_known(env)) { - env->features[FEAT_HYPERV_EAX] |=3D HV_ACCESS_FREQUENCY_MSRS; - env->features[FEAT_HYPERV_EDX] |=3D HV_FREQUENCY_MSRS_AVAILABL= E; + } + if (cpu->hyperv_frequencies) { + if (!has_msr_hv_frequencies) { + fprintf(stderr, "Hyper-V frequency MSRs " + "(requested by 'hv-frequencies' cpu flag) " + "are not supported by kernel\n"); + return -ENOSYS; } + env->features[FEAT_HYPERV_EAX] |=3D HV_ACCESS_FREQUENCY_MSRS; + env->features[FEAT_HYPERV_EDX] |=3D HV_FREQUENCY_MSRS_AVAILABLE; } if (cpu->hyperv_crash && has_msr_hv_crash) { env->features[FEAT_HYPERV_EDX] |=3D HV_GUEST_CRASH_MSR_AVAILABLE; --=20 2.14.3 From nobody Mon Apr 29 10:09:58 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522429559522491.63420021611284; Fri, 30 Mar 2018 10:05:59 -0700 (PDT) Received: from localhost ([::1]:53691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1xTS-0005MU-Nu for importer@patchew.org; Fri, 30 Mar 2018 13:05:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1xQ1-0002i4-83 for qemu-devel@nongnu.org; Fri, 30 Mar 2018 13:02:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1xPx-0006xl-ME for qemu-devel@nongnu.org; Fri, 30 Mar 2018 13:02:25 -0400 Received: from mail-he1eur01on0711.outbound.protection.outlook.com ([2a01:111:f400:fe1e::711]:39856 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f1xPx-0006si-55 for qemu-devel@nongnu.org; Fri, 30 Mar 2018 13:02:21 -0400 Received: from rkaganb.sw.ru (195.214.232.6) by AM5PR0801MB1970.eurprd08.prod.outlook.com (2603:10a6:203:4b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.10; Fri, 30 Mar 2018 17:02:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=2lbTUgtKJch9FzHI3y+xgOyLrLRi42ggxjshiIWmvP0=; b=XGHzsUfBajy0HXXdR5KmtT3Vzf+8x6pAhKtCSb7mLsntLdvUyYqek0PUvPIpCcwpDBBiW1ojvpJM8tp3O1RyV965eicA61wRp0g+MFzpVoM100IRkvXe+CJ+E5kp6J8WxOCbGCxbP0+RZ7Y/bRA9uiiaBIUjUGFJvyfu6IjOawA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rkagan@virtuozzo.com; From: Roman Kagan To: qemu-devel@nongnu.org, Paolo Bonzini , Eduardo Habkost , Vitaly Kuznetsov Date: Fri, 30 Mar 2018 20:02:09 +0300 Message-Id: <20180330170209.20627-3-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180330170209.20627-1-rkagan@virtuozzo.com> References: <20180330170209.20627-1-rkagan@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0501CA0036.eurprd05.prod.outlook.com (2603:10a6:3:1a::46) To AM5PR0801MB1970.eurprd08.prod.outlook.com (2603:10a6:203:4b::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a4cffa49-c751-44ff-cea6-08d5965ffef3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0801MB1970; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1970; 3:E5c+Z2/SFcK2ChVD6PMR/vOSg/TbnJD+kyfMfKzMopiGhYttkjQ1888ZykbQrgV0JRXeqY7n79NPl0ltcaFwd7aiHdQPF41m7FWtRg6Mp5Tf/hum5IJXs+W8r7I7yt+1Pttjr5cB5uv2KT7kfIodrWdLA6i7mb685RyEXybOgmN4VjYaNoVOIAf0Ujc11AVpdPoiSB2VW2DOJ7BRkZtpoanRsO+1A3hD94Edhz2EnaFInYT7BK63FoT8qN3brRNl; 25:tNTd668mcLck+h8qCASjeq9lmpmQfTPVKlh1J9XnmsTETuQMiZsLeT1Fe9xTOhuxSRmpubF8hxqpLVfW3BdUxHAN3X+WxZkC1RFvSTgTaw1suYsz8AYN/Zc3H3SU2tTPGNOTr5gNG9rXQldmTm/xQaiO1e/i2BF9PJQwPIuuVWDuB56//bromG8JDJZwzVv8CeAWB5KEL9IgROAdMjVTQTkbudxjQc3j6qkjhsPgyy3Jh1hEFKJjv2AFbpu9CoAptdueaBIFE56OBKNawVsICLkLcera2Ao2qukZN87YZF+p6QKENhXPFz1VBKdePAON15vxh/OpeBP3mS2VmFOenw==; 31:wyM6Dprm9e9cjq/VBvlxt0YsMo2OBF5wXKCaigPgWSBtwc+XGm4pKP2NhVUVdeEnpFAdWpGG0HmFmkYiK577bRHzdJxMWQkQX3wEv8PTu8+VVJkPN6sWOn0uUFt9iR/WgWL5elI87dnjvrIjpmPre1T8PEMxEE9bqnMsGsqzNwez/6vnmn91b6L/X1sXfeQcRR5iXbIJl5bCo/435QXZYPpo30Am9wvgXfGoXujhxyM= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1970: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1970; 20:tVnluCW/RnbdCGLVbZQoYfccDy6XFUrP5Z5DMV48Sjgn2Fwbp3UNWLSv8vHujva2+rKTNgxV0Y+Q0yKEl2rqH7gMig36YtAxZk9uO6iwmQ9j6JUfxL1HBExhdPynWnUvU1RRBsCFr70MCBtmZhpkqHfaZStEDhqIopyFsBZbefkodiJ08CRe1GNIvWmiW19xp52FgnriVtQJf54/NqOLqLdP0FXecHudIqsfBf0Gh6uFO1e126zCrl8EGu4sC1w61oJuDFGCqSBshvcPgJwA7V8Nw3VKZ5BUTX5svc+b116fPpA+nbQ2pf2SccwdEwApA+c1tnYtP0K3agFBJaSHtyAC8+jdYjsXLCicnStXUuJT+U92BAGPdp/u/Y6e7xSCiajZ6Un4f5E7bw/78TSjX9+QZ/yDi02KzIlJ5580hPzV6rYVFdkMJqJgXMffaJNeACT4TJ0I7N9/tKYFwX/kF3uki+jVbuEUlQXE0T+a1gNzUvMBEpM8cpV7s1tV+wfv; 4:HgYEU6USXWWfECuHLm8Ep5awI9DR6NdV8pM0xyPXoCA1N5dAxIp+87YG2exZ4I8DFC2uBjXknWZRnWIOe4n29c/istPNJF+Ec/WoV3vEjZdWA9HSX+W+oBKBKGivtfJURJqRNDjNksCIFDPeS4vkvvX4EzXosF1n5+0NqCeW6lzMRer4K72gjLI1DmrqqxNgwvHuVyTEJwlnTTRyYL4w18dWZF7WZEc6LctmY+TqOIea6FV4lSJHdQY+8njKdqNksM3tuLQjCgofTirIDDfCQQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(10201501046)(93006095)(93001095)(6041310)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM5PR0801MB1970; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0801MB1970; X-Forefront-PRVS: 06274D1C43 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39840400004)(396003)(346002)(366004)(376002)(39380400002)(189003)(199004)(6486002)(478600001)(386003)(59450400001)(52116002)(69596002)(51416003)(53936002)(97736004)(76176011)(68736007)(5660300001)(6506007)(105586002)(81166006)(50466002)(8936002)(1076002)(36756003)(305945005)(106356001)(2906002)(486005)(47776003)(6512007)(66066001)(16586007)(486005)(3846002)(48376002)(7736002)(476003)(11346002)(2616005)(316002)(50226002)(446003)(956004)(8676002)(25786009)(86362001)(110136005)(55236004)(6666003)(53416004)(26005)(6116002)(16526019)(186003)(81156014); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1970; H:rkaganb.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; 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; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1970; 23:EA6hsl5+nZ2PgmPYIzLEbAogn3WC4TGdNUaTW+X?= =?us-ascii?Q?PUue81Udxb2Fl3pNFtHOOKNu1PUa/g8uKRLqn2BhstozVQ5B7kLLJUpn0BW8?= =?us-ascii?Q?tYXzYk1rNc7Wwk8JIVnGKEtO1sCyKHc575H0wnv9HxoCICUfmRqZkXBUCuNI?= =?us-ascii?Q?9R136+eGE+vl6T+QkHg/jBib/L9aEYrNtTkYNyQjDwQ/MLzTOpj+qN8abP5J?= =?us-ascii?Q?LNrh05kV/+9jbAoa6JRCMn0fNWULMHRtNtNO2JS25/E5EKkvLzlOgJUY/Yf2?= =?us-ascii?Q?Q02ugwI7AkWZXRQUpkpq1ocYeU51gBfr09kdlZQDVPF1X/zO/3sAWnkAITTb?= =?us-ascii?Q?Dr4fzuBCmp/rBMTmI5wYkCzE4bkvUZEtqGDZqjODqxth8mecJDQLctj1w8EM?= =?us-ascii?Q?T5/bMfr75yscD3+lJ7cwt5MwVZk4X0sRpN36oBz5kh3umkrflgwJvzZWh9m9?= =?us-ascii?Q?TSyNnFUMRcTooXrppi8GYJ/G1xmuc/MPbu3nKrpzpu/SgPZz/NtxxeNdlnJE?= =?us-ascii?Q?DsrqVu1orTccJcl9yauDRfdu6Lrva9efO3A0/3FEHOW62mNDF8G6l5pnm8YC?= =?us-ascii?Q?uk8/0DtYddt/92Nfb4aHLTYW5TpO3CyjUy6PmhkhUbGm4qfJfeGzHIjIBCx7?= =?us-ascii?Q?Gz5fQmR3bPuJqWY89DBNaJ9mWn+ER++u1scV6nj9pNnk/lDPVPiSZnRMjtA0?= =?us-ascii?Q?hyFvQPlYmWy8of8rzm3y1kE6XV26iLL6+O0TFoVoz7p1/rvyMCn5KdScvKI5?= =?us-ascii?Q?1Pa0nFAx1658OVGAPYwwekuHekWt6lbqIAQv/CPTGUaATL4mjOUOWFKHlMEc?= =?us-ascii?Q?yEcxAUDcPDoPbqnMIizJHIbGTrZMz0WINquxVZ/C3WujTHKO1mm7LP+s9jxP?= =?us-ascii?Q?LpOXQG68XFfMg/ef0Sziw7w9boDHxJbck0JA+Qu20Rayia0qkOJN/oK6m2mn?= =?us-ascii?Q?WuIho0dLvqkvVJPRzdrw+emlycMIFUSpf5s1xONyzNAhGhDRduqUMsyjZHhK?= =?us-ascii?Q?GjDf1mw7tx07u96+Ol3OFxTE9pRusIGXBPg3gjzu/fY1RY6D3ywCJe3yIvHZ?= =?us-ascii?Q?2A/dD7sDtKjG7jhhhf4I+G+NhDgO28/Ha/JfZG/ZwcixRYOeDwlFWrDJLqlM?= =?us-ascii?Q?7M0QTWPOqxcqZOHDGOeaCl+ABEQi5pTkGyIQ4LewoW6Jwv29lxoa7W2tWbu1?= =?us-ascii?Q?pHP5DiF1vGlYT3/mJ6zmfMi7qZ+v1XwKLE4hNLMAkhJbbcCOumQ/piEELugR?= =?us-ascii?Q?ws6sy+FgRtG2MiJHrv+ExUFF4g48YQo99XU6Mj1EewYGj1ZV9bfJD9R7ZKVs?= =?us-ascii?Q?Jeg=3D=3D?= X-Microsoft-Antispam-Message-Info: uJcsaxqURrOmv+fSC4SqZgFij/E9M1ewWHCpVAfiGuYPJZu/p+N5MZVOA4UBlJmRxgd20PB8q9s2D2H2FgK/z6sd3o1F2lrQSbVzCsdutCUFJYmsDETi5Soj2ibmHWVFeHXEtV7+m0zc6qkcNpAVL2cfkCqyhd6Se2V+xJIPVENnUduKe4nkwjhhl0I8IbJi X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1970; 6:N96ei8aZEd+ywtF4y3gHbzsm6k0hN+Wux/rCczbREQ6EpHyLjfe8k6jJZQ1N9Vak4L43T4Iu4Vk57f7IerlzQE5swEN/Y327lCk5qqMD8ssbeoWeRktoY2z7MvBpyi2VyK14ONnt5qXS4/3XOcSIBJJ1gNV9Kq8wpj+jBen0Ne+vTGtQl/OOjqP+OL64j4ZXEhUguh7z8cn73Fm75P+zHNWOY9gVSVj2BDJ68SACgMr76EfwORpLyfICMQV+n1EAN1LVnuYPyKo53xCk87dYubv0JUvg8bqxIfRWCUN6JvU69rABI/hkvDeMWinAWC5+4ruGo6AHeB9MVMD0YaU7QIYSMs0teWC2GumRq7FQoQfzkL5usKNjN+d6zYFOYiQ+pAgYnnXyfMLSMs+6LPkt1s9jiLmz92C0jEmZjWOxm8D+ighG6pfx+9+8KUDWcLb45V9Rv4YO7WcaCM5mlaJtWg==; 5:fkw6IfqePcMtn48xV1qabrbv4eosfvtxuPkzM+sKlB4IJnsz+Fjj1Pgua90KLDgjZJdbiO/GJjQj7pf8n97ouiFCwjwvAHQWs8Vf1ysF4tODyX6LV4T0g8jTLw8Q0e62T1hUkQ58HsUC7Sp/fuBVhw0StFUs6V03siOV8hbnMLo=; 24:rjCmbKC2lhmA5VUMj/UZO2FP2ZraXm40pRaz7rrbU1vizdbLA4Eru+xV/tDCkWEfr5W1CRBqCmR4Zga5MoCLAk/puAsUHaNdSrbKxlD5cMM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1970; 7:wgXIExqEN3csp8zvQKNoySZXxNPW1xAX42o91N192TSaj89GoH7tfGj0ld1K5CJHYNzUqIS+UwqEE53jUpfveNlZkat46q+v4yjM6k5cjZdZURouyFTRhJJ+os2dbSHjs0JSOhNjiAYKAllzBM3qnYmvP6A247/ca2TWDtQxTxmhflcoa8+VH40a7YWzBXR0DXv8JQS9+YI4eFR9airbB7XKvzOEPCBAu8oWOtBuKZ2ge9Gf4NH36TcU6GQQX5Ri; 20:zFwPaQgYt6Yb0Kw5ZcUf2wuofG3mrOGUy/XghYxK2AZkt+zP88sGmmFEKOR+OM6T4yvqkM56SKF49JXcplRgSEQWuBgO8jNVYf3KvkMNNgDtsp0QFeJjs0fj6Nd7PGIjhxGVjptS12KPEfqdn8LF6Gf6MdaCE0kByjhdgI/6Zt8= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2018 17:02:18.2790 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a4cffa49-c751-44ff-cea6-08d5965ffef3 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1970 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe1e::711 Subject: [Qemu-devel] [PATCH for-2.12 v3 2/2] i386/hyperv: error out if features requested but unsupported 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In order to guarantee compatibility on migration, QEMU should have complete control over the features it announces to the guest via CPUID. However, for a number of Hyper-V-related cpu properties, if the corresponding feature is not supported by the underlying KVM, the propery is silently ignored and the feature is not announced to the guest. Refuse to start with an error instead. Signed-off-by: Roman Kagan Reviewed-by: Eduardo Habkost --- v2 -> v3: - include the fix for 'hv-time' missed previously v1 -> v2: - indicate what flag requested the feature that can't be enabled in the error message - fix a typo in the error message for VP_RUNTIME target/i386/kvm.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index b35623ae24..6c49954e68 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -632,11 +632,6 @@ static int hyperv_handle_properties(CPUState *cs) X86CPU *cpu =3D X86_CPU(cs); CPUX86State *env =3D &cpu->env; =20 - if (cpu->hyperv_time && - kvm_check_extension(cs->kvm_state, KVM_CAP_HYPERV_TIME) <=3D 0= ) { - cpu->hyperv_time =3D false; - } - if (cpu->hyperv_relaxed_timing) { env->features[FEAT_HYPERV_EAX] |=3D HV_HYPERCALL_AVAILABLE; } @@ -645,6 +640,12 @@ static int hyperv_handle_properties(CPUState *cs) env->features[FEAT_HYPERV_EAX] |=3D HV_APIC_ACCESS_AVAILABLE; } if (cpu->hyperv_time) { + if (kvm_check_extension(cs->kvm_state, KVM_CAP_HYPERV_TIME) <=3D 0= ) { + fprintf(stderr, "Hyper-V clocksources " + "(requested by 'hv-time' cpu flag) " + "are not supported by kernel\n"); + return -ENOSYS; + } env->features[FEAT_HYPERV_EAX] |=3D HV_HYPERCALL_AVAILABLE; env->features[FEAT_HYPERV_EAX] |=3D HV_TIME_REF_COUNT_AVAILABLE; env->features[FEAT_HYPERV_EAX] |=3D HV_REFERENCE_TSC_AVAILABLE; @@ -659,17 +660,41 @@ static int hyperv_handle_properties(CPUState *cs) env->features[FEAT_HYPERV_EAX] |=3D HV_ACCESS_FREQUENCY_MSRS; env->features[FEAT_HYPERV_EDX] |=3D HV_FREQUENCY_MSRS_AVAILABLE; } - if (cpu->hyperv_crash && has_msr_hv_crash) { + if (cpu->hyperv_crash) { + if (!has_msr_hv_crash) { + fprintf(stderr, "Hyper-V crash MSRs " + "(requested by 'hv-crash' cpu flag) " + "are not supported by kernel\n"); + return -ENOSYS; + } env->features[FEAT_HYPERV_EDX] |=3D HV_GUEST_CRASH_MSR_AVAILABLE; } env->features[FEAT_HYPERV_EDX] |=3D HV_CPU_DYNAMIC_PARTITIONING_AVAILA= BLE; - if (cpu->hyperv_reset && has_msr_hv_reset) { + if (cpu->hyperv_reset) { + if (!has_msr_hv_reset) { + fprintf(stderr, "Hyper-V reset MSR " + "(requested by 'hv-reset' cpu flag) " + "is not supported by kernel\n"); + return -ENOSYS; + } env->features[FEAT_HYPERV_EAX] |=3D HV_RESET_AVAILABLE; } - if (cpu->hyperv_vpindex && has_msr_hv_vpindex) { + if (cpu->hyperv_vpindex) { + if (!has_msr_hv_vpindex) { + fprintf(stderr, "Hyper-V VP_INDEX MSR " + "(requested by 'hv-vpindex' cpu flag) " + "is not supported by kernel\n"); + return -ENOSYS; + } env->features[FEAT_HYPERV_EAX] |=3D HV_VP_INDEX_AVAILABLE; } - if (cpu->hyperv_runtime && has_msr_hv_runtime) { + if (cpu->hyperv_runtime) { + if (!has_msr_hv_runtime) { + fprintf(stderr, "Hyper-V VP_RUNTIME MSR " + "(requested by 'hv-runtime' cpu flag) " + "is not supported by kernel\n"); + return -ENOSYS; + } env->features[FEAT_HYPERV_EAX] |=3D HV_VP_RUNTIME_AVAILABLE; } if (cpu->hyperv_synic) { --=20 2.14.3