Intel Processor Trace virtulization enabling
Subsystems (4)
v5 cover Intel Processor Trace virtulization enabling
Hi All,
Here is a patch-series which adding Processor Trace enabling in KVM guest. You can get It's software developer manuals from:
https://software.intel.com/sites/default/files/managed/c5/15/architecture-instruction-set-extensions-programming-reference.pdf
In Chapter 5 INTEL PROCESSOR TRACE: VMX IMPROVEMENTS.
Introduction:
Intel Processor Trace (Intel PT) is an extension of Intel Architecture that captures information about software execution using dedicated hardware facilities that cause only minimal performance perturbation to the software being traced. Details on the Intel PT infrastructure and trace capabilities can be found in the Intel 64 and IA-32 Architectures Software Developer’s Manual, Volume 3C.
The suite of architecture changes serve to simplify the process of virtualizing Intel PT for use by a guest software. There are two primary elements to this new architecture support for VMX support improvements made for Intel PT.
1. Addition of a new guest IA32_RTIT_CTL value field to the VMCS.
— This serves to speed and simplify the process of disabling trace on VM exit, and restoring it on VM entry.
2. Enabling use of EPT to redirect PT output.
— This enables the VMM to elect to virtualize the PT output buffer using EPT. In this mode, the CPU will treat PT output addresses as Guest Physical Addresses (GPAs) and translate them using EPT. This means that Intel PT output reads (of the ToPA table) and writes (of trace output) can cause EPT violations, and other output events.
Processor Trace virtualization can be work in one of 3 possible modes by set new option "pt_mode". Default value is system mode.
a. system-wide: trace both host/guest and output to host buffer;
b. host-only: only trace host and output to host buffer;
c. host-guest: trace host/guest simultaneous and output to their respective buffer.
Quoted 1 line
From V4:
- add data check when setting the value of MSR_IA32_RTIT_CTL;
- Invoke new interface to set the intercept of MSRs read/write after "MSR bitmap per-vcpu" patches.
Quoted 1 line
From V3:
- change default mode to SYSTEM mode;
- add a new patch to move PT out of scattered features;
- add a new fucntion kvm_get_pt_addr_cnt() to get the number of address ranges;
- add a new function vmx_set_rtit_ctl() to set the value of guest RTIT_CTL, GUEST_IA32_RTIT_CTL and MSRs intercept.
Quoted 1 line
From v2:
- replace *_PT_SUPPRESS_PIP to *_PT_CONCEAL_PIP;
- clean SECONDARY_EXEC_PT_USE_GPA, VM_EXIT_CLEAR_IA32_RTIT_CTL and VM_ENTRY_LOAD_IA32_RTIT_CTL in SYSTEM mode. These bits must be all set or all clean;
- move processor tracing out of scattered features;
- add a new function to enable/disable intercept MSRs read/write;
- add all Intel PT MSRs read/write and disable intercept when PT is enabled in guest;
- disable Intel PT and enable intercept MSRs when L1 guest VMXON;
- performance optimization.
In Host only mode. we just need to save host RTIT_CTL before vm-entry and restore host RTIT_CTL after vm-exit;
In HOST_GUEST mode. we need to save and restore all MSRs only when PT has enabled in guest.
- use XSAVES/XRESTORES implement context switch.
Haven't implementation in this version and still in debuging. will make a separate patch work on this.
Quoted 1 line
From v1:
- remove guest-only mode because guest-only mode can be covered by host-guest mode;
- always set "use GPA for processor tracing" in secondary execution control if it can be;
- trap RTIT_CTL read/write. Forbid write this msr when VMXON in L1 hypervisor.
Chao Peng (8):
perf/x86/intel/pt: Move Intel-PT MSR bit definitions to a public
header
perf/x86/intel/pt: Change pt_cap_get() to a public function
KVM: x86: Add Intel Processor Trace virtualization mode
KVM: x86: Add Intel Processor Trace cpuid emulation
KVM: x86: Add Intel processor trace context for each vcpu
KVM: x86: Implement Intel Processor Trace context switch
KVM: x86: Implement Intel Processor Trace MSRs read/write
KVM: x86: Set intercept for Intel PT MSRs
Luwei Kang (3):
perf/x86/intel/pt: Introduce a new function to get the capability of
Intel PT
KVM: x86: Introduce a function to initialize the PT configuration
KVM: x86: Disable Intel Processor Trace when VMXON in L1 guest
arch/x86/events/intel/pt.c | 18 +- arch/x86/events/intel/pt.h | 58 ------ arch/x86/include/asm/intel_pt.h | 40 ++++ arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/msr-index.h | 38 ++++ arch/x86/include/asm/vmx.h | 8 + arch/x86/kvm/cpuid.c | 22 ++- arch/x86/kvm/svm.c | 6 + arch/x86/kvm/vmx.c | 416 ++++++++++++++++++++++++++++++++++++++- arch/x86/kvm/x86.c | 33 +++- 10 files changed, 572 insertions(+), 68 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v5 1/11 perf/x86/intel/pt: Move Intel-PT MSR bit definitions to a public header
From: Chao Peng <[email protected]>
Intel Processor Trace virtualization enabling in guest need to use these MSR bits, so move them to public header msr-index.h. Introduce RTIT_CTL_FABRIC_EN and sync the definitions to latest spec.
--- arch/x86/events/intel/pt.c | 4 ++-- arch/x86/events/intel/pt.h | 37 ------------------------------------- arch/x86/include/asm/msr-index.h | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 39 deletions(-)
arch/x86/events/intel/pt.c +2 -2
@@ -271,7 +271,7 @@ static int __init pt_pmu_hw_init(void)return ret; } -#define RTIT_CTL_CYC_PSB (RTIT_CTL_CYCLEACC | \ +#define RTIT_CTL_CYC_PSB (RTIT_CTL_CYC_EN | \ RTIT_CTL_CYC_THRESH | \ RTIT_CTL_PSB_FREQ)
@@ -293,7 +293,7 @@ static int __init pt_pmu_hw_init(void)#define PT_CONFIG_MASK (RTIT_CTL_TRACEEN | \ RTIT_CTL_TSC_EN | \ - RTIT_CTL_DISRETC | \ + RTIT_CTL_DIS_RETC | \ RTIT_CTL_BRANCH_EN | \ RTIT_CTL_CYC_PSB | \ RTIT_CTL_MTC | \
arch/x86/events/intel/pt.h +0 -37
@@ -20,43 +20,6 @@#define __INTEL_PT_H__/* -* PT MSR bit definitions -*/ -#define RTIT_CTL_TRACEEN BIT(0) -#define RTIT_CTL_CYCLEACC BIT(1) -#define RTIT_CTL_OS BIT(2) -#define RTIT_CTL_USR BIT(3) -#define RTIT_CTL_PWR_EVT_EN BIT(4) -#define RTIT_CTL_FUP_ON_PTW BIT(5) -#define RTIT_CTL_CR3EN BIT(7) -#define RTIT_CTL_TOPA BIT(8) -#define RTIT_CTL_MTC_EN BIT(9) -#define RTIT_CTL_TSC_EN BIT(10) -#define RTIT_CTL_DISRETC BIT(11) -#define RTIT_CTL_PTW_EN BIT(12) -#define RTIT_CTL_BRANCH_EN BIT(13) -#define RTIT_CTL_MTC_RANGE_OFFSET 14 -#define RTIT_CTL_MTC_RANGE (0x0full << RTIT_CTL_MTC_RANGE_OFFSET) -#define RTIT_CTL_CYC_THRESH_OFFSET 19 -#define RTIT_CTL_CYC_THRESH (0x0full << RTIT_CTL_CYC_THRESH_OFFSET) -#define RTIT_CTL_PSB_FREQ_OFFSET 24 -#define RTIT_CTL_PSB_FREQ (0x0full << RTIT_CTL_PSB_FREQ_OFFSET) -#define RTIT_CTL_ADDR0_OFFSET 32 -#define RTIT_CTL_ADDR0 (0x0full << RTIT_CTL_ADDR0_OFFSET) -#define RTIT_CTL_ADDR1_OFFSET 36 -#define RTIT_CTL_ADDR1 (0x0full << RTIT_CTL_ADDR1_OFFSET) -#define RTIT_CTL_ADDR2_OFFSET 40 -#define RTIT_CTL_ADDR2 (0x0full << RTIT_CTL_ADDR2_OFFSET) -#define RTIT_CTL_ADDR3_OFFSET 44 -#define RTIT_CTL_ADDR3 (0x0full << RTIT_CTL_ADDR3_OFFSET) -#define RTIT_STATUS_FILTEREN BIT(0) -#define RTIT_STATUS_CONTEXTEN BIT(1) -#define RTIT_STATUS_TRIGGEREN BIT(2) -#define RTIT_STATUS_BUFFOVF BIT(3) -#define RTIT_STATUS_ERROR BIT(4) -#define RTIT_STATUS_STOPPED BIT(5) - -/* * Single-entry ToPA: when this close to region boundary, switch * buffers to avoid losing data. */
arch/x86/include/asm/msr-index.h +37 -0
@@ -106,7 +106,43 @@#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6#define MSR_IA32_RTIT_CTL 0x00000570 +#define RTIT_CTL_TRACEEN BIT(0) +#define RTIT_CTL_CYC_EN BIT(1) +#define RTIT_CTL_OS BIT(2) +#define RTIT_CTL_USR BIT(3) +#define RTIT_CTL_PWR_EVT_EN BIT(4) +#define RTIT_CTL_FUP_ON_PTW BIT(5) +#define RTIT_CTL_FABRIC_EN BIT(6) +#define RTIT_CTL_CR3_FILTER BIT(7) +#define RTIT_CTL_TOPA BIT(8) +#define RTIT_CTL_MTC_EN BIT(9) +#define RTIT_CTL_TSC_EN BIT(10) +#define RTIT_CTL_DIS_RETC BIT(11) +#define RTIT_CTL_PTW_EN BIT(12) +#define RTIT_CTL_BRANCH_EN BIT(13) +#define RTIT_CTL_MTC_RANGE_OFFSET 14 +#define RTIT_CTL_MTC_RANGE (0x0full << RTIT_CTL_MTC_RANGE_OFFSET) +#define RTIT_CTL_CYC_THRESH_OFFSET 19 +#define RTIT_CTL_CYC_THRESH (0x0full << RTIT_CTL_CYC_THRESH_OFFSET) +#define RTIT_CTL_PSB_FREQ_OFFSET 24 +#define RTIT_CTL_PSB_FREQ (0x0full << RTIT_CTL_PSB_FREQ_OFFSET) +#define RTIT_CTL_ADDR0_OFFSET 32 +#define RTIT_CTL_ADDR0 (0x0full << RTIT_CTL_ADDR0_OFFSET) +#define RTIT_CTL_ADDR1_OFFSET 36 +#define RTIT_CTL_ADDR1 (0x0full << RTIT_CTL_ADDR1_OFFSET) +#define RTIT_CTL_ADDR2_OFFSET 40 +#define RTIT_CTL_ADDR2 (0x0full << RTIT_CTL_ADDR2_OFFSET) +#define RTIT_CTL_ADDR3_OFFSET 44 +#define RTIT_CTL_ADDR3 (0x0full << RTIT_CTL_ADDR3_OFFSET)#define MSR_IA32_RTIT_STATUS 0x00000571 +#define RTIT_STATUS_FILTEREN BIT(0) +#define RTIT_STATUS_CONTEXTEN BIT(1) +#define RTIT_STATUS_TRIGGEREN BIT(2) +#define RTIT_STATUS_BUFFOVF BIT(3) +#define RTIT_STATUS_ERROR BIT(4) +#define RTIT_STATUS_STOPPED BIT(5) +#define RTIT_STATUS_BYTECNT_OFFSET 32 +#define RTIT_STATUS_BYTECNT (0x1ffffull << RTIT_STATUS_BYTECNT_OFFSET)#define MSR_IA32_RTIT_ADDR0_A 0x00000580#define MSR_IA32_RTIT_ADDR0_B 0x00000581#define MSR_IA32_RTIT_ADDR1_A 0x00000582
@@ -115,6 +151,7 @@#define MSR_IA32_RTIT_ADDR2_B 0x00000585#define MSR_IA32_RTIT_ADDR3_A 0x00000586#define MSR_IA32_RTIT_ADDR3_B 0x00000587 +#define MSR_IA32_RTIT_ADDR_COUNT 8#define MSR_IA32_RTIT_CR3_MATCH 0x00000572#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561
Signature · 1 line
1.8.3.1
PATCH v5 2/11 perf/x86/intel/pt: Change pt_cap_get() to a public function
In reply to Luwei KangFrom: Chao Peng <[email protected]>
Change pt_cap_get() to a public function so that KVM can access it. Introduce new capablility PT_CAP_output_subsys to support of output to Trace Transport subsystem.
--- arch/x86/events/intel/pt.c | 4 +++- arch/x86/events/intel/pt.h | 21 --------------------- arch/x86/include/asm/intel_pt.h | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 22 deletions(-)
arch/x86/events/intel/pt.c +3 -1
@@ -68,6 +68,7 @@PT_CAP (topa_output,0 ,CPUID_ECX ,BIT (0 )),PT_CAP (topa_multiple_entries,0 ,CPUID_ECX ,BIT (1 )),PT_CAP (single_range_output,0 ,CPUID_ECX ,BIT (2 )), +PT_CAP (output_subsys,0 ,CPUID_ECX ,BIT (3 )),PT_CAP (payloads_lip,0 ,CPUID_ECX ,BIT (31 )),PT_CAP (num_address_ranges,1 ,CPUID_EAX ,0x3 ), PT_CAP(mtc_periods, 1, CPUID_EAX, 0xffff0000),
@@ -75,7 +76,7 @@ PT_CAP(psb_periods, 1, CPUID_EBX, 0xffff0000), }; -static u32 pt_cap_get (enum pt_capabilities cap) +u32 pt_cap_get (enum pt_capabilities cap) {struct pt_cap_desc *cd = &pt_caps[cap];u32 c = pt_pmu.caps[cd->leaf *PT_CPUID_REGS_NUM + cd->reg];
@@ -83,6 +84,7 @@ static u32 pt_cap_get(enum pt_capabilities cap)return (c & cd->mask) >> shift; } +EXPORT_SYMBOL_GPL (pt_cap_get); static ssize_t pt_cap_show(struct device *cdev, struct device_attribute *attr,
arch/x86/events/intel/pt.h +0 -21
@@ -45,30 +45,9 @@ struct topa_entry { u64 rsvd4 : 16; }; -#define PT_CPUID_LEAVES 2 -#define PT_CPUID_REGS_NUM 4/* number of regsters (eax, ebx, ecx, edx) */ -/* TSC to Core Crystal Clock Ratio */ #define CPUID_TSC_LEAF 0x15 -enum pt_capabilities { - PT_CAP_max_subleaf =0 , - PT_CAP_cr3_filtering, - PT_CAP_psb_cyc, - PT_CAP_ip_filtering, - PT_CAP_mtc, - PT_CAP_ptwrite, - PT_CAP_power_event_trace, - PT_CAP_topa_output, - PT_CAP_topa_multiple_entries, - PT_CAP_single_range_output, - PT_CAP_payloads_lip, - PT_CAP_num_address_ranges, - PT_CAP_mtc_periods, - PT_CAP_cycle_thresholds, - PT_CAP_psb_periods, -}; -struct pt_pmu {struct pmu pmu;u32 caps[PT_CPUID_REGS_NUM *PT_CPUID_LEAVES ];
arch/x86/include/asm/intel_pt.h +24 -0
@@ -2,10 +2,34 @@#ifndef _ASM_X86_INTEL_PT_H#define _ASM_X86_INTEL_PT_H +#define PT_CPUID_LEAVES 2 +#define PT_CPUID_REGS_NUM 4/* number of regsters (eax, ebx, ecx, edx) */ + +enum pt_capabilities { + PT_CAP_max_subleaf =0 , + PT_CAP_cr3_filtering, + PT_CAP_psb_cyc, + PT_CAP_ip_filtering, + PT_CAP_mtc, + PT_CAP_ptwrite, + PT_CAP_power_event_trace, + PT_CAP_topa_output, + PT_CAP_topa_multiple_entries, + PT_CAP_single_range_output, + PT_CAP_output_subsys, + PT_CAP_payloads_lip, + PT_CAP_num_address_ranges, + PT_CAP_mtc_periods, + PT_CAP_cycle_thresholds, + PT_CAP_psb_periods, +}; +#if defined(CONFIG_PERF_EVENTS ) && defined(CONFIG_CPU_SUP_INTEL )void cpu_emergency_stop_pt (void ); +extern u32 pt_cap_get (enum pt_capabilities cap);#else static inline void cpu_emergency_stop_pt (void ) {} +static inline u32 pt_cap_get (enum pt_capabilities cap) {return 0 ; }#endif #endif /* _ASM_X86_INTEL_PT_H */
Signature · 1 line
1.8.3.1
PATCH v5 3/11 perf/x86/intel/pt: Introduce a new function to get the capability of Intel PT
In reply to Luwei KangBecause of the guest CPUID information may diffrent with with host(some bits may mask off in guest) so introduce a new function pt_cap_get_ex() to get the capability of Intel PT.
--- arch/x86/events/intel/pt.c | 10 ++++++++++ arch/x86/include/asm/intel_pt.h | 2 ++ 2 files changed, 12 insertions(+)
arch/x86/events/intel/pt.c +10 -0
@@ -86,6 +86,16 @@ u32 pt_cap_get(enum pt_capabilities cap) }EXPORT_SYMBOL_GPL (pt_cap_get); +u32 pt_cap_get_ex (u32 *caps,enum pt_capabilities cap) +{ +struct pt_cap_desc *cd = &pt_caps[cap]; +u32 c = caps[cd->leaf *PT_CPUID_REGS_NUM + cd->reg]; +unsigned int shift =__ffs (cd->mask); + +return (c & cd->mask) >> shift; +} +EXPORT_SYMBOL_GPL (pt_cap_get_ex); +static ssize_t pt_cap_show (struct device *cdev,struct device_attribute *attr,char *buf)
arch/x86/include/asm/intel_pt.h +2 -0
@@ -27,9 +27,11 @@ enum pt_capabilities {#if defined(CONFIG_PERF_EVENTS ) && defined(CONFIG_CPU_SUP_INTEL )void cpu_emergency_stop_pt (void );extern u32 pt_cap_get (enum pt_capabilities cap); +extern u32 pt_cap_get_ex (u32 *caps,enum pt_capabilities cap);#else static inline void cpu_emergency_stop_pt (void ) {}static inline u32 pt_cap_get (enum pt_capabilities cap) {return 0 ; } +static u32 pt_cap_get_ex (u32 *caps,enum pt_capabilities cap) {return 0 ; }#endif #endif /* _ASM_X86_INTEL_PT_H */
Signature · 1 line
1.8.3.1
Paolo Bonzini
maintainerRe: [PATCH v5 03/11] perf/x86/intel/pt: Introduce a new function to get the capability of Intel PT
arch/x86/events/intel/pt.c u32 pt_cap_get(enum pt_capabilities cap) · line 98
Quoted 10 lines · Luwei Kang
arch/x86/events/intel/pt.c +10
-0+u32 pt_cap_get_ex (u32 *caps,enum pt_capabilities cap) +{ +struct pt_cap_desc *cd = &pt_caps[cap]; +u32 c = caps[cd->leaf *PT_CPUID_REGS_NUM + cd->reg]; +unsigned int shift =__ffs (cd->mask); + +return (c & cd->mask) >> shift; +} +EXPORT_SYMBOL_GPL (pt_cap_get_ex); +
You should change pt_cap_get to use this function. Also, "_ex" is not a very common suffix, so perhaps you can call it __pt_cap_get.
I don't have any other comments on patches 1-3, so when you resend we can ask the x86 maintainers for approval.
Thanks,
Paolo
RE: [PATCH v5 03/11] perf/x86/intel/pt: Introduce a new function to get the capability of Intel PT
Quoted 13 lines
Review
Quoted 9 lines
(quoted diff) +9
-0+u32 pt_cap_get_ex(u32 *caps, enum pt_capabilities cap) { + struct pt_cap_desc *cd = &pt_caps[cap]; + u32 c = caps[cd->leaf * PT_CPUID_REGS_NUM + cd->reg]; + unsigned int shift = __ffs(cd->mask); + + return (c & cd->mask) >> shift; +} +EXPORT_SYMBOL_GPL(pt_cap_get_ex); +You should change
pt_cap_getto use this function. Also, "_ex" is not a very common suffix, so perhaps you can call it__pt_cap_get.
Quoted 2 lines
I don't have any other comments on patches 1-3, so when you resend we can ask the x86 maintainers for approval.
Hi Paolo,
Is that like this?
arch/x86/events/intel/pt.c +8 -2
@@ -76,14 +76,20 @@ PT_CAP(psb_periods, 1, CPUID_EBX, 0xffff0000), }; -u32 pt_cap_get (enum pt_capabilities cap) +u32 __pt_cap_get (u32 *caps,enum pt_capabilities cap) {struct pt_cap_desc *cd = &pt_caps[cap]; -u32 c = pt_pmu.caps[cd->leaf *PT_CPUID_REGS_NUM + cd->reg]; +u32 c = caps[cd->leaf *PT_CPUID_REGS_NUM + cd->reg];unsigned int shift =__ffs (cd->mask);return (c & cd->mask) >> shift; } +EXPORT_SYMBOL_GPL (__pt_cap_get); + +u32 pt_cap_get (enum pt_capabilities cap) +{ +return __pt_cap_get (pt_pmu.caps, cap); +}EXPORT_SYMBOL_GPL (pt_cap_get); static ssize_t pt_cap_show(struct device *cdev,
arch/x86/include/asm/intel_pt.h +2 -0
@@ -27,9 +27,11 @@ enum pt_capabilities {#if defined(CONFIG_PERF_EVENTS ) && defined(CONFIG_CPU_SUP_INTEL )void cpu_emergency_stop_pt (void );extern u32 pt_cap_get (enum pt_capabilities cap); +extern u32 __pt_cap_get (u32 *caps,enum pt_capabilities cap);#else static inline void cpu_emergency_stop_pt (void ) {}static inline u32 pt_cap_get (enum pt_capabilities cap) {return 0 ; } +static u32 __pt_cap_get (u32 *caps,enum pt_capabilities cap) {return 0 ; }
Thanks,
Luwei Kang
Paolo Bonzini
maintainerRe: [PATCH v5 03/11] perf/x86/intel/pt: Introduce a new function to get the capability of Intel PT
Quoted 13 lines · Luwei
Quoted 13 lines
Review
Quoted 9 lines
(quoted diff) +9
-0+u32 pt_cap_get_ex(u32 *caps, enum pt_capabilities cap) { + struct pt_cap_desc *cd = &pt_caps[cap]; + u32 c = caps[cd->leaf * PT_CPUID_REGS_NUM + cd->reg]; + unsigned int shift = __ffs(cd->mask); + + return (c & cd->mask) >> shift; +} +EXPORT_SYMBOL_GPL(pt_cap_get_ex); +You should change
pt_cap_getto use this function. Also, "_ex" is not a very common suffix, so perhaps you can call it__pt_cap_get.
Quoted 5 lines
Quoted 2 lines
I don't have any other comments on patches 1-3, so when you resend we can ask the x86 maintainers for approval.
Hi Paolo,
Is that like this?
Yes, thanks.
Paolo
Quoted 43 lines
arch/x86/events/intel/pt.c +8
-2@@ -76,14 +76,20 @@ PT_CAP(psb_periods, 1, CPUID_EBX, 0xffff0000), }; -u32 pt_cap_get (enum pt_capabilities cap) +u32 __pt_cap_get (u32 *caps,enum pt_capabilities cap) {struct pt_cap_desc *cd = &pt_caps[cap]; -u32 c = pt_pmu.caps[cd->leaf *PT_CPUID_REGS_NUM + cd->reg]; +u32 c = caps[cd->leaf *PT_CPUID_REGS_NUM + cd->reg];unsigned int shift =__ffs (cd->mask);return (c & cd->mask) >> shift; } +EXPORT_SYMBOL_GPL (__pt_cap_get); + +u32 pt_cap_get (enum pt_capabilities cap) +{ +return __pt_cap_get (pt_pmu.caps, cap); +}EXPORT_SYMBOL_GPL (pt_cap_get); static ssize_t pt_cap_show(struct device *cdev,arch/x86/include/asm/intel_pt.h +2
-0@@ -27,9 +27,11 @@ enum pt_capabilities {#if defined(CONFIG_PERF_EVENTS ) && defined(CONFIG_CPU_SUP_INTEL )void cpu_emergency_stop_pt (void );extern u32 pt_cap_get (enum pt_capabilities cap); +extern u32 __pt_cap_get (u32 *caps,enum pt_capabilities cap);#else static inline void cpu_emergency_stop_pt (void ) {}static inline u32 pt_cap_get (enum pt_capabilities cap) {return 0 ; } +static u32 __pt_cap_get (u32 *caps,enum pt_capabilities cap) {return 0 ; } Thanks,Luwei Kang
PATCH v5 4/11 KVM: x86: Add Intel Processor Trace virtualization mode
In reply to Luwei KangFrom: Chao Peng <[email protected]>
Intel PT virtualization can be work in one of 3 possible modes:
a. system-wide: trace both host/guest and output to host buffer; b. host-only: only trace host and output to host buffer; c. host-guest: trace host/guest simultaneous and output to their
respective buffer.
--- arch/x86/include/asm/intel_pt.h | 6 ++++ arch/x86/include/asm/msr-index.h | 1 + arch/x86/include/asm/vmx.h | 8 +++++ arch/x86/kvm/vmx.c | 68 +++++++++++++++++++++++++++++++++++++--- 4 files changed, 79 insertions(+), 4 deletions(-)
arch/x86/include/asm/intel_pt.h +6 -0
@@ -5,6 +5,12 @@#define PT_CPUID_LEAVES 2#define PT_CPUID_REGS_NUM 4/* number of regsters (eax, ebx, ecx, edx) */ +enum pt_mode { +PT_MODE_SYSTEM =0 , +PT_MODE_HOST , +PT_MODE_HOST_GUEST , +}; +enum pt_capabilities { PT_CAP_max_subleaf =0 , PT_CAP_cr3_filtering,
arch/x86/include/asm/msr-index.h +1 -0
@@ -776,6 +776,7 @@#define VMX_BASIC_INOUT 0x0040000000000000LLU/* MSR_IA32_VMX_MISC bits */ +#define MSR_IA32_VMX_MISC_INTEL_PT (1ULL << 14)#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29)#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F/* AMD-V MSRs */
arch/x86/include/asm/vmx.h +8 -0
@@ -76,7 +76,9 @@#define SECONDARY_EXEC_SHADOW_VMCS 0x00004000#define SECONDARY_EXEC_RDSEED_EXITING 0x00010000#define SECONDARY_EXEC_ENABLE_PML 0x00020000 +#define SECONDARY_EXEC_PT_CONCEAL_VMX 0x00080000#define SECONDARY_EXEC_XSAVES 0x00100000 +#define SECONDARY_EXEC_PT_USE_GPA 0x01000000#define SECONDARY_EXEC_TSC_SCALING 0x02000000#define PIN_BASED_EXT_INTR_MASK 0x00000001
@@ -97,6 +99,8 @@#define VM_EXIT_LOAD_IA32_EFER 0x00200000#define VM_EXIT_SAVE_VMX_PREEMPTION_TIMER 0x00400000#define VM_EXIT_CLEAR_BNDCFGS 0x00800000 +#define VM_EXIT_PT_CONCEAL_PIP 0x01000000 +#define VM_EXIT_CLEAR_IA32_RTIT_CTL 0x02000000#define VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR 0x00036dff
@@ -108,6 +112,8 @@#define VM_ENTRY_LOAD_IA32_PAT 0x00004000#define VM_ENTRY_LOAD_IA32_EFER 0x00008000#define VM_ENTRY_LOAD_BNDCFGS 0x00010000 +#define VM_ENTRY_PT_CONCEAL_PIP 0x00020000 +#define VM_ENTRY_LOAD_IA32_RTIT_CTL 0x00040000#define VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR 0x000011ff
@@ -234,6 +240,8 @@ enum vmcs_field {GUEST_PDPTR3_HIGH =0x00002811 ,GUEST_BNDCFGS =0x00002812 ,GUEST_BNDCFGS_HIGH =0x00002813 , +GUEST_IA32_RTIT_CTL =0x00002814 , +GUEST_IA32_RTIT_CTL_HIGH =0x00002815 ,HOST_IA32_PAT =0x00002c00 ,HOST_IA32_PAT_HIGH =0x00002c01 , HOST_IA32_EFER = 0x00002c02,
arch/x86/kvm/vmx.c +64 -4
134 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH v5 5/11 KVM: x86: Add Intel Processor Trace cpuid emulation
In reply to Luwei KangFrom: Chao Peng <[email protected]>
Expose Intel Processor Trace to guest only when PT work in HOST_GUEST mode.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/cpuid.c | 22 ++++++++++++++++++++-- arch/x86/kvm/svm.c | 6 ++++++ arch/x86/kvm/vmx.c | 6 ++++++ 4 files changed, 33 insertions(+), 2 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -1032,6 +1032,7 @@ struct kvm_x86_ops {bool (*mpx_supported)(void );bool (*xsaves_supported)(void );bool (*umip_emulated)(void ); +bool (*pt_supported)(void );int (*check_nested_events)(struct kvm_vcpu *vcpu,bool external_intr);
arch/x86/kvm/cpuid.c +20 -2
@@ -331,6 +331,7 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,unsigned f_mpx =kvm_mpx_supported () ?F (MPX ) :0 ;unsigned f_xsaves = kvm_x86_ops->xsaves_supported () ?F (XSAVES ) :0 ;unsigned f_umip = kvm_x86_ops->umip_emulated () ?F (UMIP ) :0 ; +unsigned f_intel_pt = kvm_x86_ops->pt_supported () ?F (INTEL_PT ) :0 ;/* cpuid 1.edx */ const u32 kvm_cpuid_1_edx_x86_features =
@@ -388,7 +389,7 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,F (BMI2 ) |F (ERMS ) | f_invpcid |F (RTM ) | f_mpx |F (RDSEED ) |F (ADX ) |F (SMAP ) |F (AVX512IFMA ) |F (AVX512F ) |F (AVX512PF ) |F (AVX512ER ) |F (AVX512CD ) |F (CLFLUSHOPT ) |F (CLWB ) |F (AVX512DQ ) | -F (SHA_NI ) |F (AVX512BW ) |F (AVX512VL ); +F (SHA_NI ) |F (AVX512BW ) |F (AVX512VL ) | f_intel_pt;/* cpuid 0xD.1.eax */ const u32 kvm_cpuid_D_1_eax_x86_features =
@@ -418,7 +419,7 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,switch (function) {case 0 : - entry->eax =min (entry->eax, (u32 )0xd ); + entry->eax =min (entry->eax, (u32)(f_intel_pt ?0x14 :0xd ));break ;case 1 : entry->edx &= kvm_cpuid_1_edx_x86_features;
@@ -590,6 +591,23 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, }break ; } +/* Intel PT */ +case 0x14 : { +int t, times = entry->eax; + +if (!f_intel_pt) +break ; + + entry->flags |=KVM_CPUID_FLAG_SIGNIFCANT_INDEX ; +for (t =1 ; t <= times; ++t) { +if (*nent >= maxnent) + goto out; +do_cpuid_1_ent (&entry[t], function, t); + entry[t].flags |=KVM_CPUID_FLAG_SIGNIFCANT_INDEX ; + ++*nent; + } +break ; + }case KVM_CPUID_SIGNATURE : {static const char signature[12 ] ="KVMKVMKVM\0\0" ;const u32 *sigptr = (const u32 *)signature;
arch/x86/kvm/svm.c +6 -0
@@ -5719,6 +5719,11 @@ static bool svm_umip_emulated(void)return false; } +static bool svm_pt_supported (void ) +{ +return false; +} +static bool svm_has_wbinvd_exit (void ) {return true;
@@ -6939,6 +6944,7 @@ static int svm_unregister_enc_region(struct kvm *kvm, .mpx_supported = svm_mpx_supported, .xsaves_supported = svm_xsaves_supported, .umip_emulated = svm_umip_emulated, + .pt_supported = svm_pt_supported, .set_supported_cpuid = svm_set_supported_cpuid,
arch/x86/kvm/vmx.c +6 -0
@@ -9311,6 +9311,11 @@ static bool vmx_umip_emulated(void)SECONDARY_EXEC_DESC ; } +static bool vmx_pt_supported (void ) +{ +return (pt_mode ==PT_MODE_HOST_GUEST ); +} +static void vmx_recover_nmi_blocking (struct vcpu_vmx *vmx) {u32 exit_intr_info;
@@ -12455,6 +12460,7 @@ static int enable_smi_window(struct kvm_vcpu *vcpu) .mpx_supported = vmx_mpx_supported, .xsaves_supported = vmx_xsaves_supported, .umip_emulated = vmx_umip_emulated, + .pt_supported = vmx_pt_supported, .check_nested_events = vmx_check_nested_events,
Signature · 1 line
1.8.3.1
PATCH v5 6/11 KVM: x86: Add Intel processor trace context for each vcpu
In reply to Luwei KangFrom: Chao Peng <[email protected]>
Add a data structure to save Intel Processor Trace context. It mainly include the value of Intel PT host/guest MSRs and guest CPUID information.
--- arch/x86/kvm/vmx.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/x86/kvm/vmx.c +19 -0
@@ -589,6 +589,23 @@ static inline int pi_test_sn(struct pi_desc *pi_desc) (unsigned long *)&pi_desc->control); } +struct pt_ctx { +u64 ctl; +u64 status; +u64 output_base; +u64 output_mask; +u64 cr3_match; +u64 addrs[MSR_IA32_RTIT_ADDR_COUNT ]; +}; + +struct pt_desc { +u64 ctl_bitmask; +u32 range_cnt; +u32 caps[PT_CPUID_REGS_NUM *PT_CPUID_LEAVES ]; +struct pt_ctx host; +struct pt_ctx guest; +}; +struct vcpu_vmx {struct kvm_vcpu vcpu;unsigned long host_rsp;
@@ -685,6 +702,8 @@ struct vcpu_vmx {*/ u64 msr_ia32_feature_control;u64 msr_ia32_feature_control_valid_bits; + +struct pt_desc pt_desc; };enum segment_cache_field {
Signature · 1 line
1.8.3.1
PATCH v5 7/11 KVM: x86: Implement Intel Processor Trace context switch
In reply to Luwei KangFrom: Chao Peng <[email protected]>
Load/Store Intel processor trace register in context switch. MSR IA32_RTIT_CTL is loaded/stored automatically from VMCS. In HOST mode, we just need to restore the status of IA32_RTIT_CTL. In HOST_GUEST mode, we need load/resore PT MSRs only when PT is enabled in guest.
--- arch/x86/kvm/vmx.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)
arch/x86/kvm/vmx.c +60 -0
@@ -2156,6 +2156,55 @@ static unsigned long segment_base(u16 selector) }#endif +static inline void pt_load_msr (struct pt_ctx *ctx,u32 range_cnt) +{ +u32 i; + +wrmsrl (MSR_IA32_RTIT_STATUS , ctx->status); +wrmsrl (MSR_IA32_RTIT_OUTPUT_BASE , ctx->output_base); +wrmsrl (MSR_IA32_RTIT_OUTPUT_MASK , ctx->output_mask); +wrmsrl (MSR_IA32_RTIT_CR3_MATCH , ctx->cr3_match); +for (i =0 ; i < range_cnt; i++) +wrmsrl (MSR_IA32_RTIT_ADDR0_A + i, ctx->addrs[i]); +} + +static inline void pt_save_msr (struct pt_ctx *ctx,u32 range_cnt) +{ +u32 i; + +rdmsrl (MSR_IA32_RTIT_STATUS , ctx->status); +rdmsrl (MSR_IA32_RTIT_OUTPUT_BASE , ctx->output_base); +rdmsrl (MSR_IA32_RTIT_OUTPUT_MASK , ctx->output_mask); +rdmsrl (MSR_IA32_RTIT_CR3_MATCH , ctx->cr3_match); +for (i =0 ; i < range_cnt; i++) +rdmsrl (MSR_IA32_RTIT_ADDR0_A + i, ctx->addrs[i]); +} + +static void pt_guest_enter (struct vcpu_vmx *vmx) +{ +if (pt_mode ==PT_MODE_HOST || pt_mode ==PT_MODE_HOST_GUEST ) +rdmsrl (MSR_IA32_RTIT_CTL , vmx->pt_desc.host.ctl); + +if (pt_mode ==PT_MODE_HOST_GUEST && + vmx->pt_desc.guest.ctl &RTIT_CTL_TRACEEN ) { +wrmsrl (MSR_IA32_RTIT_CTL ,0 ); +pt_save_msr (&vmx->pt_desc.host, vmx->pt_desc.range_cnt); +pt_load_msr (&vmx->pt_desc.guest, vmx->pt_desc.range_cnt); + } +} + +static void pt_guest_exit (struct vcpu_vmx *vmx) +{ +if (pt_mode ==PT_MODE_HOST_GUEST && + vmx->pt_desc.guest.ctl &RTIT_CTL_TRACEEN ) { +pt_save_msr (&vmx->pt_desc.guest, vmx->pt_desc.range_cnt); +pt_load_msr (&vmx->pt_desc.host, vmx->pt_desc.range_cnt); + } + +if (pt_mode ==PT_MODE_HOST || pt_mode ==PT_MODE_HOST_GUEST ) +wrmsrl (MSR_IA32_RTIT_CTL , vmx->pt_desc.host.ctl); +} +static void vmx_save_host_state (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu);
@@ -5845,6 +5894,13 @@ static void vmx_vcpu_setup(struct vcpu_vmx *vmx)vmcs_write64 (PML_ADDRESS ,page_to_phys (vmx->pml_pg));vmcs_write16 (GUEST_PML_INDEX ,PML_ENTITY_NUM -1 ); } + +if (pt_mode ==PT_MODE_HOST_GUEST ) { +memset (&vmx->pt_desc,0 ,sizeof (vmx->pt_desc)); +/* Bit[6~0] are forced to 1, writes are ignored. */ + vmx->pt_desc.guest.output_mask =0x7F ; +vmcs_write64 (GUEST_IA32_RTIT_CTL ,0 ); + } }static void vmx_vcpu_reset (struct kvm_vcpu *vcpu,bool init_event)
@@ -9542,6 +9598,8 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) vcpu->arch.pkru != vmx->host_pkru)__write_pkru (vcpu->arch.pkru); +pt_guest_enter (vmx); +atomic_switch_perf_msrs (vmx);vmx_arm_hv_timer (vcpu);
@@ -9721,6 +9779,8 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) | (1 << VCPU_EXREG_CR3)); vcpu->arch.regs_dirty =0 ; +pt_guest_exit (vmx); +/* * eager fpu is enabled if PKEY is supported and CR4 is switched * back on host, so it is safe to read guest PKRU from current
Signature · 1 line
1.8.3.1
PATCH v5 8/11 KVM: x86: Introduce a function to initialize the PT configuration
In reply to Luwei KangInitialize the Intel PT configuration when cpuid update. Include cpuid inforamtion, rtit_ctl bit mask and the number of address ranges.
--- arch/x86/kvm/vmx.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+)
arch/x86/kvm/vmx.c +69 -0
@@ -10092,6 +10092,71 @@ static void nested_vmx_cr_fixed1_bits_update(struct kvm_vcpu *vcpu)#undef cr4_fixed1_update } +static void update_intel_pt_cfg (struct kvm_vcpu *vcpu) +{ +struct vcpu_vmx *vmx =to_vmx (vcpu); +struct kvm_cpuid_entry2 *best =NULL ; +int i; + +for (i =0 ; i <PT_CPUID_LEAVES ; i++) { + best =kvm_find_cpuid_entry (vcpu,0x14 , i); +if (!best) +return ; + vmx->pt_desc.caps[CPUID_EAX + i*PT_CPUID_REGS_NUM ] = best->eax; + vmx->pt_desc.caps[CPUID_EBX + i*PT_CPUID_REGS_NUM ] = best->ebx; + vmx->pt_desc.caps[CPUID_ECX + i*PT_CPUID_REGS_NUM ] = best->ecx; + vmx->pt_desc.caps[CPUID_EDX + i*PT_CPUID_REGS_NUM ] = best->edx; + } + +/* Get the number of configurable Address Ranges for filtering */ + vmx->pt_desc.range_cnt =pt_cap_get_ex (vmx->pt_desc.caps, + PT_CAP_num_address_ranges); + +/* Clear the no dependency bits */ + vmx->pt_desc.ctl_bitmask = ~(RTIT_CTL_TRACEEN |RTIT_CTL_OS | +RTIT_CTL_USR |RTIT_CTL_TSC_EN |RTIT_CTL_DIS_RETC ); + +/* If CPUID.(EAX=14H,ECX=0):EBX[0]=1 CR3Filter can be set */ +if (pt_cap_get_ex (vmx->pt_desc.caps, PT_CAP_cr3_filtering)) + vmx->pt_desc.ctl_bitmask &= ~RTIT_CTL_CR3_FILTER ; + +/* +* If CPUID.(EAX=14H,ECX=0):EBX[1]=1 CYCEn, CycThresh and +* PSBFreq can be set +*/ +if (pt_cap_get_ex (vmx->pt_desc.caps, PT_CAP_psb_cyc)) + vmx->pt_desc.ctl_bitmask &= ~(RTIT_CTL_CYC_EN | +RTIT_CTL_CYC_THRESH |RTIT_CTL_PSB_FREQ ); + +/* +* If CPUID.(EAX=14H,ECX=0):EBX[3]=1 MTCEn BranchEn and +* MTCFreq can be set +*/ +if (pt_cap_get_ex (vmx->pt_desc.caps, PT_CAP_mtc)) + vmx->pt_desc.ctl_bitmask &= ~(RTIT_CTL_MTC_EN | +RTIT_CTL_BRANCH_EN |RTIT_CTL_MTC_RANGE ); + +/* If CPUID.(EAX=14H,ECX=0):EBX[4]=1 FUPonPTW and PTWEn can be set */ +if (pt_cap_get_ex (vmx->pt_desc.caps, PT_CAP_ptwrite)) + vmx->pt_desc.ctl_bitmask &= ~(RTIT_CTL_FUP_ON_PTW | +RTIT_CTL_PTW_EN ); + +/* If CPUID.(EAX=14H,ECX=0):EBX[5]=1 PwrEvEn can be set */ +if (pt_cap_get_ex (vmx->pt_desc.caps, PT_CAP_power_event_trace)) + vmx->pt_desc.ctl_bitmask &= ~RTIT_CTL_PWR_EVT_EN ; + +/* If CPUID.(EAX=14H,ECX=0):ECX[0]=1 ToPA can be set */ +if (pt_cap_get_ex (vmx->pt_desc.caps, PT_CAP_topa_output)) + vmx->pt_desc.ctl_bitmask &= ~RTIT_CTL_TOPA ; +/* If CPUID.(EAX=14H,ECX=0):ECX[3]=1 FabircEn can be set */ +if (pt_cap_get_ex (vmx->pt_desc.caps, PT_CAP_output_subsys)) + vmx->pt_desc.ctl_bitmask &= ~RTIT_CTL_FABRIC_EN ; + +/* unmask address range configure area */ +for (i =0 ; i < vmx->pt_desc.range_cnt; i++) + vmx->pt_desc.ctl_bitmask &= ~(0xf << (32 + i*4 )); +} +static void vmx_cpuid_update (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu);
@@ -10110,6 +10175,10 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu)if (nested_vmx_allowed (vcpu))nested_vmx_cr_fixed1_bits_update (vcpu); + +if (boot_cpu_has (X86_FEATURE_INTEL_PT ) && +guest_cpuid_has (vcpu,X86_FEATURE_INTEL_PT )) +update_intel_pt_cfg (vcpu); }static void vmx_set_supported_cpuid (u32 func,struct kvm_cpuid_entry2 *entry)
Signature · 1 line
1.8.3.1
PATCH v5 9/11 KVM: x86: Implement Intel Processor Trace MSRs read/write
In reply to Luwei KangFrom: Chao Peng <[email protected]>
Implement Intel Processor Trace MSRs read/write.
--- arch/x86/include/asm/intel_pt.h | 8 ++ arch/x86/kvm/vmx.c | 167 ++++++++++++++++++++++++++++++++++++++++ arch/x86/kvm/x86.c | 33 +++++++- 3 files changed, 207 insertions(+), 1 deletion(-)
arch/x86/include/asm/intel_pt.h +8 -0
@@ -5,6 +5,14 @@#define PT_CPUID_LEAVES 2#define PT_CPUID_REGS_NUM 4/* number of regsters (eax, ebx, ecx, edx) */ +#define MSR_IA32_RTIT_STATUS_MASK (~(RTIT_STATUS_FILTEREN | \ + RTIT_STATUS_CONTEXTEN | RTIT_STATUS_TRIGGEREN | \ + RTIT_STATUS_ERROR | RTIT_STATUS_STOPPED | \ + RTIT_STATUS_BYTECNT)) + +#define MSR_IA32_RTIT_OUTPUT_BASE_MASK \ + (~((1UL << cpuid_query_maxphyaddr(vcpu)) - 1) | 0x7f) +enum pt_mode {PT_MODE_SYSTEM =0 ,PT_MODE_HOST ,
arch/x86/kvm/vmx.c +167 -0
191 lines not on this page · raw message
arch/x86/kvm/x86.c +32 -1
@@ -69,6 +69,7 @@#include <asm/irq_remapping.h> #include <asm/mshyperv.h> #include <asm/hypervisor.h> +#include <asm/intel_pt.h> #define CREATE_TRACE_POINTS #include "trace.h"
@@ -1016,7 +1017,13 @@ bool kvm_rdpmc(struct kvm_vcpu *vcpu)#endif MSR_IA32_TSC ,MSR_IA32_CR_PAT ,MSR_VM_HSAVE_PA ,MSR_IA32_FEATURE_CONTROL ,MSR_IA32_BNDCFGS ,MSR_TSC_AUX , - MSR_IA32_SPEC_CTRL, MSR_IA32_ARCH_CAPABILITIES +MSR_IA32_SPEC_CTRL ,MSR_IA32_ARCH_CAPABILITIES , +MSR_IA32_RTIT_CTL ,MSR_IA32_RTIT_STATUS ,MSR_IA32_RTIT_CR3_MATCH , +MSR_IA32_RTIT_OUTPUT_BASE ,MSR_IA32_RTIT_OUTPUT_MASK , +MSR_IA32_RTIT_ADDR0_A ,MSR_IA32_RTIT_ADDR0_B , +MSR_IA32_RTIT_ADDR1_A ,MSR_IA32_RTIT_ADDR1_B , +MSR_IA32_RTIT_ADDR2_A ,MSR_IA32_RTIT_ADDR2_B , + MSR_IA32_RTIT_ADDR3_A, MSR_IA32_RTIT_ADDR3_B, };static unsigned num_msrs_to_save;
@@ -4527,6 +4534,30 @@ static void kvm_init_msr_list(void)if (!kvm_x86_ops->rdtscp_supported ())continue ;break ; +case MSR_IA32_RTIT_CTL : +case MSR_IA32_RTIT_STATUS : +if (!kvm_x86_ops->pt_supported ()) +continue ; +break ; +case MSR_IA32_RTIT_CR3_MATCH : +if (!kvm_x86_ops->pt_supported () || + !pt_cap_get (PT_CAP_cr3_filtering)) +continue ; +break ; +case MSR_IA32_RTIT_OUTPUT_BASE : +case MSR_IA32_RTIT_OUTPUT_MASK : +if (!kvm_x86_ops->pt_supported () || + (!pt_cap_get (PT_CAP_topa_output) && + !pt_cap_get (PT_CAP_single_range_output))) +continue ; +break ; + case MSR_IA32_RTIT_ADDR0_A ... MSR_IA32_RTIT_ADDR3_B: { +if (!kvm_x86_ops->pt_supported () || + msrs_to_save[i] -MSR_IA32_RTIT_ADDR0_A >= +2 *pt_cap_get (PT_CAP_num_address_ranges)) +continue ; +break ; + }default :break ; }
Signature · 1 line
1.8.3.1
PATCH v5 10/11 KVM: x86: Set intercept for Intel PT MSRs
In reply to Luwei KangFrom: Chao Peng <[email protected]>
Disable interrcept Intel PT MSRs only when Intel PT is enabled in guest. But MSR_IA32_RTIT_CTL will alway be intercept.
--- arch/x86/kvm/vmx.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/x86/kvm/vmx.c +20 -0
@@ -935,6 +935,7 @@ static bool nested_vmx_is_page_fault_vmexit(struct vmcs12 *vmcs12, static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,u32 msr,int type);static bool vmx_pt_supported (void ); +static void pt_set_intercept_for_msr (struct vcpu_vmx *vmx,bool flag); static DEFINE_PER_CPU(struct vmcs *, vmxarea); static DEFINE_PER_CPU(struct vmcs *, current_vmcs);
@@ -3713,6 +3714,7 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)return 1 ;vmcs_write64 (GUEST_IA32_RTIT_CTL , data); vmx->pt_desc.guest.ctl = data; +pt_set_intercept_for_msr (vmx, !(data &RTIT_CTL_TRACEEN ));break ;case MSR_IA32_RTIT_STATUS : if (!vmx_pt_supported() ||
@@ -5496,6 +5498,24 @@ static void vmx_update_msr_bitmap(struct kvm_vcpu *vcpu) vmx->msr_bitmap_mode = mode; } +static void pt_set_intercept_for_msr (struct vcpu_vmx *vmx,bool flag) +{ +unsigned long *msr_bitmap = vmx->vmcs01.msr_bitmap; +u32 i; + +vmx_set_intercept_for_msr (msr_bitmap,MSR_IA32_RTIT_STATUS , +MSR_TYPE_RW , flag); +vmx_set_intercept_for_msr (msr_bitmap,MSR_IA32_RTIT_OUTPUT_BASE , +MSR_TYPE_RW , flag); +vmx_set_intercept_for_msr (msr_bitmap,MSR_IA32_RTIT_OUTPUT_MASK , +MSR_TYPE_RW , flag); +vmx_set_intercept_for_msr (msr_bitmap,MSR_IA32_RTIT_CR3_MATCH , +MSR_TYPE_RW , flag); +for (i =0 ; i < vmx->pt_desc.range_cnt; i++) +vmx_set_intercept_for_msr (msr_bitmap,MSR_IA32_RTIT_ADDR0_A + i, +MSR_TYPE_RW , flag); +} +static bool vmx_get_enable_apicv (struct kvm_vcpu *vcpu) {return enable_apicv;
Signature · 1 line
1.8.3.1
PATCH v5 11/11 KVM: x86: Disable Intel Processor Trace when VMXON in L1 guest
In reply to Luwei KangCurrently, Intel Processor Trace do not support tracing in L1 guest VMX operation(IA32_VMX_MISC[bit 14] is 0). As mentioned in SDM, on these type of processors, execution of the VMXON instruction will clears IA32_RTIT_CTL.TraceEn and any attempt to write IA32_RTIT_CTL causes a general-protection exception (#GP).
--- arch/x86/kvm/vmx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/x86/kvm/vmx.c +8 -1
@@ -3710,7 +3710,8 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)clear_atomic_switch_msr (vmx,MSR_IA32_XSS );break ;case MSR_IA32_RTIT_CTL : -if (!vmx_pt_supported () ||vmx_rtit_ctl_check (vcpu, data)) +if (!vmx_pt_supported () ||vmx_rtit_ctl_check (vcpu, data) || + vmx->nested.vmxon)return 1 ;vmcs_write64 (GUEST_IA32_RTIT_CTL , data); vmx->pt_desc.guest.ctl = data;
@@ -7783,6 +7784,12 @@ static int handle_vmon(struct kvm_vcpu *vcpu)if (ret)return ret; +if (pt_mode ==PT_MODE_HOST_GUEST ) { + vmx->pt_desc.guest.ctl =0 ; +vmcs_write64 (GUEST_IA32_RTIT_CTL ,0 ); +pt_set_intercept_for_msr (vmx,1 ); + } +nested_vmx_succeed (vcpu);return kvm_skip_emulated_instruction (vcpu); }
Signature · 1 line
1.8.3.1
Paolo Bonzini
maintainerRe: [PATCH v5 11/11] KVM: x86: Disable Intel Processor Trace when VMXON in L1 guest
arch/x86/kvm/vmx.c static int handle_vmon(struct kvm_vcpu *vcpu) · line 7787
Quoted 1 line · Luwei Kang
arch/x86/kvm/vmx.c +1
-0+if (pt_mode ==PT_MODE_HOST_GUEST ) {
This would be vmx_pt_supported(), but I think it's better to remove that function and just test pt_mode == PT_MODE_HOST_GUEST everywhere (or !=).
Paolo
Quoted 5 lines
arch/x86/kvm/vmx.c +5
-0+ vmx->pt_desc.guest.ctl =0 ; +vmcs_write64 (GUEST_IA32_RTIT_CTL ,0 ); +pt_set_intercept_for_msr (vmx,1 ); + } +
RE: [PATCH v5 11/11] KVM: x86: Disable Intel Processor Trace when VMXON in L1 guest
Quoted 4 lines
arch/x86/kvm/vmx.c static int handle_vmon(struct kvm_vcpu *vcpu) · line 7787
Quoted 1 line
arch/x86/kvm/vmx.c +1
-0+if (pt_mode ==PT_MODE_HOST_GUEST ) {This would be
vmx_pt_supported(), but I think it's better to remove that function and just testpt_mode==PT_MODE_HOST_GUESTeverywhere (or !=).
Hi Paolo,
There have so many vmx_pt_supported() invoked in MSRs read/write (patch 9) patch and I think it can be replaced by pt_mode check. But I think this function need to be reserved in patch 5(cpuid emulation). What is your opinion?
Thanks,
Luwei Kang
Quoted 8 lines
Paolo
Quoted 5 lines
arch/x86/kvm/vmx.c +5
-0+ vmx->pt_desc.guest.ctl =0 ; +vmcs_write64 (GUEST_IA32_RTIT_CTL ,0 ); +pt_set_intercept_for_msr (vmx,1 ); + } +
Paolo Bonzini
maintainerRe: [PATCH v5 11/11] KVM: x86: Disable Intel Processor Trace when VMXON in L1 guest
Quoted 6 lines · Luwei
Quoted 3 lines
arch/x86/kvm/vmx.c static int handle_vmon(struct kvm_vcpu *vcpu) · line 7787
Quoted 1 line
arch/x86/kvm/vmx.c +1
-0+if (pt_mode ==PT_MODE_HOST_GUEST ) {This would be
vmx_pt_supported(), but I think it's better to remove that function and just testpt_mode==PT_MODE_HOST_GUESTeverywhere (or !=).Hi Paolo,
There have so manyvmx_pt_supported()invoked in MSRs read/write (patch 9) patch and I think it can be replaced bypt_modecheck. But I think this function need to be reserved in patch 5(cpuid emulation). What is your opinion?
Yes, the function pointer needs to stay.
Paolo