From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mukesh Rathor Subject: [V0 PATCH 1/6] AMD-PVH: construct vmcb changes Date: Fri, 15 Aug 2014 18:53:11 -0700 Message-ID: <1408153996-16425-2-git-send-email-mukesh.rathor@oracle.com> References: <1408153996-16425-1-git-send-email-mukesh.rathor@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XITBV-0007H6-Qm for xen-devel@lists.xenproject.org; Sat, 16 Aug 2014 01:53:33 +0000 In-Reply-To: <1408153996-16425-1-git-send-email-mukesh.rathor@oracle.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.xenproject.org Cc: keir@xen.org, boris.ostrovsky@oracle.com, Aravind.Gopalakrishnan@amd.com, jbeulich@suse.com, suravee.suthikulpanit@amd.com List-Id: xen-devel@lists.xenproject.org PVH guest starts in Long 64bit paging mode. This patch modifies construct_vmcb for that. Signed-off-by: Mukesh Rathor --- xen/arch/x86/hvm/svm/vmcb.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 21292bb..5df5f36 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -138,6 +138,8 @@ static int construct_vmcb(struct vcpu *v) /* Guest EFER. */ v->arch.hvm_vcpu.guest_efer = 0; + if ( is_pvh_vcpu(v) ) + v->arch.hvm_vcpu.guest_efer |= EFER_LMA; /* PVH 32bitfixme */ hvm_update_guest_efer(v); /* Guest segment limits. */ @@ -162,7 +164,12 @@ static int construct_vmcb(struct vcpu *v) vmcb->ds.attr.bytes = 0xc93; vmcb->fs.attr.bytes = 0xc93; vmcb->gs.attr.bytes = 0xc93; - vmcb->cs.attr.bytes = 0xc9b; /* exec/read, accessed */ + + if ( is_pvh_vcpu(v) ) + /* CS.L == 1, exec, read/write, accessed. PVH 32bitfixme. */ + vmcb->cs.attr.bytes = 0xa9b; + else + vmcb->cs.attr.bytes = 0xc9b; /* exec/read, accessed */ /* Guest IDT. */ vmcb->idtr.base = 0; @@ -184,12 +191,17 @@ static int construct_vmcb(struct vcpu *v) vmcb->tr.limit = 0xff; v->arch.hvm_vcpu.guest_cr[0] = X86_CR0_PE | X86_CR0_ET; + /* PVH domains start in paging mode */ + if ( is_pvh_vcpu(v) ) + v->arch.hvm_vcpu.guest_cr[0] |= X86_CR0_PG; hvm_update_guest_cr(v, 0); - v->arch.hvm_vcpu.guest_cr[4] = 0; + v->arch.hvm_vcpu.guest_cr[4] = is_pvh_vcpu(v) ? X86_CR4_PAE : 0; hvm_update_guest_cr(v, 4); - paging_update_paging_modes(v); + /* For pvh, paging mode is updated by arch_set_info_guest(). */ + if ( is_hvm_vcpu(v) ) + paging_update_paging_modes(v); vmcb->_exception_intercepts = HVM_TRAP_MASK -- 1.8.3.1