From patchwork Tue Oct 11 23:40:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Lai X-Patchwork-Id: 9371865 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 10F1560487 for ; Tue, 11 Oct 2016 23:40:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0109828FD2 for ; Tue, 11 Oct 2016 23:40:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E387B28FD4; Tue, 11 Oct 2016 23:40:37 +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 5AB6029112 for ; Tue, 11 Oct 2016 23:40:36 +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 1bu6cb-0007H7-FL; Tue, 11 Oct 2016 23:38:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bu6ca-0007Gl-31 for xen-devel@lists.xensource.com; Tue, 11 Oct 2016 23:38:08 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 21/C8-19721-FD77DF75; Tue, 11 Oct 2016 23:38:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42Jpa+tI0b1b/jf coKVd2+LelPfsDowe2/t2sQcwRrFm5iXlVySwZjyeZ19wzbhi2/sfbA2M/9W7GDk4hAQqJXra 4roYOTkkBHgljiybwQph+0vc/HyQDcQWEqiQ2Dy1jb2LkQvIXsYo8fF8MyNEokSid/ECsAY2A VWJ5ecmgcVFBBQl1q1+xwJiMwukSazd9AVskLBAtMTslz1gNgtQ/YXvu5lAbuAVcJbovpkKsV dO4ua5TmYQm1PAReLQmm9MEGc6S0yfIj+BkX8BI8MqRo3i1KKy1CJdIxO9pKLM9IyS3MTMHF1 DA1O93NTi4sT01JzEpGK95PzcTYzAsKlnYGDcwXhzst8hRkkOJiVR3ly+v+FCfEn5KZUZicUZ 8UWlOanFhxhlODiUJHgPlAHlBItS01Mr0jJzgAEMk5bg4FES4d0BkuYtLkjMLc5Mh0idYtTlO Db3xlomIZa8/LxUKXHeQJAiAZCijNI8uBGwaLrEKCslzMvIwMAgxFOQWpSbWYIq/4pRnINRSZ j3GMgUnsy8ErhNr4COYAI6wmbSH5AjShIRUlINjMmendM876e37A7/lKX2QdbJzfme/ravX4x fH4kLebs81PXj+sdzXiwzCl7bcjy/xeBthIO3l5qY5sbLZT6l6lFpRX+Nt0pxVgWJTi96++Ts OZlr3s5c36/+Lnpvle75qjHT+9N0r6PrNvHNTxWadHZa9fmZsVwSvqenbDMKZRGKfBVktqb2v RJLcUaioRZzUXEiAK7UkwChAgAA X-Env-Sender: pclai@intel.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1476229083!62710306!1 X-Originating-IP: [134.134.136.100] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52901 invoked from network); 11 Oct 2016 23:38:05 -0000 Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by server-5.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 11 Oct 2016 23:38:05 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP; 11 Oct 2016 16:38:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,479,1473145200"; d="scan'208";a="771535006" Received: from scymds01.sc.intel.com ([10.82.194.37]) by FMSMGA003.fm.intel.com with ESMTP; 11 Oct 2016 16:38:02 -0700 Received: from pclaidev.sc.intel.com (pclaidev.sc.intel.com [143.183.85.56]) by scymds01.sc.intel.com with ESMTP id u9BNc2u8017942; Tue, 11 Oct 2016 16:38:02 -0700 Received: by pclaidev.sc.intel.com (Postfix, from userid 1002) id CC65E20110; Tue, 11 Oct 2016 16:40:11 -0700 (PDT) From: Paul Lai To: xen-devel@lists.xensource.com Date: Tue, 11 Oct 2016 16:40:10 -0700 Message-Id: <1476229211-9974-2-git-send-email-paul.c.lai@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476229211-9974-1-git-send-email-paul.c.lai@intel.com> References: <1476229211-9974-1-git-send-email-paul.c.lai@intel.com> Cc: ravi.sahita@intel.com, george.dunlap@citrix.com, jbeulich@suse.com Subject: [Xen-devel] [PATCH Altp2m cleanup 2/3 v10 1/2] Move altp2m specific functions to altp2m files. 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This makes the code a little easier to read. Moving hvm_altp2m_supported() check into functions that use it for better readability. Got rid of stray blanks after open paren after function names. Defining _XEN_ASM_X86_P2M_H instead of _XEN_P2M_H for xen/include/asm-x86/p2m.h. Signed-off-by: Paul Lai --- v10 Per request: fix coding style of "if (rc) {" --- xen/arch/x86/mm/altp2m.c | 58 +++++++++++++++++++++++++++++++++++++++ xen/arch/x86/mm/hap/hap.c | 40 ++++++++------------------- xen/include/asm-x86/altp2m.h | 4 ++- xen/include/asm-x86/hvm/vmx/vmx.h | 3 ++ xen/include/asm-x86/p2m.h | 9 ++---- 5 files changed, 78 insertions(+), 36 deletions(-) diff --git a/xen/arch/x86/mm/altp2m.c b/xen/arch/x86/mm/altp2m.c index 930bdc2..0b99d5d 100644 --- a/xen/arch/x86/mm/altp2m.c +++ b/xen/arch/x86/mm/altp2m.c @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -66,6 +67,63 @@ altp2m_vcpu_destroy(struct vcpu *v) } /* + * allocate and initialize memory for altp2m portion of domain + * + * returns < 0 on error + * returns 0 on no operation & success + */ +int +altp2m_domain_init(struct domain *d) +{ + int rc; + unsigned int i; + + if ( d == NULL ) + return 0; + + if ( !hvm_altp2m_supported() ) + return 0; + + /* Init alternate p2m data. */ + if ( (d->arch.altp2m_eptp = alloc_xenheap_page()) == NULL ) + return -ENOMEM; + + for ( i = 0; i < MAX_EPTP; i++ ) + d->arch.altp2m_eptp[i] = mfn_x(INVALID_MFN); + + for ( i = 0; i < MAX_ALTP2M; i++ ) + { + rc = p2m_alloc_table(d->arch.altp2m_p2m[i]); + if ( rc != 0 ) + { + altp2m_domain_teardown(d); + return rc; + } + } + + d->arch.altp2m_active = 0; + + return rc; +} + +void +altp2m_domain_teardown(struct domain *d) +{ + unsigned int i; + + if ( !hvm_altp2m_supported() ) + return; + + d->arch.altp2m_active = 0; + + for ( i = 0; i < MAX_ALTP2M; i++ ) + p2m_teardown(d->arch.altp2m_p2m[i]); + + free_xenheap_page(d->arch.altp2m_eptp); + d->arch.altp2m_eptp = NULL; +} + +/* * Local variables: * mode: C * c-file-style: "BSD" diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 3218fa2..4612871 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -493,32 +494,25 @@ int hap_enable(struct domain *d, u32 mode) goto out; } - for (i = 0; i < MAX_NESTEDP2M; i++) { + for (i = 0; i < MAX_NESTEDP2M; i++) + { rv = p2m_alloc_table(d->arch.nested_p2m[i]); if ( rv != 0 ) goto out; } - if ( hvm_altp2m_supported() ) + if ( (rv = altp2m_domain_init(d)) < 0 ) { - /* Init alternate p2m data */ - if ( (d->arch.altp2m_eptp = alloc_xenheap_page()) == NULL ) + for (i = 0; i < MAX_NESTEDP2M; i++) { - rv = -ENOMEM; - goto out; + p2m_teardown(d->arch.nested_p2m[i]); } - for ( i = 0; i < MAX_EPTP; i++ ) - d->arch.altp2m_eptp[i] = mfn_x(INVALID_MFN); - - for ( i = 0; i < MAX_ALTP2M; i++ ) - { - rv = p2m_alloc_table(d->arch.altp2m_p2m[i]); - if ( rv != 0 ) - goto out; - } + if ( d->arch.paging.hap.total_pages != 0 ) + hap_teardown(d, NULL); - d->arch.altp2m_active = 0; + p2m_teardown(p2m_get_hostp2m(d)); + goto out; } /* Now let other users see the new mode */ @@ -533,19 +527,7 @@ void hap_final_teardown(struct domain *d) { unsigned int i; - if ( hvm_altp2m_supported() ) - { - d->arch.altp2m_active = 0; - - if ( d->arch.altp2m_eptp ) - { - free_xenheap_page(d->arch.altp2m_eptp); - d->arch.altp2m_eptp = NULL; - } - - for ( i = 0; i < MAX_ALTP2M; i++ ) - p2m_teardown(d->arch.altp2m_p2m[i]); - } + altp2m_domain_teardown(d); /* Destroy nestedp2m's first */ for (i = 0; i < MAX_NESTEDP2M; i++) { diff --git a/xen/include/asm-x86/altp2m.h b/xen/include/asm-x86/altp2m.h index 64c7618..0090c89 100644 --- a/xen/include/asm-x86/altp2m.h +++ b/xen/include/asm-x86/altp2m.h @@ -18,7 +18,6 @@ #ifndef __ASM_X86_ALTP2M_H #define __ASM_X86_ALTP2M_H -#include #include /* for struct vcpu, struct domain */ #include /* for vcpu_altp2m */ @@ -38,4 +37,7 @@ static inline uint16_t altp2m_vcpu_idx(const struct vcpu *v) return vcpu_altp2m(v).p2midx; } +int altp2m_domain_init(struct domain *d); +void altp2m_domain_teardown(struct domain *d); + #endif /* __ASM_X86_ALTP2M_H */ diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index 4cdd9b1..9f4c7de 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -561,6 +561,9 @@ void ept_p2m_uninit(struct p2m_domain *p2m); void ept_walk_table(struct domain *d, unsigned long gfn); bool_t ept_handle_misconfig(uint64_t gpa); void setup_ept_dump(void); +void p2m_init_altp2m_ept(struct domain *d, unsigned int i); +/* Locate an alternate p2m by its EPTP */ +unsigned int p2m_find_altp2m_by_eptp(struct domain *d, uint64_t eptp); void update_guest_eip(void); diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 7035860..0e72880 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -23,8 +23,8 @@ * along with this program; If not, see . */ -#ifndef _XEN_P2M_H -#define _XEN_P2M_H +#ifndef _XEN_ASM_X86_P2M_H +#define _XEN_ASM_X86_P2M_H #include #include @@ -784,9 +784,6 @@ static inline struct p2m_domain *p2m_get_altp2m(struct vcpu *v) return v->domain->arch.altp2m_p2m[index]; } -/* Locate an alternate p2m by its EPTP */ -unsigned int p2m_find_altp2m_by_eptp(struct domain *d, uint64_t eptp); - /* Switch alternate p2m for a single vcpu */ bool_t p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx); @@ -848,7 +845,7 @@ static inline unsigned int p2m_get_iommu_flags(p2m_type_t p2mt) return flags; } -#endif /* _XEN_P2M_H */ +#endif /* _XEN_ASM_X86_P2M_H */ /* * Local variables: