Skip to contentSkip to conversation

PROBLEM: lk 4.5 oops on boot with Xeon D-1520

DISCUSSION Tony Battersby 5 participants 7 messages Feb 17, 2016 – Feb 29, 2016

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

The following commit in 4.5 is causing a general protection fault during early boot:

d6980ef32570 ("perf/x86/intel/uncore: Add Broadwell-EP uncore support")

With the commit reverted, the system boots fine.

CPU:         Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
Motherboard: Supermicro X10SDV-4C-TLN2F

The general protection fault occurs when hswep_uncore_sbox_msr_init_box() calls wrmsrl(). I added a printk to get the following values just before the oops:

box->pmu->type->box_ctl     = 1824
box->pmu->pmu_idx           = 0
box->pmu->type->msr_offset  = 10

box->pmu->type->msr_offsets = NULL
msr = 1824
(all values are decimal)

Here is the call trace:

  hswep_uncore_sbox_msr_init_box+0x7c/0xc0 (RIP)
  uncore_cpu_starting+0x8a/0x1c0
  ? uncore_change_context+0xe5/0x150
  ? uncore_types_init+0x1d6/0x1d6
  uncore_cpu_setup+0x10/0x12
  on_each_cpu+0x32/0x50
  intel_uncore_init+0x2e8/0x36d
  ? cstate_pmu_init+0x14f/0x195
  ? uncore_cpu_setup+0x12/0x12

I have a jpg image of the monitor displaying the full oops; let me know if anyone wants that.

----------

/proc/cpuinfo:

processor : 0
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 0
cpu cores : 4
apicid : 0
initial apicid : 0
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 1
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 1
cpu cores : 4
apicid : 2
initial apicid : 2
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 2
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 2
cpu cores : 4
apicid : 4
initial apicid : 4
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 3
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 3
cpu cores : 4
apicid : 6
initial apicid : 6
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 4
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 0
cpu cores : 4
apicid : 1
initial apicid : 1
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 5
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 1
cpu cores : 4
apicid : 3
initial apicid : 3
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 6
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 2
cpu cores : 4
apicid : 5
initial apicid : 5
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 7
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 3
cpu cores : 4
apicid : 7
initial apicid : 7
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

----------

#1 lore raw

Added Liang to CC, preserved full mail for reference

Quoted 330 lines · Tony Battersby

The following commit in 4.5 is causing a general protection fault during early boot:

d6980ef32570 ("perf/x86/intel/uncore: Add Broadwell-EP uncore support")

With the commit reverted, the system boots fine.

CPU:         Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
Motherboard: Supermicro X10SDV-4C-TLN2F

The general protection fault occurs when hswep_uncore_sbox_msr_init_box() calls wrmsrl(). I added a printk to get the following values just before the oops:

box->pmu->type->box_ctl     = 1824
box->pmu->pmu_idx           = 0
box->pmu->type->msr_offset  = 10

box->pmu->type->msr_offsets = NULL
msr = 1824
(all values are decimal)

Here is the call trace:

  hswep_uncore_sbox_msr_init_box+0x7c/0xc0 (RIP)
  uncore_cpu_starting+0x8a/0x1c0
  ? uncore_change_context+0xe5/0x150
  ? uncore_types_init+0x1d6/0x1d6
  uncore_cpu_setup+0x10/0x12
  on_each_cpu+0x32/0x50
  intel_uncore_init+0x2e8/0x36d
  ? cstate_pmu_init+0x14f/0x195
  ? uncore_cpu_setup+0x12/0x12

I have a jpg image of the monitor displaying the full oops; let me know if anyone wants that.

----------

/proc/cpuinfo:

processor : 0
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 0
cpu cores : 4
apicid : 0
initial apicid : 0
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 1
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 1
cpu cores : 4
apicid : 2
initial apicid : 2
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 2
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 2
cpu cores : 4
apicid : 4
initial apicid : 4
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 3
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 3
cpu cores : 4
apicid : 6
initial apicid : 6
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 4
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 0
cpu cores : 4
apicid : 1
initial apicid : 1
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 5
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 1
cpu cores : 4
apicid : 3
initial apicid : 3
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 6
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 2
cpu cores : 4
apicid : 5
initial apicid : 5
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 7
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 3
cpu cores : 4
apicid : 7
initial apicid : 7
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc dtherm arat pln pts
bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

----------

#2 lore raw

I have no idea why the original email was redirected to Junk folder. Sorry for the late response.

I extended BDX-DE uncore code to support BDX-EP. So they share the same code path. But there is no sbox in BDX-DE. I once tried the BDX-EP patch on my BDX-DE, it boots fine. But it looks it doesn't work well for all machines. :(

