perf fixes
Subsystems (2)
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: 4a31b424ac0656d1bb17520ee861144fe7a19664 perf/core: Fix memory leak triggered by perf --namespace
Misc fixes: two PMU driver fixes and a memory leak fix.
Thanks,
Ingo
------------------>
Andi Kleen (1):
perf/x86/intel: Hide TSX events when RTM is not supported
Kan Liang (1):
perf/x86/intel/uncore: Add event constraint for BDX PCU
Vasily Averin (1):
perf/core: Fix memory leak triggered by perf --namespace
arch/x86/events/intel/core.c | 35 +++++++++++++++++++++++------------ arch/x86/events/intel/uncore_snbep.c | 8 ++++++++ kernel/events/core.c | 1 + 3 files changed, 32 insertions(+), 12 deletions(-)
arch/x86/events/intel/core.c +23 -12
@@ -3730,6 +3730,19 @@ EVENT_ATTR_STR(cycles-t, cycles_t, "event=0x3c,in_tx=1");EVENT_ATTR_STR (cycles-ct, cycles_ct,"event=0x3c,in_tx=1,in_tx_cp=1" );static struct attribute *hsw_events_attrs[] = { +EVENT_PTR (mem_ld_hsw), +EVENT_PTR (mem_st_hsw), +EVENT_PTR (td_slots_issued), +EVENT_PTR (td_slots_retired), +EVENT_PTR (td_fetch_bubbles), +EVENT_PTR (td_total_slots), +EVENT_PTR (td_total_slots_scale), +EVENT_PTR (td_recovery_bubbles), +EVENT_PTR (td_recovery_bubbles_scale), +NULL +}; + +static struct attribute *hsw_tsx_events_attrs[] = {EVENT_PTR (tx_start),EVENT_PTR (tx_commit),EVENT_PTR (tx_abort),
@@ -3742,18 +3755,16 @@ static struct attribute *hsw_events_attrs[] = {EVENT_PTR (el_conflict),EVENT_PTR (cycles_t),EVENT_PTR (cycles_ct), -EVENT_PTR (mem_ld_hsw), -EVENT_PTR (mem_st_hsw), -EVENT_PTR (td_slots_issued), -EVENT_PTR (td_slots_retired), -EVENT_PTR (td_fetch_bubbles), -EVENT_PTR (td_total_slots), -EVENT_PTR (td_total_slots_scale), -EVENT_PTR (td_recovery_bubbles), -EVENT_PTR (td_recovery_bubbles_scale), NULL }; +static __init struct attribute **get_hsw_events_attrs (void ) +{ +return boot_cpu_has (X86_FEATURE_RTM ) ? +merge_attr (hsw_events_attrs, hsw_tsx_events_attrs) : + hsw_events_attrs; +} +static ssize_t freeze_on_smi_show (struct device *cdev,struct device_attribute *attr,char *buf)
@@ -4182,7 +4193,7 @@ __init int intel_pmu_init(void) x86_pmu.hw_config = hsw_hw_config; x86_pmu.get_event_constraints = hsw_get_event_constraints; - x86_pmu.cpu_events = hsw_events_attrs; + x86_pmu.cpu_events =get_hsw_events_attrs (); x86_pmu.lbr_double_abort = true; extra_attr =boot_cpu_has (X86_FEATURE_RTM ) ? hsw_format_attr : nhm_format_attr;
@@ -4221,7 +4232,7 @@ __init int intel_pmu_init(void) x86_pmu.hw_config = hsw_hw_config; x86_pmu.get_event_constraints = hsw_get_event_constraints; - x86_pmu.cpu_events = hsw_events_attrs; + x86_pmu.cpu_events =get_hsw_events_attrs (); x86_pmu.limit_period = bdw_limit_period; extra_attr =boot_cpu_has (X86_FEATURE_RTM ) ? hsw_format_attr : nhm_format_attr;
@@ -4279,7 +4290,7 @@ __init int intel_pmu_init(void) extra_attr =boot_cpu_has (X86_FEATURE_RTM ) ? hsw_format_attr : nhm_format_attr; extra_attr =merge_attr (extra_attr, skl_format_attr); - x86_pmu.cpu_events = hsw_events_attrs; + x86_pmu.cpu_events =get_hsw_events_attrs ();intel_pmu_pebs_data_source_skl ( boot_cpu_data.x86_model ==INTEL_FAM6_SKYLAKE_X );pr_cont ("Skylake events, " );
arch/x86/events/intel/uncore_snbep.c +8 -0
@@ -3035,11 +3035,19 @@ static struct intel_uncore_type *bdx_msr_uncores[] = { NULL, }; +/* Bit 7 'Use Occupancy' is not available for counter 0 on BDX */ +static struct event_constraint bdx_uncore_pcu_constraints[] = { +EVENT_CONSTRAINT (0x80 ,0xe ,0x80 ), +EVENT_CONSTRAINT_END +}; +void bdx_uncore_cpu_init (void ) {if (bdx_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores) bdx_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores; uncore_msr_uncores = bdx_msr_uncores; + + hswep_uncore_pcu.constraints = bdx_uncore_pcu_constraints; }static struct intel_uncore_type bdx_uncore_ha = {
kernel/events/core.c +1 -0
@@ -6756,6 +6756,7 @@ static void perf_fill_ns_link_info(struct perf_ns_link_info *ns_link_info, ns_inode = ns_path.dentry->d_inode; ns_link_info->dev =new_encode_dev (ns_inode->i_sb->s_dev); ns_link_info->ino = ns_inode->i_ino; +path_put (&ns_path); } }