From patchwork Tue Oct 3 15:20:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Dyasli X-Patchwork-Id: 9983069 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 BA7126038E for ; Tue, 3 Oct 2017 15:23:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC72E2889D for ; Tue, 3 Oct 2017 15:23:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1579289BE; Tue, 3 Oct 2017 15:23:53 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2A7E8289B1 for ; Tue, 3 Oct 2017 15:23:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzP0a-0002z7-7E; Tue, 03 Oct 2017 15:21:20 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzP0Y-0002ut-J5 for xen-devel@lists.xen.org; Tue, 03 Oct 2017 15:21:18 +0000 Received: from [85.158.143.35] by server-9.bemta-6.messagelabs.com id 2A/67-03422-EEAA3D95; Tue, 03 Oct 2017 15:21:18 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHSDve6rVZc jDX73mFgs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBktjx+xFtxXqriw8xVLA+MjmS5GTg4JAX+J 82d+s4PYbAJ6Ehtnv2ICsUUEZCVWd80BizMLfGKSaDjmCGILC3hLXGlewAZiswioSFw6epkVx OYVsJG4dOUBK8RMeYldbRfBbE4BW4kpx+azgNhCQDXfv+xhhLBVJV6/2MUC0SsocXLmExaIXR ISB1+8YJ7AyDsLSWoWktQCRqZVjBrFqUVlqUW6hgZ6SUWZ6RkluYmZOUCemV5uanFxYnpqTmJ SsV5yfu4mRmDwMADBDsbj7+MOMUpyMCmJ8r5edjlSiC8pP6UyI7E4I76oNCe1+BCjDAeHkgTv hZVAOcGi1PTUirTMHGAYw6QlOHiURHgtVwCleYsLEnOLM9MhUqcYdTk6bt79wyTEkpeflyolz vsIZIYASFFGaR7cCFhMXWKUlRLmZQQ6SoinILUoN7MEVf4VozgHo5Iw7xeQKTyZeSVwm14BHc EEdMScrgsgR5QkIqSkGhhZ7p81rwqYNnsL63Ud5nk2jdKMEoWyeZaWxq+qG95mclanWbPu8K9 7tOz+1ZlfuIP9+DXq3X1SvjYafQiwv3xZNHp1/Lmla07VirJn79xxte6Cfm7p4eil17gK3n7o uaDNP5FvY/HH9I3y2j2vijs/ME7/ssrrkWGV45Jsk8tnjsddfChgv0GJpTgj0VCLuag4EQA5m /JCpAIAAA== X-Env-Sender: prvs=4422f64de=sergey.dyasli@citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1507044071!79162960!3 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28611 invoked from network); 3 Oct 2017 15:21:14 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-14.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 3 Oct 2017 15:21:14 -0000 X-IronPort-AV: E=Sophos;i="5.42,474,1500940800"; d="scan'208";a="450330537" From: Sergey Dyasli To: Date: Tue, 3 Oct 2017 16:20:58 +0100 Message-ID: <20171003152104.1432-4-sergey.dyasli@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171003152104.1432-1-sergey.dyasli@citrix.com> References: <20171003152104.1432-1-sergey.dyasli@citrix.com> MIME-Version: 1.0 Cc: Sergey Dyasli , Kevin Tian , Jun Nakajima , George Dunlap , Andrew Cooper , Tim Deegan , Jan Beulich , Boris Ostrovsky , Suravee Suthikulpanit Subject: [Xen-devel] [PATCH v3 3/9] x86/np2m: remove np2m_base from p2m_get_nestedp2m() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Remove np2m_base parameter as it should always match the value of np2m_base in VMCx12. Signed-off-by: Sergey Dyasli Reviewed-by: George Dunlap Reviewed-by: Boris Ostrovsky --- xen/arch/x86/hvm/svm/nestedsvm.c | 6 +++++- xen/arch/x86/hvm/vmx/vvmx.c | 3 +-- xen/arch/x86/mm/hap/nested_hap.c | 2 +- xen/arch/x86/mm/p2m.c | 8 ++++---- xen/include/asm-x86/p2m.h | 5 ++--- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index 66a1777298..1de896e456 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -412,7 +412,11 @@ static void nestedsvm_vmcb_set_nestedp2m(struct vcpu *v, ASSERT(v != NULL); ASSERT(vvmcb != NULL); ASSERT(n2vmcb != NULL); - p2m = p2m_get_nestedp2m(v, vvmcb->_h_cr3); + + /* This will allow nsvm_vcpu_hostcr3() to return correct np2m_base */ + vcpu_nestedsvm(v).ns_vmcb_hostcr3 = vvmcb->_h_cr3; + + p2m = p2m_get_nestedp2m(v); n2vmcb->_h_cr3 = pagetable_get_paddr(p2m_get_pagetable(p2m)); } diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index d333aa6d78..2f468e6ced 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1109,8 +1109,7 @@ static void load_shadow_guest_state(struct vcpu *v) uint64_t get_shadow_eptp(struct vcpu *v) { - uint64_t np2m_base = nvmx_vcpu_eptp_base(v); - struct p2m_domain *p2m = p2m_get_nestedp2m(v, np2m_base); + struct p2m_domain *p2m = p2m_get_nestedp2m(v); struct ept_data *ept = &p2m->ept; ept->mfn = pagetable_get_pfn(p2m_get_pagetable(p2m)); diff --git a/xen/arch/x86/mm/hap/nested_hap.c b/xen/arch/x86/mm/hap/nested_hap.c index 162afed46b..ed137fa784 100644 --- a/xen/arch/x86/mm/hap/nested_hap.c +++ b/xen/arch/x86/mm/hap/nested_hap.c @@ -212,7 +212,7 @@ nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t *L2_gpa, uint8_t p2ma_21 = p2m_access_rwx; p2m = p2m_get_hostp2m(d); /* L0 p2m */ - nested_p2m = p2m_get_nestedp2m(v, nhvm_vcpu_p2m_base(v)); + nested_p2m = p2m_get_nestedp2m(v); /* walk the L1 P2M table */ rv = nestedhap_walk_L1_p2m(v, *L2_gpa, &L1_gpa, &page_order_21, &p2ma_21, diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b7588b2ec1..d3e602de22 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1813,11 +1813,12 @@ static void assign_np2m(struct vcpu *v, struct p2m_domain *p2m) } struct p2m_domain * -p2m_get_nestedp2m(struct vcpu *v, uint64_t np2m_base) +p2m_get_nestedp2m(struct vcpu *v) { struct nestedvcpu *nv = &vcpu_nestedhvm(v); struct domain *d = v->domain; struct p2m_domain *p2m; + uint64_t np2m_base = nhvm_vcpu_p2m_base(v); /* Mask out low bits; this avoids collisions with P2M_BASE_EADDR */ np2m_base &= ~(0xfffull); @@ -1865,7 +1866,7 @@ p2m_get_p2m(struct vcpu *v) if (!nestedhvm_is_n2(v)) return p2m_get_hostp2m(v->domain); - return p2m_get_nestedp2m(v, nhvm_vcpu_p2m_base(v)); + return p2m_get_nestedp2m(v); } unsigned long paging_gva_to_gfn(struct vcpu *v, @@ -1880,13 +1881,12 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, unsigned long l2_gfn, l1_gfn; struct p2m_domain *p2m; const struct paging_mode *mode; - uint64_t np2m_base = nhvm_vcpu_p2m_base(v); uint8_t l1_p2ma; unsigned int l1_page_order; int rv; /* translate l2 guest va into l2 guest gfn */ - p2m = p2m_get_nestedp2m(v, np2m_base); + p2m = p2m_get_nestedp2m(v); mode = paging_get_nestedmode(v); l2_gfn = mode->gva_to_gfn(v, p2m, va, pfec); diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index ce50e37f46..798295ec12 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -360,10 +360,9 @@ struct p2m_domain { #define p2m_get_hostp2m(d) ((d)->arch.p2m) /* - * Assigns an np2m with the specified np2m_base to the specified vCPU - * and returns that np2m. + * Updates vCPU's n2pm to match its np2m_base in VMCx12 and returns that np2m. */ -struct p2m_domain *p2m_get_nestedp2m(struct vcpu *v, uint64_t np2m_base); +struct p2m_domain *p2m_get_nestedp2m(struct vcpu *v); /* If vcpu is in host mode then behaviour matches p2m_get_hostp2m(). * If vcpu is in guest mode then behaviour matches p2m_get_nestedp2m().