From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Ostrovsky Subject: [PATCH v4 16/17] x86/VPMU: Suport for PVH guests Date: Tue, 21 Jan 2014 14:09:01 -0500 Message-ID: <1390331342-3967-17-git-send-email-boris.ostrovsky@oracle.com> References: <1390331342-3967-1-git-send-email-boris.ostrovsky@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1390331342-3967-1-git-send-email-boris.ostrovsky@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.xen.org Cc: keir@xen.org, suravee.suthikulpanit@amd.com, andrew.cooper3@citrix.com, eddie.dong@intel.com, dietmar.hahn@ts.fujitsu.com, JBeulich@suse.com, jun.nakajima@intel.com, boris.ostrovsky@oracle.com List-Id: xen-devel@lists.xenproject.org Add support for PVH guests. Most of operations are performed as in an HVM guest. However, interrupt management is done in PV-like manner. Signed-off-by: Boris Ostrovsky --- xen/arch/x86/hvm/hvm.c | 3 ++- xen/arch/x86/hvm/vmx/vmx.c | 4 +++- xen/arch/x86/hvm/vpmu.c | 22 ++++++++++++++++++---- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 69f7e74..1e50c35 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3451,7 +3451,8 @@ static hvm_hypercall_t *const pvh_hypercall64_table[NR_hypercalls] = { [ __HYPERVISOR_physdev_op ] = (hvm_hypercall_t *)hvm_physdev_op, HYPERCALL(hvm_op), HYPERCALL(sysctl), - HYPERCALL(domctl) + HYPERCALL(domctl), + HYPERCALL(xenpmu_op) }; int hvm_do_hypercall(struct cpu_user_regs *regs) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index dfff628..59b8ef1 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -112,7 +112,9 @@ static int vmx_vcpu_initialise(struct vcpu *v) return rc; } - vpmu_initialise(v); + /* PVH will initialize VPMU using PV path */ + if ( is_hvm_domain(v->domain) ) + vpmu_initialise(v); vmx_install_vlapic_mapping(v); diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c index e76b538..f736de0 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/hvm/vpmu.c @@ -37,6 +37,7 @@ #include #include #include +#include #include /* @@ -194,13 +195,17 @@ int vpmu_do_interrupt(struct cpu_user_regs *regs) if ( !is_hvm_domain(v->domain) || (vpmu_mode & XENPMU_MODE_PRIV) ) { - /* PV guest or dom0 is doing system profiling */ + /* PV(H) guest or dom0 is doing system profiling */ struct cpu_user_regs *gregs; int err; if ( v->arch.vpmu.xenpmu_data->pmu_flags & PMU_CACHED ) return 1; + if ( is_pvh_domain(current->domain) && !(vpmu_mode & XENPMU_MODE_PRIV) ) + if ( !vpmu->arch_vpmu_ops->do_interrupt(regs) ) + return 0; + /* PV guest will be reading PMU MSRs from xenpmu_data */ vpmu_set(vpmu, VPMU_CONTEXT_SAVE | VPMU_CONTEXT_LOADED); err = vpmu->arch_vpmu_ops->arch_vpmu_save(v); @@ -237,7 +242,7 @@ int vpmu_do_interrupt(struct cpu_user_regs *regs) else if ( !is_control_domain(current->domain) && !is_idle_vcpu(current) ) { - /* PV guest */ + /* PV(H) guest */ gregs = guest_cpu_user_regs(); memcpy(&v->arch.vpmu.xenpmu_data->pmu.r.regs, gregs, sizeof(struct cpu_user_regs)); @@ -247,7 +252,15 @@ int vpmu_do_interrupt(struct cpu_user_regs *regs) regs, sizeof(struct cpu_user_regs)); gregs = &v->arch.vpmu.xenpmu_data->pmu.r.regs; - gregs->cs = cs; + if ( !is_pvh_domain(current->domain) ) + gregs->cs = cs; + else if ( !(vpmu_apic_vector & APIC_DM_NMI) ) + { + struct segment_register seg_cs; + + hvm_get_segment_register(current, x86_seg_cs, &seg_cs); + gregs->cs = seg_cs.attr.fields.dpl; + } } else { @@ -271,7 +284,8 @@ int vpmu_do_interrupt(struct cpu_user_regs *regs) v->arch.vpmu.xenpmu_data->vcpu_id = current->vcpu_id; v->arch.vpmu.xenpmu_data->pcpu_id = smp_processor_id(); - v->arch.vpmu.xenpmu_data->pmu_flags |= PMU_CACHED; + if ( !is_pvh_domain(current->domain) || (vpmu_mode & XENPMU_MODE_PRIV) ) + v->arch.vpmu.xenpmu_data->pmu_flags |= PMU_CACHED; apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc | APIC_LVT_MASKED); vpmu->hw_lapic_lvtpc |= APIC_LVT_MASKED; -- 1.8.1.4