From nobody Fri May 3 08:11:23 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 1521810095947545.7077455806457; Fri, 23 Mar 2018 06:01:35 -0700 (PDT) Received: from localhost ([::1]:37987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezMK1-0004u1-1K for importer@patchew.org; Fri, 23 Mar 2018 09:01:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezMH1-0002di-33 for qemu-devel@nongnu.org; Fri, 23 Mar 2018 08:58:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezMGy-000176-Gv for qemu-devel@nongnu.org; Fri, 23 Mar 2018 08:58:23 -0400 Received: from mail-eopbgr20137.outbound.protection.outlook.com ([40.107.2.137]:1764 helo=EUR02-VE1-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 1ezMGy-00015C-8b; Fri, 23 Mar 2018 08:58:20 -0400 Received: from rkaganb.sw.ru (195.214.232.6) by HE1PR0801MB1980.eurprd08.prod.outlook.com (2603:10a6:3:4f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Fri, 23 Mar 2018 12:58:16 +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=45j85V90f5nhbVTrB+Gtcne2xsJ7XbYNNaAXZEpWb+8=; b=K0/8uF3wp8BqRvltgK4+/KNMszMiKARISan61KJOV730QK/v4jX2jeYL8O45LDLzChWLKOFzTHBNKnU3Or/qGFgfZjEVCWOvuklN5lGgxUXRMVRQ9Gfc8np9scAmKQvxWNoH/kT0smqr6YIo3goa6uL80xE5c9JSQ9PgPyPNnvU= 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, 23 Mar 2018 15:58:07 +0300 Message-Id: <20180323125808.4479-2-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180323125808.4479-1-rkagan@virtuozzo.com> References: <20180323125808.4479-1-rkagan@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0340.eurprd05.prod.outlook.com (2603:10a6:7:92::35) To HE1PR0801MB1980.eurprd08.prod.outlook.com (2603:10a6:3:4f::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2234081c-25f4-4228-b759-08d590bdbefb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR0801MB1980; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1980; 3:66ICbT0gfpgO3VBtQse5x+LbKPzHsBXqi2Ct6ee/WsB/irqQjgThXmSMraGLYaovEhYjbRJq7OYJQ2n4WXzTWqP9n3ob1bYzHpI0qsfgmKj6HJGcJsj4Ii2Z0VtfAnEAYZ0AJGhEKX15jd+3Si6wB+c3OrqYJi48k/KQ3yCEvvzqj3hvwnZjtAVewwxCXsPOqcxjR5EHmJQuZk2FWeZSQuGbpdxskWBDBCt6dHYyfSQSs2UIvQRX/s1CVNtJULsv; 25:YhpffbnwBvp/e5pt0kaJCLCaKX09CPa4vE4dS87r2Jkrq+8n889B3BweViy0kNPgshNlNo02XQgGtCsSkRRYt7cSZbDXZwE9zH0pJWFeTwR3CoKRnkfRAYhIc1qMncM3BRBRetTUFhmEtUcICsLPaIRgZaUkhWdE8U3fahXej5LKcUrUTl5lMuH35ZhM4Q3IFmzyIf62Jm5KozN/7r5D45iE2ttTJ3KFQMrrJVElDoz8zIUxEadYOILeOL0o7v2GRYcanDHFYpK/F94s7VoAnOOqsiMKZI4qQeVbcT+gXBUFdNiHbnNEH0bdg5XbiHpzD7AyC45HMzCEVndqND6A8g==; 31:8ze0TkZ5jzwi4Er31g1chyEJtc0LNjY0EM9ve/csLw/U2CwOSzr9VLHYn5kdC0pmLCuirwkb+5M1X3ITugjvZARKvgy/v1FkQpuPDf4v1/Jxm3O7GdJEX2cED2LsA6XXz5Ah227llxCMxNPxRj2l3yegbZJTHYz+JSF4yGfhtHVFPdy48/3ttqpIMb71UxJ4ol/ePM7s7uQaUv++0StCjnUhdJ6Zo54i146/Td+C5CA= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1980: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1980; 20:R/LD9+vZ6CTz7nBfW2nUUCT1LffkKfssk2HJMRoFkZtN4X54qOvFnHFshQ42zvy0INILfmcyZpNwBxKjAY1JzEoK+ml1Acsz3/Plv0zqz1jYmZDizqNpG6CBsqZo8aWeg+h8+V/ZXpwwQGqM/xs++2/lMedlbivDQY+1TipT9wRYMOCzjs5J9XTnB0Qsf2xDQwIa4Dsg0Q6BZWPWmXWbVYHaOfdioBIEHYDvkOH9Juy3TBYj7xr03rnsE6jMA25s2woZTE23AvxdFM79C7Hm144xagA4dZewmJssJPTltfqCMYpJR3RKv6/4qZIe1nCdD43/QTuICe71r+72ivPuBwyAvwxbdX5yujwF33AU4a67mWzGCKqPa26sPM7dXU+L4vyxJvsfaDHnsGhHT0zuLlukwt9erj32ZY/3NHaNbMVzBiNEstUU8IF1twL9sf5oAQyHR0JqpEz8+ubwQsyr7lNM+xLynvZWbfIrUJz15Ro6U69sAue1Y4STvVJmEtvE; 4:I5+z3FdShGC/9O/DRQFaJ8BcTTG45bAn1ylIsdCrluNPahDl97WheHlSEUmHnAzrh4ArHlreDDJlo5gtNXKA2u/9SnOUW418irm7ytutbh9HFTxLU41Aq6wTvEVrpKztyfaiqPxynUNcmxwaW/LSdwmwi5C1GMJoTaUxbGTXhq3QTCRRBIyKiz6oeiQJIh3IOvbGDDXOs5+ONxeJa99m5q0DZ4Dkr6alwM0y9ntpNw1Cqdd5Op8mQHXzbUb128B+YCicvAWH474CSkSNUXOOgw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3231221)(944501327)(52105095)(93006095)(93001095)(3002001)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:HE1PR0801MB1980; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB1980; X-Forefront-PRVS: 0620CADDF3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(376002)(39850400004)(366004)(346002)(39380400002)(199004)(189003)(47776003)(8936002)(2906002)(81156014)(81166006)(53416004)(66066001)(446003)(50226002)(11346002)(7736002)(305945005)(68736007)(386003)(6506007)(8676002)(478600001)(25786009)(1076002)(6666003)(59450400001)(86362001)(52116002)(76176011)(51416003)(4326008)(36756003)(5660300001)(55236004)(26005)(6116002)(3846002)(16586007)(16526019)(316002)(186003)(106356001)(6486002)(53936002)(6512007)(69596002)(105586002)(48376002)(97736004)(110136005)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1980; H:rkaganb.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; 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; HE1PR0801MB1980; 23:PQHR/dm4gRSrbt0Wuz/IaHeWHWdHt+OF/9SsSTx?= =?us-ascii?Q?tKtR0CcXim+daxlEzNqwenqIvpT+mO22P/l/SDGmpxv4bb+3mdc0uRigNzWE?= =?us-ascii?Q?LE+WuD4r7MvQ9gOiD3HVk1kj7/qfSDEcnYaeKtQLNLAyWdCKlz9goBD/0Aoh?= =?us-ascii?Q?C3s4FF4NJBEHzzZIpbC7VXWb8C/bW69CFf6rxm8vkA5o6gJPmFd7rXksabk+?= =?us-ascii?Q?qYwebFv9fuSf686qpZr35ykIyGRLUsGr3lVSjWAhw0VCa0cgD8cz6Eyti1NR?= =?us-ascii?Q?J9o2c24eNlWiuLU4NeXZH1hKkCTafQtp/0oMVAxEsTl/ArglleqvboV6LtJ2?= =?us-ascii?Q?pBctikcnXrayselyrbezZzLq4K9oSw6MoE2KtQ/UT3legOzGxmC7xzV7/Ccj?= =?us-ascii?Q?pFhGzinq1jq019/CHeulZ4wakV9aQdNFiB9k1b2kCFwolSFEDxeUasoJw/6D?= =?us-ascii?Q?4n9SIVqpCDzP3RikZscSXl10f6wQQG2q0FO6hCMpYtWLDFEJpYCXNjzsEdcB?= =?us-ascii?Q?929kDaCS67pFesKAekaFytAucwUZRbHo8wHffQteSTQUvSScGGBG2vkTk1xC?= =?us-ascii?Q?2GxN0Mo5LWA5RWWHL7KWxsJ1Hxqp9S0tzBjdxHB6NbOw/wdsi89Pcx57znt7?= =?us-ascii?Q?22lRvuIKkx+EZBx+Z1FVHWFX7cfbUvGPDWCltFzcMNwss5gNEhlnP5OzWlUJ?= =?us-ascii?Q?QLftKFHkkSywJZIV46DSKqq2/PZkQNUf7UqrwKaIHLmzMOz3RSwXYNMc/hCh?= =?us-ascii?Q?caYxzrx+Rl/cD84S5ny3h1s9ZWLW/oSG6k8QSWdi8IrZk2rlic2QD8yoKoti?= =?us-ascii?Q?kpDZyToitiTc2DwUPgiSOPmWXVHzXIV4b6u0Si2nKKcKLGBF/mf+j5PVwfqI?= =?us-ascii?Q?Sf5nxZ1IUCPLs0wQ7gjjEwi3ctxgOiIAF40J2xl68qFevg50b1koqJ9niX9O?= =?us-ascii?Q?X8EL+ZdgPR9vmViV+YpVjTnvxMXpTZD02dAPe9ttDwidPPVwK0wNBdlSvB4d?= =?us-ascii?Q?WIY7VDoTak95rXDiIzrFy1H0gUs/bMzPW3B9jzSWlxdlnH/Io3CkfBj4bDwV?= =?us-ascii?Q?HwYV51KOakTNNUu+WB78bYe2io/4AjbWHKDn610x/vfpYgqE9OGxasxMi97a?= =?us-ascii?Q?i4T6pI/utKhqKZ2m1fFMoyFsKgbaQ3XIgFmMEZPCkResgtkaV9hgl51IZxsd?= =?us-ascii?Q?gEE1EDs51/hnaaW+ryG+/M20ahDjhJFj5hzzLHqtdi5k/f7gxml/hzKNFAQ?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Antispam-Message-Info: DKaDzXgMO8aKECkx3aA/FWrCqfcgfMGY+WV1p5Im3j1JT6Px30plNIT+Y+hmt1FdS+DWvJu9Q5KHaLnBdZVW33swgkOO8MsUSiQtdQni5wxhM7u/QNWir8hCoBg9+I0qE12w96d2MKWV7NTAChInlnP5TlKy/NWKML8J3AcFBgMPkhGgsLkVkqt7ppa+fuPm X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1980; 6:cdRiWSsj6B5lOBBFKWMj1lAvgRVYQZDq9FXV+dfc/5dnBgtqqvfRuxZcLZoqUlbuEPGXVYjSNLEBIsNqCM2hb9J9B+beh3g2uepkXGAQd+Y/I37YYbn47mu3wdI3J+m8Vgi0GHXA7jqqs25yX1YbOQTCENP5daXwJuhCFL/1Dy25JN7Wj/TIZTl1Aksbyx4q38EoGIsIhskswxtkocjM6/+Nj1us8SEoVKOXXmV68TOVzXQmtJY56P1x5c00siyexj2lc69Ux1NveCoyxk5mR4Qwa/cW2/jFHsNelXosPQSXQZncGQsNkx9kXueifvdaO7xYgcvf5AqMJZA/xV9cq1cnRAn3mglkx9iOAThbKCY=; 5:elgjL/4iUUVkCtn20pSWKFUFVXzICUiC9JSXHCYhqaXsJZ3EhpB5+0x+k9H+yG6WKCapcHdfPywpVuczt3K3Uw592ZHE65gvv+FNYB4CS/KTVwB0vfpJoJ0Z9mC/sYDYQFlejPyQgKRDUk/Yk/TN6gJ+2ou9QCfwWvuNFi7vAf0=; 24:SOye4T+3gRkHRKfqqJV3FtjznHwdxxwVF5Z8bUwk/UjicuxUsIo6zvbuuik/hCvPpDbRo3q4w9StrUlGM7mi0QTWKfl+3nnsWNzq2pMx9pc=; 7:t4vx1nGGxSRNytSpy+1EMbJVIGKI5o8hBpuxCcOhzhN9sWT10P3Yq/ZcXR4Zd/SrXknpWtPK7mPZK1n46553YNV3dAsmLjRi48EfYCIymsvK2hQ9neEcF3TTlvsT+XiekL25/j1bw42F+x494SeepKexx9u4ZtWjGVCq9QDpqBJEOULAbShoeuimaoHbWL9RZP88PYvvXgrsnu97Zo9io2+zCGzG91XKPtKPHgp6xkH6AunYTNFRSFgDYUGq4G1w SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1980; 20:9UuHNR4rB+qBFDkfFpIPKd4kjiFziwq307CTaarsf1T9yumXO6RlZoum7QbtYnJt07v+3/f9LN2HncoqK2qW36mO0r3SF02FyE1rngtlmitMB+gy4rr3b6yb5sGWS1DPC1gJiMc40IbVH0Ga9EE+mxj9M29iYbcUqljOkG9rw7E= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2018 12:58:16.8148 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2234081c-25f4-4228-b759-08d590bdbefb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1980 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.137 Subject: [Qemu-devel] [PATCH for-2.12 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: , Cc: qemu-stable@nongnu.org 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 declared 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. Cc: qemu-stable@nongnu.org Signed-off-by: Roman Kagan --- Note: this patch introduces a new cpu property, which is not what we normally do in stable branches. However, this appears to be the minimal effort/churn approach to reduce the number of published QEMU releases where the behavior of the feature is unpredictable, with potentially fatal consequences for the guest. target/i386/cpu.h | 1 + target/i386/cpu.c | 1 + target/i386/kvm.c | 12 ++++++++---- 3 files changed, 10 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..fb20ff18c2 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -648,11 +648,15 @@ 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 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 Fri May 3 08:11:23 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 1521810007275742.4486771581174; Fri, 23 Mar 2018 06:00:07 -0700 (PDT) Received: from localhost ([::1]:37955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezMIg-0003dh-Az for importer@patchew.org; Fri, 23 Mar 2018 09:00:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezMH1-0002dh-31 for qemu-devel@nongnu.org; Fri, 23 Mar 2018 08:58:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezMGz-00017Q-1F for qemu-devel@nongnu.org; Fri, 23 Mar 2018 08:58:23 -0400 Received: from mail-eopbgr20137.outbound.protection.outlook.com ([40.107.2.137]:1764 helo=EUR02-VE1-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 1ezMGy-00015C-PF; Fri, 23 Mar 2018 08:58:20 -0400 Received: from rkaganb.sw.ru (195.214.232.6) by HE1PR0801MB1980.eurprd08.prod.outlook.com (2603:10a6:3:4f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Fri, 23 Mar 2018 12:58: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=l+fB7YAxM74rBsw3gsFFsVr9yZj/8Kt0KncP32oyEbo=; b=dkByFIN5GGSXGc3C25yXgwHB+m2GDJNlMp8hWVhVyhfWf2XTGV0T0jmWuhMkQzzNZRnCOR3+OrTuWZzgfZYyW5zJ1VYwFXYoRnruIFN92Wmbr+NKpe8LvpN54SyNcVCwVySvWKiHotEoC0ZtTt1IxSM94xLVCapvi1gyPux51Ag= 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, 23 Mar 2018 15:58:08 +0300 Message-Id: <20180323125808.4479-3-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180323125808.4479-1-rkagan@virtuozzo.com> References: <20180323125808.4479-1-rkagan@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0340.eurprd05.prod.outlook.com (2603:10a6:7:92::35) To HE1PR0801MB1980.eurprd08.prod.outlook.com (2603:10a6:3:4f::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c4a5ce9-93d7-43d0-a064-08d590bdbf45 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR0801MB1980; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1980; 3:8iHl674wzcP3hUiudzRQL6PGHmO6sLwIG9/Ov8d+cMzQCp0/Dq67TgbaKbwAVxq99VSYwjlL+oWYyQjCvjn6vlVfutbmrsw6colsqV35a5BXc59NboHqWcU+84/4DQeIQ2QQYsX2ZN6vGKTicONzjzk9pAoZB7vOqp8Hh0tdm4ELNEAsLC42pPnD25Sv6Ea3go15USvcyw2KdKR/ZhpC2ielpvyhmHTm4l9yUeIaqGow1E3d+/bxUZyYOyu4vbzP; 25:d7C0nclho0AGJE9kgNifbs80nE70qvvLPjMRHUj8eoNRLJh6i4lrU/2DDfcplNXFLY/CswUVduUqz7857SaedC6hbf1O1oRnwcxVaix2y+3OS0fezBzMB8hrC7CAedbi1CVFFU6GUmBrO9ziE6mVk+iK3aPHCZQj94kjJdC0rDTV4NbNO5H3s7s3xIHe4KXyky1iovrwhzZDCkrs/lu6B9He0cJre8E3f+gpqswXbGP5npHBRq7g+261kemV9lRkHznKo9IqDZClfgDsfonNaSaxrGEh/MKHTRySlb6nbXnmDzqt3mRMYvd2DwLy13a7KNSSs0YoviskK7EFX+Bftw==; 31:n0lMje98O0V3dH33hly+CQ15j82f30kQAl6HflhqiP5IVpiC6MXGmiL0UPUJScOJgIOMVOEqw5P8OHHgQuuXbozCkIcEayx4vJNMOmZRw4VNa33IPBgwHcdUVp+CK74bJ2QRm3hgBZcgmc3W9aGNg7TCNE2evceUglpXdw9/D66YacbQXAX2F4/FaJf5FLPVcMgEiaiGiXyouMCbxT9xg9g7oEd1oLIIU60bvv3dBIw= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1980: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1980; 20:WDbt2ibjSzGbuWa0HvLt85gYNZ5H9lQ5NI1bZsjO8BgmT5work/1p6p/sTtw01R0YyE3bnCRRx+06DqbDcV8pMY2SH9lJLeT7DjG+nven/NnS9TGKR76yYfTibVFq9y1ldOd30qsK45Tw5tM4ev61pHbJHX95kMv7S4ecK+QDCMPqRB0RBPQK4XvwnEUBmieLqGscSj7RTNNnw8woSlyH3fsDoBoda4kz4ESeSv2MBo9AeTg35tMQ0W/T/klMCspsaXbGlv8FFaX/lJR4BoHRcjkLHqoGYFAQkQ9Yene8TsHDBRAVabdGSemv7PprXQgxqV2Tq3XJnJDSX/sTzUpsc2cp8b3Kc6+hY7PRZ3+ChuD1mu4HjBpI4upcVw7S2AaaQZgGCqrJ+uKkI+BlAfGL5HJ7M2rXhG6Tc8+S+e7cUvgzOhvfl9PQ1zwMT6l+G0uq9ezxgX5FDvG+hkZmBHS8QFWqfDIpgcQRRItttbwPU4swpw1SMEzHMt7Jf8GaN13; 4:pzqDT1nmQV2if3yckAJ4FsBmIp/zGuYWSxHwOqZIOccucyHD2M8YDDh09Cd8SbMPFwba/i0Qm4M+sN5+ehnuEeZE/hXK5+QyShZBSKC7qvPGcur+hX8hQALpM9l/yq/pPqHGepk9A6J92MjqNwJ2dRn0EHS8v//LSuccYKNVxrhXoGxlPQZBGkcE58qUtOWLTRmRco+XSR57D4oIRcmSHJ4tVlDYSqK6ydboenYjk7xK+K/AmTdQNMZuL2XsRAaDjLiyVZ0/SuLoJm/EkDeDVw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3231221)(944501327)(52105095)(93006095)(93001095)(3002001)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:HE1PR0801MB1980; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB1980; X-Forefront-PRVS: 0620CADDF3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(376002)(39850400004)(366004)(346002)(39380400002)(199004)(189003)(47776003)(8936002)(2906002)(81156014)(81166006)(53416004)(66066001)(446003)(50226002)(11346002)(7736002)(305945005)(68736007)(386003)(6506007)(8676002)(478600001)(25786009)(1076002)(6666003)(59450400001)(86362001)(52116002)(76176011)(51416003)(4326008)(36756003)(5660300001)(55236004)(26005)(6116002)(3846002)(16586007)(16526019)(316002)(186003)(106356001)(6486002)(53936002)(6512007)(69596002)(105586002)(48376002)(97736004)(110136005)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1980; H:rkaganb.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; 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; HE1PR0801MB1980; 23:S68vOAr3llDREbHBcrypqgfLWklDvoFO0Oa496Y?= =?us-ascii?Q?5IHv7TO33lF3vXPKJY+VTHkM7o/G+94UmxoRMxWVfs4D5rmQGo9XbfuqBLJW?= =?us-ascii?Q?xkMxezaA2CuzL/bmn0+h4JukOpt8RvkSesxeZElD/Iu7j3KM2QeSr+H+rkT6?= =?us-ascii?Q?piW8K4XSw2NepmucAloge4b3vqXJ+Eol/QcStaxInW8ivOfCazVAAiB/5Z9I?= =?us-ascii?Q?PxsjTdSvcfpwNbWuaaGKwzDfWTtyRCyQecsAolxWWm453rMzNhnkqbJFnAON?= =?us-ascii?Q?yScVos9wIGRoe+z2jsaz4IATFgCg4GZflDMGMSzDQ+A2MJCj7/CW//2yNjbL?= =?us-ascii?Q?V/p85u02rmfJRKbZ7aVPVfKfIQ8w0DeHy7Qbg4IWjCWVvFYlBBuMyAegdPlM?= =?us-ascii?Q?ngf/0HpS9TZRXh90QGHWzP1UpZeGQw6SsJRUtwBNj4zFt2CWG9xbRYuFfOVo?= =?us-ascii?Q?0l1RIZ8pbNuyBeBYX1AfRxdKdnnGVovq7rGiaCDW65f+qMJmphHztzr16Z1f?= =?us-ascii?Q?L+MGKDfvye7wI7hiApXGiDGedCvFfpjEv2jRdrSdsfT6KW1MBAVN4PMqJ/Ct?= =?us-ascii?Q?LKUk09VVkR46Us1BzLwLWj3sKZVsQ4Ic4lON/+T0nyPDnEwIh8xVHnXb+gwe?= =?us-ascii?Q?kuxMC5ca/9/LZgkq7s9d+PWew8ZIbChIF78GyR1YU5pz3O7XGEonqmg/Fjhz?= =?us-ascii?Q?XNFz/0DNktlRlGvjldDlOh6/LQfluEfxxjJBG4b1C91bTP50iWxoneuOHNAN?= =?us-ascii?Q?hcYhAf3hTBemlazusd1alQmQTv7I3jodmAx/X0H8KwYXwhb2mmIn1Gj3OzKV?= =?us-ascii?Q?uXp+yR2wtMD81gPutE3z0K5dRHwBSoYPt1PUAIpMQHbTqj3ITCeUIbHBq0KX?= =?us-ascii?Q?oBdCCE5ilsPz3FloxqTVQUo0t1sDEqYLi/tbMpcnzupULZaD0J5pcUiLG29a?= =?us-ascii?Q?v2Q5/9Vb9SzNfGR7mqScxyvlfHIfdslX+sTVhoXLRZ4w3rfDAcgcj3491/9w?= =?us-ascii?Q?5c1c3T7Pvd74YVE/79yOCChLqHdzBecgLhxHYrY3DigOHfxXNauoVZiJvEb6?= =?us-ascii?Q?lrQx8KPc5EkFMl7qbHNYyyEkdhQTEb2sCQq0hsGRrlS7/HUq3rrSwEmO3lRK?= =?us-ascii?Q?60hJH/VUpkObDlefGLoSk2jWl/hbvEr3z10bX6CwMR39phfcg/evaYfQaSuN?= =?us-ascii?Q?BDZ3pN+KCGxB1L6G8kcuMk/ArBQNVFb26mx5/jfJuz7pLPIajYgA4axMs6Q?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Antispam-Message-Info: 6bwacYYZhh8mJ1Um5CxvzYQ++pyyot8HCTHlgZGcSEni/GY+PNaa6xdcYHsHL8HC8urCWnmWXTakx4gy5nxHi3agQQZfhEoBA1b+PmQT3lNHU480pWjrY6ZYF413i0OkfXjXz1VTMbKbyIsC/9sRt25t0bhcBj4DK8xs/A1nvSCc/eL6YYn2LPSZE8CshfFT X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1980; 6:ZjCjWaIzexGrAtu3tl7KP/Bqr1iJlp6N/jTYeEkQEzpRgyl0R6jvPZ4TJ0SFl+I+Bue6z7LkMvJ49q1l28psSsAQZwpF3UkE2xnr56ps3xlHI8OBTiTiYjg7HPCO/nVu7KGk/56i7CAUGUVZoXBnB9D91sS0wcSiVfCNuALOypCAIOhRBu7BbG78l6TnbYkfsBj7xtfCOYPfhEwekyHS2YMbDsE8dpQu+GA2icO/MTx4N1cFacpvyaeWtlSg6/dD/zfIA4ZN+gKMa1kJ3OY2/RF+ropFbQlsGs5Car796gqNYJOvx6veqW/a5kSa5uS24/84WXrjiH9rTONHevVI8leyTrt2EUzVOGhuUE3knf0=; 5:FS6sXJ3xMOu7Jng4nQSVX6ztp2grFflmSnxhSDLIBO+mHcLXbnw94zXr4QI9h94je43Bolhp+pC8C/p3jyKU4589s0P9/bRVGR1W/pdMtA8DJ/+Dn8fbumoj3QzNftOBPAJmdF0Iie4uD733ezZtA3ba5hnnoPslbTHwVR+aLSg=; 24:3gvKlgX51zU9IzsRIgyQm2BW17eo2LKNQf//XuirN090c27PaJ+nrt4lFcAN6NxNNm6peNDNT6YKYuFRcvB5DCRPdOl4YeYxNFJ2jW5brx8=; 7:ly6vUb1qoc8FFr/B52m69a/7fFb2F6zBmQnvqwWdC9mttZKsyzYT58mVkRsLr2+aa7eH9OkLtffdzWJ4Y78awVxXBpfXg4TFz0RW4jP5xf7KhKi8Xy2TIv7pwCYARCUjzIFd8gk4V6UR+he8Id1P0XTEOYk2cVtUlCNm4PEKtSpBq3Iahj0LUvyFK9TgXFdlA4irwzKGxjdXyHPoV5D3AOUDVZExKcK7aHqKxJiIW+jjXK36jwfk+VLsHAkrmVPN SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1980; 20:4ZMtZdgHwoL/k89bXvOF5pIKIBiC5boWEMS72IunM/nNfjWFzE8dDuCdHDlfHokOb5eg6lWjXWo3o3Dkfjav1xzIWkGspWBA+eX0kbGq1Evba+cdX4R7IMjl9YZKdt0yEgSAPpeXswLQ+lRJqtBkkj873cR4+N5MkLRmRSgj7qQ= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2018 12:58:17.2991 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c4a5ce9-93d7-43d0-a064-08d590bdbf45 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1980 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.137 Subject: [Qemu-devel] [PATCH for-2.12 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: , Cc: qemu-stable@nongnu.org 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. Cc: qemu-stable@nongnu.org Signed-off-by: Roman Kagan --- target/i386/kvm.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index fb20ff18c2..c9c359241c 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -658,17 +658,34 @@ 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 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 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 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_INDEX 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