From patchwork Mon Feb 5 18:47:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: KarimAllah Ahmed X-Patchwork-Id: 10201381 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 E4731602CA for ; Mon, 5 Feb 2018 18:51:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D294D287CF for ; Mon, 5 Feb 2018 18:51:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5450287DA; Mon, 5 Feb 2018 18:51:18 +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 195F4287CF for ; Mon, 5 Feb 2018 18:51:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753831AbeBESvQ (ORCPT ); Mon, 5 Feb 2018 13:51:16 -0500 Received: from smtp-fw-4101.amazon.com ([72.21.198.25]:15450 "EHLO smtp-fw-4101.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753657AbeBESr6 (ORCPT ); Mon, 5 Feb 2018 13:47:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1517856479; x=1549392479; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VeJjFiKZof8U+YYzcrLdXkfau7cZ58thjjCPeC3Xofo=; b=WrSk6tLccRnjFiGiTUh1wab5lmaNprKJQ79qRyv88yWJ6Xoqx6NU5MYH BJ2Gna4AINfInb9ysGEreXsFv9yb0SLLre8XgBYZRYegxn0+TOQa4ebvZ T1/zEJ+eJGpuATCIBSi39cZ2uITetqatkRvFAO/ZNAhlGS0nhYt4FW6sA o=; X-IronPort-AV: E=Sophos;i="5.46,465,1511827200"; d="scan'208";a="706879261" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-2a-7c6d20a4.us-west-2.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-4101.iad4.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 05 Feb 2018 18:47:57 +0000 Received: from u54e1ad5160425a4b64ea.ant.amazon.com (pdx2-ws-svc-lb17-vlan3.amazon.com [10.247.140.70]) by email-inbound-relay-2a-7c6d20a4.us-west-2.amazon.com (8.14.7/8.14.7) with ESMTP id w15IlpLg085406 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Feb 2018 18:47:53 GMT Received: from u54e1ad5160425a4b64ea.ant.amazon.com (localhost [127.0.0.1]) by u54e1ad5160425a4b64ea.ant.amazon.com (8.15.2/8.15.2/Debian-3) with ESMTP id w15IlpfH003154; Mon, 5 Feb 2018 19:47:51 +0100 Received: (from karahmed@localhost) by u54e1ad5160425a4b64ea.ant.amazon.com (8.15.2/8.15.2/Submit) id w15IloNX003153; Mon, 5 Feb 2018 19:47:50 +0100 From: KarimAllah Ahmed To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: KarimAllah Ahmed , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [RFC 04/12] KVM/VMX: Use the new host mapping API for pi_desc_page Date: Mon, 5 Feb 2018 19:47:23 +0100 Message-Id: <1517856451-2932-5-git-send-email-karahmed@amazon.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517856451-2932-1-git-send-email-karahmed@amazon.de> References: <1517856451-2932-1-git-send-email-karahmed@amazon.de> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For nested guests the pi_desc_page was mapped to the host kernel using kvm_vcpu_gpa_to_page which assumes that all guest memory is backed by a "struct page". This breaks guests that have their memory outside the kernel control. Switch to the new host mapping API which takes care of this use-case as well. Cc: Paolo Bonzini Cc: Radim Krčmář Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: KarimAllah Ahmed --- arch/x86/kvm/vmx.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 6bd0c45..40d73f4 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -453,7 +453,7 @@ struct nested_vmx { */ struct kvm_host_mapping apic_access_mapping; struct kvm_host_mapping virtual_apic_mapping; - struct page *pi_desc_page; + struct kvm_host_mapping pi_desc_mapping; struct pi_desc *pi_desc; bool pi_pending; u16 posted_intr_nv; @@ -7501,12 +7501,11 @@ static void free_nested(struct vcpu_vmx *vmx) /* Unpin physical memory we referred to in the vmcs02 */ if (vmx->nested.apic_access_mapping.pfn) kvm_release_host_mapping(&vmx->nested.apic_access_mapping, true); + if (vmx->nested.virtual_apic_mapping.pfn) kvm_release_host_mapping(&vmx->nested.virtual_apic_mapping, true); - if (vmx->nested.pi_desc_page) { - kunmap(vmx->nested.pi_desc_page); - kvm_release_page_dirty(vmx->nested.pi_desc_page); - vmx->nested.pi_desc_page = NULL; + if (vmx->nested.pi_desc_mapping.pfn) { + kvm_release_host_mapping(&vmx->nested.pi_desc_mapping, true); vmx->nested.pi_desc = NULL; } @@ -10041,7 +10040,6 @@ static void nested_get_vmcs12_pages(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) { struct vcpu_vmx *vmx = to_vmx(vcpu); - struct page *page; if (nested_cpu_has2(vmcs12, SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES)) { /* @@ -10097,24 +10095,22 @@ static void nested_get_vmcs12_pages(struct kvm_vcpu *vcpu, } if (nested_cpu_has_posted_intr(vmcs12)) { - if (vmx->nested.pi_desc_page) { /* shouldn't happen */ - kunmap(vmx->nested.pi_desc_page); - kvm_release_page_dirty(vmx->nested.pi_desc_page); - vmx->nested.pi_desc_page = NULL; - } - page = kvm_vcpu_gpa_to_page(vcpu, vmcs12->posted_intr_desc_addr); - if (is_error_page(page)) + if (vmx->nested.pi_desc_mapping.pfn) /* shouldn't happen */ + kvm_release_host_mapping(&vmx->nested.pi_desc_mapping, true); + + if (!kvm_vcpu_gpa_to_host_mapping(vcpu, vmcs12->posted_intr_desc_addr, + &vmx->nested.pi_desc_mapping, true)) return; - vmx->nested.pi_desc_page = page; - vmx->nested.pi_desc = kmap(vmx->nested.pi_desc_page); + + vmx->nested.pi_desc = vmx->nested.pi_desc_mapping.kaddr; vmx->nested.pi_desc = (struct pi_desc *)((void *)vmx->nested.pi_desc + (unsigned long)(vmcs12->posted_intr_desc_addr & (PAGE_SIZE - 1))); vmcs_write64(POSTED_INTR_DESC_ADDR, - page_to_phys(vmx->nested.pi_desc_page) + - (unsigned long)(vmcs12->posted_intr_desc_addr & - (PAGE_SIZE - 1))); + (vmx->nested.pi_desc_mapping.pfn << PAGE_SHIFT) + + (unsigned long)(vmcs12->posted_intr_desc_addr & + (PAGE_SIZE - 1))); } if (cpu_has_vmx_msr_bitmap() && nested_cpu_has(vmcs12, CPU_BASED_USE_MSR_BITMAPS) && @@ -11675,12 +11671,12 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, /* Unpin physical memory we referred to in vmcs02 */ if (vmx->nested.apic_access_mapping.pfn) kvm_release_host_mapping(&vmx->nested.apic_access_mapping, true); + if (vmx->nested.virtual_apic_mapping.pfn) kvm_release_host_mapping(&vmx->nested.virtual_apic_mapping, true); - if (vmx->nested.pi_desc_page) { - kunmap(vmx->nested.pi_desc_page); - kvm_release_page_dirty(vmx->nested.pi_desc_page); - vmx->nested.pi_desc_page = NULL; + + if (vmx->nested.pi_desc_mapping.pfn) { + kvm_release_host_mapping(&vmx->nested.pi_desc_mapping, true); vmx->nested.pi_desc = NULL; }