From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751904AbdIEOB0 (ORCPT ); Tue, 5 Sep 2017 10:01:26 -0400 Received: from mga04.intel.com ([192.55.52.120]:49607 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751808AbdIEOBY (ORCPT ); Tue, 5 Sep 2017 10:01:24 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,480,1498546800"; d="scan'208";a="1011122587" From: Alexander Shishkin To: Peter Zijlstra Cc: Ingo Molnar , linux-kernel@vger.kernel.org, acme@redhat.com, kirill.shutemov@linux.intel.com, Borislav Petkov , rric@kernel.org, Alexander Shishkin Subject: [RFC PATCH 16/17] perf/x86/intel/pt: Add PMU info Date: Tue, 5 Sep 2017 16:30:25 +0300 Message-Id: <20170905133026.13689-17-alexander.shishkin@linux.intel.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170905133026.13689-1-alexander.shishkin@linux.intel.com> References: <20170905133026.13689-1-alexander.shishkin@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add PMU-specific data structure with family/model/stepping and clock information required by the decoder. Signed-off-by: Alexander Shishkin --- arch/x86/events/intel/pt.c | 23 ++++++++++++++++++++++- arch/x86/events/intel/pt.h | 11 +++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c index 3b993942a0..053b96f491 100644 --- a/arch/x86/events/intel/pt.c +++ b/arch/x86/events/intel/pt.c @@ -35,6 +35,8 @@ static DEFINE_PER_CPU(struct pt, pt_ctx); +#define PMU_NAME "intel_pt" + static struct pt_pmu pt_pmu; /* @@ -271,6 +273,22 @@ static int __init pt_pmu_hw_init(void) return ret; } +static struct intel_pt_pmu_info pt_pmu_info; + +static void pt_pmu_info_setup(void) +{ + BUILD_BUG_ON(sizeof(pt_pmu_info) + + sizeof(struct perf_event_mmap_page) > PAGE_SIZE); + pt_pmu_info.pi.note_size = sizeof(pt_pmu_info.pi); + pt_pmu_info.pi.pmu_descsz = sizeof(pt_pmu_info) - pt_pmu_info.pi.note_size; + pt_pmu_info.x86_family = boot_cpu_data.x86; + pt_pmu_info.x86_model = boot_cpu_data.x86_model; + pt_pmu_info.x86_step = boot_cpu_data.x86_mask; + pt_pmu_info.x86_tsc_max_nonturbo_ratio = pt_pmu.max_nonturbo_ratio; + pt_pmu_info.x86_tsc_to_art_numerator = pt_pmu.tsc_art_num; + pt_pmu_info.x86_tsc_to_art_denominator = pt_pmu.tsc_art_den; +} + #define RTIT_CTL_CYC_PSB (RTIT_CTL_CYCLEACC | \ RTIT_CTL_CYC_THRESH | \ RTIT_CTL_PSB_FREQ) @@ -1512,6 +1530,8 @@ static __init int pt_init(void) return -ENODEV; } + pt_pmu_info_setup(); + if (!pt_cap_get(PT_CAP_topa_multiple_entries)) pt_pmu.pmu.capabilities = PERF_PMU_CAP_AUX_NO_SG | PERF_PMU_CAP_AUX_SW_DOUBLEBUF; @@ -1531,8 +1551,9 @@ static __init int pt_init(void) pt_pmu.pmu.addr_filters_validate = pt_event_addr_filters_validate; pt_pmu.pmu.nr_addr_filters = pt_cap_get(PT_CAP_num_address_ranges); + pt_pmu.pmu.pmu_info = &pt_pmu_info.pi; - ret = perf_pmu_register(&pt_pmu.pmu, "intel_pt", -1); + ret = perf_pmu_register(&pt_pmu.pmu, PMU_NAME, -1); return ret; } diff --git a/arch/x86/events/intel/pt.h b/arch/x86/events/intel/pt.h index 25fa9710f4..fc19080ca3 100644 --- a/arch/x86/events/intel/pt.h +++ b/arch/x86/events/intel/pt.h @@ -189,4 +189,15 @@ struct pt { int vmx_on; }; +struct intel_pt_pmu_info { + struct pmu_info pi; + u8 x86_family; + u8 x86_model; + u8 x86_step; + u8 x86_tsc_max_nonturbo_ratio; + u32 x86_tsc_to_art_numerator; + u32 x86_tsc_to_art_denominator; + u32 __reserved_0; +}; + #endif /* __INTEL_PT_H__ */ -- 2.14.1