Inject a PMI for KVM Guest when ToPA buffer is filled
Subsystems (4)
v2 cover Inject a PMI for KVM Guest when ToPA buffer is filled
Each intel processor trace table of physical addresses (ToPA) entry has an INT bit. If this bit is set, the processor will signal a performance-monitoring interrupt (PMI) when the corresponding trace output region is filled. This patch set will inject a PMI for Intel Processor Trace when ToPA buffer is filled.
Quoted 1 line
From v1:
- Exported a global function pointers may not a good chioce. Add a new member in kvm_guest_cbs to send Intel PT PMI for KVM guest.
Luwei Kang (2):
KVM: x86: Inject PMI for KVM guest
KVM: x86: Add support of clear Trace_ToPA_PMI status
arch/x86/events/intel/core.c | 6 +++++- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/msr-index.h | 8 ++++++++ arch/x86/kvm/vmx/pmu_intel.c | 8 +++++++- arch/x86/kvm/x86.c | 10 ++++++++++ include/linux/perf_event.h | 1 + 6 files changed, 32 insertions(+), 2 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v2 1/2 KVM: x86: Inject PMI for KVM guest
Inject a PMI for KVM guest when Intel PT working in Host-Guest mode and Guest ToPA entry memory buffer was completely filled.
--- arch/x86/events/intel/core.c | 6 +++++- arch/x86/include/asm/msr-index.h | 4 ++++ arch/x86/kvm/x86.c | 10 ++++++++++ include/linux/perf_event.h | 1 + 4 files changed, 20 insertions(+), 1 deletion(-)
arch/x86/events/intel/core.c +5 -1
@@ -2273,7 +2273,11 @@ static int handle_pmi_common(struct pt_regs *regs, u64 status)*/ if (__test_and_clear_bit (55 , (unsigned long *)&status)) { handled++; -intel_pt_interrupt (); +if (unlikely (perf_guest_cbs && perf_guest_cbs->is_in_guest () && + perf_guest_cbs->handle_intel_pt_intr)) + perf_guest_cbs->handle_intel_pt_intr (); +else +intel_pt_interrupt (); }/*
arch/x86/include/asm/msr-index.h +4 -0
@@ -775,6 +775,10 @@#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 +/* PERF_GLOBAL_OVF_CTL bits */ +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI_BIT 55 +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI (1ULL << MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI_BIT) +/* Geode defined MSRs */ #define MSR_GEODE_BUSCONT_CONF0 0x00001900
arch/x86/kvm/x86.c +10 -0
@@ -6795,10 +6795,20 @@ static unsigned long kvm_get_guest_ip(void)return ip; } +static void kvm_handle_intel_pt_intr (void ) +{ +struct kvm_vcpu *vcpu =__this_cpu_read (current_vcpu); + +kvm_make_request (KVM_REQ_PMI , vcpu); +__set_bit (MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI_BIT , + (unsigned long *)&vcpu->arch.pmu.global_status); +} +static struct perf_guest_info_callbacks kvm_guest_cbs = { .is_in_guest = kvm_is_in_guest, .is_user_mode = kvm_is_user_mode, .get_guest_ip = kvm_get_guest_ip, + .handle_intel_pt_intr = kvm_handle_intel_pt_intr, };static void kvm_set_mmio_spte_mask (void )
include/linux/perf_event.h +1 -0
@@ -30,6 +30,7 @@ struct perf_guest_info_callbacks {int (*is_in_guest)(void );int (*is_user_mode)(void );unsigned long (*get_guest_ip)(void ); +void (*handle_intel_pt_intr)(void ); };#ifdef CONFIG_HAVE_HW_BREAKPOINT
Signature · 1 line
1.8.3.1
PATCH v2 2/2 KVM: x86: Add support of clear Trace_ToPA_PMI status
In reply to Luwei KangAdd support of clear Intel PT ToPA PMI status for
KVM guest.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/msr-index.h | 4 ++++ arch/x86/kvm/vmx/pmu_intel.c | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -468,6 +468,7 @@ struct kvm_pmu {u64 global_ovf_ctrl;u64 counter_bitmask[2 ];u64 global_ctrl_mask; +u64 global_ovf_ctrl_mask;u64 reserved_bits;u8 version;struct kvm_pmc gp_counters[INTEL_PMC_MAX_GENERIC ];
arch/x86/include/asm/msr-index.h +4 -0
@@ -778,6 +778,10 @@/* PERF_GLOBAL_OVF_CTL bits */ #define MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI_BIT 55#define MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI (1ULL << MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI_BIT) +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL_OVF_BUF_BIT 62 +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL_OVF_BUF (1ULL << MSR_CORE_PERF_GLOBAL_OVF_CTRL_OVF_BUF_BIT) +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL_COND_CHGD_BIT 63 +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL_COND_CHGD (1ULL << MSR_CORE_PERF_GLOBAL_OVF_CTRL_COND_CHGD_BIT)/* Geode defined MSRs */ #define MSR_GEODE_BUSCONT_CONF0 0x00001900
arch/x86/kvm/vmx/pmu_intel.c +7 -1
@@ -227,7 +227,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) }break ;case MSR_CORE_PERF_GLOBAL_OVF_CTRL : -if (!(data & (pmu->global_ctrl_mask & ~(3ull <<62 )))) { +if (!(data & pmu->global_ovf_ctrl_mask)) {if (!msr_info->host_initiated) pmu->global_status &= ~data; pmu->global_ovf_ctrl = data;
@@ -297,6 +297,12 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) pmu->global_ctrl = ((1ull << pmu->nr_arch_gp_counters) -1 ) | (((1ull << pmu->nr_arch_fixed_counters) -1 ) <<INTEL_PMC_IDX_FIXED ); pmu->global_ctrl_mask = ~pmu->global_ctrl; + pmu->global_ovf_ctrl_mask = ~(pmu->global_ctrl | +MSR_CORE_PERF_GLOBAL_OVF_CTRL_OVF_BUF | +MSR_CORE_PERF_GLOBAL_OVF_CTRL_COND_CHGD ); +if (kvm_x86_ops->pt_supported ()) + pmu->global_ovf_ctrl_mask &= + ~MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI ; entry =kvm_find_cpuid_entry (vcpu,7 ,0 ); if (entry &&
Signature · 1 line
1.8.3.1
Paolo Bonzini
maintainerQuoted 14 lines · Luwei Kang
Each intel processor trace table of physical addresses (ToPA) entry has an INT bit. If this bit is set, the processor will signal a performance-monitoring interrupt (PMI) when the corresponding trace output region is filled. This patch set will inject a PMI for Intel Processor Trace when ToPA buffer is filled.
Quoted 1 line
From v1:
- Exported a global function pointers may not a good chioce. Add a new member in
kvm_guest_cbsto send Intel PT PMI for KVM guest.Luwei Kang (2):
KVM: x86: Inject PMI for KVM guest
KVM: x86: Add support of clearTrace_ToPA_PMIstatus
Quoted 8 lines
arch/x86/events/intel/core.c | 6 +++++- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/msr-index.h | 8 ++++++++ arch/x86/kvm/vmx/pmu_intel.c | 8 +++++++- arch/x86/kvm/x86.c | 10 ++++++++++ include/linux/perf_event.h | 1 + 6 files changed, 32 insertions(+), 2 deletions(-)
Queued, with just a little change in patch 2:
arch/x86/kvm/vmx/pmu_intel.c +3 -3
@@ -297,9 +297,9 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) pmu->global_ctrl = ((1ull << pmu->nr_arch_gp_counters) -1 ) | (((1ull << pmu->nr_arch_fixed_counters) -1 ) <<INTEL_PMC_IDX_FIXED ); pmu->global_ctrl_mask = ~pmu->global_ctrl; - pmu->global_ovf_ctrl_mask = ~(pmu->global_ctrl | -MSR_CORE_PERF_GLOBAL_OVF_CTRL_OVF_BUF | -MSR_CORE_PERF_GLOBAL_OVF_CTRL_COND_CHGD ); + 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 ()) pmu->global_ovf_ctrl_mask &= ~MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI ;
this makes the review easier, and also makes the assignment look the same as the one inside the "if (kvm_x86_ops->pt_supported())".
Paolo