perf/x86/intel/uncore: Split the Ice Lake and Tiger Lake MSR uncore support
Subsystems (2)
PATCH 1/3 perf/x86/intel/uncore: Split the Ice Lake and Tiger Lake MSR uncore support
From: Kan Liang <[email protected]>
Previously, the MSR uncore for the Ice Lake and Tiger Lake are identical. The code path is shared. However, with recent update, the global MSR_UNC_PERF_GLOBAL_CTRL register and ARB uncore unit are changed for the Ice Lake. Split the Ice Lake and Tiger Lake MSR uncore support.
The changes only impact the MSR ops() and the ARB uncore unit. Other codes can still be shared between the Ice Lake and the Tiger Lake.
--- arch/x86/events/intel/uncore.c | 4 ++-- arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snb.c | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-)
arch/x86/events/intel/uncore.c +2 -2
@@ -1478,12 +1478,12 @@ static const struct intel_uncore_init_fun icl_uncore_init __initconst = { };static const struct intel_uncore_init_fun tgl_uncore_init__initconst = { - .cpu_init = icl_uncore_cpu_init, + .cpu_init = tgl_uncore_cpu_init, .mmio_init = tgl_uncore_mmio_init, };static const struct intel_uncore_init_fun tgl_l_uncore_init__initconst = { - .cpu_init = icl_uncore_cpu_init, + .cpu_init = tgl_uncore_cpu_init, .mmio_init = tgl_l_uncore_mmio_init, };
arch/x86/events/intel/uncore.h +1 -0
@@ -567,6 +567,7 @@ void snb_uncore_cpu_init(void);void nhm_uncore_cpu_init (void );void skl_uncore_cpu_init (void );void icl_uncore_cpu_init (void ); +void tgl_uncore_cpu_init (void );void tgl_uncore_mmio_init (void );void tgl_l_uncore_mmio_init (void );int snb_pci2phy_map_init (int devid);
arch/x86/events/intel/uncore_snb.c +16 -0
@@ -377,6 +377,22 @@ void icl_uncore_cpu_init(void) snb_uncore_arb.ops = &skl_uncore_msr_ops; } +static struct intel_uncore_type *tgl_msr_uncores[] = { + &icl_uncore_cbox, + &snb_uncore_arb, + &icl_uncore_clockbox, +NULL , +}; + +void tgl_uncore_cpu_init (void ) +{ + uncore_msr_uncores = tgl_msr_uncores; + icl_uncore_cbox.num_boxes =icl_get_cbox_num (); + icl_uncore_cbox.ops = &skl_uncore_msr_ops; + icl_uncore_clockbox.ops = &skl_uncore_msr_ops; + snb_uncore_arb.ops = &skl_uncore_msr_ops; +} +enum {SNB_PCI_UNCORE_IMC , };
Signature · 1 line
2.17.1
PATCH 2/3 perf/x86/intel/uncore: Update Ice Lake uncore units
From: Kan Liang <[email protected]>
There are some updates for the Icelake model specific uncore performance monitors. (The update can be found at 10th generation intel core processors families specification update Revision 004, ICL068)
1) Counter 0 of ARB uncore unit is not available for software use
2) The global 'enable bit' (bit 29) and 'freeze bit' (bit 31) of MSR_UNC_PERF_GLOBAL_CTRL cannot be used to control counter behavior. Needs to use local enable in event select MSR.
Accessing the modified bit/registers will be ignored by HW. Users may observe inaccurate results with the current code.
The changes of the MSR_UNC_PERF_GLOBAL_CTRL imply that groups cannot be read atomically anymore. Although the error of the result for a group becomes a bit bigger, it still far lower than not using a group. The group support is still kept. Only Remove the *_box() related implementation.
Since the counter 0 of ARB uncore unit is not available, update the MSR address for the ARB uncore unit.
There is no change for IMC uncore unit, which only include free-running counters.
--- arch/x86/events/intel/uncore_snb.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
arch/x86/events/intel/uncore_snb.c +25 -4
@@ -126,6 +126,10 @@#define ICL_UNC_CBO_0_PER_CTR0 0x702#define ICL_UNC_CBO_MSR_OFFSET 0x8 +/* ICL ARB register */ +#define ICL_UNC_ARB_PER_CTR 0x3b1 +#define ICL_UNC_ARB_PERFEVTSEL 0x3b3 +DEFINE_UNCORE_FORMAT_ATTR (event, event,"config:0-7" );DEFINE_UNCORE_FORMAT_ATTR (umask, umask,"config:8-15" );DEFINE_UNCORE_FORMAT_ATTR (edge, edge,"config:18" );
@@ -313,6 +317,12 @@ void skl_uncore_cpu_init(void) snb_uncore_arb.ops = &skl_uncore_msr_ops; } +static struct intel_uncore_ops icl_uncore_msr_ops = { + .disable_event = snb_uncore_msr_disable_event, + .enable_event = snb_uncore_msr_enable_event, + .read_counter = uncore_msr_read_counter, +}; +static struct intel_uncore_type icl_uncore_cbox = { .name ="cbox" , .num_counters =4 ,
@@ -321,7 +331,7 @@ static struct intel_uncore_type icl_uncore_cbox = { .event_ctl = SNB_UNC_CBO_0_PERFEVTSEL0, .event_mask = SNB_UNC_RAW_EVENT_MASK, .msr_offset = ICL_UNC_CBO_MSR_OFFSET, - .ops = &skl_uncore_msr_ops, + .ops = &icl_uncore_msr_ops, .format_group = &snb_uncore_format_group, };
@@ -350,13 +360,25 @@ static struct intel_uncore_type icl_uncore_clockbox = { .single_fixed = 1, .event_mask = SNB_UNC_CTL_EV_SEL_MASK, .format_group = &icl_uncore_clock_format_group, - .ops = &skl_uncore_msr_ops, + .ops = &icl_uncore_msr_ops, .event_descs = icl_uncore_events, }; +static struct intel_uncore_type icl_uncore_arb = { + .name ="arb" , + .num_counters =1 , + .num_boxes =1 , + .perf_ctr_bits =44 , + .perf_ctr =ICL_UNC_ARB_PER_CTR , + .event_ctl =ICL_UNC_ARB_PERFEVTSEL , + .event_mask =SNB_UNC_RAW_EVENT_MASK , + .ops = &icl_uncore_msr_ops, + .format_group = &snb_uncore_format_group, +}; +static struct intel_uncore_type *icl_msr_uncores[] = { &icl_uncore_cbox, - &snb_uncore_arb, + &icl_uncore_arb, &icl_uncore_clockbox,NULL , };
@@ -374,7 +396,6 @@ void icl_uncore_cpu_init(void) { uncore_msr_uncores = icl_msr_uncores; icl_uncore_cbox.num_boxes =icl_get_cbox_num (); - snb_uncore_arb.ops = &skl_uncore_msr_ops; }static struct intel_uncore_type *tgl_msr_uncores[] = {
Signature · 1 line
2.17.1
[tip: perf/core] perf/x86/intel/uncore: Update Ice Lake uncore units
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 8f5d41f3a0f495435c88ebba8fc150c931c10fef Gitweb: https://git.kernel.org/tip/8f5d41f3a0f495435c88ebba8fc150c931c10fef Author: Kan Liang <[email protected]> AuthorDate: Fri, 25 Sep 2020 06:49:04 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 29 Sep 2020 09:57:01 +02:00
perf/x86/intel/uncore: Update Ice Lake uncore units
There are some updates for the Icelake model specific uncore performance monitors. (The update can be found at 10th generation intel core processors families specification update Revision 004, ICL068)
1) Counter 0 of ARB uncore unit is not available for software use
2) The global 'enable bit' (bit 29) and 'freeze bit' (bit 31) of MSR_UNC_PERF_GLOBAL_CTRL cannot be used to control counter behavior. Needs to use local enable in event select MSR.
Accessing the modified bit/registers will be ignored by HW. Users may observe inaccurate results with the current code.
The changes of the MSR_UNC_PERF_GLOBAL_CTRL imply that groups cannot be read atomically anymore. Although the error of the result for a group becomes a bit bigger, it still far lower than not using a group. The group support is still kept. Only Remove the *_box() related implementation.
Since the counter 0 of ARB uncore unit is not available, update the MSR address for the ARB uncore unit.
There is no change for IMC uncore unit, which only include free-running counters.
--- arch/x86/events/intel/uncore_snb.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
arch/x86/events/intel/uncore_snb.c +25 -4
@@ -126,6 +126,10 @@#define ICL_UNC_CBO_0_PER_CTR0 0x702#define ICL_UNC_CBO_MSR_OFFSET 0x8 +/* ICL ARB register */ +#define ICL_UNC_ARB_PER_CTR 0x3b1 +#define ICL_UNC_ARB_PERFEVTSEL 0x3b3 +DEFINE_UNCORE_FORMAT_ATTR (event, event,"config:0-7" );DEFINE_UNCORE_FORMAT_ATTR (umask, umask,"config:8-15" );DEFINE_UNCORE_FORMAT_ATTR (edge, edge,"config:18" );
@@ -313,6 +317,12 @@ void skl_uncore_cpu_init(void) snb_uncore_arb.ops = &skl_uncore_msr_ops; } +static struct intel_uncore_ops icl_uncore_msr_ops = { + .disable_event = snb_uncore_msr_disable_event, + .enable_event = snb_uncore_msr_enable_event, + .read_counter = uncore_msr_read_counter, +}; +static struct intel_uncore_type icl_uncore_cbox = { .name ="cbox" , .num_counters =4 ,
@@ -321,7 +331,7 @@ static struct intel_uncore_type icl_uncore_cbox = { .event_ctl = SNB_UNC_CBO_0_PERFEVTSEL0, .event_mask = SNB_UNC_RAW_EVENT_MASK, .msr_offset = ICL_UNC_CBO_MSR_OFFSET, - .ops = &skl_uncore_msr_ops, + .ops = &icl_uncore_msr_ops, .format_group = &snb_uncore_format_group, };
@@ -350,13 +360,25 @@ static struct intel_uncore_type icl_uncore_clockbox = { .single_fixed = 1, .event_mask = SNB_UNC_CTL_EV_SEL_MASK, .format_group = &icl_uncore_clock_format_group, - .ops = &skl_uncore_msr_ops, + .ops = &icl_uncore_msr_ops, .event_descs = icl_uncore_events, }; +static struct intel_uncore_type icl_uncore_arb = { + .name ="arb" , + .num_counters =1 , + .num_boxes =1 , + .perf_ctr_bits =44 , + .perf_ctr =ICL_UNC_ARB_PER_CTR , + .event_ctl =ICL_UNC_ARB_PERFEVTSEL , + .event_mask =SNB_UNC_RAW_EVENT_MASK , + .ops = &icl_uncore_msr_ops, + .format_group = &snb_uncore_format_group, +}; +static struct intel_uncore_type *icl_msr_uncores[] = { &icl_uncore_cbox, - &snb_uncore_arb, + &icl_uncore_arb, &icl_uncore_clockbox,NULL , };
@@ -374,7 +396,6 @@ void icl_uncore_cpu_init(void) { uncore_msr_uncores = icl_msr_uncores; icl_uncore_cbox.num_boxes =icl_get_cbox_num (); - snb_uncore_arb.ops = &skl_uncore_msr_ops; }static struct intel_uncore_type *tgl_msr_uncores[] = {
PATCH 3/3 perf/x86/intel/uncore: Reduce the number of CBOX counters
In reply to [email protected]From: Kan Liang <[email protected]>
An oops is triggered by the fuzzy test.
[ 327.853081] unchecked MSR access error: RDMSR from 0x70c at rIP: 0xffffffffc082c820 (uncore_msr_read_counter+0x10/0x50 [intel_uncore]) [ 327.853083] Call Trace: [ 327.853085] <IRQ> [ 327.853089] uncore_pmu_event_start+0x85/0x170 [intel_uncore] [ 327.853093] uncore_pmu_event_add+0x1a4/0x410 [intel_uncore] [ 327.853097] ? event_sched_in.isra.118+0xca/0x240
There are 2 GP counters for each CBOX, but the current code claims 4 counters. Accessing the invalid registers triggers the oops.
--- arch/x86/events/intel/uncore_snb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/uncore_snb.c +1 -1
@@ -325,7 +325,7 @@ static struct intel_uncore_ops icl_uncore_msr_ops = {static struct intel_uncore_type icl_uncore_cbox = { .name ="cbox" , - .num_counters =4 , + .num_counters =2 , .perf_ctr_bits =44 , .perf_ctr =ICL_UNC_CBO_0_PER_CTR0 , .event_ctl =SNB_UNC_CBO_0_PERFEVTSEL0 ,
Signature · 1 line
2.17.1
[tip: perf/core] perf/x86/intel/uncore: Reduce the number of CBOX counters
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: ee139385432e919f4d1f59b80edbc073cdae1391 Gitweb: https://git.kernel.org/tip/ee139385432e919f4d1f59b80edbc073cdae1391 Author: Kan Liang <[email protected]> AuthorDate: Fri, 25 Sep 2020 06:49:05 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 29 Sep 2020 09:57:01 +02:00
perf/x86/intel/uncore: Reduce the number of CBOX counters
An oops is triggered by the fuzzy test.
[ 327.853081] unchecked MSR access error: RDMSR from 0x70c at rIP: 0xffffffffc082c820 (uncore_msr_read_counter+0x10/0x50 [intel_uncore]) [ 327.853083] Call Trace: [ 327.853085] <IRQ> [ 327.853089] uncore_pmu_event_start+0x85/0x170 [intel_uncore] [ 327.853093] uncore_pmu_event_add+0x1a4/0x410 [intel_uncore] [ 327.853097] ? event_sched_in.isra.118+0xca/0x240
There are 2 GP counters for each CBOX, but the current code claims 4 counters. Accessing the invalid registers triggers the oops.
--- arch/x86/events/intel/uncore_snb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/uncore_snb.c +1 -1
@@ -325,7 +325,7 @@ static struct intel_uncore_ops icl_uncore_msr_ops = {static struct intel_uncore_type icl_uncore_cbox = { .name ="cbox" , - .num_counters =4 , + .num_counters =2 , .perf_ctr_bits =44 , .perf_ctr =ICL_UNC_CBO_0_PER_CTR0 , .event_ctl =SNB_UNC_CBO_0_PERFEVTSEL0 ,
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 8abbcfefb5f7afabab4578bedd7cd400800cb039 Gitweb: https://git.kernel.org/tip/8abbcfefb5f7afabab4578bedd7cd400800cb039 Author: Kan Liang <[email protected]> AuthorDate: Fri, 25 Sep 2020 06:49:03 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 29 Sep 2020 09:57:00 +02:00
perf/x86/intel/uncore: Split the Ice Lake and Tiger Lake MSR uncore support
Previously, the MSR uncore for the Ice Lake and Tiger Lake are identical. The code path is shared. However, with recent update, the global MSR_UNC_PERF_GLOBAL_CTRL register and ARB uncore unit are changed for the Ice Lake. Split the Ice Lake and Tiger Lake MSR uncore support.
The changes only impact the MSR ops() and the ARB uncore unit. Other codes can still be shared between the Ice Lake and the Tiger Lake.
--- arch/x86/events/intel/uncore.c | 4 ++-- arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snb.c | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-)
arch/x86/events/intel/uncore.c +2 -2
@@ -1627,12 +1627,12 @@ static const struct intel_uncore_init_fun icl_uncore_init __initconst = { };static const struct intel_uncore_init_fun tgl_uncore_init__initconst = { - .cpu_init = icl_uncore_cpu_init, + .cpu_init = tgl_uncore_cpu_init, .mmio_init = tgl_uncore_mmio_init, };static const struct intel_uncore_init_fun tgl_l_uncore_init__initconst = { - .cpu_init = icl_uncore_cpu_init, + .cpu_init = tgl_uncore_cpu_init, .mmio_init = tgl_l_uncore_mmio_init, };
arch/x86/events/intel/uncore.h +1 -0
@@ -568,6 +568,7 @@ void snb_uncore_cpu_init(void);void nhm_uncore_cpu_init (void );void skl_uncore_cpu_init (void );void icl_uncore_cpu_init (void ); +void tgl_uncore_cpu_init (void );void tgl_uncore_mmio_init (void );void tgl_l_uncore_mmio_init (void );int snb_pci2phy_map_init (int devid);
arch/x86/events/intel/uncore_snb.c +16 -0
@@ -377,6 +377,22 @@ void icl_uncore_cpu_init(void) snb_uncore_arb.ops = &skl_uncore_msr_ops; } +static struct intel_uncore_type *tgl_msr_uncores[] = { + &icl_uncore_cbox, + &snb_uncore_arb, + &icl_uncore_clockbox, +NULL , +}; + +void tgl_uncore_cpu_init (void ) +{ + uncore_msr_uncores = tgl_msr_uncores; + icl_uncore_cbox.num_boxes =icl_get_cbox_num (); + icl_uncore_cbox.ops = &skl_uncore_msr_ops; + icl_uncore_clockbox.ops = &skl_uncore_msr_ops; + snb_uncore_arb.ops = &skl_uncore_msr_ops; +} +enum {SNB_PCI_UNCORE_IMC , };