PEBS enabling in KVM guest
cover PEBS enabling in KVM guest
Intel new hardware introduces some Precise Event-Based Sampling (PEBS) extensions that output the PEBS record to Intel PT stream instead of DS area. The PEBS record will be packaged in a specific format when outputing to Intel PT.
This patch set will enable PEBS functionality in KVM Guest by PEBS output to Intel PT. The native driver as [1] (still under review).
[1] https://www.spinics.net/lists/kernel/msg3215354.html
Luwei Kang (9):
KVM: x86: Add base address parameter for get_fixed_pmc function
KVM: x86: PEBS via Intel PT HW feature detection
KVM: x86: Implement MSR_IA32_PEBS_ENABLE read/write emulation
KVM: x86: Implement counter reload MSRs read/write emulation
KVM: x86: Allocate performance counter for PEBS event
KVM: x86: Add shadow value of PEBS status
KVM: X86: Expose PDCM cpuid to guest
KVM: X86: MSR_IA32_PERF_CAPABILITIES MSR emulation
KVM: x86: Expose PEBS feature to guest
arch/x86/include/asm/kvm_host.h | 8 ++++ arch/x86/include/asm/msr-index.h | 12 ++++++ arch/x86/kvm/cpuid.c | 3 +- arch/x86/kvm/pmu.c | 57 ++++++++++++++++++++++---- arch/x86/kvm/pmu.h | 11 ++--- arch/x86/kvm/pmu_amd.c | 2 +- arch/x86/kvm/svm.c | 12 ++++++ arch/x86/kvm/vmx/capabilities.h | 21 ++++++++++ arch/x86/kvm/vmx/pmu_intel.c | 88 +++++++++++++++++++++++++++++++++++----- arch/x86/kvm/vmx/vmx.c | 24 ++++++++++- arch/x86/kvm/x86.c | 22 +++++++--- 11 files changed, 229 insertions(+), 31 deletions(-)
Signature · 1 line
1.8.3.1
RFC 1/9 KVM: x86: Add base address parameter for get_fixed_pmc function
PEBS output Inte PT introduces some new MSRs (MSR_RELOAD_FIXED_CTRx) for fixed function counters that use for autoload the preset value after writing out a PEBS event.
Introduce base MSRs address parameter to make this function can get performance monitor counter structure by MSR_RELOAD_FIXED_CTRx registers.
--- arch/x86/kvm/pmu.h | 5 ++--- arch/x86/kvm/vmx/pmu_intel.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-)
arch/x86/kvm/pmu.h +2 -3
@@ -93,10 +93,9 @@ static inline struct kvm_pmc *get_gp_pmc(struct kvm_pmu *pmu, u32 msr, }/* returns fixed PMC with the specified MSR */ -static inline struct kvm_pmc *get_fixed_pmc (struct kvm_pmu *pmu,u32 msr) +static inline struct kvm_pmc *get_fixed_pmc (struct kvm_pmu *pmu,u32 msr, +int base) { -int base =MSR_CORE_PERF_FIXED_CTR0 ; -if (msr >= base && msr < base + pmu->nr_arch_fixed_counters)return &pmu->fixed_counters[msr - base];
arch/x86/kvm/vmx/pmu_intel.c +9 -5
@@ -41,7 +41,8 @@ static void reprogram_fixed_counters(struct kvm_pmu *pmu, u64 data)u8 old_ctrl =fixed_ctrl_field (pmu->fixed_ctr_ctrl, i);struct kvm_pmc *pmc; - pmc =get_fixed_pmc (pmu,MSR_CORE_PERF_FIXED_CTR0 + i); + pmc =get_fixed_pmc (pmu,MSR_CORE_PERF_FIXED_CTR0 + i, +MSR_CORE_PERF_FIXED_CTR0 );if (old_ctrl == new_ctrl)continue ;
@@ -106,7 +107,8 @@ static struct kvm_pmc *intel_pmc_idx_to_pmc(struct kvm_pmu *pmu, int pmc_idx)else {u32 idx = pmc_idx -INTEL_PMC_IDX_FIXED ; -return get_fixed_pmc (pmu, idx +MSR_CORE_PERF_FIXED_CTR0 ); +return get_fixed_pmc (pmu, idx +MSR_CORE_PERF_FIXED_CTR0 , +MSR_CORE_PERF_FIXED_CTR0 ); } }
@@ -155,7 +157,7 @@ static bool intel_is_valid_msr(struct kvm_vcpu *vcpu, u32 msr)default : ret =get_gp_pmc (pmu, msr,MSR_IA32_PERFCTR0 ) ||get_gp_pmc (pmu, msr,MSR_P6_EVNTSEL0 ) || -get_fixed_pmc (pmu, msr); +get_fixed_pmc (pmu, msr,MSR_CORE_PERF_FIXED_CTR0 );break ; }
@@ -185,7 +187,8 @@ static int intel_pmu_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *data)u64 val =pmc_read_counter (pmc); *data = val & pmu->counter_bitmask[KVM_PMC_GP ];return 0 ; - }else if ((pmc =get_fixed_pmc (pmu, msr))) { + }else if ((pmc =get_fixed_pmc (pmu, msr, +MSR_CORE_PERF_FIXED_CTR0 ))) {u64 val =pmc_read_counter (pmc); *data = val & pmu->counter_bitmask[KVM_PMC_FIXED ];return 0 ;
@@ -243,7 +246,8 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)else pmc->counter = (s32 )data;return 0 ; - }else if ((pmc =get_fixed_pmc (pmu, msr))) { + }else if ((pmc =get_fixed_pmc (pmu, msr, +MSR_CORE_PERF_FIXED_CTR0 ))) { pmc->counter = data;return 0 ; }else if ((pmc =get_gp_pmc (pmu, msr,MSR_P6_EVNTSEL0 ))) {
Signature · 1 line
1.8.3.1
Re: [RFC v1 1/9] KVM: x86: Add base address parameter for get_fixed_pmc function
Quoted 20 lines · Luwei Kang
PEBS output Inte PT introduces some new MSRs (
MSR_RELOAD_FIXED_CTRx) for fixed function counters that use for autoload the preset value after writing out a PEBS event.Introduce base MSRs address parameter to make this function can get performance monitor counter structure by
MSR_RELOAD_FIXED_CTRxregisters.Signed-off-by Luwei Kang <[email protected]>--- arch/x86/kvm/pmu.h | 5 ++--- arch/x86/kvm/vmx/pmu_intel.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-)arch/x86/kvm/pmu.h +0
-0@@ -93,10 +93,9 @@ static inline struct kvm_pmc *get_gp_pmc(struct kvm_pmu *pmu, u32 msr, }
arch/x86/kvm/pmu.h static inline struct kvm_pmc *get_gp_pmc(struct kvm_pmu *pmu, u32 msr, · line 100
Quoted 10 lines
arch/x86/kvm/pmu.h +2
-3/* returns fixed PMC with the specified MSR */ -static inline struct kvm_pmc *get_fixed_pmc (struct kvm_pmu *pmu,u32 msr) +static inline struct kvm_pmc *get_fixed_pmc (struct kvm_pmu *pmu,u32 msr, +int base) { -int base =MSR_CORE_PERF_FIXED_CTR0 ; -if (msr >= base && msr < base + pmu->nr_arch_fixed_counters)return &pmu->fixed_counters[msr - base];
IIUC, these new MSRs aren't new fixed PMCs, but are values to be reloaded into the existing fixed PMCs when a PEBS event has been written. This change makes it look like you are introducing an additional set of fixed PMCs.
RE: [RFC v1 1/9] KVM: x86: Add base address parameter for get_fixed_pmc function
Quoted 25 lines
Quoted 6 lines
PEBS output Inte PT introduces some new MSRs (
MSR_RELOAD_FIXED_CTRx) for fixed function counters that use for autoload the preset value after writing out a PEBS event.Introduce base MSRs address parameter to make this function can get performance monitor counter structure by
MSR_RELOAD_FIXED_CTRxregisters.
Quoted 12 lines
Signed-off-by Luwei Kang <[email protected]>--- arch/x86/kvm/pmu.h | 5 ++--- arch/x86/kvm/vmx/pmu_intel.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-)arch/x86/kvm/pmu.h index renamed from arch/x86/kvm/pmu.h +0
-058265f7..c62a1ff 100644
arch/x86/kvm/pmu.h static inline struct kvm_pmc *get_gp_pmc(struct · line 97
Quoted 5 lines
arch/x86/kvm/pmu.h +1
-0@@ -93,10 +93,9 @@ static inline struct kvm_pmc *get_gp_pmc(struct kvm_pmu *pmu, u32 msr, } /* returns fixed PMC with the specified MSR */ -static inline struct kvm_pmc *get_fixed_pmc(struct kvm_pmu *pmu, u32 msr) +static inline struct kvm_pmc *get_fixed_pmc(struct kvm_pmu *pmu, u32msr,
Quoted 11 lines
arch/x86/kvm/pmu.h static inline struct kvm_pmc *get_gp_pmc(struct kvm_pmu *pmu, u32 msr, · line 100
Quoted 7 lines
arch/x86/kvm/pmu.h +2
-2+int +base) { -int base =MSR_CORE_PERF_FIXED_CTR0 ; -if (msr >= base && msr < base + pmu->nr_arch_fixed_counters)return &pmu->fixed_counters[msr - base];IIUC, these new MSRs aren't new fixed PMCs, but are values to be reloaded into the existing fixed PMCs when a PEBS event has been written. This change makes it look like you are introducing an additional set of fixed PMCs.
Yes, you are right. They are not new fixed counters.
Each fixed/general purpose counters have a "kvm_pmc" structure in KVM. We already have a function to get general purpose counter by event selectors and gp counters, as below:
pmc = get_gp_pmc(pmu, msr, MSR_IA32_PERFCTR0) //by gp counter
pmc = get_gp_pmc(pmu, msr, MSR_P6_EVNTSEL0) //by gp event selector
So I extended the " get_fixed_pmc " function to support get fixed counters by MSR_RELOAD_FIXED_CTRx. Actually, they are all get "kvm_pmc" structure by offset.
Thanks,
Luwei Kang
Re: [RFC v1 1/9] KVM: x86: Add base address parameter for get_fixed_pmc function
In reply to Luwei Kangarch/x86/kvm/pmu.h static inline struct kvm_pmc *get_gp_pmc(struct kvm_pmu *pmu, u32 msr, · line 97
Quoted 4 lines
/* returns fixed PMC with the specified MSR */
arch/x86/kvm/pmu.h +2
-1-static inline struct kvm_pmc *get_fixed_pmc (struct kvm_pmu *pmu,u32 msr) +static inline struct kvm_pmc *get_fixed_pmc (struct kvm_pmu *pmu,u32 msr, +int base)
Better define a __get_fixed_pmc just for this case, with the existing get_fixed_pmc being a wrapper.
This would avoid changing all the callers below.
-Andi
RE: [RFC v1 1/9] KVM: x86: Add base address parameter for get_fixed_pmc function
Quoted 10 lines
Quoted 3 lines
/* returns fixed PMC with the specified MSR */ -static inline struct
kvm_pmc*get_fixed_pmc(structkvm_pmu*pmu, u32 msr) +static inline structkvm_pmc*get_fixed_pmc(structkvm_pmu*pmu, u32msr,
arch/x86/kvm/pmu.h static inline struct kvm_pmc *get_gp_pmc(struct kvm_pmu *pmu, u32 msr, · line 97
Quoted 1 line
arch/x86/kvm/pmu.h +1
-0+ int base)Better define a
__get_fixed_pmcjust for this case, with the existingget_fixed_pmcbeing a wrapper.This would avoid changing all the callers below.
Do you mean change the code like this, and call "__get_fixed_pmc" in my patch? We already have a similar function to get gp counters.
struct kvm_pmc *get_gp_pmc(struct kvm_pmu *pmu, u32 msr, u32 base) // get gp counters
struct kvm_pmc *get_fixed_pmc(struct kvm_pmu *pmu, u32 msr) // get fixed counters
-/* returns fixed PMC with the specified MSR */
-static inline struct kvm_pmc *get_fixed_pmc(struct kvm_pmu *pmu, u32 msr) +static inline struct kvm_pmc *__get_fixed_pmc(struct kvm_pmu *pmu, u32 msr, u32 base)
{
- int base = MSR_CORE_PERF_FIXED_CTR0;
-
if (msr >= base && msr < base + pmu->nr_arch_fixed_counters)
return &pmu->fixed_counters[msr - base];
return NULL;}
+/* returns fixed PMC with the specified MSR */
+static inline struct kvm_pmc *get_fixed_pmc(struct kvm_pmu *pmu, u32 msr) +{
+ return __get_fixed_pmc(pmu, msr, MSR_CORE_PERF_FIXED_CTR0)
+}
Thanks,
Luwei Kang
Quoted 3 lines
-Andi
RFC 2/9 KVM: x86: PEBS via Intel PT HW feature detection
In reply to Luwei KangPEBS can be enabled in KVM guest by direct PEBS record into the Intel Processor Trace output buffer. This patch adds a new flag to detect if PEBS can be supported in KVM guest. It not only need HW support PEBS output Intel PT (IA32_PERF_CAPABILITIES.PEBS_OUTPUT_PT_AVAIL[16]=1) but also depends on:
1. PEBS feature is supported by HW (IA32_MISC_ENABLE[Bit12]=0);
2. Intel PT must be working in HOST_GUEST mode.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/msr-index.h | 3 +++ arch/x86/kvm/vmx/capabilities.h | 11 +++++++++++ arch/x86/kvm/vmx/pmu_intel.c | 7 ++++++- 4 files changed, 21 insertions(+), 1 deletion(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -472,6 +472,7 @@ struct kvm_pmu {u64 global_ovf_ctrl_mask;u64 reserved_bits;u8 version; +bool pebs_pt;/* PEBS output to Intel PT */ struct kvm_pmc gp_counters[INTEL_PMC_MAX_GENERIC ];struct kvm_pmc fixed_counters[INTEL_PMC_MAX_FIXED ];struct irq_work irq_work;
arch/x86/include/asm/msr-index.h +3 -0
@@ -134,6 +134,7 @@#define MSR_IA32_PEBS_ENABLE 0x000003f1#define MSR_PEBS_DATA_CFG 0x000003f2#define MSR_IA32_DS_AREA 0x00000600 +#define MSR_IA32_PERF_CAP_PEBS_OUTPUT_PT (1UL << 16)#define MSR_IA32_PERF_CAPABILITIES 0x00000345#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6
@@ -660,6 +661,8 @@#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT)#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) +#define MSR_IA32_MISC_ENABLE_PEBS_BIT 12 +#define MSR_IA32_MISC_ENABLE_PEBS (1ULL << MSR_IA32_MISC_ENABLE_PEBS_BIT)#define MSR_IA32_MISC_ENABLE_TM2_BIT 13#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT)#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19
arch/x86/kvm/vmx/capabilities.h +11 -0
@@ -342,4 +342,15 @@ static inline bool cpu_has_vmx_intel_pt(void) (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_RTIT_CTL); } +static inline bool cpu_has_vmx_pebs_output_pt (void ) +{ +u64 misc, perf_cap; + +rdmsrl (MSR_IA32_MISC_ENABLE , misc); +rdmsrl (MSR_IA32_PERF_CAPABILITIES , perf_cap); + +return (!(misc &MSR_IA32_MISC_ENABLE_PEBS ) && + (perf_cap &MSR_IA32_PERF_CAP_PEBS_OUTPUT_PT )); +} +#endif /* __KVM_X86_VMX_CAPS_H */
arch/x86/kvm/vmx/pmu_intel.c +6 -1
@@ -12,6 +12,7 @@#include <linux/kvm_host.h> #include <linux/perf_event.h> #include <asm/perf_event.h> +#include "capabilities.h" #include "x86.h" #include "cpuid.h" #include "lapic.h"
@@ -309,10 +310,14 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) pmu->global_ovf_ctrl_mask = pmu->global_ctrl_mask & ~(MSR_CORE_PERF_GLOBAL_OVF_CTRL_OVF_BUF |MSR_CORE_PERF_GLOBAL_OVF_CTRL_COND_CHGD ); -if (kvm_x86_ops->pt_supported ()) +if (kvm_x86_ops->pt_supported ()) { pmu->global_ovf_ctrl_mask &= ~MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI ; +if (cpu_has_vmx_pebs_output_pt ()) + pmu->pebs_pt = true; + } + entry =kvm_find_cpuid_entry (vcpu,7 ,0 ); if (entry && (boot_cpu_has(X86_FEATURE_HLE) || boot_cpu_has(X86_FEATURE_RTM)) &&
Signature · 1 line
1.8.3.1
RFC 3/9 KVM: x86: Implement MSR_IA32_PEBS_ENABLE read/write emulation
In reply to Luwei KangThis patch implements the MSR_IA32_PEBS_ENABLE register read/write emulation for KVM guest. MSR_IA32_PEBS_ENABLE register can be accessed only when PEBS is supported in KVM.
VMM need to reprogram the counter when the value of this MSR changed because some of the counters will be created or destroyed.
--- arch/x86/include/asm/kvm_host.h | 2 ++ arch/x86/include/asm/msr-index.h | 3 +++ arch/x86/kvm/vmx/pmu_intel.c | 42 +++++++++++++++++++++++++++++++++++++--- 3 files changed, 44 insertions(+), 3 deletions(-)
arch/x86/include/asm/kvm_host.h +2 -0
@@ -471,6 +471,8 @@ struct kvm_pmu {u64 global_ctrl_mask;u64 global_ovf_ctrl_mask;u64 reserved_bits; +u64 pebs_enable; +u64 pebs_enable_mask;u8 version;bool pebs_pt;/* PEBS output to Intel PT */ struct kvm_pmc gp_counters[INTEL_PMC_MAX_GENERIC ];
arch/x86/include/asm/msr-index.h +3 -0
@@ -131,6 +131,9 @@#define LBR_INFO_ABORT BIT_ULL(61)#define LBR_INFO_CYCLES 0xffff +#define MSR_IA32_PEBS_PMI_AFTER_REC (1UL << 60) +#define MSR_IA32_PEBS_OUTPUT_PT (1UL << 61) +#define MSR_IA32_PEBS_OUTPUT_MASK (3UL << 61)#define MSR_IA32_PEBS_ENABLE 0x000003f1#define MSR_PEBS_DATA_CFG 0x000003f2#define MSR_IA32_DS_AREA 0x00000600
arch/x86/kvm/vmx/pmu_intel.c +39 -3
86 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Re: [RFC v1 3/9] KVM: x86: Implement MSR_IA32_PEBS_ENABLE read/write emulation
arch/x86/kvm/vmx/pmu_intel.c static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) · line 271
Quoted 9 lines
arch/x86/kvm/vmx/pmu_intel.c +9
-0+case MSR_IA32_PEBS_ENABLE : +if (pmu->pebs_enable == data) +return 0 ; +if (!(data & pmu->pebs_enable_mask) && + (data &MSR_IA32_PEBS_OUTPUT_MASK ) == +MSR_IA32_PEBS_OUTPUT_PT ) { +pebs_enable_changed (pmu, data); +return 0 ; + }
Need #GP for bad values
RE: [RFC v1 3/9] KVM: x86: Implement MSR_IA32_PEBS_ENABLE read/write emulation
Quoted 7 lines
arch/x86/kvm/vmx/pmu_intel.c static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
Quoted 6 lines
arch/x86/kvm/vmx/pmu_intel.c +6
-0+case MSR_IA32_PEBS_ENABLE : +if (pmu->pebs_enable == data) +return 0 ; +if (!(data & pmu->pebs_enable_mask) && + (data &MSR_IA32_PEBS_OUTPUT_MASK ) == +MSR_IA32_PEBS_OUTPUT_PT ){
Quoted 5 lines
arch/x86/kvm/vmx/pmu_intel.c static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) · line 271
Quoted 3 lines
arch/x86/kvm/vmx/pmu_intel.c +3
-0+pebs_enable_changed (pmu, data); +return 0 ; + }Need #GP for bad values
Yes, this function will return 1 if neither of above two conditions check are not true. And will inject a #GP to guest.
Thanks,
Luwei Kang
RFC 4/9 KVM: x86: Implement counter reload MSRs read/write emulation
In reply to Luwei KangThis patch implements the counter reload register MSR_RELOAD_PMCx/FIXED_CTRx read/write emulation. These registers can be accessed only when PEBS is supported in KVM.
VMM need to reprogram the counters to make the host PMU framework load the value to real hardware after configuration has been changed.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/msr-index.h | 3 +++ arch/x86/kvm/vmx/pmu_intel.c | 22 +++++++++++++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -454,6 +454,7 @@ struct kvm_pmc {enum pmc_type type;u8 idx;u64 counter; +u64 reload_cnt;u64 eventsel;struct perf_event *perf_event;struct kvm_vcpu *vcpu;
arch/x86/include/asm/msr-index.h +3 -0
@@ -141,6 +141,9 @@#define MSR_IA32_PERF_CAPABILITIES 0x00000345#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 +#define MSR_IA32_RELOAD_PMC0 0x000014c1 +#define MSR_IA32_RELOAD_FIXED_CTR0 0x00001309 +#define MSR_IA32_RTIT_CTL 0x00000570#define RTIT_CTL_TRACEEN BIT(0)#define RTIT_CTL_CYCLEACC BIT(1)
arch/x86/kvm/vmx/pmu_intel.c +21 -1
@@ -175,7 +175,9 @@ static bool intel_is_valid_msr(struct kvm_vcpu *vcpu, u32 msr)default : ret =get_gp_pmc (pmu, msr,MSR_IA32_PERFCTR0 ) ||get_gp_pmc (pmu, msr,MSR_P6_EVNTSEL0 ) || -get_fixed_pmc (pmu, msr,MSR_CORE_PERF_FIXED_CTR0 ); +get_fixed_pmc (pmu, msr,MSR_CORE_PERF_FIXED_CTR0 ) || +get_gp_pmc (pmu, msr,MSR_IA32_RELOAD_PMC0 ) || +get_fixed_pmc (pmu, msr,MSR_IA32_RELOAD_FIXED_CTR0 );break ; }
@@ -216,6 +218,11 @@ static int intel_pmu_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *data) }else if ((pmc =get_gp_pmc (pmu, msr,MSR_P6_EVNTSEL0 ))) { *data = pmc->eventsel;return 0 ; + }else if ((pmc =get_gp_pmc (pmu, msr,MSR_IA32_RELOAD_PMC0 )) || + (pmc =get_fixed_pmc (pmu, msr, +MSR_IA32_RELOAD_FIXED_CTR0 ))) { + *data = pmc->reload_cnt; +return 0 ; } }
@@ -288,6 +295,19 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)reprogram_gp_counter (pmc, data);return 0 ; } + }else if ((pmc =get_gp_pmc (pmu, msr,MSR_IA32_RELOAD_PMC0 )) || + (pmc =get_fixed_pmc (pmu, msr, +MSR_IA32_RELOAD_FIXED_CTR0 ))) { +if (data == pmc->reload_cnt) +return 0 ; +if (!(data & ~pmc_bitmask (pmc))) { +int pmc_idx =pmc_is_fixed (pmc) ? + pmc->idx +INTEL_PMC_IDX_FIXED : + pmc->idx; + pmc->reload_cnt = data; +reprogram_counter (pmu, pmc_idx); +return 0 ; + } } }
Signature · 1 line
1.8.3.1
RFC 5/9 KVM: x86: Allocate performance counter for PEBS event
In reply to Luwei KangThis patch add a new parameter "pebs" that to make the host PMU framework allocate performance counter for guest PEBS event.
--- arch/x86/kvm/pmu.c | 23 +++++++++++++++-------- arch/x86/kvm/pmu.h | 5 +++-- arch/x86/kvm/pmu_amd.c | 2 +- arch/x86/kvm/vmx/pmu_intel.c | 7 +++++-- 4 files changed, 24 insertions(+), 13 deletions(-)
arch/x86/kvm/pmu.c +15 -8
@@ -99,7 +99,7 @@ static void kvm_perf_overflow_intr(struct perf_event *perf_event,static void pmc_reprogram_counter (struct kvm_pmc *pmc,u32 type,unsigned config,bool exclude_user,bool exclude_kernel,bool intr, -bool in_tx,bool in_tx_cp) +bool in_tx,bool in_tx_cp,bool pebs) {struct perf_event *event;struct perf_event_attr attr = {
@@ -111,9 +111,12 @@ static void pmc_reprogram_counter(struct kvm_pmc *pmc, u32 type, .exclude_user = exclude_user, .exclude_kernel = exclude_kernel, .config = config, + .precise_ip = pebs ? 1 : 0, + .aux_output = pebs ? 1 : 0, }; - attr.sample_period = (-pmc->counter) &pmc_bitmask (pmc); + attr.sample_period = pebs ? (-pmc->reload_cnt) &pmc_bitmask (pmc) : + (-pmc->counter) &pmc_bitmask (pmc);if (in_tx) attr.config |=HSW_IN_TX ;
@@ -140,7 +143,7 @@ static void pmc_reprogram_counter(struct kvm_pmc *pmc, u32 type,clear_bit (pmc->idx, (unsigned long *)&pmc_to_pmu (pmc)->reprogram_pmi); } -void reprogram_gp_counter (struct kvm_pmc *pmc,u64 eventsel) +void reprogram_gp_counter (struct kvm_pmc *pmc,u64 eventsel,bool pebs) {unsigned config, type =PERF_TYPE_RAW ;u8 event_select, unit_mask;
@@ -198,11 +201,12 @@ void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel) !(eventsel &ARCH_PERFMON_EVENTSEL_OS ), eventsel &ARCH_PERFMON_EVENTSEL_INT , (eventsel &HSW_IN_TX ), - (eventsel & HSW_IN_TX_CHECKPOINTED)); + (eventsel &HSW_IN_TX_CHECKPOINTED ), + pebs); }EXPORT_SYMBOL_GPL (reprogram_gp_counter); -void reprogram_fixed_counter (struct kvm_pmc *pmc,u8 ctrl,int idx) +void reprogram_fixed_counter (struct kvm_pmc *pmc,u8 ctrl,int idx,bool pebs) {unsigned en_field = ctrl &0x3 ;bool pmi = ctrl &0x8 ;
@@ -228,7 +232,8 @@ void reprogram_fixed_counter(struct kvm_pmc *pmc, u8 ctrl, int idx) kvm_x86_ops->pmu_ops->find_fixed_event (idx), !(en_field &0x2 ),/* exclude user */ !(en_field &0x1 ),/* exclude kernel */ - pmi, false, false); + pmi, false, false, + pebs); }EXPORT_SYMBOL_GPL (reprogram_fixed_counter);
@@ -240,12 +245,14 @@ void reprogram_counter(struct kvm_pmu *pmu, int pmc_idx)return ;if (pmc_is_gp (pmc)) -reprogram_gp_counter (pmc, pmc->eventsel); +reprogram_gp_counter (pmc, pmc->eventsel, + (pmu->pebs_enable & (1ul << pmc_idx)));else {int idx = pmc_idx -INTEL_PMC_IDX_FIXED ;u8 ctrl =fixed_ctrl_field (pmu->fixed_ctr_ctrl, idx); -reprogram_fixed_counter (pmc, ctrl, idx); +reprogram_fixed_counter (pmc, ctrl, idx, + (pmu->pebs_enable & (1ul << pmc_idx))); } }EXPORT_SYMBOL_GPL (reprogram_counter);
arch/x86/kvm/pmu.h +3 -2
@@ -102,8 +102,9 @@ static inline struct kvm_pmc *get_fixed_pmc(struct kvm_pmu *pmu, u32 msr,return NULL ; } -void reprogram_gp_counter (struct kvm_pmc *pmc,u64 eventsel); -void reprogram_fixed_counter (struct kvm_pmc *pmc,u8 ctrl,int fixed_idx); +void reprogram_gp_counter (struct kvm_pmc *pmc,u64 eventsel,bool pebs); +void reprogram_fixed_counter (struct kvm_pmc *pmc,u8 ctrl,int fixed_idx, +bool pebs);void reprogram_counter (struct kvm_pmu *pmu,int pmc_idx);void kvm_pmu_deliver_pmi (struct kvm_vcpu *vcpu);
arch/x86/kvm/pmu_amd.c +1 -1
@@ -248,7 +248,7 @@ static int amd_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)if (data == pmc->eventsel)return 0 ;if (!(data & pmu->reserved_bits)) { -reprogram_gp_counter (pmc, data); +reprogram_gp_counter (pmc, data, false);return 0 ; } }
arch/x86/kvm/vmx/pmu_intel.c +5 -2
@@ -48,7 +48,8 @@ static void reprogram_fixed_counters(struct kvm_pmu *pmu, u64 data)if (old_ctrl == new_ctrl)continue ; -reprogram_fixed_counter (pmc, new_ctrl, i); +reprogram_fixed_counter (pmc, new_ctrl, i, (pmu->pebs_enable & + (1ul << (i +INTEL_PMC_IDX_FIXED )))); } pmu->fixed_ctr_ctrl = data;
@@ -292,7 +293,9 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)if (data == pmc->eventsel)return 0 ;if (!(data & pmu->reserved_bits)) { -reprogram_gp_counter (pmc, data); +reprogram_gp_counter (pmc, data, + (pmu->pebs_enable & + (1ul << (msr -MSR_P6_EVNTSEL0 ))));return 0 ; } } else if ((pmc = get_gp_pmc(pmu, msr, MSR_IA32_RELOAD_PMC0)) ||
Signature · 1 line
1.8.3.1
RFC 6/9 KVM: x86: Add shadow value of PEBS status
In reply to Luwei KangThe performance counter used by guest perspective may different with the counter allocated from real hardware (e.g. Guest driver get counter 0 for PEBS but the host PMU driver may alloc other counters for this event).
Introduce a new parameter for the mapping of PEBS enable status from guest to real hardware. Update the shadow value of PEBS before VM-entry when PT is enabled in guest.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/pmu.c | 34 ++++++++++++++++++++++++++++++++++ arch/x86/kvm/pmu.h | 1 + arch/x86/kvm/vmx/vmx.c | 8 +++++++- 4 files changed, 43 insertions(+), 1 deletion(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -473,6 +473,7 @@ struct kvm_pmu {u64 global_ovf_ctrl_mask;u64 reserved_bits;u64 pebs_enable; +u64 pebs_enable_shadow;u64 pebs_enable_mask;u8 version;bool pebs_pt;/* PEBS output to Intel PT */
arch/x86/kvm/pmu.c +34 -0
@@ -257,6 +257,40 @@ void reprogram_counter(struct kvm_pmu *pmu, int pmc_idx) }EXPORT_SYMBOL_GPL (reprogram_counter); +void kvm_pmu_pebs_shadow (struct kvm_vcpu *vcpu) +{ +struct kvm_pmu *pmu =vcpu_to_pmu (vcpu); +struct perf_event *event; +int i; + +if (!pmu->pebs_pt) +return ; + + pmu->pebs_enable_shadow =MSR_IA32_PEBS_OUTPUT_PT ; + +for (i =0 ; i < pmu->nr_arch_gp_counters; i++) { +if (!test_bit (i, (unsigned long *)&pmu->pebs_enable)) +continue ; + + event = pmu->gp_counters[i].perf_event; +if (event && (event->hw.idx !=-1 )) +set_bit (event->hw.idx, + (unsigned long *)&pmu->pebs_enable_shadow); + } + +for (i =0 ; i < pmu->nr_arch_fixed_counters; i++) { +if (!test_bit (i +INTEL_PMC_IDX_FIXED , + (unsigned long *)&pmu->pebs_enable)) +continue ; + + event = pmu->fixed_counters[i].perf_event; +if (event && (event->hw.idx !=-1 )) +set_bit (event->hw.idx, + (unsigned long *)&pmu->pebs_enable_shadow); + } +} +EXPORT_SYMBOL_GPL (kvm_pmu_pebs_shadow); +void kvm_pmu_handle_event (struct kvm_vcpu *vcpu) {struct kvm_pmu *pmu =vcpu_to_pmu (vcpu);
arch/x86/kvm/pmu.h +1 -0
@@ -119,6 +119,7 @@ void reprogram_fixed_counter(struct kvm_pmc *pmc, u8 ctrl, int fixed_idx,void kvm_pmu_init (struct kvm_vcpu *vcpu);void kvm_pmu_destroy (struct kvm_vcpu *vcpu);int kvm_vm_ioctl_set_pmu_event_filter (struct kvm *kvm,void __user *argp); +void kvm_pmu_pebs_shadow (struct kvm_vcpu *vcpu);bool is_vmware_backdoor_pmc (u32 pmc_idx);
arch/x86/kvm/vmx/vmx.c +7 -1
@@ -1019,6 +1019,7 @@ static void pt_guest_enter(struct vcpu_vmx *vmx)wrmsrl (MSR_IA32_RTIT_CTL ,0 );pt_save_msr (&vmx->pt_desc.host, vmx->pt_desc.addr_range);pt_load_msr (&vmx->pt_desc.guest, vmx->pt_desc.addr_range); +kvm_pmu_pebs_shadow (&vmx->vcpu); } }
@@ -6365,12 +6366,17 @@ static void atomic_switch_perf_msrs(struct vcpu_vmx *vmx)if (!msrs)return ; -for (i =0 ; i < nr_msrs; i++) +for (i =0 ; i < nr_msrs; i++) { +if (msrs[i].msr ==MSR_IA32_PEBS_ENABLE ) + msrs[i].guest = +vcpu_to_pmu (&vmx->vcpu)->pebs_enable_shadow; +if (msrs[i].host == msrs[i].guest)clear_atomic_switch_msr (vmx, msrs[i].msr);else add_atomic_switch_msr (vmx, msrs[i].msr, msrs[i].guest, msrs[i].host, false); + } }static void vmx_update_hv_timer (struct kvm_vcpu *vcpu)
Signature · 1 line
1.8.3.1
RFC 7/9 KVM: X86: Expose PDCM cpuid to guest
In reply to Luwei KangPDCM (Perfmon and Debug Capability) indicates the processor supports the performance and debug feature indication MSR IA32_PERF_CAPABILITIES.
PEBS enabling in KVM guest depend on PEBS via PT, and PEBS via PT is detected by IA32_PERF_CAPABILITIES[Bit16].
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/cpuid.c | 3 ++- arch/x86/kvm/svm.c | 6 ++++++ arch/x86/kvm/vmx/capabilities.h | 10 ++++++++++ arch/x86/kvm/vmx/vmx.c | 1 + 5 files changed, 20 insertions(+), 1 deletion(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -1129,6 +1129,7 @@ struct kvm_x86_ops {bool (*xsaves_supported)(void );bool (*umip_emulated)(void );bool (*pt_supported)(void ); +bool (*pdcm_supported)(void );int (*check_nested_events)(struct kvm_vcpu *vcpu,bool external_intr);void (*request_immediate_exit)(struct kvm_vcpu *vcpu);
arch/x86/kvm/cpuid.c +2 -1
@@ -430,6 +430,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,unsigned f_rdtscp = kvm_x86_ops->rdtscp_supported () ?F (RDTSCP ) :0 ;unsigned f_xsaves = kvm_x86_ops->xsaves_supported () ?F (XSAVES ) :0 ;unsigned f_intel_pt = kvm_x86_ops->pt_supported () ?F (INTEL_PT ) :0 ; +unsigned f_pdcm = kvm_x86_ops->pdcm_supported () ?F (PDCM ) :0 ;/* cpuid 1.edx */ const u32 kvm_cpuid_1_edx_x86_features =
@@ -458,7 +459,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,F (XMM3 ) |F (PCLMULQDQ ) |0 /* DTES64, MONITOR */ |0 /* DS-CPL, VMX, SMX, EST */ |0 /* TM2 */ |F (SSSE3 ) |0 /* CNXT-ID */ |0 /* Reserved */ | -F (FMA ) |F (CX16 ) |0 /* xTPR Update, PDCM */ | +F (FMA ) |F (CX16 ) |0 /* xTPR Update */ | f_pdcm |F (PCID ) |0 /* Reserved, DCA */ |F (XMM4_1 ) |F (XMM4_2 ) |F (X2APIC ) |F (MOVBE ) |F (POPCNT ) | 0 /* Reserved*/ | F(AES) | F(XSAVE) | 0 /* OSXSAVE */ | F(AVX) |
arch/x86/kvm/svm.c +6 -0
@@ -6005,6 +6005,11 @@ static bool svm_pt_supported(void)return false; } +static bool svm_pdcm_supported (void ) +{ +return false; +} +static bool svm_has_wbinvd_exit (void ) {return true;
@@ -7293,6 +7298,7 @@ static bool svm_need_emulation_on_page_fault(struct kvm_vcpu *vcpu) .xsaves_supported = svm_xsaves_supported, .umip_emulated = svm_umip_emulated, .pt_supported = svm_pt_supported, + .pdcm_supported = svm_pdcm_supported, .set_supported_cpuid = svm_set_supported_cpuid,
arch/x86/kvm/vmx/capabilities.h +10 -0
@@ -353,4 +353,14 @@ static inline bool cpu_has_vmx_pebs_output_pt(void) (perf_cap & MSR_IA32_PERF_CAP_PEBS_OUTPUT_PT)); } +static inline bool vmx_pebs_supported (void ) +{ +return (cpu_has_vmx_pebs_output_pt () && pt_mode ==PT_MODE_HOST_GUEST ); +} + +static inline bool vmx_pdcm_supported (void ) +{ +return boot_cpu_has (X86_FEATURE_PDCM ) &&vmx_pebs_supported (); +} +#endif /* __KVM_X86_VMX_CAPS_H */
arch/x86/kvm/vmx/vmx.c +1 -0
@@ -7768,6 +7768,7 @@ static __exit void hardware_unsetup(void) .xsaves_supported = vmx_xsaves_supported, .umip_emulated = vmx_umip_emulated, .pt_supported = vmx_pt_supported, + .pdcm_supported = vmx_pdcm_supported, .request_immediate_exit = vmx_request_immediate_exit,
Signature · 1 line
1.8.3.1
RFC 8/9 KVM: X86: MSR_IA32_PERF_CAPABILITIES MSR emulation
In reply to Luwei KangExpose some bits of definition which relate with enable PEBS to KVM guest especially PEBS via PT feature.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/msr-index.h | 3 +++ arch/x86/kvm/vmx/vmx.c | 14 ++++++++++++++ 3 files changed, 18 insertions(+)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -576,6 +576,7 @@ struct kvm_vcpu_arch {u64 ia32_xss;u64 microcode_version;u64 arch_capabilities; +u64 ia32_perf_capabilities;/* * Paging state of the vcpu
arch/x86/include/asm/msr-index.h +3 -0
@@ -137,6 +137,9 @@#define MSR_IA32_PEBS_ENABLE 0x000003f1#define MSR_PEBS_DATA_CFG 0x000003f2#define MSR_IA32_DS_AREA 0x00000600 +#define MSR_IA32_PERF_CAP_PEBS_TRAP (1UL << 6) +#define MSR_IA32_PERF_CAP_PEBS_ARCH_REG (1UL << 7) +#define MSR_IA32_PERF_CAP_PEBS_REC_FMT (0xfUL << 8)#define MSR_IA32_PERF_CAP_PEBS_OUTPUT_PT (1UL << 16)#define MSR_IA32_PERF_CAPABILITIES 0x00000345#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6
arch/x86/kvm/vmx/vmx.c +14 -0
@@ -1737,6 +1737,16 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)return 1 ; msr_info->data = vcpu->arch.ia32_xss;break ; +case MSR_IA32_PERF_CAPABILITIES : +if (!vmx_pdcm_supported () || !vmx_pebs_supported ()) +return 1 ; +rdmsrl (MSR_IA32_PERF_CAPABILITIES , msr_info->data); + msr_info->data = msr_info->data & + (MSR_IA32_PERF_CAP_PEBS_TRAP | +MSR_IA32_PERF_CAP_PEBS_ARCH_REG | +MSR_IA32_PERF_CAP_PEBS_REC_FMT | +MSR_IA32_PERF_CAP_PEBS_OUTPUT_PT ); +break ;case MSR_IA32_RTIT_CTL :if (pt_mode !=PT_MODE_HOST_GUEST )return 1 ;
@@ -1981,6 +1991,10 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)else clear_atomic_switch_msr (vmx,MSR_IA32_XSS );break ; +case MSR_IA32_PERF_CAPABILITIES : +if (!vmx_pdcm_supported () || !vmx_pebs_supported ()) +return 1 ; +break ;case MSR_IA32_RTIT_CTL : if ((pt_mode != PT_MODE_HOST_GUEST) || vmx_rtit_ctl_check(vcpu, data) ||
Signature · 1 line
1.8.3.1
RFC 9/9 KVM: x86: Expose PEBS feature to guest
In reply to Luwei KangExpose PEBS feature to guest by IA32_MISC_ENABLE[bit12]. IA32_MISC_ENABLE[bit12] is Processor Event Based Sampling (PEBS) Unavailable (RO) flag:
1 = PEBS is not supported; 0 = PEBS is supported.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/svm.c | 6 ++++++ arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/x86.c | 22 +++++++++++++++++----- 4 files changed, 25 insertions(+), 5 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -1130,6 +1130,7 @@ struct kvm_x86_ops {bool (*xsaves_supported)(void );bool (*umip_emulated)(void );bool (*pt_supported)(void ); +bool (*pebs_supported)(void );bool (*pdcm_supported)(void );int (*check_nested_events)(struct kvm_vcpu *vcpu,bool external_intr);
arch/x86/kvm/svm.c +6 -0
@@ -6005,6 +6005,11 @@ static bool svm_pt_supported(void)return false; } +static bool svm_pebs_supported (void ) +{ +return false; +} +static bool svm_pdcm_supported (void ) {return false;
@@ -7298,6 +7303,7 @@ static bool svm_need_emulation_on_page_fault(struct kvm_vcpu *vcpu) .xsaves_supported = svm_xsaves_supported, .umip_emulated = svm_umip_emulated, .pt_supported = svm_pt_supported, + .pebs_supported = svm_pebs_supported, .pdcm_supported = svm_pdcm_supported, .set_supported_cpuid = svm_set_supported_cpuid,
arch/x86/kvm/vmx/vmx.c +1 -0
@@ -7782,6 +7782,7 @@ static __exit void hardware_unsetup(void) .xsaves_supported = vmx_xsaves_supported, .umip_emulated = vmx_umip_emulated, .pt_supported = vmx_pt_supported, + .pebs_supported = vmx_pebs_supported, .pdcm_supported = vmx_pdcm_supported, .request_immediate_exit = vmx_request_immediate_exit,
arch/x86/kvm/x86.c +17 -5
@@ -2483,6 +2483,7 @@ static void record_steal_time(struct kvm_vcpu *vcpu)int kvm_set_msr_common (struct kvm_vcpu *vcpu,struct msr_data *msr_info) {bool pr = false; +bool update_cpuid = false;u32 msr = msr_info->index;u64 data = msr_info->data;
@@ -2563,11 +2564,17 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) ((vcpu->arch.ia32_misc_enable_msr ^ data) & MSR_IA32_MISC_ENABLE_MWAIT)) {if (!guest_cpuid_has (vcpu,X86_FEATURE_XMM3 ))return 1 ; - vcpu->arch.ia32_misc_enable_msr = data; - kvm_update_cpuid(vcpu); - } else { - vcpu->arch.ia32_misc_enable_msr = data; + update_cpuid = true; } + +if (kvm_x86_ops->pebs_supported ()) + data &= ~MSR_IA32_MISC_ENABLE_PEBS ; +else + data |=MSR_IA32_MISC_ENABLE_PEBS ; + + vcpu->arch.ia32_misc_enable_msr = data; +if (update_cpuid) +kvm_update_cpuid (vcpu);break ;case MSR_IA32_SMBASE :if (!msr_info->host_initiated)
@@ -2875,7 +2882,12 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) msr_info->data = (u64 )vcpu->arch.ia32_tsc_adjust_msr;break ;case MSR_IA32_MISC_ENABLE : - msr_info->data = vcpu->arch.ia32_misc_enable_msr; +if (kvm_x86_ops->pebs_supported ()) + msr_info->data = (vcpu->arch.ia32_misc_enable_msr & + ~MSR_IA32_MISC_ENABLE_PEBS ); +else + msr_info->data = (vcpu->arch.ia32_misc_enable_msr | +MSR_IA32_MISC_ENABLE_PEBS );break ;case MSR_IA32_SMBASE :if (!msr_info->host_initiated)
Signature · 1 line
1.8.3.1
Quoted 9 lines · Luwei Kang
Intel new hardware introduces some Precise Event-Based Sampling (PEBS) extensions that output the PEBS record to Intel PT stream instead of DS area. The PEBS record will be packaged in a specific format when outputing to Intel PT.
This patch set will enable PEBS functionality in KVM Guest by PEBS output to Intel PT. The native driver as [1] (still under review).
Please use:
https://lkml.kernel.org/r/$MSGID
then I don't have to touch a browser but can find the email in my MUA.
Quoted 9 lines · Luwei Kang
Quoted 8 lines
Intel new hardware introduces some Precise Event-Based Sampling (PEBS) extensions that output the PEBS record to Intel PT stream instead of DS area. The PEBS record will be packaged in a specific format when outputing to Intel PT.
This patch set will enable PEBS functionality in KVM Guest by PEBS output to Intel PT. The native driver as [1] (still under review).
Quoted 7 lines
Quoted 1 line
Please use:
https://lkml.kernel.org/r/$MSGID
then I don't have to touch a browser but can find the email in my MUA.
Thanks. The link of native driver should be:
https://lkml.kernel.org/r/[email protected]
Luwei Kang