[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v8 11/19] x86/VPMU: Initialize PMU for PV(H) guests
Code for initializing/tearing down PMU for PV guests Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx> Acked-by: Kevin Tian <kevin.tian@xxxxxxxxx> Reviewed-by: Dietmar Hahn <dietmar.hahn@xxxxxxxxxxxxxx> Tested-by: Dietmar Hahn <dietmar.hahn@xxxxxxxxxxxxxx> --- xen/arch/x86/hvm/hvm.c | 3 +- xen/arch/x86/hvm/svm/svm.c | 8 +++- xen/arch/x86/hvm/svm/vpmu.c | 36 ++++++++++------- xen/arch/x86/hvm/vmx/vmx.c | 9 ++++- xen/arch/x86/hvm/vmx/vpmu_core2.c | 67 +++++++++++++++++++++---------- xen/arch/x86/hvm/vpmu.c | 84 ++++++++++++++++++++++++++++++++++++++- xen/common/event_channel.c | 1 + xen/include/asm-x86/hvm/vpmu.h | 1 + xen/include/public/pmu.h | 2 + xen/include/public/xen.h | 1 + 10 files changed, 171 insertions(+), 41 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 17ff011..2322ee3 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4699,7 +4699,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/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 76616ac..555e5f7 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1158,7 +1158,9 @@ static int svm_vcpu_initialise(struct vcpu *v) return rc; } - vpmu_initialise(v); + /* PVH's VPMU is initialized via hypercall */ + if ( is_hvm_domain(v->domain) ) + vpmu_initialise(v); svm_guest_osvw_init(v); @@ -1167,7 +1169,9 @@ static int svm_vcpu_initialise(struct vcpu *v) static void svm_vcpu_destroy(struct vcpu *v) { - vpmu_destroy(v); + /* PVH's VPMU destroyed via hypercall */ + if ( is_hvm_domain(v->domain) ) + vpmu_destroy(v); svm_destroy_vmcb(v); passive_domain_destroy(v); } diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c index df67c25..22bd53f 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/hvm/svm/vpmu.c @@ -382,15 +382,21 @@ static int amd_vpmu_initialise(struct vcpu *v) } } - ctxt = xzalloc_bytes(sizeof(struct xen_pmu_amd_ctxt) + - 2 * sizeof(uint64_t) * AMD_MAX_COUNTERS); - if ( !ctxt ) + if ( is_hvm_domain(v->domain) ) { - gdprintk(XENLOG_WARNING, "Insufficient memory for PMU, " - " PMU feature is unavailable on domain %d vcpu %d.\n", - v->vcpu_id, v->domain->domain_id); - return -ENOMEM; + ctxt = xzalloc_bytes(sizeof(struct xen_pmu_amd_ctxt) + + sizeof(uint64_t) * AMD_MAX_COUNTERS + + sizeof(uint64_t) * AMD_MAX_COUNTERS); + if ( !ctxt ) + { + gdprintk(XENLOG_WARNING, "Insufficient memory for PMU, " + " PMU feature is unavailable on domain %d vcpu %d.\n", + v->vcpu_id, v->domain->domain_id); + return -ENOMEM; + } } + else + ctxt = &v->arch.vpmu.xenpmu_data->pmu.c.amd; ctxt->counters = sizeof(struct xen_pmu_amd_ctxt); ctxt->ctrls = ctxt->counters + sizeof(uint64_t) * AMD_MAX_COUNTERS; @@ -408,17 +414,19 @@ static void amd_vpmu_destroy(struct vcpu *v) if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) return; - if ( has_hvm_container_domain(v->domain) && is_msr_bitmap_on(vpmu) ) - amd_vpmu_unset_msr_bitmap(v); + if ( has_hvm_container_domain(v->domain) ) + { + if ( is_msr_bitmap_on(vpmu) ) + amd_vpmu_unset_msr_bitmap(v); - xfree(vpmu->context); - vpmu_reset(vpmu, VPMU_CONTEXT_ALLOCATED); + if ( is_hvm_domain(v->domain) ) + xfree(vpmu->context); - if ( vpmu_is_set(vpmu, VPMU_RUNNING) ) - { - vpmu_reset(vpmu, VPMU_RUNNING); release_pmu_ownship(PMU_OWNER_HVM); } + + vpmu->context = NULL; + vpmu_clear(vpmu); } /* VPMU part of the 'q' keyhandler */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 22b3325..1533d98 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -116,7 +116,9 @@ static int vmx_vcpu_initialise(struct vcpu *v) return rc; } - vpmu_initialise(v); + /* PVH's VPMU is initialized via hypercall */ + if ( is_hvm_domain(v->domain) ) + vpmu_initialise(v); vmx_install_vlapic_mapping(v); @@ -130,7 +132,10 @@ static int vmx_vcpu_initialise(struct vcpu *v) static void vmx_vcpu_destroy(struct vcpu *v) { vmx_destroy_vmcs(v); - vpmu_destroy(v); + + /* PVH's VPMU is destroyed via hypercall */ + if ( is_hvm_domain(v->domain) ) + vpmu_destroy(v); passive_domain_destroy(v); } diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 65b03d1..3f15e0c 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -360,24 +360,36 @@ static int core2_vpmu_alloc_resource(struct vcpu *v) struct xen_pmu_intel_ctxt *core2_vpmu_cxt = NULL; uint64_t *p = NULL; - if ( !acquire_pmu_ownership(PMU_OWNER_HVM) ) - return 0; - - wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, 0); - if ( vmx_add_msr(MSR_CORE_PERF_GLOBAL_CTRL, VMX_HOST_MSR) ) + p = xzalloc_bytes(sizeof(uint64_t)); + if ( !p ) goto out_err; - if ( vmx_add_msr(MSR_CORE_PERF_GLOBAL_CTRL, VMX_GUEST_MSR) ) - goto out_err; - vmx_write_guest_msr(MSR_CORE_PERF_GLOBAL_CTRL, 0); + if ( has_hvm_container_domain(v->domain) ) + { + if ( !acquire_pmu_ownership(PMU_OWNER_HVM) ) + goto out_err; + + wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, 0); + if ( vmx_add_msr(MSR_CORE_PERF_GLOBAL_CTRL, VMX_HOST_MSR) ) + goto out_err_hvm; + if ( vmx_add_msr(MSR_CORE_PERF_GLOBAL_CTRL, VMX_GUEST_MSR) ) + goto out_err_hvm; + vmx_write_guest_msr(MSR_CORE_PERF_GLOBAL_CTRL, 0); + } - core2_vpmu_cxt = xzalloc_bytes(sizeof(struct xen_pmu_intel_ctxt) + - sizeof(uint64_t) * fixed_pmc_cnt + - sizeof(struct xen_pmu_cntr_pair) * - arch_pmc_cnt); - p = xzalloc_bytes(sizeof(uint64_t)); - if ( !core2_vpmu_cxt || !p ) - goto out_err; + if ( is_hvm_domain(v->domain) ) + { + core2_vpmu_cxt = xzalloc_bytes(sizeof(struct xen_pmu_intel_ctxt) + + sizeof(uint64_t) * fixed_pmc_cnt + + sizeof(struct xen_pmu_cntr_pair) * + arch_pmc_cnt); + if ( !core2_vpmu_cxt ) + goto out_err_hvm; + } + else + { + core2_vpmu_cxt = &v->arch.vpmu.xenpmu_data->pmu.c.intel; + } core2_vpmu_cxt->fixed_counters = sizeof(struct xen_pmu_intel_ctxt); core2_vpmu_cxt->arch_counters = core2_vpmu_cxt->fixed_counters + @@ -390,7 +402,7 @@ static int core2_vpmu_alloc_resource(struct vcpu *v) return 1; -out_err: +out_err_hvm: vmx_rm_msr(MSR_CORE_PERF_GLOBAL_CTRL, VMX_HOST_MSR); vmx_rm_msr(MSR_CORE_PERF_GLOBAL_CTRL, VMX_GUEST_MSR); release_pmu_ownship(PMU_OWNER_HVM); @@ -398,6 +410,7 @@ out_err: xfree(core2_vpmu_cxt); xfree(p); +out_err: printk("Failed to allocate VPMU resources for domain %u vcpu %u\n", v->vcpu_id, v->domain->domain_id); @@ -755,6 +768,10 @@ func_out: fixed_pmc_cnt = core2_get_fixed_pmc_count(); check_pmc_quirk(); + /* PV domains can allocate resources immediately */ + if ( is_pv_domain(v->domain) && !core2_vpmu_alloc_resource(v) ) + return 1; + return 0; } @@ -765,12 +782,20 @@ static void core2_vpmu_destroy(struct vcpu *v) if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) return; - xfree(vpmu->context); + if ( has_hvm_container_domain(v->domain) ) + { + if ( cpu_has_vmx_msr_bitmap ) + core2_vpmu_unset_msr_bitmap(v->arch.hvm_vmx.msr_bitmap); + + if ( is_hvm_domain(v->domain) ) + xfree(vpmu->context); + + release_pmu_ownship(PMU_OWNER_HVM); + } + xfree(vpmu->priv_context); - if ( has_hvm_container_domain(v->domain) && cpu_has_vmx_msr_bitmap ) - core2_vpmu_unset_msr_bitmap(v->arch.hvm_vmx.msr_bitmap); - release_pmu_ownship(PMU_OWNER_HVM); - vpmu_reset(vpmu, VPMU_CONTEXT_ALLOCATED); + vpmu->context = NULL; + vpmu_clear(vpmu); } struct arch_vpmu_ops core2_vpmu_ops = { diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c index 2a5ef83..b10a0a4 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/hvm/vpmu.c @@ -22,10 +22,13 @@ #include <xen/sched.h> #include <xen/xenoprof.h> #include <xen/event.h> +#include <xen/softirq.h> +#include <xen/hypercall.h> #include <xen/guest_access.h> #include <asm/regs.h> #include <asm/types.h> #include <asm/msr.h> +#include <asm/p2m.h> #include <asm/hvm/support.h> #include <asm/hvm/vmx/vmx.h> #include <asm/hvm/vmx/vmcs.h> @@ -278,7 +281,74 @@ void vpmu_destroy(struct vcpu *v) struct vpmu_struct *vpmu = vcpu_vpmu(v); if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_destroy ) + { + /* Unload VPMU first. This will stop counters */ + on_selected_cpus(cpumask_of(vcpu_vpmu(v)->last_pcpu), + vpmu_save_force, v, 1); + vpmu->arch_vpmu_ops->arch_vpmu_destroy(v); + } +} + +static int pvpmu_init(struct domain *d, xen_pmu_params_t *params) +{ + struct vcpu *v; + struct page_info *page; + uint64_t gfn = params->val; + + if ( (params->vcpu >= d->max_vcpus) || (d->vcpu == NULL) || + (d->vcpu[params->vcpu] == NULL) ) + return -EINVAL; + + page = get_page_from_gfn(d, gfn, NULL, P2M_ALLOC); + if ( !page ) + return -EINVAL; + + if ( !get_page_type(page, PGT_writable_page) ) + { + put_page(page); + return -EINVAL; + } + + v = d->vcpu[params->vcpu]; + v->arch.vpmu.xenpmu_data = __map_domain_page_global(page); + if ( !v->arch.vpmu.xenpmu_data ) + { + put_page_and_type(page); + return -EINVAL; + } + + vpmu_initialise(v); + + return 0; +} + +static void pvpmu_finish(struct domain *d, xen_pmu_params_t *params) +{ + struct vcpu *v; + uint64_t mfn; + + if ( (params->vcpu >= d->max_vcpus) || (d->vcpu == NULL) || + (d->vcpu[params->vcpu] == NULL) ) + return; + + v = d->vcpu[params->vcpu]; + if ( v != current ) + vcpu_pause(v); + + if ( v->arch.vpmu.xenpmu_data ) + { + mfn = domain_page_map_to_mfn(v->arch.vpmu.xenpmu_data); + if ( mfn_valid(mfn) ) + { + unmap_domain_page_global(v->arch.vpmu.xenpmu_data); + put_page_and_type(mfn_to_page(mfn)); + } + } + vpmu_destroy(v); + + if ( v != current ) + vcpu_unpause(v); } /* Dump some vpmu informations on console. Used in keyhandler dump_domains(). */ @@ -434,7 +504,19 @@ long do_xenpmu_op(int op, XEN_GUEST_HANDLE_PARAM(xen_pmu_params_t) arg) return -EFAULT; ret = 0; break; - } + + case XENPMU_init: + if ( copy_from_guest(&pmu_params, arg, 1) ) + return -EFAULT; + ret = pvpmu_init(current->domain, &pmu_params); + break; + + case XENPMU_finish: + if ( copy_from_guest(&pmu_params, arg, 1) ) + return -EFAULT; + pvpmu_finish(current->domain, &pmu_params); + break; + } return ret; } diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 6853842..7f9b8c9 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -108,6 +108,7 @@ static int virq_is_global(uint32_t virq) case VIRQ_TIMER: case VIRQ_DEBUG: case VIRQ_XENOPROF: + case VIRQ_XENPMU: rc = 0; break; case VIRQ_ARCH_0 ... VIRQ_ARCH_7: diff --git a/xen/include/asm-x86/hvm/vpmu.h b/xen/include/asm-x86/hvm/vpmu.h index 4a0410d..25954c6 100644 --- a/xen/include/asm-x86/hvm/vpmu.h +++ b/xen/include/asm-x86/hvm/vpmu.h @@ -61,6 +61,7 @@ struct vpmu_struct { void *context; /* May be shared with PV guest */ void *priv_context; /* hypervisor-only */ struct arch_vpmu_ops *arch_vpmu_ops; + xen_pmu_data_t *xenpmu_data; }; /* VPMU states */ diff --git a/xen/include/public/pmu.h b/xen/include/public/pmu.h index 252a2dd..00fec98 100644 --- a/xen/include/public/pmu.h +++ b/xen/include/public/pmu.h @@ -25,6 +25,8 @@ #define XENPMU_mode_set 1 #define XENPMU_feature_get 2 #define XENPMU_feature_set 3 +#define XENPMU_init 4 +#define XENPMU_finish 5 /* ` } */ /* Parameters structure for HYPERVISOR_xenpmu_op call */ diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 0766790..e4d0b79 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -161,6 +161,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t); #define VIRQ_MEM_EVENT 10 /* G. (DOM0) A memory event has occured */ #define VIRQ_XC_RESERVED 11 /* G. Reserved for XenClient */ #define VIRQ_ENOMEM 12 /* G. (DOM0) Low on heap memory */ +#define VIRQ_XENPMU 13 /* V. PMC interrupt */ /* Architecture-specific VIRQ definitions. */ #define VIRQ_ARCH_0 16 -- 1.8.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |