From patchwork Fri Sep 29 15:01:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 9978261 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 EF97960311 for ; Fri, 29 Sep 2017 15:04:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E22C32766D for ; Fri, 29 Sep 2017 15:04:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6DA628448; Fri, 29 Sep 2017 15:04:21 +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 6E6042766D for ; Fri, 29 Sep 2017 15:04:21 +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 1dxwnq-0003f3-LC; Fri, 29 Sep 2017 15:02:10 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dxwnp-0003dn-Cm for xen-devel@lists.xenproject.org; Fri, 29 Sep 2017 15:02:09 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id E4/EF-03093-0706EC95; Fri, 29 Sep 2017 15:02:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHSDvW5Bwrl Ig+uXhCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyHDV2sBVtVKk7sf8DYwLhIrouRk0NCwF/i 5vuNzCA2m4CexLzjX1m6GDk4RARUJG7vNehi5OJgFjjCKHHkxnEWkBphAQ+Jby+3s4HYLAKqE k1PbzKC2LwCNhJ9T3+wQ8yUlzj34DbYTE4BW4lN/d1gthBQzbNrd9khbFWJxQ+OskP0CkqcnP kEbD6zgITEwRcvmCcw8s5CkpqFJLWAkWkVo0ZxalFZapGukaleUlFmekZJbmJmjq6hgZlebmp xcWJ6ak5iUrFecn7uJkZg8DAAwQ7GVQsCDzFKcjApifIKxJ6LFOJLyk+pzEgszogvKs1JLT7E KMPBoSTBWxQPlBMsSk1PrUjLzAGGMUxagoNHSYSXEyTNW1yQmFucmQ6ROsWoy9Fx8+4fJiGWv Py8VClxXlGQIgGQoozSPLgRsJi6xCgrJczLCHSUEE9BalFuZgmq/CtGcQ5GJWHeVpApPJl5JX CbXgEdwQR0xOSJZ0COKElESEk1MEb8mXTo6L0HUzVmH1N5+vr+lvVrH9uWsq09+Pw+a/gs56k f7k1h3h8Xp5+Vt1js30Qmxh1dL73kef8H7SiUms4aztOhdKXkYuh/B5cgtfNr39kz2vEppx+5 vtRre9g8+epY8YKkK1+vr8q0/1TDfDZv9dJdXdkrZtpfm2OzsMk8u+7V4lufVixVYinOSDTUY i4qTgQAdpexcKQCAAA= X-Env-Sender: prvs=438a79e6a=George.Dunlap@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1506697326!109688636!1 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 39355 invoked from network); 29 Sep 2017 15:02:07 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 29 Sep 2017 15:02:07 -0000 X-IronPort-AV: E=Sophos;i="5.42,452,1500940800"; d="scan'208";a="449785855" From: George Dunlap To: Date: Fri, 29 Sep 2017 16:01:38 +0100 Message-ID: <20170929150144.7602-3-george.dunlap@citrix.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170929150144.7602-1-george.dunlap@citrix.com> References: <20170929150144.7602-1-george.dunlap@citrix.com> MIME-Version: 1.0 Cc: Sergey Dyasli , Kevin Tian , Jun Nakajima , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH 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 From: Sergey Dyasli 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 --- CC: Andrew Cooper CC: Jan Beulich CC: Jun Nakajima CC: Kevin Tian --- 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 5501ccc455..85874ab401 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().