x86, perf, uncore: Add support for ARB uncore PMU on Sandy/IvyBridge
Subsystems (2)
PATCH 1/3 x86, perf, uncore: Add support for ARB uncore PMU on Sandy/IvyBridge
From: Andi Kleen <[email protected]>
Add a new "ARB" uncore PMU that is used to monitor the uncore queue arbiter. This is useful to measure uncore queue occupancy and similar statistics. The registers all have the same format as the existing CBOX PMU.
Also move the event constraints from the CBOX to ARB. The 0x80+ events are ARB events and cannot be scheduled on a CBOX PMU.
--- arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c +21 -2
@@ -44,6 +44,11 @@#define SNB_UNC_CBO_0_PER_CTR0 0x706#define SNB_UNC_CBO_MSR_OFFSET 0x10 +/* SNB ARB register */ +#define SNB_UNC_ARB_PER_CTR0 0x3b0 +#define SNB_UNC_ARB_PERFEVTSEL0 0x3b2 +#define SNB_UNC_ARB_MSR_OFFSET 0x10 +/* NHM global control register */ #define NHM_UNC_PERF_GLOBAL_CTL 0x391#define NHM_UNC_FIXED_CTR 0x394
@@ -114,7 +119,7 @@ static struct intel_uncore_ops snb_uncore_msr_ops = { .read_counter = uncore_msr_read_counter, }; -static struct event_constraint snb_uncore_cbox_constraints[] = { +static struct event_constraint snb_uncore_arb_constraints[] = {UNCORE_EVENT_CONSTRAINT (0x80 ,0x1 ),UNCORE_EVENT_CONSTRAINT (0x83 ,0x1 ),EVENT_CONSTRAINT_END
@@ -133,14 +138,28 @@ static struct intel_uncore_type snb_uncore_cbox = { .single_fixed = 1, .event_mask = SNB_UNC_RAW_EVENT_MASK, .msr_offset = SNB_UNC_CBO_MSR_OFFSET, - .constraints = snb_uncore_cbox_constraints, .ops = &snb_uncore_msr_ops, .format_group = &snb_uncore_format_group, .event_descs = snb_uncore_events, }; +static struct intel_uncore_type snb_uncore_arb = { + .name ="arb" , + .num_counters =2 , + .num_boxes =1 , + .perf_ctr_bits =44 , + .perf_ctr =SNB_UNC_ARB_PER_CTR0 , + .event_ctl =SNB_UNC_ARB_PERFEVTSEL0 , + .event_mask =SNB_UNC_RAW_EVENT_MASK , + .msr_offset =SNB_UNC_ARB_MSR_OFFSET , + .constraints = snb_uncore_arb_constraints, + .ops = &snb_uncore_msr_ops, + .format_group = &snb_uncore_format_group, +}; +static struct intel_uncore_type *snb_msr_uncores[] = { &snb_uncore_cbox, + &snb_uncore_arb,NULL , };
Signature · 1 line
2.4.2
PATCH 2/3 x86, perf, uncore: Use Sandy Bridge client PMU on Haswell/Broadwell
From: Andi Kleen <[email protected]>
Haswell and Broadwell have the same uncore CBOX/ARB PMU as Sandy Bridge. Add the respective model numbers to enable the SNB uncore PMU.
--- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/kernel/cpu/perf_event_intel_uncore.c +5 -0
@@ -1202,6 +1202,11 @@ static int __init uncore_cpu_init(void)break ;case 42 :/* Sandy Bridge */ case 58 :/* Ivy Bridge */ +case 60 :/* Haswell */ +case 69 :/* Haswell */ +case 70 :/* Haswell */ +case 61 :/* Broadwell */ +case 71 :/* Broadwell */ snb_uncore_cpu_init ();break ;case 45 :/* Sandy Bridge-EP */
Signature · 1 line
2.4.2
tip-bot for Andi Kleen
merge bot[tip:perf/core] perf/x86/intel/uncore: Use Sandy Bridge client PMU on Haswell/Broadwell
perf/x86/intel/uncore: Use Sandy Bridge client PMU on Haswell/Broadwell
Commit-ID: 3a999587b4a1815cf4dadddf6b5aad470f048239 Gitweb: http://git.kernel.org/tip/3a999587b4a1815cf4dadddf6b5aad470f048239 Author: Andi Kleen <[email protected]> AuthorDate: Sun, 14 Jun 2015 22:57:41 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 4 Aug 2015 10:16:53 +0200
perf/x86/intel/uncore: Use Sandy Bridge client PMU on Haswell/Broadwell
Haswell and Broadwell have the same uncore CBOX/ARB PMU as Sandy Bridge. Add the respective model numbers to enable the SNB uncore PMU.
--- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/kernel/cpu/perf_event_intel_uncore.c +5 -0
@@ -1209,6 +1209,11 @@ static int __init uncore_cpu_init(void)break ;case 42 :/* Sandy Bridge */ case 58 :/* Ivy Bridge */ +case 60 :/* Haswell */ +case 69 :/* Haswell */ +case 70 :/* Haswell */ +case 61 :/* Broadwell */ +case 71 :/* Broadwell */ snb_uncore_cpu_init ();break ;case 45 :/* Sandy Bridge-EP */
PATCH 3/3 x86, perf, uncore: Don't make MSR uncore depend on PCI uncore
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
Several sytems, such as my laptop, don't expose the PCI devices for the PCI uncore measurements. But the MSRs for the CBOX and ARB uncores are always available. Currently the init code doesn't initialize the MSR uncores when the PCI uncore registration fails. Stop it from doing that and always try to register the MSR uncores.
This makes the pci uncore exit function unused. We'll need it later when the uncore becomes modular, so instead of removing it I just marked it with module_exit right now (which discards it)
--- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_uncore.c +4 -12
@@ -952,6 +952,8 @@ static void __init uncore_pci_exit(void)uncore_types_exit (uncore_pci_uncores); } } +module_exit (uncore_pci_exit); +/* XXX: need exit code for MSR uncores too */ /* CPU hot plug/unplug are serialized by cpu_add_remove_lock mutex */ static LIST_HEAD (boxes_to_free);
@@ -1287,27 +1289,17 @@ static void __init uncore_cpumask_init(void)static int __init intel_uncore_init (void ) { -int ret; -if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL )return -ENODEV ;if (cpu_has_hypervisor)return -ENODEV ; - ret =uncore_pci_init (); -if (ret) - goto fail; - ret =uncore_cpu_init (); -if (ret) { -uncore_pci_exit (); - goto fail; - } +uncore_pci_init (); +uncore_cpu_init ();uncore_cpumask_init ();uncore_pmus_register ();return 0 ; -fail: -return ret; }device_initcall (intel_uncore_init);
Signature · 1 line
2.4.2
Re: [PATCH 3/3] x86, perf, uncore: Don't make MSR uncore depend on PCI uncore
Quoted 13 lines · Andi Kleen
arch/x86/kernel/cpu/perf_event_intel_uncore.c +0
-3@@ -1287,27 +1289,17 @@ static void __init uncore_cpumask_init(void)static int __init intel_uncore_init (void ) { -int ret; -if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL )return -ENODEV ;if (cpu_has_hypervisor)return -ENODEV ; - ret =uncore_pci_init ();
arch/x86/kernel/cpu/perf_event_intel_uncore.c static void __init uncore_cpumask_init(void) · line 1300
Quoted 10 lines
arch/x86/kernel/cpu/perf_event_intel_uncore.c +2
-7-if (ret) - goto fail; - ret =uncore_cpu_init (); -if (ret) { -uncore_pci_exit (); - goto fail; - } +uncore_pci_init (); +uncore_cpu_init ();uncore_cpumask_init ();
So, even if the cpu does not support that, we install a completely useless cpu notifier and invoke equally pointless init code on all cores.
Sigh,
tglx
tip-bot for Andi Kleen
merge bot[tip:perf/core] perf/x86/intel/uncore: Add support for ARB uncore PMU on Sandy/IvyBridge
In reply to Andi Kleenperf/x86/intel/uncore: Add support for ARB uncore PMU on Sandy/IvyBridge
Commit-ID: e3a13192d86048e91a2a1d534abe5ac2397d9113 Gitweb: http://git.kernel.org/tip/e3a13192d86048e91a2a1d534abe5ac2397d9113 Author: Andi Kleen <[email protected]> AuthorDate: Sun, 14 Jun 2015 22:57:40 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 4 Aug 2015 10:16:52 +0200
perf/x86/intel/uncore: Add support for ARB uncore PMU on Sandy/IvyBridge
Add a new "ARB" uncore PMU that is used to monitor the uncore queue arbiter. This is useful to measure uncore queue occupancy and similar statistics. The registers all have the same format as the existing CBOX PMU.
Also move the event constraints from the CBOX to ARB. The 0x80+ events are ARB events and cannot be scheduled on a CBOX PMU.
--- arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c +21 -2
@@ -45,6 +45,11 @@#define SNB_UNC_CBO_0_PER_CTR0 0x706#define SNB_UNC_CBO_MSR_OFFSET 0x10 +/* SNB ARB register */ +#define SNB_UNC_ARB_PER_CTR0 0x3b0 +#define SNB_UNC_ARB_PERFEVTSEL0 0x3b2 +#define SNB_UNC_ARB_MSR_OFFSET 0x10 +/* NHM global control register */ #define NHM_UNC_PERF_GLOBAL_CTL 0x391#define NHM_UNC_FIXED_CTR 0x394
@@ -115,7 +120,7 @@ static struct intel_uncore_ops snb_uncore_msr_ops = { .read_counter = uncore_msr_read_counter, }; -static struct event_constraint snb_uncore_cbox_constraints[] = { +static struct event_constraint snb_uncore_arb_constraints[] = {UNCORE_EVENT_CONSTRAINT (0x80 ,0x1 ),UNCORE_EVENT_CONSTRAINT (0x83 ,0x1 ),EVENT_CONSTRAINT_END
@@ -134,14 +139,28 @@ static struct intel_uncore_type snb_uncore_cbox = { .single_fixed = 1, .event_mask = SNB_UNC_RAW_EVENT_MASK, .msr_offset = SNB_UNC_CBO_MSR_OFFSET, - .constraints = snb_uncore_cbox_constraints, .ops = &snb_uncore_msr_ops, .format_group = &snb_uncore_format_group, .event_descs = snb_uncore_events, }; +static struct intel_uncore_type snb_uncore_arb = { + .name ="arb" , + .num_counters =2 , + .num_boxes =1 , + .perf_ctr_bits =44 , + .perf_ctr =SNB_UNC_ARB_PER_CTR0 , + .event_ctl =SNB_UNC_ARB_PERFEVTSEL0 , + .event_mask =SNB_UNC_RAW_EVENT_MASK , + .msr_offset =SNB_UNC_ARB_MSR_OFFSET , + .constraints = snb_uncore_arb_constraints, + .ops = &snb_uncore_msr_ops, + .format_group = &snb_uncore_format_group, +}; +static struct intel_uncore_type *snb_msr_uncores[] = { &snb_uncore_cbox, + &snb_uncore_arb,NULL , };