Could you please try the patch as below? It specially handles the BDX-DE by removing SBOX support.

Thanks,
Kan

Quoted 1 line

From 7e09100dda852de7263ba569dcfba737668c828e Mon Sep 17 00:00:00 2001

From: Kan Liang <[email protected]>
Date: Wed, 24 Feb 2016 05:07:43 -0500
Subject: [PATCH 1/1] x86/perf/intel/uncore: remove SBOX support for BDX-DE

BDX-DE and BDX-EP share the same uncore code path. But there is no sbox in BDX-DE. This patch remove SBOX support for BDX-DE.

---
 arch/x86/events/intel/uncore_snbep.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +7 -1
index 0c801f7..d967fcc 100644
@@ -2874,11 +2874,13 @@ static struct intel_uncore_type bdx_uncore_sbox = {
 	.format_group		= &hswep_uncore_sbox_format_group,
 };
 
+#define BDX_MSR_UNCORE_SBOX	3
+
 static struct intel_uncore_type *bdx_msr_uncores[] = {
 	&bdx_uncore_ubox,
 	&bdx_uncore_cbox,
-	&bdx_uncore_sbox,
 	&hswep_uncore_pcu,
+	&bdx_uncore_sbox,
 	NULL,
 };
 
@@ -2887,6 +2889,10 @@ 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;
+
+	/* BDX-DE doesn't have SBOX */
+	if (boot_cpu_data.x86_model == 86)
+		uncore_msr_uncores[BDX_MSR_UNCORE_SBOX] = NULL;
 }
 
 static struct intel_uncore_type bdx_uncore_ha = {
Signature · 1 line
2.4.3
Quoted 360 lines

Added Liang to CC, preserved full mail for reference

Quoted 55 lines · Tony Battersby

The following commit in 4.5 is causing a general protection fault during early boot:

d6980ef32570 ("perf/x86/intel/uncore: Add Broadwell-EP uncore support")

With the commit reverted, the system boots fine.

CPU:         Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
Motherboard: Supermicro X10SDV-4C-TLN2F

The general protection fault occurs when hswep_uncore_sbox_msr_init_box() calls wrmsrl(). I added a printk to get the following values just before the oops:

box->pmu->type->box_ctl     = 1824
box->pmu->pmu_idx           = 0
box->pmu->type->msr_offset  = 10

box->pmu->type->msr_offsets = NULL
msr = 1824
(all values are decimal)

Here is the call trace:

  hswep_uncore_sbox_msr_init_box+0x7c/0xc0 (RIP)
  uncore_cpu_starting+0x8a/0x1c0
  ? uncore_change_context+0xe5/0x150
  ? uncore_types_init+0x1d6/0x1d6
  uncore_cpu_setup+0x10/0x12
  on_each_cpu+0x32/0x50
  intel_uncore_init+0x2e8/0x36d
  ? cstate_pmu_init+0x14f/0x195
  ? uncore_cpu_setup+0x12/0x12

I have a jpg image of the monitor displaying the full oops; let me know if anyone wants that.

----------

/proc/cpuinfo:

processor : 0
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 0
cpu cores : 4
apicid : 0

Quoted 8 lines

initial apicid : 0
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good

nopl

Quoted 1 line

xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64

monitor

Quoted 5 lines

ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc

dtherm arat pln pts

Quoted 22 lines

bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 1
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 1
cpu cores : 4
apicid : 2

Quoted 8 lines

initial apicid : 2
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good

nopl

Quoted 1 line

xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64

monitor

Quoted 5 lines

ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc

dtherm arat pln pts

Quoted 22 lines

bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 2
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 2
cpu cores : 4
apicid : 4

Quoted 8 lines

initial apicid : 4
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good

nopl

Quoted 1 line

xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64

monitor

Quoted 5 lines

ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc

dtherm arat pln pts

Quoted 22 lines

bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 3
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 3
cpu cores : 4
apicid : 6

Quoted 8 lines

initial apicid : 6
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good

nopl

Quoted 1 line

xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64

monitor

Quoted 5 lines

ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc

dtherm arat pln pts

Quoted 22 lines

bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 4
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 0
cpu cores : 4
apicid : 1

Quoted 8 lines

initial apicid : 1
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good

nopl

Quoted 1 line

xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64

monitor

Quoted 5 lines

ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc

dtherm arat pln pts

Quoted 22 lines

bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 5
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 1
cpu cores : 4
apicid : 3

Quoted 8 lines

initial apicid : 3
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good

nopl

Quoted 1 line

xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64

monitor

Quoted 5 lines

ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc

dtherm arat pln pts

Quoted 22 lines

bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 6
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 2
cpu cores : 4
apicid : 5

Quoted 8 lines

initial apicid : 5
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good

nopl

Quoted 1 line

xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64

monitor

Quoted 5 lines

ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc

dtherm arat pln pts

Quoted 22 lines

bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

processor : 7
vendor_id : GenuineIntel
cpu family : 6
model : 86
model name : Intel(R) Xeon(R) CPU D-1520 @ 2.20GHz
stepping : 2
microcode : 0xa
cpu MHz : 2200.000
tsc MHz : 2199.998
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 3
cpu cores : 4
apicid : 7

Quoted 8 lines

initial apicid : 7
fpu : yes
fpu_exception : yes
cpuid level : 20
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good

nopl

Quoted 1 line

xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64

monitor

Quoted 5 lines

ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdseed adx smap xsaveopt cqm_llc cqm_occup_llc

dtherm arat pln pts

Quoted 10 lines

bugs :
bogomips : 4399.57
clflush size : 64
cache_alignment : 64
address sizes : 46 bits physical, 48 bits virtual
power management:

----------

author Tested-by
#3 lore raw

Thanks, that fixes it.

Note: your patch appears to be against linux-next. I had to change "arch/x86/events/intel/uncore_snbep.c" to "arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c" for the patch to apply against current linux-git.

Quoted 58 lines · Kan

I have no idea why the original email was redirected to Junk folder. Sorry for the late response.

I extended BDX-DE uncore code to support BDX-EP. So they share the same code path. But there is no sbox in BDX-DE. I once tried the BDX-EP patch on my BDX-DE, it boots fine. But it looks it doesn't work well for all machines. :(

Could you please try the patch as below? It specially handles the BDX-DE by removing SBOX support.

Thanks,
Kan

Quoted 1 line

From 7e09100dda852de7263ba569dcfba737668c828e Mon Sep 17 00:00:00 2001

From: Kan Liang <[email protected]>
Date: Wed, 24 Feb 2016 05:07:43 -0500
Subject: [PATCH 1/1] x86/perf/intel/uncore: remove SBOX support for BDX-DE

BDX-DE and BDX-EP share the same uncore code path. But there is no sbox in BDX-DE. This patch remove SBOX support for BDX-DE.

---
 arch/x86/events/intel/uncore_snbep.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +7 -1
index 0c801f7..d967fcc 100644
@@ -2874,11 +2874,13 @@ static struct intel_uncore_type bdx_uncore_sbox = {
 	.format_group		= &hswep_uncore_sbox_format_group,
 };
 
+#define BDX_MSR_UNCORE_SBOX	3
+
 static struct intel_uncore_type *bdx_msr_uncores[] = {
 	&bdx_uncore_ubox,
 	&bdx_uncore_cbox,
-	&bdx_uncore_sbox,
 	&hswep_uncore_pcu,
+	&bdx_uncore_sbox,
 	NULL,
 };
 
@@ -2887,6 +2889,10 @@ 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;
+
+	/* BDX-DE doesn't have SBOX */
+	if (boot_cpu_data.x86_model == 86)
+		uncore_msr_uncores[BDX_MSR_UNCORE_SBOX] = NULL;
 }
 
 static struct intel_uncore_type bdx_uncore_ha = {
#4 lore raw
Quoted 7 lines

Thanks, that fixes it.

Note: your patch appears to be against linux-next. I had to change "arch/x86/events/intel/uncore_snbep.c" to "arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c" for the patch to apply against current linux-git.

Thanks for the verification.

I think the perf related code just moved to a new place "arch/x86/events/". So the patch is based on that new place.

Peter, should I resend the patch for the old place?

Thanks,
Kan

Quoted 69 lines
Quoted 8 lines · Kan

I have no idea why the original email was redirected to Junk folder. Sorry for the late response.

I extended BDX-DE uncore code to support BDX-EP. So they share the same code path. But there is no sbox in BDX-DE.
I once tried the BDX-EP patch on my BDX-DE, it boots fine. But it looks it doesn't work well for all machines. :(

Quoted 8 lines

Could you please try the patch as below? It specially handles the BDX-DE by removing SBOX support.

Thanks,
Kan

Quoted 1 line

From 7e09100dda852de7263ba569dcfba737668c828e Mon Sep 17

00:00:00

arch/x86/events/intel/uncore_snbep.c static struct intel_uncore_type

Quoted 20 lines
Quoted 1 line

2001

From: Kan Liang <[email protected]>
Date: Wed, 24 Feb 2016 05:07:43 -0500
Subject: [PATCH 1/1] x86/perf/intel/uncore: remove SBOX support for BDX-DE

BDX-DE and BDX-EP share the same uncore code path. But there is no sbox in BDX-DE. This patch remove SBOX support for BDX-DE.

---
 arch/x86/events/intel/uncore_snbep.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +0 -0
index 0c801f7..d967fcc 100644
@@ -2874,11 +2874,13 @@ static struct intel_uncore_type

bdx_uncore_sbox = {

Quoted 15 lines
arch/x86/events/intel/uncore_snbep.c +3 -1
 	.format_group		= &hswep_uncore_sbox_format_group,
 };
 
+#define BDX_MSR_UNCORE_SBOX	3
+
 static struct intel_uncore_type *bdx_msr_uncores[] = {
 	&bdx_uncore_ubox,
 	&bdx_uncore_cbox,
-	&bdx_uncore_sbox,
 	&hswep_uncore_pcu,
+	&bdx_uncore_sbox,
 	NULL,
 };
 

arch/x86/events/intel/uncore_snbep.c void bdx_uncore_cpu_init(void) · line 2889

Quoted 1 line
arch/x86/events/intel/uncore_snbep.c +0 -0
@@ -2887,6 +2889,10 @@ void bdx_uncore_cpu_init(void)
 	if (bdx_uncore_cbox.num_boxes >

boot_cpu_data.x86_max_cores)

arch/x86/events/intel/uncore_snbep.c void bdx_uncore_cpu_init(void) · line 2890

Quoted 1 line
arch/x86/events/intel/uncore_snbep.c +0 -0
 		bdx_uncore_cbox.num_boxes =

boot_cpu_data.x86_max_cores;

Quoted 8 lines
arch/x86/events/intel/uncore_snbep.c +4 -0
 	uncore_msr_uncores = bdx_msr_uncores;
+
+	/* BDX-DE doesn't have SBOX */
+	if (boot_cpu_data.x86_model == 86)
+		uncore_msr_uncores[BDX_MSR_UNCORE_SBOX] = NULL;
 }
 
 static struct intel_uncore_type bdx_uncore_ha = {
maintainer
#5 lore raw
Quoted 8 lines · Kan
Quoted 7 lines

Thanks, that fixes it.

Note: your patch appears to be against linux-next. I had to change "arch/x86/events/intel/uncore_snbep.c" to "arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c" for the patch to apply against current linux-git.

Quoted 6 lines

Thanks for the verification.

I think the perf related code just moved to a new place "arch/x86/events/". So the patch is based on that new place.

Peter, should I resend the patch for the old place?

Nah, I'll sort it out. Thanks!

#6 lore raw

[tip:perf/core] perf/x86/intel/uncore: Remove SBOX support for BDX-DE

In reply to Liang, Kan
perf/x86/intel/uncore: Remove SBOX support for BDX-DE
Commit-ID:  6cb2f1d9af5b0f0afdd4e689d969df4b5c76a4c2
Gitweb:     http://git.kernel.org/tip/6cb2f1d9af5b0f0afdd4e689d969df4b5c76a4c2
Author:     Kan Liang <[email protected]>
AuthorDate: Wed, 24 Feb 2016 05:07:43 -0500
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 29 Feb 2016 09:35:11 +0100

perf/x86/intel/uncore: Remove SBOX support for BDX-DE

BDX-DE and BDX-EP share the same uncore code path. But there is no sbox in BDX-DE. This patch remove SBOX support for BDX-DE.

---
 arch/x86/events/intel/uncore_snbep.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +7 -1
index 0c801f7..d967fcc 100644
@@ -2874,11 +2874,13 @@ static struct intel_uncore_type bdx_uncore_sbox = {
 	.format_group		= &hswep_uncore_sbox_format_group,
 };
 
+#define BDX_MSR_UNCORE_SBOX	3
+
 static struct intel_uncore_type *bdx_msr_uncores[] = {
 	&bdx_uncore_ubox,
 	&bdx_uncore_cbox,
-	&bdx_uncore_sbox,
 	&hswep_uncore_pcu,
+	&bdx_uncore_sbox,
 	NULL,
 };
 
@@ -2887,6 +2889,10 @@ 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;
+
+	/* BDX-DE doesn't have SBOX */
+	if (boot_cpu_data.x86_model == 86)
+		uncore_msr_uncores[BDX_MSR_UNCORE_SBOX] = NULL;
 }
 
 static struct intel_uncore_type bdx_uncore_ha = {