From patchwork Tue Dec 12 16:07:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Kagan X-Patchwork-Id: 10107819 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ECF0460327 for ; Tue, 12 Dec 2017 16:07:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE6B229BAC for ; Tue, 12 Dec 2017 16:07:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D311529BB9; Tue, 12 Dec 2017 16:07:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B2C129BAC for ; Tue, 12 Dec 2017 16:07:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752495AbdLLQH5 (ORCPT ); Tue, 12 Dec 2017 11:07:57 -0500 Received: from mail-eopbgr40090.outbound.protection.outlook.com ([40.107.4.90]:52096 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752323AbdLLQHy (ORCPT ); Tue, 12 Dec 2017 11:07:54 -0500 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=7XcvUND+ayrVDyQ0+CtERhk9/rfDFt4lzbLal6u1pjI=; b=cX/axwGnenTI2SR9aa39CMcbcNGNhx8P8lUjAkdN7ufcjGbYt9MPrxE4zQsllCzjoSQb703ryDaM7EoEL418hXtTnGmNTW4CRn5amFAb+sp4UYJ8CpgcdLWxK34yFonI0JBRA9n6TSk9FqmgR0YbivHXbMTNM1k3ptxSXcPICkk= Received: from rkaganb.sw.ru (195.214.232.6) by HE1PR08MB0843.eurprd08.prod.outlook.com (2a01:111:e400:59b2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Tue, 12 Dec 2017 16:07:51 +0000 From: Roman Kagan To: kvm@vger.kernel.org, Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: "Denis V. Lunev" , Konrad Rzeszutek Wilk , Vitaly Kuznetsov , David Hildenbrand Subject: [PATCH v5 1/2] kvm: x86: factor out kvm.arch.hyperv (de)init Date: Tue, 12 Dec 2017 19:07:41 +0300 Message-Id: <20171212160742.793-2-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171212160742.793-1-rkagan@virtuozzo.com> References: <20171212160742.793-1-rkagan@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR09CA0080.eurprd09.prod.outlook.com (2603:10a6:7:3d::24) To HE1PR08MB0843.eurprd08.prod.outlook.com (2a01:111:e400:59b2::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f2a57233-116b-4f21-bd64-08d5417a7eef X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307); SRVR:HE1PR08MB0843; X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0843; 3:D95FzFd+nLyUkmj49tKfSaVa0/leq44BONXKgE0yf33cmhqo+0xlKhsc4dCrHouI9izyTjyTWi/Z30dMyX+0RAV7GtVRirCWAdYDO8DAHtxe35vCghtdMLIJtCeoVRPd0t34571Qb0FNlbT+lVNZJ5NyjpFE3CDjsXI3w9Yedd+jx+VpfP95sSPht4lAwXxAl16Y8a6kokVoQj/eezjZYtV38gW8FdoKJ+oQFnpHs0e7GTEyYUF0fzbeJp/mwkBi; 25:jcWFGKs644MhaMelGFkTZhIkPjtaKiAFy6ZI8Jp6LVUH3hc7Cw/qvZ6vI0IjCWqH49iBVkvnxbBU4nzckL3TmYlRvRcPWOmhNJli4cZ+jFBjzFb1WKwRKRcLtzUWGrWehrVfujNVjkRBF/UaKt+PXaBpg43Gu0warRJbt11YkJQ6KdNla/f3o3auT1QJzrm7JPS8y4CBmTZ/nZ113J3R2lvSNWu+eRxZYdSjB2aWZ4biE6J2JeWCqtk1kbi4sRK0+X29xx5uGLB8owYBEwDJWTJL0XPIT60vrMNa1Fjz7Un4b8OhJwIKjnCcFWPBLIgxA5YVVlJ6xKgfbWn2QM9j7w==; 31:4CmpdC1UeD9WIozRy+CRsBYnXokRk5ZtHkwY1pWAhAHHkM2sK7CKstyQh1u9tTgbrQ0cvtFT6GiMa6YC2rdYHLOeo6PzaqySUE8tnhQ+EsLzMc6rEMn0hPwPgoca6+PvO26TmB2YbtZd8BpRDK0+fzDITUJPkSAG14PaDYPh95vYSam5FWo/WG6lXTcQijAneMRKXjhtS4xAhwmtbyCqqDbqhfXysirQZAMFNeI0118= X-MS-TrafficTypeDiagnostic: HE1PR08MB0843: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rkagan@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0843; 20:YNjew1bryRN35FJp5CJ4YyIwzWHKXXheNJqyDoiTxHmoKBvJMwqsTe1IICMAPEmtj4Yfvt8TubAsY0UBGtSQaJT5CYvpZroczLpW9v7wyk+yPgPmQNUvExtnx7MVwU7wJad/SP4FxhlXSZqZZBCG/hSIBgAK9Il26R1A9ex6OC3WE9LcURonM/jsU07u3Wn5MIu13sJ08TJJ32XxpszaDtmMwOBfKX+V+FP4I8tPLj5zHujMPGZFDOp/N+1qaRhrVELxthw/lNCFr1iDOxTdsCxNo35Z9S8awyTL/AH1Wo9xdFeVjMQ6JeOmQsc/OYrLScTeCU1PBZM8owNWtaJNUw6+i81CUCDhffFgryjWkGN2ebe5gprUqFzMl83zX5Yt3kX3Y4sRVHoUvV7N9pqOyLJmF/rD6lqd8bBHrIX6los=; 4:EngeWntYPH+2THYJwkv4bciiNRYmWzuDuxs+Z3puuf9FmRsX7U+WKhO+MMYAwPlHE2ouaQ3AkGQq+NL71Q2NvnqfvXr+6/THfpj5aCmY566ES/J225oSyec+rFNcnF6F5B76E4qG3BpZIa2Qlqy2OvgYB60niSbpjI7l3UZ2pZIc4gMWq4hleRoSR2UOPzT/uWThJk3FjF/denC3wRMRp60z14KaBJ9P3C8ifl3DYpj2fMd3N7rZQRLGLg4DCG9pXFnojxd5Z8jn0YejNZCWhg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231023)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(20161123560025)(6072148)(201708071742011); SRVR:HE1PR08MB0843; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR08MB0843; X-Forefront-PRVS: 051900244E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(366004)(346002)(189003)(199004)(6512007)(16586007)(76176011)(25786009)(8936002)(51416003)(52116002)(4326008)(316002)(68736007)(16526018)(2950100002)(106356001)(97736004)(59450400001)(305945005)(86362001)(6666003)(478600001)(110136005)(66066001)(36756003)(54906003)(47776003)(53936002)(69596002)(7736002)(6486002)(81156014)(48376002)(81166006)(50466002)(6506006)(105586002)(3846002)(53416004)(5660300001)(2906002)(55236003)(50226002)(8676002)(6116002)(1076002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR08MB0843; H:rkaganb.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR08MB0843; 23:mUKxlXjD3jVGupDtJsUaaFC3qzmYF5Z+aRwctXXNd?= =?us-ascii?Q?zZhL7Z8QzzLW4TV/S+gMezHI+L5VOondpaEzWWsg/i2GwUMC9wqJzRtq0apD?= =?us-ascii?Q?goHx6y8omkhNbmcLk1w8fY7ebkZrKb5V3xG9BU8qxDnwrW0kqReucxVMZsYa?= =?us-ascii?Q?VjJwzQ1r5KxRsWWmcZss14a9Mp9/d7yBlH80KlR1CRoDzB3PYdEzavmw1WP4?= =?us-ascii?Q?kkzRrcj8qAXn2F/iia8xqXOh+DQdQDC389OdDlPX+4tpUYM5XhmyeXRM8srV?= =?us-ascii?Q?jyaqBXIVXCigFNYv3LQwjBH60TDv2HtDytTXXh8S8cb1p7tsZS+jzTt8Fk95?= =?us-ascii?Q?e6bhtDOtZN+ddRM8NxlXl0JVtBwk1HwyD4VoQ8JEw6Lw2IgWCbvZBpFs2LUo?= =?us-ascii?Q?/K7byt66rwXh77UcoZoV8rfQdxMaH4Z00N7p5Iprjt5wDt4pp+H4ZqlyEq8J?= =?us-ascii?Q?x8NnYOrmZV/Vz1D3D4pmpNX5XD3OydTDnAIL6OuOA0XzWCGtAoUi6mNMhNsL?= =?us-ascii?Q?GWe7Jw+jhDy8AZcXNAenYn8bDWd9KXQXrLxBko8hK1w12j7IAeOYwOdcPhPM?= =?us-ascii?Q?GAFdKMPES99hNJXdGOxCdW19VpB//jQ03tXmNpX2H+dUykLX6V7GKG3aujcR?= =?us-ascii?Q?SdyXI1oDX31AgsjnwRZ1v3GRPqOOSdCoIp0LE9FXzjZcZUTiQDAtiHgNdH/T?= =?us-ascii?Q?JsnvU49MbGltZHuTDrthU92WPxo8GUbXNQc0vZoPff4rarN2oJJFxiudIayR?= =?us-ascii?Q?yEiLch+ERRxmLiak1OosJm+4t5C/V6Gnyt2abNAYrufXsbEsY47payQQ/sjH?= =?us-ascii?Q?OTWlfrN+Zy3sK1OGWrH3oGEDrrCvIoVhxbruhO8JePEatOuw87mhUh6KCG5w?= =?us-ascii?Q?bhdlOjRYX4VvoJQuxDDhxxJFksn1rJ0NdrQf6ywMfUb8SfRopfI8IncTLGWO?= =?us-ascii?Q?UAR0PG47ZIq044a8e70kJfHaTlYwzp12YWQ8R8Vb+MQ/fqAU8G6lfbKuXkqX?= =?us-ascii?Q?Y6223ffDwTA1NLcmBwhKvKKiS3D+RgSHvH7SackAHfeHR7kHSfpPwP0sj5UF?= =?us-ascii?Q?mXpd1NRk5F5/KGpAD5yPHL3W2lVPt4IP7EQO+MIhljUrpXApSZLMO5jbTtKH?= =?us-ascii?Q?hF+BmELulc=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0843; 6:jhbKAraeZxv35kPpxJu04LtbZ6Uc1jvVleYIleP7X1xM2hY/B1M3q1A8O2AGvcLynJulAFhWmkIjPOVFsbDwxN3DkICS8SeRi4/WpJne2qYsjHMYTBZwS8OqAj1SXKvEI0xWWb7p29S4XcuPasDrW4FHZwVHfRtOXjb6jsZir4imATmKvSk8PJr8aAtC/roFR6hqbD+dk6EiETj+fq+E4mtIQuSc00hFaZBS0mWxmiG2UhIisY/anISVHMgZ/ONpeWdb4hDBZukCs3sO5z1yfFgYm6f7M/DyzWVM9IPgWRR07UFsnKMm1ZY8nqgnQI/fOvnHHyKph0fvJhSEZnR8taHzUyN+j5b6bW+3SMZJFhQ=; 5:HA9pltrZ4Q2zYO7U2LSouzNu9U3/rHdndeaZxYDCd485ca2UxbCFj+ckp5sl8aQirHiWUASKGQofeGI4jWG+MjDv9AqytsuZrGiWcumcWrWaTFZwttM8EWVUaWqoeoxK8uWL6AgUV+7x15paSTLHj4XYouzH1cccAt294GKYYZQ=; 24:WvmJvPOW7KU0SgqJHPD4GR7hRSTzxIelh+7voCkBYNPPY6EhmjVSfd58ohGxHRkEJglGFTPI1L5cKEv3WXaRmGYrM+T4ksVZdEXNHqSA9oM=; 7:JhG9O6z6bD45qwgezFKDYIJufNea66truQ0ZuXKNRMIRuYxgoQQTROpNaoFPglChp/iO08vC1BXM/3qbfW4pNmaQxBFkncdvJE8/tiYZTlDWWoD3jTPhj/DLETXtRmHZ7+L/BBjG9xiWsL1es0mN8jyjP7nWOihmrslsd0MdLh6S8TDJQe8xX1L25qXDsG7RYZZiYLZq+Or3IBom3y1XaUKh+JMuoHaAOkvobUVByHq0ogGbttGbceLiOU4lT2Ie SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0843; 20:A69ApZfRZ6QGG84makEiYSYLR1s8Ads2EQA5o77qv79jPc/JthXDcroLF50NREe/ykkT03Q7NYcU+017/PJl1EbkAaePYdXPTD7Hd9aRj8pIONLw3qZj3xCvJZLqn4N0AtAWtBL4c7lcmLz/GmhYFIZIvPHZ/bIVIrM7273iXgg= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2017 16:07:51.1593 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f2a57233-116b-4f21-bd64-08d5417a7eef X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR08MB0843 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move kvm.arch.hyperv initialization and cleanup to separate functions. For now only a mutex is inited in the former, and the latter is empty; more stuff will go in there in a followup patch. Signed-off-by: Roman Kagan --- v3 -> v4 -> v5: no change v2 -> v3: - style fixes v1 -> v2: - fix subject prefix arch/x86/kvm/hyperv.h | 3 +++ arch/x86/kvm/hyperv.c | 9 +++++++++ arch/x86/kvm/x86.c | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/hyperv.h b/arch/x86/kvm/hyperv.h index e637631a9574..cc2468244ca2 100644 --- a/arch/x86/kvm/hyperv.h +++ b/arch/x86/kvm/hyperv.h @@ -88,4 +88,7 @@ void kvm_hv_process_stimers(struct kvm_vcpu *vcpu); void kvm_hv_setup_tsc_page(struct kvm *kvm, struct pvclock_vcpu_time_info *hv_clock); +void kvm_hv_init_vm(struct kvm *kvm); +void kvm_hv_destroy_vm(struct kvm *kvm); + #endif diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index dc97f2544b6f..015fb06c7522 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -1301,3 +1301,12 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) kvm_hv_hypercall_set_result(vcpu, ret); return 1; } + +void kvm_hv_init_vm(struct kvm *kvm) +{ + mutex_init(&kvm->arch.hyperv.hv_lock); +} + +void kvm_hv_destroy_vm(struct kvm *kvm) +{ +} diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index faf843c9b916..d17cf7900138 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8148,7 +8148,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) raw_spin_lock_init(&kvm->arch.tsc_write_lock); mutex_init(&kvm->arch.apic_map_lock); - mutex_init(&kvm->arch.hyperv.hv_lock); spin_lock_init(&kvm->arch.pvclock_gtod_sync_lock); kvm->arch.kvmclock_offset = -ktime_get_boot_ns(); @@ -8157,6 +8156,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) INIT_DELAYED_WORK(&kvm->arch.kvmclock_update_work, kvmclock_update_fn); INIT_DELAYED_WORK(&kvm->arch.kvmclock_sync_work, kvmclock_sync_fn); + kvm_hv_init_vm(kvm); kvm_page_track_init(kvm); kvm_mmu_init_vm(kvm); @@ -8291,6 +8291,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) kvfree(rcu_dereference_check(kvm->arch.apic_map, 1)); kvm_mmu_uninit_vm(kvm); kvm_page_track_cleanup(kvm); + kvm_hv_destroy_vm(kvm); } void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,