perf/x86/intel/uncore: Fix missing marker for snr_uncore_imc_freerunning_events
Subsystems (3)
PATCH RESEND 1/2 perf/x86/intel/uncore: Fix missing marker for snr_uncore_imc_freerunning_events
From: Kan Liang <[email protected]>
An Oops during the boot is found on some SNR machines.
[ 15.795410] BUG: unable to handle page fault for address: 00000000000022b0 [ 15.795412] #PF: supervisor read access in kernel mode [ 15.795413] #PF: error_code(0x0000) - not-present page [ 15.795414] PGD 0 P4D 0 [ 15.795418] Oops: 0000 [#1] SMP NOPTI [ 15.795420] CPU: 6 PID: 941 Comm: systemd-udevd Not tainted 5.3.0-snr-v5.3 #292 [ 15.795421] Hardware name: Intel Corporation JACOBSVILLE/JACOBSVILLE, BIOS JBVLCRB1.86B.0011.D44.1909191126 09/19/2019 [ 15.795428] RIP: 0010:strlen+0x0/0x20 [ 15.795431] Code: 48 89 f9 74 09 48 83 c1 01 80 39 00 75 f7 31 d2 44 0f b6 04 16 44 88 04 11 48 83 c2 01 45 84 c0 75 ee c3 0f 1f 80 00 00 00 00 <80> 3f 00 74 10 48 89 f8 48 83 c0 01 80 38 00 75 f7 48 29 f8 c3 31 [ 15.855395] i801_smbus 0000:00:1f.4: SPD Write Disable is set [ 15.858351] RSP: 0018:ffffaeb4812039c8 EFLAGS: 00010202 [ 15.858353] RAX: 0000000000000000 RBX: ffff9fec99c71300 RCX: 0000000000008000 [ 15.858354] RDX: 00000000000022b0 RSI: 0000000000000cc0 RDI: 00000000000022b0 [ 15.858355] RBP: 00000000000022b0 R08: 0000000000000000 R09: 0000000000000000 [ 15.858356] R10: 0000000000000000 R11: 0000000000000000 R12: ffff9fec8583a800 [ 15.858357] R13: 0000000000000cc0 R14: ffff9fec94015648 R15: ffff9fec81f291a8 [ 15.858358] FS: 00007f89e7160940(0000) GS:ffff9fec9dc00000(0000) knlGS:0000000000000000 [ 15.858361] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 15.864343] i801_smbus 0000:00:1f.4: SMBus using polling [ 15.869998] CR2: 00000000000022b0 CR3: 0000000842ca2000 CR4: 0000000000340ee0 [ 15.870000] Call Trace: [ 15.870006] kstrdup+0x1a/0x60 [ 15.870012] __kernfs_new_node+0x41/0x1f0 [ 15.870018] ? __mutex_unlock_slowpath+0x4d/0x2a0 [ 15.895135] ioatdma 0000:00:01.3: enabling device (0004 -> 0006) [ 15.899395] kernfs_new_node+0x36/0x60 [ 15.899400] __kernfs_create_file+0x2c/0xf3 [ 15.961374] sysfs_add_file_mode_ns+0xa4/0x1a0 [ 15.961379] internal_create_group+0x117/0x370 [ 15.972133] ? sysfs_add_file_mode_ns+0xa4/0x1a0 [ 15.972138] internal_create_groups.part.0+0x3d/0xa0 [ 15.982656] device_add+0x625/0x690 [ 15.982662] pmu_dev_alloc+0x93/0xf0 [ 15.982664] perf_pmu_register+0x292/0x3e0 [ 15.982674] uncore_pmu_register+0x76/0x120 [intel_uncore] [ 15.982681] intel_uncore_init+0x1fd/0xe2c [intel_uncore] [ 15.982688] ? uncore_types_init+0x1d4/0x1d4 [intel_uncore] [ 16.013580] do_one_initcall+0x5d/0x2e4 [ 16.013584] ? do_init_module+0x23/0x230 [ 16.013586] ? rcu_read_lock_sched_held+0x6b/0x80 [ 16.013589] ? kmem_cache_alloc_trace+0x2c4/0x2f0 [ 16.013591] ? do_init_module+0x23/0x230 [ 16.013594] do_init_module+0x5c/0x230 [ 16.013597] load_module+0x2779/0x2a90 [ 16.013605] ? ima_post_read_file+0xfd/0x110 [ 16.026926] ioatdma 0000:00:01.4: enabling device (0004 -> 0006) [ 16.028808] ? __do_sys_finit_module+0xaa/0x110 [ 16.060527] __do_sys_finit_module+0xaa/0x110 [ 16.060536] do_syscall_64+0x5c/0xb0 [ 16.060540] entry_SYSCALL_64_after_hwframe+0x49/0xbe
This snr_uncore_imc_freerunning_events array was missing an end-marker.
--- arch/x86/events/intel/uncore_snbep.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/intel/uncore_snbep.c +1 -0
@@ -4536,6 +4536,7 @@ static struct uncore_event_desc snr_uncore_imc_freerunning_events[] = {INTEL_UNCORE_EVENT_DESC (write,"event=0xff,umask=0x21" ),INTEL_UNCORE_EVENT_DESC (write.scale,"3.814697266e-6" ), INTEL_UNCORE_EVENT_DESC(write.unit, "MiB"), + { /* end: all zeroes */ }, }; static struct intel_uncore_ops snr_uncore_imc_freerunning_ops = {
Signature · 1 line
2.21.1
PATCH 2/2 perf/x86/intel/uncore: Remove PCIe3 unit for SNR
From: Kan Liang <[email protected]>
The PCIe Root Port driver for CPU Complex PCIe Root Ports are not loaded on SNR.
The device ID for SNR PCIe3 unit is used by both uncore driver and the PCIe Root Port driver. If uncore driver is loaded, the PCIe Root Port driver never be probed.
Remove the PCIe3 unit for SNR for now. The support for PCIe3 unit will be added later separately.
--- arch/x86/events/intel/uncore_snbep.c | 24 ------------------------ 1 file changed, 24 deletions(-)
arch/x86/events/intel/uncore_snbep.c +0 -24
@@ -369,11 +369,6 @@#define SNR_M2M_PCI_PMON_BOX_CTL 0x438#define SNR_M2M_PCI_PMON_UMASK_EXT 0xff -/* SNR PCIE3 */ -#define SNR_PCIE3_PCI_PMON_CTL0 0x508 -#define SNR_PCIE3_PCI_PMON_CTR0 0x4e8 -#define SNR_PCIE3_PCI_PMON_BOX_CTL 0x4e4 -/* SNR IMC */ #define SNR_IMC_MMIO_PMON_FIXED_CTL 0x54#define SNR_IMC_MMIO_PMON_FIXED_CTR 0x38
@@ -4328,27 +4323,12 @@ static struct intel_uncore_type snr_uncore_m2m = { .format_group = &snr_m2m_uncore_format_group, }; -static struct intel_uncore_type snr_uncore_pcie3 = { - .name ="pcie3" , - .num_counters =4 , - .num_boxes =1 , - .perf_ctr_bits =48 , - .perf_ctr =SNR_PCIE3_PCI_PMON_CTR0 , - .event_ctl =SNR_PCIE3_PCI_PMON_CTL0 , - .event_mask =SNBEP_PMON_RAW_EVENT_MASK , - .box_ctl =SNR_PCIE3_PCI_PMON_BOX_CTL , - .ops = &ivbep_uncore_pci_ops, - .format_group = &ivbep_uncore_format_group, -}; -enum {SNR_PCI_UNCORE_M2M , -SNR_PCI_UNCORE_PCIE3 , };static struct intel_uncore_type *snr_pci_uncores[] = { [SNR_PCI_UNCORE_M2M ] = &snr_uncore_m2m, - [SNR_PCI_UNCORE_PCIE3 ] = &snr_uncore_pcie3,NULL , };
@@ -4357,10 +4337,6 @@ static const struct pci_device_id snr_uncore_pci_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x344a), .driver_data = UNCORE_PCI_DEV_FULL_DATA(12, 0, SNR_PCI_UNCORE_M2M, 0), }, - {/* PCIe3 */ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x334a), - .driver_data = UNCORE_PCI_DEV_FULL_DATA(4, 0, SNR_PCI_UNCORE_PCIE3, 0), - }, {/* end: all zeroes */ } };
Signature · 1 line
2.21.1
Peter Zijlstra
maintainerQuoted 68 lines · On Thu, Jan 16, 2020 at 12:02:09PM -0800, [email protected] wrote:
From: Kan Liang <[email protected]>
An Oops during the boot is found on some SNR machines.
[ 15.795410] BUG: unable to handle page fault for address: 00000000000022b0 [ 15.795412] #PF: supervisor read access in kernel mode [ 15.795413] #PF: error_code(0x0000) - not-present page [ 15.795414] PGD 0 P4D 0 [ 15.795418] Oops: 0000 [#1] SMP NOPTI [ 15.795420] CPU: 6 PID: 941 Comm: systemd-udevd Not tainted 5.3.0-snr-v5.3 #292 [ 15.795421] Hardware name: Intel Corporation JACOBSVILLE/JACOBSVILLE, BIOS JBVLCRB1.86B.0011.D44.1909191126 09/19/2019 [ 15.795428] RIP: 0010:strlen+0x0/0x20 [ 15.795431] Code: 48 89 f9 74 09 48 83 c1 01 80 39 00 75 f7 31 d2 44 0f b6 04 16 44 88 04 11 48 83 c2 01 45 84 c0 75 ee c3 0f 1f 80 00 00 00 00 <80> 3f 00 74 10 48 89 f8 48 83 c0 01 80 38 00 75 f7 48 29 f8 c3 31 [ 15.855395] i801_smbus 0000:00:1f.4: SPD Write Disable is set [ 15.858351] RSP: 0018:ffffaeb4812039c8 EFLAGS: 00010202 [ 15.858353] RAX: 0000000000000000 RBX: ffff9fec99c71300 RCX: 0000000000008000 [ 15.858354] RDX: 00000000000022b0 RSI: 0000000000000cc0 RDI: 00000000000022b0 [ 15.858355] RBP: 00000000000022b0 R08: 0000000000000000 R09: 0000000000000000 [ 15.858356] R10: 0000000000000000 R11: 0000000000000000 R12: ffff9fec8583a800 [ 15.858357] R13: 0000000000000cc0 R14: ffff9fec94015648 R15: ffff9fec81f291a8 [ 15.858358] FS: 00007f89e7160940(0000) GS:ffff9fec9dc00000(0000) knlGS:0000000000000000 [ 15.858361] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 15.864343] i801_smbus 0000:00:1f.4: SMBus using polling [ 15.869998] CR2: 00000000000022b0 CR3: 0000000842ca2000 CR4: 0000000000340ee0 [ 15.870000] Call Trace: [ 15.870006] kstrdup+0x1a/0x60 [ 15.870012] __kernfs_new_node+0x41/0x1f0 [ 15.870018] ? __mutex_unlock_slowpath+0x4d/0x2a0 [ 15.895135] ioatdma 0000:00:01.3: enabling device (0004 -> 0006) [ 15.899395] kernfs_new_node+0x36/0x60 [ 15.899400] __kernfs_create_file+0x2c/0xf3 [ 15.961374] sysfs_add_file_mode_ns+0xa4/0x1a0 [ 15.961379] internal_create_group+0x117/0x370 [ 15.972133] ? sysfs_add_file_mode_ns+0xa4/0x1a0 [ 15.972138] internal_create_groups.part.0+0x3d/0xa0 [ 15.982656] device_add+0x625/0x690 [ 15.982662] pmu_dev_alloc+0x93/0xf0 [ 15.982664] perf_pmu_register+0x292/0x3e0 [ 15.982674] uncore_pmu_register+0x76/0x120 [intel_uncore] [ 15.982681] intel_uncore_init+0x1fd/0xe2c [intel_uncore] [ 15.982688] ? uncore_types_init+0x1d4/0x1d4 [intel_uncore] [ 16.013580] do_one_initcall+0x5d/0x2e4 [ 16.013584] ? do_init_module+0x23/0x230 [ 16.013586] ? rcu_read_lock_sched_held+0x6b/0x80 [ 16.013589] ? kmem_cache_alloc_trace+0x2c4/0x2f0 [ 16.013591] ? do_init_module+0x23/0x230 [ 16.013594] do_init_module+0x5c/0x230 [ 16.013597] load_module+0x2779/0x2a90 [ 16.013605] ? ima_post_read_file+0xfd/0x110 [ 16.026926] ioatdma 0000:00:01.4: enabling device (0004 -> 0006) [ 16.028808] ? __do_sys_finit_module+0xaa/0x110 [ 16.060527] __do_sys_finit_module+0xaa/0x110 [ 16.060536] do_syscall_64+0x5c/0xb0 [ 16.060540] entry_SYSCALL_64_after_hwframe+0x49/0xbe
Quoted 1 line
This
snr_uncore_imc_freerunning_eventsarray was missing an end-marker.
Surely you can convey the same without the need to include that splat? That is, what actual useful information is there that you cannot more easily write?
[tip: perf/urgent] perf/x86/intel/uncore: Remove PCIe3 unit for SNR
In reply to [email protected]The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: c24a1238b071d767e80659514bfb5b3e8ee0ebb9 Gitweb: https://git.kernel.org/tip/c24a1238b071d767e80659514bfb5b3e8ee0ebb9 Author: Kan Liang <[email protected]> AuthorDate: Thu, 16 Jan 2020 12:02:10 -08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 17 Jan 2020 10:19:24 +01:00
perf/x86/intel/uncore: Remove PCIe3 unit for SNR
The PCIe Root Port driver for CPU Complex PCIe Root Ports are not loaded on SNR.
The device ID for SNR PCIe3 unit is used by both uncore driver and the PCIe Root Port driver. If uncore driver is loaded, the PCIe Root Port driver never be probed.
Remove the PCIe3 unit for SNR for now. The support for PCIe3 unit will be added later separately.
--- arch/x86/events/intel/uncore_snbep.c | 24 ------------------------ 1 file changed, 24 deletions(-)
arch/x86/events/intel/uncore_snbep.c +0 -24
@@ -369,11 +369,6 @@#define SNR_M2M_PCI_PMON_BOX_CTL 0x438#define SNR_M2M_PCI_PMON_UMASK_EXT 0xff -/* SNR PCIE3 */ -#define SNR_PCIE3_PCI_PMON_CTL0 0x508 -#define SNR_PCIE3_PCI_PMON_CTR0 0x4e8 -#define SNR_PCIE3_PCI_PMON_BOX_CTL 0x4e4 -/* SNR IMC */ #define SNR_IMC_MMIO_PMON_FIXED_CTL 0x54#define SNR_IMC_MMIO_PMON_FIXED_CTR 0x38
@@ -4328,27 +4323,12 @@ static struct intel_uncore_type snr_uncore_m2m = { .format_group = &snr_m2m_uncore_format_group, }; -static struct intel_uncore_type snr_uncore_pcie3 = { - .name ="pcie3" , - .num_counters =4 , - .num_boxes =1 , - .perf_ctr_bits =48 , - .perf_ctr =SNR_PCIE3_PCI_PMON_CTR0 , - .event_ctl =SNR_PCIE3_PCI_PMON_CTL0 , - .event_mask =SNBEP_PMON_RAW_EVENT_MASK , - .box_ctl =SNR_PCIE3_PCI_PMON_BOX_CTL , - .ops = &ivbep_uncore_pci_ops, - .format_group = &ivbep_uncore_format_group, -}; -enum {SNR_PCI_UNCORE_M2M , -SNR_PCI_UNCORE_PCIE3 , };static struct intel_uncore_type *snr_pci_uncores[] = { [SNR_PCI_UNCORE_M2M ] = &snr_uncore_m2m, - [SNR_PCI_UNCORE_PCIE3 ] = &snr_uncore_pcie3,NULL , };
@@ -4357,10 +4337,6 @@ static const struct pci_device_id snr_uncore_pci_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x344a), .driver_data = UNCORE_PCI_DEV_FULL_DATA(12, 0, SNR_PCI_UNCORE_M2M, 0), }, - {/* PCIe3 */ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x334a), - .driver_data = UNCORE_PCI_DEV_FULL_DATA(4, 0, SNR_PCI_UNCORE_PCIE3, 0), - }, {/* end: all zeroes */ } };
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: ff7be8a42c8844c7923288b218c9151934aa9b26 Gitweb: https://git.kernel.org/tip/ff7be8a42c8844c7923288b218c9151934aa9b26 Author: Kan Liang <[email protected]> AuthorDate: Thu, 16 Jan 2020 12:02:09 -08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 17 Jan 2020 10:19:24 +01:00
perf/x86/intel/uncore: Fix missing marker for snr_uncore_imc_freerunning_events
An Oops during the boot is found on some SNR machines. It turns out this is because the snr_uncore_imc_freerunning_events[] array was missing an end-marker.
--- arch/x86/events/intel/uncore_snbep.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/intel/uncore_snbep.c +1 -0
@@ -4536,6 +4536,7 @@ static struct uncore_event_desc snr_uncore_imc_freerunning_events[] = {INTEL_UNCORE_EVENT_DESC (write,"event=0xff,umask=0x21" ),INTEL_UNCORE_EVENT_DESC (write.scale,"3.814697266e-6" ), INTEL_UNCORE_EVENT_DESC(write.unit, "MiB"), + { /* end: all zeroes */ }, }; static struct intel_uncore_ops snr_uncore_imc_freerunning_ops = {
[tip: perf/urgent] perf/x86/intel/uncore: Remove PCIe3 unit for SNR
In reply to [email protected]The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 2167f1625c2f04a33145f325db0de285630f7bd1 Gitweb: https://git.kernel.org/tip/2167f1625c2f04a33145f325db0de285630f7bd1 Author: Kan Liang <[email protected]> AuthorDate: Thu, 16 Jan 2020 12:02:10 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 17 Jan 2020 11:33:38 +01:00
perf/x86/intel/uncore: Remove PCIe3 unit for SNR
The PCIe Root Port driver for CPU Complex PCIe Root Ports are not loaded on SNR.
The device ID for SNR PCIe3 unit is used by both uncore driver and the PCIe Root Port driver. If uncore driver is loaded, the PCIe Root Port driver never be probed.
Remove the PCIe3 unit for SNR for now. The support for PCIe3 unit will be added later separately.
--- arch/x86/events/intel/uncore_snbep.c | 24 ------------------------ 1 file changed, 24 deletions(-)
arch/x86/events/intel/uncore_snbep.c +0 -24
@@ -369,11 +369,6 @@#define SNR_M2M_PCI_PMON_BOX_CTL 0x438#define SNR_M2M_PCI_PMON_UMASK_EXT 0xff -/* SNR PCIE3 */ -#define SNR_PCIE3_PCI_PMON_CTL0 0x508 -#define SNR_PCIE3_PCI_PMON_CTR0 0x4e8 -#define SNR_PCIE3_PCI_PMON_BOX_CTL 0x4e4 -/* SNR IMC */ #define SNR_IMC_MMIO_PMON_FIXED_CTL 0x54#define SNR_IMC_MMIO_PMON_FIXED_CTR 0x38
@@ -4328,27 +4323,12 @@ static struct intel_uncore_type snr_uncore_m2m = { .format_group = &snr_m2m_uncore_format_group, }; -static struct intel_uncore_type snr_uncore_pcie3 = { - .name ="pcie3" , - .num_counters =4 , - .num_boxes =1 , - .perf_ctr_bits =48 , - .perf_ctr =SNR_PCIE3_PCI_PMON_CTR0 , - .event_ctl =SNR_PCIE3_PCI_PMON_CTL0 , - .event_mask =SNBEP_PMON_RAW_EVENT_MASK , - .box_ctl =SNR_PCIE3_PCI_PMON_BOX_CTL , - .ops = &ivbep_uncore_pci_ops, - .format_group = &ivbep_uncore_format_group, -}; -enum {SNR_PCI_UNCORE_M2M , -SNR_PCI_UNCORE_PCIE3 , };static struct intel_uncore_type *snr_pci_uncores[] = { [SNR_PCI_UNCORE_M2M ] = &snr_uncore_m2m, - [SNR_PCI_UNCORE_PCIE3 ] = &snr_uncore_pcie3,NULL , };
@@ -4357,10 +4337,6 @@ static const struct pci_device_id snr_uncore_pci_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x344a), .driver_data = UNCORE_PCI_DEV_FULL_DATA(12, 0, SNR_PCI_UNCORE_M2M, 0), }, - {/* PCIe3 */ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x334a), - .driver_data = UNCORE_PCI_DEV_FULL_DATA(4, 0, SNR_PCI_UNCORE_PCIE3, 0), - }, {/* end: all zeroes */ } };
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: fa694ae532836bd2f4cd659e9b4032abaf9fa9e5 Gitweb: https://git.kernel.org/tip/fa694ae532836bd2f4cd659e9b4032abaf9fa9e5 Author: Kan Liang <[email protected]> AuthorDate: Thu, 16 Jan 2020 12:02:09 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 17 Jan 2020 11:33:28 +01:00
perf/x86/intel/uncore: Fix missing marker for snr_uncore_imc_freerunning_events
An Oops during the boot is found on some SNR machines. It turns out this is because the snr_uncore_imc_freerunning_events[] array was missing an end-marker.
--- arch/x86/events/intel/uncore_snbep.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/intel/uncore_snbep.c +1 -0
@@ -4536,6 +4536,7 @@ static struct uncore_event_desc snr_uncore_imc_freerunning_events[] = {INTEL_UNCORE_EVENT_DESC (write,"event=0xff,umask=0x21" ),INTEL_UNCORE_EVENT_DESC (write.scale,"3.814697266e-6" ), INTEL_UNCORE_EVENT_DESC(write.unit, "MiB"), + { /* end: all zeroes */ }, }; static struct intel_uncore_ops snr_uncore_imc_freerunning_ops = {