From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dongxiao Xu Subject: [PATCH 1/2] nEPT: fix EPT pointer setting for L2 guest Date: Fri, 25 Jan 2013 16:21:11 +0800 Message-ID: <1359102072-5562-2-git-send-email-dongxiao.xu@intel.com> References: <1359102072-5562-1-git-send-email-dongxiao.xu@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1359102072-5562-1-git-send-email-dongxiao.xu@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: eddie.dong@intel.com, xiantao.zhang@intel.com, jun.nakajima@intel.com List-Id: xen-devel@lists.xenproject.org Each time in virtual_vmentry(), the code needs to cover both EPT and shadow mode for L2 guest, updating different EPT pointer to shadow VMCS. This fixes the issue that, launch a guest with EPT, then kill it and launch a second guest with shadow, the second guest will hang at the startup screen. Signed-off-by: Dongxiao Xu --- xen/arch/x86/hvm/vmx/vvmx.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 3c152c5..a90736a 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1076,6 +1076,14 @@ uint64_t get_shadow_eptp(struct vcpu *v) return ept_get_eptp(ept); } +static uint64_t get_host_eptp(struct vcpu *v) +{ + struct domain *d = v->domain; + struct ept_data *ept_data = &p2m_get_hostp2m(d)->ept; + + return ept_get_eptp(ept_data); +} + static bool_t nvmx_vpid_enabled(struct nestedvcpu *nvcpu) { uint32_t second_cntl; @@ -1159,6 +1167,8 @@ static void virtual_vmentry(struct cpu_user_regs *regs) /* Setup virtual ETP for L2 guest*/ if ( nestedhvm_paging_mode_hap(v) ) __vmwrite(EPT_POINTER, get_shadow_eptp(v)); + else + __vmwrite(EPT_POINTER, get_host_eptp(v)); /* nested VPID support! */ if ( cpu_has_vmx_vpid && nvmx_vpid_enabled(nvcpu) ) -- 1.7.1