From nobody Sat May 4 00:41:50 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511374587717625.3685568773174; Wed, 22 Nov 2017 10:16:27 -0800 (PST) Received: from localhost ([::1]:40792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHZZC-0001bU-PW for importer@patchew.org; Wed, 22 Nov 2017 13:16:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHZXd-0000g1-Ly for qemu-devel@nongnu.org; Wed, 22 Nov 2017 13:14:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eHZXb-0007bB-Eg for qemu-devel@nongnu.org; Wed, 22 Nov 2017 13:14:33 -0500 Received: from mail-eopbgr20115.outbound.protection.outlook.com ([40.107.2.115]:44320 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 1eHZXb-0007aQ-7B for qemu-devel@nongnu.org; Wed, 22 Nov 2017 13:14:31 -0500 Received: from rkaganb.sw.ru (195.214.232.6) by VI1PR08MB0846.eurprd08.prod.outlook.com (2a01:111:e400:5a05::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Wed, 22 Nov 2017 18:14:27 +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=ak1frGbmeY08hJ3WshHss+aH+Nz4j2AtmI37M7QHq+M=; b=MAz+ex4KuiQQJdDoIQrzvRnL9cd/3s/8E4J90f31Zm71SkfT5R/oB2PObRwqGYgdxKnZe102DoTulZro/0UNTwfPempamUbc4QV7vvY7CGbjAw1noodKxHjXn+Hnh2UikEeuktNS8Sa1G6n2d7t1a8rjgK74+F3KKSqWj/+Sa74= From: Roman Kagan To: qemu-devel@nongnu.org, Paolo Bonzini , Eduardo Habkost Date: Wed, 22 Nov 2017 21:14:16 +0300 Message-Id: <20171122181418.14180-2-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171122181418.14180-1-rkagan@virtuozzo.com> References: <20171122181418.14180-1-rkagan@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1P18901CA0021.EURP189.PROD.OUTLOOK.COM (2603:10a6:3:8b::31) To VI1PR08MB0846.eurprd08.prod.outlook.com (2a01:111:e400:5a05::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a01d1772-b0d0-4199-dc19-08d531d4de64 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(5600022)(4604075)(2017052603258); SRVR:VI1PR08MB0846; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0846; 3:S1ln2ygklBpJkIVDR5YIHq0HzAHMgmDhmcxh5zZ3vPXfKx2nq0Mp364rKiYlRfgD1pTAq9ka1vDe3dNeGaII1a+0yvQ5Gkp/PiYQ2WDlqHQ1NfPIhbhobWnXimMSvOF4m2LjHoG8XeZsKf7aIbLjxMCsdyqCJWjUHjqdeMe9Oq7hIbG2NWjHVfCRVTQJLK8pUgr6EFISmFJ8kruH3AwmBTg+/zsb3JYNRrP3X5Y3QmW7W6z9jBG0TYOD+C3Yr+fZ; 25:HzjmU2hkYaTwJKfAolAMF9uwR1pFSfQ26MfR5Ke9bSLakcDQCtLHRKZmftpJ8xn8UetdC4eQDS6RZFQehjehixH8tsuT7gdkq9UUiz15iICmS1wpBLCgsxoG1yL/h1N8bBbKQKsdecAJveohWb08X56+XxWGLNRALVSgs8Vx2sqsJkVrwhThV0NQW8/RlQe5Ba/gij51RUx5AI6Y1Puei9akT9PllYzTuH7mrvLvu8jOEhICwDKKV7YtAtCwqK9ZoQo8VWe9qTxjckO9K91GA5XopvisxuS2f7WYXhs9hEeGjv0RiBSsl1mIUi2o/PGu+XAPT2SO07fTME2LGudX3Q==; 31:kAIG+cyP7fSqFVwuwu4X4OSa/cSxBuyrDTRp6XFG0gTV5eE6pEPXbuA7KSBnfPQfY7ICFvSEHB7mhlNErFzKE0ixUxLR67zeice/XIlxOQLT6UdB0cqHnRK/Y2JBuIv2PlGkiR9euRa1hJG4UNbFc6nHCKEjJCEMZ7v5EGFelLepfgf8Fewd3nwlgvOeAVGNH1aOL/gmVvLPpWk/57liVb55T7VrfTJ3x0tttLDfV/A= X-MS-TrafficTypeDiagnostic: VI1PR08MB0846: X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0846; 20:jlaBO3G8bCglOVXJV/JHU4L9jeHZ6B7b1O3qGah3Kq//JvF2n7NH8LvSOgSGD2o3ksSWdEoA3R1CY6Ml63J3120SolesAmCFG9wodAuFp9zysZ03U+XIOidpJyIjuSW+hvI2pxM6f7IX0boYE+dX6KeEjy++8iYof7zEXlxBpoFYopiIrIB5QT6pnkLnfO5wCBkO2j09faxqUVzaz+i7+WO1cfmEJFUMlULcLQF7nxsYrmwXKLuDxsukZzK5gF0xsDV0UwhQTNcAeRPXMXo8RwsWap51oGIqxZQwBe+4VhppzucGx+c95J8/EWQ1LdQCXrKi3v/XDAX5tRWyIs7op2FXPxBsZSTr7yKVJ/6sExTzxwYNqSimf4ffpuCe6la+rn1a3X8UvTyTB7iV+6GzPiKbxBDr36IqvvY8YFErStw=; 4:WqVREuIkyqKipCowd7nFwURmThJWuDbbAuoMK8hSIbjgbKY76dOmylxuAhLv07qentvDfI7FA50PItboO6lgYZt+y/fQxzxDEHH7XVSWPDhcs/4eWEOGmpKNovtgZrFcIBwZEy8WD9m6+zmElJkA1y596ohtY7m4qZvqMRTwPHZou3015E2pBdId6i/MEKsrvu4HkL8Nudo6x8eNc0P/Dly/VHUmv20XGGdjE/GsSpROc1Poji9cY2FhttShgBUy/nykFFJl73MzvqrRP1O2/w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(3231022)(3002001)(6041248)(20161123562025)(20161123564025)(20161123555025)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR08MB0846; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR08MB0846; X-Forefront-PRVS: 0499DAF22A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(346002)(39830400002)(376002)(199003)(189002)(110136005)(50226002)(16586007)(66066001)(316002)(47776003)(8936002)(5003940100001)(2906002)(55236003)(53936002)(97736004)(86362001)(16526018)(2950100002)(76176999)(101416001)(6512007)(107886003)(50986999)(4326008)(6666003)(6486002)(5660300001)(1076002)(6506006)(305945005)(81156014)(81166006)(7736002)(53416004)(25786009)(48376002)(3846002)(6116002)(189998001)(68736007)(33646002)(69596002)(478600001)(105586002)(106356001)(8676002)(36756003)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR08MB0846; 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) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rkagan@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR08MB0846; 23:7L0NvJw5skPI5zR8LdtiaTlEG+/zQOb7Sanca2i93?= =?us-ascii?Q?1sjJsOrZq7wOH6Y+ue465C8xOIw8zFcAML/FfCFVVefvXEZRqTBFAyBu9B8t?= =?us-ascii?Q?JoCDdaQd+aV6G4qxwOSFcO07csAHrvbqkZBOA7MtNSJXi0KnMKAlG0vedkbR?= =?us-ascii?Q?NQUbpbXo9rMG5d+vnWL7Ur3wNEN4IG/DfcfoSCdk06LVuL9m7gicUS1gY4yo?= =?us-ascii?Q?PReJY+jluZh2Nmp/1Ha4JA9LzROtZI2ZZmy8KuztaSXgDAajTAEYr23X6DSN?= =?us-ascii?Q?b7GYx3Z/Lgu6skLrphVsGc9j0zfY4d174dXZNgEdwVeU3zJ4MHyiB9ZasOv+?= =?us-ascii?Q?kBywK3q8Ow+pL8gAcilfAio9QBmx1FxS+wauAwR15a5sMWO9Fey0chA+eOqp?= =?us-ascii?Q?rMYzw+nkItxbBsBWXYhxA8Lg8EzUEZQP0DduN3kADlWTnt7vnL+l1X0OSi9V?= =?us-ascii?Q?N80r2cY0YceIRgt7fmt2RDs+oSOKcduPVcl9uz85qZSiqL5CLlVf/zSZG+zD?= =?us-ascii?Q?9HiRqUHN/4JC3nS2msw24Z5fQ2Oq26H2Q9pHN9ENsfyqMNa1TuRGJJlS4l1F?= =?us-ascii?Q?BtEz5uvba3PKOYAkjDjixKcZlur0VkGVDkxtDcNAYMp5AaasETlZesl01fdd?= =?us-ascii?Q?FHM0DIuFX7H/IkCkDsGKeFckOBLAlZsoqJ6RMKdpn2zHXkIaAY1tmMrm1052?= =?us-ascii?Q?C5bTKvH0ItE+KO/Z54G08LhkL3zIH25qUmMry/xioxlPZz0lhypsm9b2B4vR?= =?us-ascii?Q?D+zrV8719HORi51zdzPlcDsTrQprO9eDD+89r5NsBxo9AoDd/s2LjIuGokpi?= =?us-ascii?Q?qmg2eoe5nFNbzB8UhoZaH/cbSVTv0kzbMhplPy4wZSl2+24+GR9sUP4RrBT+?= =?us-ascii?Q?rQ9vMRi9sXSjs1Tmr8D0YVVlZcplXfZJtnVMlvOmJkHqqCVWoizrcKI7FLl7?= =?us-ascii?Q?oWRg7T4W/Z7r13EoNqE56dDzVISkQGY1aal4uhJEuOLZdEnJhWSg8UTYi6Sw?= =?us-ascii?Q?6sQIPuPlGxyaZpEqgbAqZAC6DY+6EChxmhX50KgT1xf6XcORjrdYZLDEPy3f?= =?us-ascii?Q?Y8gjrxZZaHy7HUPUSSOVDMcnETJC109Uotymg0pO5zFbjowavsR2Y51VbRy9?= =?us-ascii?Q?HiayCerDwGrD6CJIZQAhJnDeSBns8UsWTME2+3DN+ENdWPBhTXyMnx7EN80w?= =?us-ascii?Q?1U50ThHZ69IV/AxKCCvS2TWbARsVZFQImvs?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0846; 6:8LHnT7RaKHPSS+k9eIy9k7KWjSWQrRsOLrwfxMqpppJrvWYyC2C1UfmYpitkntkEM8MW8hzg1sfv23j41N7TYOLdNhvT1QwJVy5EAC/fXTEGSdydLW01N1ANfDAZsVN4CaeW3y1CqFe8IJ2qhU2n0JNvVD3bs1bIHlwOXoAZIdU13O6t/PNIkLIDWHo2HUdbI59dBqH8K89zkI9/vWdvv33MuMp3lPUsG9Q8ySmGKvVG7CNqrc0Y0gyuTbjUq0+44oODnSNXq46P5358t2yLcHpIZeP8v4vFhHNeqB/YE/E3Hk3evIq47XOf6hkwnv5it/VEyI6zkusaSFGCabIYBUur5hyFP23o6KAK/sfrXWM=; 5:VZxdxNz576FW7BNH8PllJ3Ld4qY8njRE9AMcCkeOQUt/LxYTw+P7qpzez4n5VZ1v/KjOR39gdPrrA8ha72vYyPqNReebzFMzJABOlA4mpS4RmOIfVOB+QzljdqO+S1+zGuBAHRuOAWYJ4dUItz1lytroj6flW+nQQshrJQjItPo=; 24:C0IKNk2D9xaz2BQc922swd/Vdm2VfCvIVps3/umO0Wb8lgHBBdnAPq3kprh15B/FhmsU1vNd1G1RpIwxHWN14RVVTFIlWmkxq4JU8vcOoyg=; 7:nwkHkrLFqMCms9VOKU/od+kS0nk69PrzMu7IWNDj+0p0TuY2ACAEysdNgkMsaay9z24cbeDol7nC70acuJ2tLYSg0SXxCNlzvNiOdLh9GD/vUQUm8yBMox9lBHz3jxbL9bZKTxk4SvnpFMGU5fWnXlgp3Q5KQMLUmCleJQZLQjW06Lqk2+/qzyjCpLKR6TkGVq7gwSPcBxtxwf4BbPFjPvKIdkXcCtyMNLeXotUTMeQ50e8lGosXMongqxKR8hyx SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0846; 20:I/kum4zO/XLvQnxK4TgDSMfTWZC3/yKiVfWwx3KIYdFOA28RNabrnmS5yFJsDrKAEmOy7HR5LTYr6edkRFtjQzBazAcHdCkC808QzLPmZ3AvThhQ7mEyBLshLjZDSfHO8RWEPtuxhpQHICSDyHGdecGEnbQ1ztUYg7HZsYIm1eg= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2017 18:14:27.2554 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a01d1772-b0d0-4199-dc19-08d531d4de64 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB0846 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.115 Subject: [Qemu-devel] [PATCH 1/3] hyperv: set partition-wide MSRs only on first vcpu 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: "Denis V. Lunev" 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" From: Evgeny Yakovlev Hyper-V has a notion of partition-wide MSRs. Those MSRs are read and written as usual on each VCPU, however the hypervisor maintains a single global value for all VCPUs. Thus writing such an MSR from any single VCPU affects the global value that is read by all other VCPUs. This leads to an issue during VCPU hotplug: the zero-initialzied values of those MSRs get synced into KVM and override the global values as has already been set by the guest. This change makes the partition-wide MSRs only be synchronized on the first vcpu. Signed-off-by: Evgeny Yakovlev Signed-off-by: Roman Kagan --- target/i386/cpu.h | 5 ++++- target/i386/kvm.c | 23 +++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index b086b1528b..ea9db80de5 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1091,10 +1091,13 @@ typedef struct CPUX86State { uint64_t async_pf_en_msr; uint64_t pv_eoi_en_msr; =20 + /* Partition-wide HV MSRs, will be updated only on the first vcpu */ uint64_t msr_hv_hypercall; uint64_t msr_hv_guest_os_id; - uint64_t msr_hv_vapic; uint64_t msr_hv_tsc; + + /* Per-VCPU HV MSRs */ + uint64_t msr_hv_vapic; uint64_t msr_hv_crash_params[HV_CRASH_PARAMS]; uint64_t msr_hv_runtime; uint64_t msr_hv_synic_control; diff --git a/target/i386/kvm.c b/target/i386/kvm.c index b1e32e95d3..563967241b 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -1678,19 +1678,26 @@ static int kvm_put_msrs(X86CPU *cpu, int level) kvm_msr_entry_add(cpu, MSR_CORE_PERF_GLOBAL_CTRL, env->msr_global_ctrl); } - if (has_msr_hv_hypercall) { - kvm_msr_entry_add(cpu, HV_X64_MSR_GUEST_OS_ID, - env->msr_hv_guest_os_id); - kvm_msr_entry_add(cpu, HV_X64_MSR_HYPERCALL, - env->msr_hv_hypercall); + /* + * Hyper-V partition-wide MSRs: to avoid clearing them on cpu hot-= add, + * only sync them to KVM on the first cpu + */ + if (current_cpu =3D=3D first_cpu) { + if (has_msr_hv_hypercall) { + kvm_msr_entry_add(cpu, HV_X64_MSR_GUEST_OS_ID, + env->msr_hv_guest_os_id); + kvm_msr_entry_add(cpu, HV_X64_MSR_HYPERCALL, + env->msr_hv_hypercall); + } + if (cpu->hyperv_time) { + kvm_msr_entry_add(cpu, HV_X64_MSR_REFERENCE_TSC, + env->msr_hv_tsc); + } } if (cpu->hyperv_vapic) { kvm_msr_entry_add(cpu, HV_X64_MSR_APIC_ASSIST_PAGE, env->msr_hv_vapic); } - if (cpu->hyperv_time) { - kvm_msr_entry_add(cpu, HV_X64_MSR_REFERENCE_TSC, env->msr_hv_t= sc); - } if (has_msr_hv_crash) { int j; =20 --=20 2.14.3 From nobody Sat May 4 00:41:50 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511374582674904.894652112678; Wed, 22 Nov 2017 10:16:22 -0800 (PST) Received: from localhost ([::1]:40791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHZZD-0001bO-C5 for importer@patchew.org; Wed, 22 Nov 2017 13:16:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHZXd-0000g2-MW for qemu-devel@nongnu.org; Wed, 22 Nov 2017 13:14:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eHZXb-0007bR-Rt for qemu-devel@nongnu.org; Wed, 22 Nov 2017 13:14:33 -0500 Received: from mail-eopbgr20115.outbound.protection.outlook.com ([40.107.2.115]:44320 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 1eHZXb-0007aQ-Kc for qemu-devel@nongnu.org; Wed, 22 Nov 2017 13:14:31 -0500 Received: from rkaganb.sw.ru (195.214.232.6) by VI1PR08MB0846.eurprd08.prod.outlook.com (2a01:111:e400:5a05::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Wed, 22 Nov 2017 18:14:27 +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=bjVrrqS1WJWdEz6UlelBXXu/OH9QdYRRQVYgw3Uh6XA=; b=Aq8LAptxValDKhuv8BwicE38uSDTQQjyE6istRtORqWJMMytf2MUha32/60nsPgoFq3thiMnkYjj1dmgr+V5bC3AOekC3h7iM7TNTqh16hQqPofkUee0Jx3PsCHH9OZ6OQ2+io2KCnWTO+P5vunqhWBNSL2oekIez1rj1a4uR3U= From: Roman Kagan To: qemu-devel@nongnu.org, Paolo Bonzini , Eduardo Habkost Date: Wed, 22 Nov 2017 21:14:17 +0300 Message-Id: <20171122181418.14180-3-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171122181418.14180-1-rkagan@virtuozzo.com> References: <20171122181418.14180-1-rkagan@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1P18901CA0021.EURP189.PROD.OUTLOOK.COM (2603:10a6:3:8b::31) To VI1PR08MB0846.eurprd08.prod.outlook.com (2a01:111:e400:5a05::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0cc7c635-3e2f-4e13-c461-08d531d4decd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(5600022)(4604075)(2017052603258); SRVR:VI1PR08MB0846; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0846; 3:ZN0WyrF5DNJARBibETSwH4Hq/3tCukg4rCdDTpOX6gBEAOKOgAB/9R74+DRWxVaUmH357t9baYy2coYUahltrVp9Wbuy1FxeV2npDEQMsQknMrX7eiaOH2JFlnIIBFm0X4A5IIrhc/K3Gxi/u4uuD6vJ0QiIwFsI1MFcpG2yKGrbRSPlXNG7RWg+3EuuHsFezv0/7kV96vv/rApzokcE54bJqyuYbDA9RRme9zfP1I25UFPlDSPgoZl+EMbisP1l; 25:IvNLWBi0ljYSriUht+xRQ4rGULOr0YWhE7/xzCMpCW9paqSrKOgW4qC/3jJk5+yKRJCMS+IGyNxFmQVtneoycg6FFL0DuY7XmGzcMrDlS7QJ6bPm9jmm05X1pTsVZExJZbc2mc5YtV8prrLafuXTVwI5vflITj/rEwEWOx3s2m4ORRhh1YwgrsVuAwch7VvhM3QMJhfemC5GVRhDPLUXXCY+5okIpfuZ1r/5yhuOzHXlW/N5zCPl1hMSvpeHxfj9yntq4OCLu6xkCRbt2kxUf2ANKwI9JPsRRKjseffmm0sR0K2XyjbOrHBYJH69nTerFuqUHeN1gGzw6oIRtCVvRg==; 31:ShkptFMd1WeSXXRR4rJ6i73E5BjJf7XomtWDBUf7Iq7RbOlwS2W2lek5Nm1FHV2J/iIOT1Vt1k4tUEysy4bisenwl2x8pIofhELfrvI5OlVVI7BjoUO3Me/eu30ooSb3WMHs+VAFVPsgEF5SRnYIweaLpV7kDp3jp171s3/c8dZ7hEXQhwcuuRSHac972S4uoTd8+DWQpATDRGMmSVZI8iQtIr6PTDZR8++uflqX3iI= X-MS-TrafficTypeDiagnostic: VI1PR08MB0846: X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0846; 20:ciC1sN/mKF8d6lpzhn4keWIM6yioFbkeykfTFnyaNj2KxFdv1WGyaUpIDn4XzTscd0F6TyBJveRdObC0nGf1oHWFJHmBfbErh0ML+jMQO0Vh6WS3cLBal7VhEkQZVlIRXuXtjbMCOTkVRMhUFIjE12dY4ysDDB4gb4U9xucyc+JCPcO8MhzUXISJa37tuyIOPuq9QANtH2RbnHJhm63LfoNZBgDNBX4nDsZ7qrX18rr6y0YLgn2rBjUdrDdkNM+Z2nem/DBfNCaug5duZq/8nlhdsYyeHn88EooAj0otma+IzTKDAxFd668bz2KRBeEXDZ5yJYnZChz7UkhO1IxefjnO14W4B0IqTIIb0SgXrUFpDeA0U3gdqQQNJcsela00oi4+VC/c66j4mE965Ro9HDDz3DNh0FxeO29M3iZDxjw=; 4:/JgCfYq+n2Da9EkNAsORWeDVwfb0f5pnCXuBRDaTUQl+EuPkVGK05rathgm3FuQDmF8pPWfjFFEN8hy2bvKYZDrahQ+XAqB3KZkKBEVEVVceRcWnjFe8TRWdcLSfUxtTe5LylrMdY3ZqZRReiQFcN5t/4GLN9gqSMEyW55RHp74fMQVR8hQ4Cnkxf8W9ab9lXwCGtlr53JxW9tBH9iPYsMBFQj0LxBgcZclgKSrKHfd5JGzau7LGJpH+bE5TDvsV/AdepaPKHXF/obiZYwnQnw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(3231022)(3002001)(6041248)(20161123562025)(20161123564025)(20161123555025)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR08MB0846; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR08MB0846; X-Forefront-PRVS: 0499DAF22A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(346002)(39830400002)(376002)(199003)(189002)(110136005)(50226002)(16586007)(66066001)(316002)(47776003)(8936002)(5003940100001)(2906002)(55236003)(53936002)(97736004)(86362001)(16526018)(2950100002)(76176999)(101416001)(6512007)(107886003)(50986999)(4326008)(6666003)(6486002)(5660300001)(1076002)(6506006)(305945005)(81156014)(81166006)(7736002)(53416004)(25786009)(48376002)(3846002)(6116002)(189998001)(68736007)(33646002)(69596002)(478600001)(105586002)(106356001)(8676002)(36756003)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR08MB0846; 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) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rkagan@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR08MB0846; 23:sRkubM+1W2t2SJJ3PhjJytFw+cAvsVFluHadJvgc9?= =?us-ascii?Q?fIFl13epi8YymUNkilh6TIjZ+fMO/RnPmoM78noDmmBf8h7j4SFLIemS8T0f?= =?us-ascii?Q?FeAaPvGDwNJeV+Pix2H4tg6hSQEb2eZGlb8Vu/dagtF6FRjb0FJg7fuJ0QlM?= =?us-ascii?Q?iukJlI1jPJEOl0/mNuNbXN6u9YEcBD7Vg41y2RiitV8eJYpzpUxLBxKjYwNA?= =?us-ascii?Q?viiWKTboW+i39XQxyEYpD+Mdm5fVSJ4TeeH5JDWsH3vPzxkEC+kqM27aO2PR?= =?us-ascii?Q?kgqsTzAZQUhBFAAnovJAFIXfY70Vwj6vWWwcjg0/akJAmSwlGZrB1HoH8+DH?= =?us-ascii?Q?+IYs1YkP0SW8H5YtjnfjzCzjLd2DaA0va1GeFWu0eW0EEVPHtEC8Y4dvMld0?= =?us-ascii?Q?BDHksQwnnQO7aZKlMK8shjFI+shRzCUD8tR0yuurmHsUjkoEMRLx5/qwRw/0?= =?us-ascii?Q?QISbBCKO4mgk6kFf4zJqzomthl3y5dd8IJaAcpgyxdIXm1kFz3IOkuRrVf97?= =?us-ascii?Q?vSQAVlE3JIAXsaXAmOvYUBWU9nDwz5A0OWzv/aXnvL3a3Utban6rPbmjxDfP?= =?us-ascii?Q?BsUBZZ/A9FbNgRpWrOxzhR0FEhdttGyAZ24BNEyRGMLBvNbb/RSqJylZOZsP?= =?us-ascii?Q?djsLNyb0RKOLcWtkLUdsf/xSnrDAv9yyRxx6/3Aojy1QAGKOgCQsbHwNHhPQ?= =?us-ascii?Q?9ZV3ZqvsFQU5qB/bsg5X1cw+GfW72mtckKj/z5jFbJoofmXcrP6BYwS7lVaj?= =?us-ascii?Q?tTt49zP6MW0R1x6Idb1z5lju0yFIbkkmZ1zIBThQBpmR1MSEMuM5NyIxUAy6?= =?us-ascii?Q?cPzjCs/AoW1X1frc56oak9Nk4OBFRW/ads1+8RIIz0rp1mvhITLekmzPwr33?= =?us-ascii?Q?1lyOxQNdqote/IW/gBKoPdhx9Mne3j1/z8zCfwKfmBdmj7+4LwCCnxcipLrW?= =?us-ascii?Q?u///G/HBnWBkO8+LF2SaM5rh/rmF72+qE8VKt+TtEEDS5inGqDFf6LSK2ovR?= =?us-ascii?Q?TnnWb6wVBeMlKHJEamXawaE/ahbCiol238Z7Z0tWuR8jI8VMEFn63Mk/csKT?= =?us-ascii?Q?qm+dZudouJsCsmDaqKE22so+1Qy+sRKNNFThRUVMv+DjCtbqdeWKIzFrOIbF?= =?us-ascii?Q?vhh+BMIuFsLWki2sc9+9QCIGpfwKlJcz+wxDATysbAjS567VxiPdP3BStRqb?= =?us-ascii?Q?OwxHheLSdMfxZju2PGcYyGlVgOipOEND4vd?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0846; 6:9xVPF4oD/mh4KUM8/UA5SI1qMrsOUYPM03vyZR1MZ/ytQ+Z380mWuJa1KQ/lIO6LN4096dR1MZeWRLSgh6D25BpnXOMzYYNcKjwXGNOh8nxwuR2ucbCWD8nd65daeHyOkx8sajPxPNdhet6/ZnSHDdWawePNWuvKtqptZywuAuaw0K3wVrOZKAU+YRqxQy8ZjSVRObAMlzQQjw2uTgw12pwzyDoVQlQdfir+80t7AwuyAs5orH2bsS/FrXPMEnKBvxdagEW+WzdolPgxJ4Cllm5oyF4ZXQxrvtdmphuPfTcSeElVgIvxt/Ugxo+iLFBIrIxyAtDqmrykmSBNtbjW5/JWP4VG8aqrEYNgKICP/0s=; 5:Oc4QiQKP2Vjcut0fam3nW5iajq614t4z5JpVhpNnSWqBeUXAdKNNKYof6P9jnwamlPnmeJK3BW/Y4VBr66WI3/cAtir7wemc4sXz6uJV5UgTikKT4Zli2LUxmur0XRVj+7Y2BiuaC6tHT67iQK8lSOgOPhVbkrM+iXx7J6o1Ylw=; 24:kxuSCG+IcJ+XHMVEFzIwWNV+ONE9ixq8skhTR+bp63StLqkYo62ul2ajSJHeLSPgjTF+vRWwINYaCqc9dYJQOCOT81roHj5+FkIYF1klqdQ=; 7:3mPvydgN6CUzGOTsJjGeeedE8CCvuZxjamHKo5qYnmD1pIfZWZHZkqgeOvphGfkPT1ipDyf9io3uIHL3SIdPCG6wQfpPR8xlOivPtP+8u84YeARkV2wKT9YxdlTPCJg3YwoDjxDnvCLOzMGY1XC0UfJzCz872WK/dRUalBkzE74pxkql3IP7RjW4MYz4n5wcN/tdSuvL2elxgSfb4muRH8gMfnkWtwMv6hUXQqIVq3L1FYkepliAv17IC0iMj+FR SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0846; 20:0AvkEwXgSMJ0GGOINMCXANenQo2ZDKXfZGNRyNuTOtxko5qbvIpoTi/JLLjp5yuNTWkgvmpFszXdNRrEgxheoS50yaFsP2TePT91N2OPmpCqnUvZYwKSvRGoDDg1hL3MFKdxyA/clEEYampo9ln4rxNSHSls/+aO5kBbBWlBEz0= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2017 18:14:27.9429 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0cc7c635-3e2f-4e13-c461-08d531d4decd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB0846 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.115 Subject: [Qemu-devel] [PATCH 2/3] hyperv: ensure SINTx msrs are reset properly 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: "Denis V. Lunev" 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" Initially SINTx msrs should be in "masked" state. To ensure that happens on *every* reset, move setting their values to kvm_arch_vcpu_reset. Signed-off-by: Roman Kagan --- target/i386/kvm.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 563967241b..ea6e6e5f30 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -662,8 +662,6 @@ static int hyperv_handle_properties(CPUState *cs) env->features[FEAT_HYPERV_EAX] |=3D HV_VP_RUNTIME_AVAILABLE; } if (cpu->hyperv_synic) { - int sint; - if (!has_msr_hv_synic || kvm_vcpu_enable_cap(cs, KVM_CAP_HYPERV_SYNIC, 0)) { fprintf(stderr, "Hyper-V SynIC is not supported by kernel\n"); @@ -672,9 +670,6 @@ static int hyperv_handle_properties(CPUState *cs) =20 env->features[FEAT_HYPERV_EAX] |=3D HV_SYNIC_AVAILABLE; env->msr_hv_synic_version =3D HV_SYNIC_VERSION; - for (sint =3D 0; sint < ARRAY_SIZE(env->msr_hv_synic_sint); sint++= ) { - env->msr_hv_synic_sint[sint] =3D HV_SINT_MASKED; - } } if (cpu->hyperv_stimer) { if (!has_msr_hv_stimer) { @@ -1053,6 +1048,13 @@ void kvm_arch_reset_vcpu(X86CPU *cpu) } else { env->mp_state =3D KVM_MP_STATE_RUNNABLE; } + + if (cpu->hyperv_synic) { + int i; + for (i =3D 0; i < ARRAY_SIZE(env->msr_hv_synic_sint); i++) { + env->msr_hv_synic_sint[i] =3D HV_SINT_MASKED; + } + } } =20 void kvm_arch_do_init_vcpu(X86CPU *cpu) --=20 2.14.3 From nobody Sat May 4 00:41:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511374694091894.7361055950372; Wed, 22 Nov 2017 10:18:14 -0800 (PST) Received: from localhost ([::1]:40797 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHZam-0002s4-1q for importer@patchew.org; Wed, 22 Nov 2017 13:17:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHZXd-0000g0-Lq for qemu-devel@nongnu.org; Wed, 22 Nov 2017 13:14:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eHZXc-0007c6-7L for qemu-devel@nongnu.org; Wed, 22 Nov 2017 13:14:33 -0500 Received: from mail-eopbgr20115.outbound.protection.outlook.com ([40.107.2.115]:44320 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 1eHZXc-0007aQ-0d for qemu-devel@nongnu.org; Wed, 22 Nov 2017 13:14:32 -0500 Received: from rkaganb.sw.ru (195.214.232.6) by VI1PR08MB0846.eurprd08.prod.outlook.com (2a01:111:e400:5a05::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Wed, 22 Nov 2017 18:14:28 +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=9KmdJdwDyy3aB8Z14r1GqxX3+W+/REhkJdhR3/TAD0I=; b=SURjRufgpGOg1Z3+AStl11qiJw7ZIgolbLed1d0dpNp5q+shU7mM1CaL85lupu4I8SK26FNOgrPYNbP3x23QVMT1zzgEcBejJYQGCtMQgoNNwHbU5nLLcw+xJJ0OsSQtRjjggVS26Ixln2PGsCIHhDfsFoBvqAhTEe0Eg9xsifU= From: Roman Kagan To: qemu-devel@nongnu.org, Paolo Bonzini , Eduardo Habkost Date: Wed, 22 Nov 2017 21:14:18 +0300 Message-Id: <20171122181418.14180-4-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171122181418.14180-1-rkagan@virtuozzo.com> References: <20171122181418.14180-1-rkagan@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1P18901CA0021.EURP189.PROD.OUTLOOK.COM (2603:10a6:3:8b::31) To VI1PR08MB0846.eurprd08.prod.outlook.com (2a01:111:e400:5a05::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0756a4b7-ff13-4d44-acb5-08d531d4df36 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(5600022)(4604075)(2017052603258); SRVR:VI1PR08MB0846; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0846; 3:Ueba1HKAnOBWdEJmMZVaIIPnCYimqvpcc//SQ259txKXs+RmsPRTnIOcDMyE8bOU1vM4GirMm/XKYCwqJf04Y8IFgukbipOanLlcWZpYyxcA0/FZAJ8gEXIgqVYXfi7Uqde3PIigw8N0I+cT+aMP6D8I43i7m49Z55AnWqQaOFpjq56Lhsy5goMYBTggZkMLriivVM6+10qWr/MwqRF0zjrtv9XW354y0Ka8+in8xSQcn960OBD7Xv4m1lkA6aXi; 25:JT1Cnn6J29OyCNhrbRebcErHCMsWERkgwsnj9mdSNK3f4zLkAl+Udv4mc8Ueu4U5KwiD9JW0FArwgWWzDJkwWaooTYLk/MC3BDL29/FA5X4Nq/Er0x9YGG5qA4aexOQ/d4vTM9f5Bh5y1toFwdnRPD/+YCvCFWSQMq16yY2b6Wko4XNoSb9wU9SMqjpoo8afemuMyrOJLnUGYowZtPgsBR1/ynGllmnzDCodMxJ4BYqyK0+qYT3HCan79ZkYMZqjIamdnqxQvkQX1Yz/BPmB2dYiM3FcRe4DjJlgN+UNyVc5ysXIQ5vdIdeGsr/jBck1YwrnxcB9qU8Wl+B87wPSTg==; 31:TyKOrQCgloWRbTPh6fd5ojhonyodJB4qpITHYVuwez+16wKE33lr1Iv5ffS64AqqOiSdgBCpL/tG8Bx49G9HjrQTL5A7d9UjQu8W1DnKWtJ+FJ2cqq85O87iBezo/d+VZnOdVNwY6cdCBhIaFqSqrjcuZuagMZXWGi6N2U9SydM+CDxbxnYx1/9Ng+enJy1u46faCnW7RTXnAx3/5MdTXRyDiyf3oID031+Jzd/d+Dw= X-MS-TrafficTypeDiagnostic: VI1PR08MB0846: X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0846; 20:D6zKKby8/3tfGlIE95c1LIhsJz99friKqhA+0pIcTQF7g+uUdxUlGoDA8Jnhkcg6QQYMQwB2yw4XA4T1CwP621LaiyZs1aipGK/+H+yGM1Rdr++3rIsAmZaszGREE/lB05Bvbgz8LL8YXVXsv4B+5nr3iWmOuEPpNQ7Q0zmvyf/zKD5yxqvJ/PSIk3neoAC9Dw6OM6CsE7sfaliDJB4l0IQEkOK8aqJn49Si2aGU7QOwTUL+0lxG+3EcOUeMcPsv5dGyK0faGZuKD83dKkIsZIL+gfMNsd6OkD3i01rQbvNtsutCYxjAcCRTGiK//QO2RVtF7NbASUBq9gdeBK9e0g0BCTPRxZq2hqeW5EcB00DxfE6NYIYQu8IJjqGXR6S2N66yE/6HGM24R3FgAvhvMJXMrxfbQViuCilnP3jvj2E=; 4:0u2WWlAjKy58BfbIDt3v3vf2KfuT84RiMd0AyWdduGcmlauYbvw6Y1R9HOy2xedga9dsCiCgfLbzY8vxzZxcu86Y41GpkHwdVva5kYEW3HSpT8oESxaltK/mMNQDGIfu0dz0JbWR1i0HhrGZfv9fNH88kyUYSqTzpaWp38LFhztlCmpqie5vJ0TGmSMoxXy2ePFozcKYe/CC+F8be41cUXY2mOwKiAfRpReyDI7l2cr6H3jTUxCkZXnwahqS+Ss4MnpPgGq8qy9b7xkZD5qQqA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(3231022)(3002001)(6041248)(20161123562025)(20161123564025)(20161123555025)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR08MB0846; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR08MB0846; X-Forefront-PRVS: 0499DAF22A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(346002)(39830400002)(376002)(199003)(189002)(110136005)(50226002)(16586007)(66066001)(316002)(47776003)(8936002)(5003940100001)(2906002)(55236003)(53936002)(97736004)(86362001)(16526018)(2950100002)(76176999)(101416001)(6512007)(107886003)(50986999)(4326008)(6666003)(6486002)(5660300001)(1076002)(6506006)(305945005)(81156014)(81166006)(7736002)(53416004)(25786009)(48376002)(3846002)(6116002)(189998001)(68736007)(33646002)(69596002)(478600001)(105586002)(106356001)(8676002)(36756003)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR08MB0846; H:rkaganb.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rkagan@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR08MB0846; 23:LWdULVS5Wc48FR6AZZcL9mmcxGIYjLKZ67KAUP9K9?= =?us-ascii?Q?UbZrrTFyReFytllAEp39v7esMBvzK+YZwAVfAaY2OEy+MFi/5BRYImwnj+f0?= =?us-ascii?Q?oMoOp3hCi2LOKF3epLmzYOAhXFElx1Dn+rQGvCDx7O6pfLgiBRpNj41cieLe?= =?us-ascii?Q?nlOF+2V4NaeefGDWV4mdpyJf+uWWBIKkLUcxjfW31hE4ZzPHYOIq1kIxM2oN?= =?us-ascii?Q?ZU6keTWbDPo8qbtpDefbmtebRIWCpTRM9k2sGPJvZtp2mH85xQ5k12cpXfcK?= =?us-ascii?Q?hXMeKlKk+WM/BSyoDvzoK84AUN9sfzje3nGbwxn3CYzOPhUxGUsg2ISn8Vdj?= =?us-ascii?Q?dZKONe0kaWC6LeVX7w9OMbD23N5xDpC/HeFm/A9PTXs/Z/anu5BnOJGBt6rE?= =?us-ascii?Q?/9bQKK75WzGUXvaxIqZCourvxiLxmWzNCSWmrQ/eqHNeKDdnw3bJJxkO0+Jv?= =?us-ascii?Q?rutkapKlmuwxNDQ5pjwQb1wrD9tQ6Tue1MwZN4IcrZAvKDl7D1PbOoVUZGo9?= =?us-ascii?Q?YnVntXelemYM6WyMlDNXAIFFHXjj6QihLv5aveEZXXqTCwq600Lxghdah7lE?= =?us-ascii?Q?FrFi5uPQeWVji7N5dg6c8fjQT5QvSwpFsVKPW9v/1rI5YV1UhACfvk+XDb4u?= =?us-ascii?Q?CEUIJUBE5ytRQ4L5R8XFQXMrv+ZTLZEbaK1SoGHBld0D46/oSFJ8xSwQP76x?= =?us-ascii?Q?OzwGtodsi4R3yvcmLBzuoqJiDHRJUwWQZaIG/9o3g6aGjpX1DMO6zRIMP0Et?= =?us-ascii?Q?oy/8rUlL4Oeiw8FW4b0wxzhl9rpqG3tAzw5tu/wcjUfkN25XHWovpSXb4sxT?= =?us-ascii?Q?hpX0jBA3nK4kN8Sm/guD0jQw47eeoDTZ4+IJb2I14HxUjkEiuu8zWCfM2XFQ?= =?us-ascii?Q?s10Mtki2gmawnpxRivPYKGxnOVxluf0qjTGY/4VIDVxye0jB4FQ1QD25nKoE?= =?us-ascii?Q?VPXVzyDE1D+Aktw6y/huup1u2MgVR0di/0Z8o5Jzt22hBX2U2kIsZWOLVkN2?= =?us-ascii?Q?vT6xPyuqMtAt++6XShDpioDGiW124WmGlztTgdP+kN1YZl/pFgomUSeVK13t?= =?us-ascii?Q?a3hsebRvdhe89qu3nZ8LKbOnbe5bMjTfTpjn51zIYyw+ElNUnzbPn5iapYNA?= =?us-ascii?Q?QGZWfQrhyueu3UF5jUEE4K3jWWj1C7VQmPVgF24dkZ5J25aygP8PYNyy4RmH?= =?us-ascii?Q?PRV8rvM5zRAnwGlch9g2LuegIPZVfys026K?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0846; 6:/FxXrG7Iu3l1tPKyAnadAzzKd9RudKS4J7qGAcnmOfD47hUYfoqqqgH7NomL1We19CNjLUwwNP0XTVrMxiYqMq7X/J8o3w1ce4UN/JG53Us6qihzk/SNKe02tJ//wbcwJuOeWHNpeL37MWX0IQc69NoJd8zsOU9vKLSslQrxzv7FobeTXZJv7NaiRKZEXJyF9drtzuacGe8TRysPR05n7kagaYT0crH5BAm6K4rkyRoGQnmDGt8eqO1QiMYNvTPXsXltQD7D6JXMrsyK6DicxYTG04AyEgqas3ORxwxx5ODfYB571sZtib6Dznr8+/TkGSjaeIBJSC21FPbJSgkJ3a87AbRhPStvnhmcGRTr5II=; 5:YEb33QcfHYgUYyZ7U6O3qaGoSEEGBf0JBQY9V4f9ueavZvzbroFrCOAmTi9op6s/sve2t3tt87lm3pSTNInI0vZHptf6BfWfb+iRTn0wwtM4o8XS0Ou+jV1SrjHdPgfs0Sa+Vt0NvsWVV+cdkA8ixbJ4uaBmf3k+7fk64lvOJ6w=; 24:82vXI93OMda7Y3s/horu/0PByrlgMDzITGREDlBlxvdnHjWAB+FKFcnd5clf7WOSiU4+3GCc/AHI3PR1U1vpqqA86AW4pKCIoAysoq3w58c=; 7:Kvi8KrKn3Y3wCfnWJMWARfkJuHblUcJ3ecJl+Jq7KcOVO1jFJa9oMoqEiAO8peapdUu0UaV/Z+ETFnvGG7IzjuIfWI4pVnfRBdO5qpV/SpuOq+gD49KnZ2rvhcti+Ty1VQZlhCiT0X68s/qFWG62fals7W+9hmryDGkinUXyRD/MsdVY/PbY7ZvwHQbwvAhsFk7Jk0FmfzrRNgnOUq6735l1bIah0Oagsu37BtqktmsxPzUUvmPUYcK/3YWmUNPF SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0846; 20:kcOb/dBwQQTezunjrAxu13ApmwY3Bc6y218NxClYwPsKOhffCDkc1IRoM8qFbX5F6WU74Rm1qruUjMog8bjMvz9MLg1nw+10MWi3ojBiSd17EdQa/f3lBP/ybGhrPXCEA846N3MhXi1lco6LK/g146v1eZby7BYoB3gjJZqctdk= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2017 18:14:28.6460 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0756a4b7-ff13-4d44-acb5-08d531d4df36 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB0846 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.115 Subject: [Qemu-devel] [PATCH 3/3] hyperv: make SynIC version msr constant 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: "Denis V. Lunev" 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_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The value of HV_X64_MSR_SVERSION is initialized once at vcpu init, and is reset to zero on vcpu reset, which is wrong. It is supposed to be a constant, so drop the field from X86CPU, set the msr with the constant value, and don't bother getting it. Signed-off-by: Roman Kagan --- target/i386/cpu.h | 1 - target/i386/kvm.c | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index ea9db80de5..b264419678 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1101,7 +1101,6 @@ typedef struct CPUX86State { uint64_t msr_hv_crash_params[HV_CRASH_PARAMS]; uint64_t msr_hv_runtime; uint64_t msr_hv_synic_control; - uint64_t msr_hv_synic_version; uint64_t msr_hv_synic_evt_page; uint64_t msr_hv_synic_msg_page; uint64_t msr_hv_synic_sint[HV_SINT_COUNT]; diff --git a/target/i386/kvm.c b/target/i386/kvm.c index ea6e6e5f30..0479fa4e4a 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -669,7 +669,6 @@ static int hyperv_handle_properties(CPUState *cs) } =20 env->features[FEAT_HYPERV_EAX] |=3D HV_SYNIC_AVAILABLE; - env->msr_hv_synic_version =3D HV_SYNIC_VERSION; } if (cpu->hyperv_stimer) { if (!has_msr_hv_stimer) { @@ -1715,10 +1714,10 @@ static int kvm_put_msrs(X86CPU *cpu, int level) if (cpu->hyperv_synic) { int j; =20 + kvm_msr_entry_add(cpu, HV_X64_MSR_SVERSION, HV_SYNIC_VERSION); + kvm_msr_entry_add(cpu, HV_X64_MSR_SCONTROL, env->msr_hv_synic_control); - kvm_msr_entry_add(cpu, HV_X64_MSR_SVERSION, - env->msr_hv_synic_version); kvm_msr_entry_add(cpu, HV_X64_MSR_SIEFP, env->msr_hv_synic_evt_page); kvm_msr_entry_add(cpu, HV_X64_MSR_SIMP, @@ -2082,7 +2081,6 @@ static int kvm_get_msrs(X86CPU *cpu) uint32_t msr; =20 kvm_msr_entry_add(cpu, HV_X64_MSR_SCONTROL, 0); - kvm_msr_entry_add(cpu, HV_X64_MSR_SVERSION, 0); kvm_msr_entry_add(cpu, HV_X64_MSR_SIEFP, 0); kvm_msr_entry_add(cpu, HV_X64_MSR_SIMP, 0); for (msr =3D HV_X64_MSR_SINT0; msr <=3D HV_X64_MSR_SINT15; msr++) { @@ -2286,9 +2284,6 @@ static int kvm_get_msrs(X86CPU *cpu) case HV_X64_MSR_SCONTROL: env->msr_hv_synic_control =3D msrs[i].data; break; - case HV_X64_MSR_SVERSION: - env->msr_hv_synic_version =3D msrs[i].data; - break; case HV_X64_MSR_SIEFP: env->msr_hv_synic_evt_page =3D msrs[i].data; break; --=20 2.14.3