From patchwork Mon May 13 14:38:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Chartre X-Patchwork-Id: 10941123 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 623451390 for ; Mon, 13 May 2019 14:41:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5575F27861 for ; Mon, 13 May 2019 14:41:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49A9F2832D; Mon, 13 May 2019 14:41:48 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable 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 CB39227861 for ; Mon, 13 May 2019 14:41:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730762AbfEMOln (ORCPT ); Mon, 13 May 2019 10:41:43 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:47814 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727786AbfEMOlm (ORCPT ); Mon, 13 May 2019 10:41:42 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x4DEd2K2181455; Mon, 13 May 2019 14:40:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=bVamqx26WofIGHx47Rok5tY+OeXg0YuA7C3C4gCjugU=; b=phOTgVyRSmfJlShasjXR81DKx3htuPesB+i0d59gwRf4Pvj7Dim335VGDly6TaryasbH p79YnJpLHxV6ux2E6qwXe0qzqxgl9bjTmvmDzhmAzNh5lJ8rrhJ6ObfkWiFmfAq3lRJz K05CgDIVBI1/f6xo2nFMOruVDoE6XxhauS8j3PiqHmyqCTNH4xnpgnaVEUHrFTBXW7f2 VLrhtdpEyD7KijA3Esx4FX4nbFn/WkBHai46PD3BIoP4/Hkwmpdc6QjQUAlSMhB2yCbA Ui+mFwRtvI4wzRar5LmOK42XboaGtSbIhchHkhsgVIP9GVewhcqNUP1Lh2Qu6jIn+TwR /w== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2130.oracle.com with ESMTP id 2sdnttfemt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 May 2019 14:40:04 +0000 Received: from achartre-desktop.fr.oracle.com (dhcp-10-166-106-34.fr.oracle.com [10.166.106.34]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x4DEcZQU022780; Mon, 13 May 2019 14:39:56 GMT From: Alexandre Chartre To: pbonzini@redhat.com, rkrcmar@redhat.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, kvm@vger.kernel.org, x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: konrad.wilk@oracle.com, jan.setjeeilers@oracle.com, liran.alon@oracle.com, jwadams@google.com, alexandre.chartre@oracle.com Subject: [RFC KVM 27/27] kvm/isolation: initialize the KVM page table with KVM buses Date: Mon, 13 May 2019 16:38:35 +0200 Message-Id: <1557758315-12667-28-git-send-email-alexandre.chartre@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1557758315-12667-1-git-send-email-alexandre.chartre@oracle.com> References: <1557758315-12667-1-git-send-email-alexandre.chartre@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9255 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905130103 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP KVM buses can change after they have been created so new buses have to be mapped when they are created. Signed-off-by: Alexandre Chartre --- arch/x86/kvm/isolation.c | 37 +++++++++++++++++++++++++++++++++++++ arch/x86/kvm/isolation.h | 1 + arch/x86/kvm/x86.c | 13 ++++++++++++- include/linux/kvm_host.h | 1 + virt/kvm/kvm_main.c | 2 ++ 5 files changed, 53 insertions(+), 1 deletions(-) diff --git a/arch/x86/kvm/isolation.c b/arch/x86/kvm/isolation.c index 255b2da..329e769 100644 --- a/arch/x86/kvm/isolation.c +++ b/arch/x86/kvm/isolation.c @@ -1614,6 +1614,29 @@ void kvm_isolation_check_memslots(struct kvm *kvm) } +void kvm_isolation_check_buses(struct kvm *kvm) +{ + struct kvm_range_mapping *rmapping; + struct kvm_io_bus *bus; + int i, err; + + if (!kvm_isolation()) + return; + + for (i = 0; i < KVM_NR_BUSES; i++) { + bus = kvm->buses[i]; + rmapping = kvm_get_range_mapping(bus, NULL); + if (rmapping) + continue; + pr_debug("remapping kvm buses[%d]\n", i); + err = kvm_copy_ptes(bus, sizeof(*bus) + bus->dev_count * + sizeof(struct kvm_io_range)); + if (err) + pr_debug("failed to map kvm buses[%d]\n", i); + } + +} + int kvm_isolation_init_vm(struct kvm *kvm) { int err, i; @@ -1632,6 +1655,15 @@ int kvm_isolation_init_vm(struct kvm *kvm) return err; } + pr_debug("mapping kvm buses\n"); + + for (i = 0; i < KVM_NR_BUSES; i++) { + err = kvm_copy_ptes(kvm->buses[i], + sizeof(struct kvm_io_bus)); + if (err) + return err; + } + pr_debug("mapping kvm srcu sda\n"); return (kvm_copy_percpu_mapping(kvm->srcu.sda, @@ -1650,6 +1682,11 @@ void kvm_isolation_destroy_vm(struct kvm *kvm) for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++) kvm_clear_range_mapping(kvm->memslots[i]); + pr_debug("unmapping kvm buses\n"); + + for (i = 0; i < KVM_NR_BUSES; i++) + kvm_clear_range_mapping(kvm->buses[i]); + pr_debug("unmapping kvm srcu sda\n"); kvm_clear_percpu_mapping(kvm->srcu.sda); diff --git a/arch/x86/kvm/isolation.h b/arch/x86/kvm/isolation.h index 1e55799..b048946 100644 --- a/arch/x86/kvm/isolation.h +++ b/arch/x86/kvm/isolation.h @@ -33,6 +33,7 @@ static inline bool kvm_isolation(void) extern int kvm_copy_percpu_mapping(void *percpu_ptr, size_t size); extern void kvm_clear_percpu_mapping(void *percpu_ptr); extern void kvm_isolation_check_memslots(struct kvm *kvm); +extern void kvm_isolation_check_buses(struct kvm *kvm); extern int kvm_add_task_mapping(struct task_struct *tsk); extern void kvm_cleanup_task_mapping(struct task_struct *tsk); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 7d98e9f..3ba1996 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -9253,6 +9253,13 @@ void kvm_arch_sync_events(struct kvm *kvm) cancel_delayed_work_sync(&kvm->arch.kvmclock_sync_work); cancel_delayed_work_sync(&kvm->arch.kvmclock_update_work); kvm_free_pit(kvm); + /* + * Note that kvm_isolation_destroy_vm() has to be called from + * here, and not from kvm_arch_destroy_vm() because it will unmap + * buses which are already destroyed when kvm_arch_destroy_vm() + * is invoked. + */ + kvm_isolation_destroy_vm(kvm); } int __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, u32 size) @@ -9331,7 +9338,6 @@ void kvm_arch_destroy_vm(struct kvm *kvm) x86_set_memory_region(kvm, IDENTITY_PAGETABLE_PRIVATE_MEMSLOT, 0, 0); x86_set_memory_region(kvm, TSS_PRIVATE_MEMSLOT, 0, 0); } - kvm_isolation_destroy_vm(kvm); if (kvm_x86_ops->vm_destroy) kvm_x86_ops->vm_destroy(kvm); kvm_pic_destroy(kvm); @@ -9909,6 +9915,11 @@ bool kvm_vector_hashing_enabled(void) } EXPORT_SYMBOL_GPL(kvm_vector_hashing_enabled); +void kvm_arch_buses_updated(struct kvm *kvm, struct kvm_io_bus *bus) +{ + kvm_isolation_check_buses(kvm); +} + EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_exit); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_fast_mmio); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_inj_virq); diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index ad24d9e..1291d8d 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -199,6 +199,7 @@ void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, struct kvm_io_device *dev); struct kvm_io_device *kvm_io_bus_get_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr); +void kvm_arch_buses_updated(struct kvm *kvm, struct kvm_io_bus *bus); #ifdef CONFIG_KVM_ASYNC_PF struct kvm_async_pf { diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 3c0c3db..374e79f 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -3749,6 +3749,8 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, synchronize_srcu_expedited(&kvm->srcu); kfree(bus); + kvm_arch_buses_updated(kvm, new_bus); + return 0; }