Skip to contentSkip to conversation

uncore_pmu_event_init: using smp_processor_id() in preemptible core

BUG Peter Zijlstra 2 participants 3 messages Sep 16, 2013 – Sep 17, 2013

Subsystems (2)
lore
Share & tools
lore

Peter Zijlstra

author maintainer
#0 lore raw

Hi,

Trinity just triggered this:

[  595.847438] BUG: using smp_processor_id() in preemptible [00000000] code: trinity-child28/2674
[  595.857378] caller is uncore_pmu_event_init+0x114/0x270
[  595.863262] CPU: 11 PID: 2674 Comm: trinity-child28 Tainted: G        W    3.11.0+ #365
[  595.872146] Hardware name: Supermicro X8DTN/X8DTN, BIOS 4.6.3 01/08/2010
[  595.879656]  000000000000000b ffff880433e09d98 ffffffff81642eb8 ffff880433e09fd8
[  595.888430]  ffff880433e09dc0 ffffffff81367d1e ffff880373621000 ffff880435bacc00
[  595.897330]  0000000000000000 ffff880433e09df8 ffffffff81068394 ffffffff81068285
[  595.906252] Call Trace:
[  595.909127]  [<ffffffff81642eb8>] dump_stack+0x4e/0x82
[  595.914925]  [<ffffffff81367d1e>] debug_smp_processor_id+0xde/0x100
[  595.921903]  [<ffffffff81068394>] uncore_pmu_event_init+0x114/0x270
[  595.928907]  [<ffffffff81068285>] ? uncore_pmu_event_init+0x5/0x270
[  595.935806]  [<ffffffff8114d18c>] perf_init_event+0xcc/0x190

That's in uncore_validate_group() where we allocate the fake_box().

I'm thinking we might as well use raw_smp_processor_id() since it really doesn't matter where the fake box lives.

---
 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/perf_event_intel_uncore.c +1 -1
index 8ed4458..63c8913 100644
@@ -3031,7 +3031,7 @@ static int uncore_validate_group(struct intel_uncore_pmu *pmu,
 	struct intel_uncore_box *fake_box;
 	int ret = -EINVAL, n;
 
-	fake_box = uncore_alloc_box(pmu->type, smp_processor_id());
+	fake_box = uncore_alloc_box(pmu->type, raw_smp_processor_id());
 	if (!fake_box)
 		return -ENOMEM;
 
#1 lore raw
Quoted 33 lines · Peter Zijlstra

Hi,

Trinity just triggered this:

[  595.847438] BUG: using smp_processor_id() in preemptible [00000000] code: trinity-child28/2674
[  595.857378] caller is uncore_pmu_event_init+0x114/0x270
[  595.863262] CPU: 11 PID: 2674 Comm: trinity-child28 Tainted: G        W    3.11.0+ #365
[  595.872146] Hardware name: Supermicro X8DTN/X8DTN, BIOS 4.6.3 01/08/2010
[  595.879656]  000000000000000b ffff880433e09d98 ffffffff81642eb8 ffff880433e09fd8
[  595.888430]  ffff880433e09dc0 ffffffff81367d1e ffff880373621000 ffff880435bacc00
[  595.897330]  0000000000000000 ffff880433e09df8 ffffffff81068394 ffffffff81068285
[  595.906252] Call Trace:
[  595.909127]  [<ffffffff81642eb8>] dump_stack+0x4e/0x82
[  595.914925]  [<ffffffff81367d1e>] debug_smp_processor_id+0xde/0x100
[  595.921903]  [<ffffffff81068394>] uncore_pmu_event_init+0x114/0x270
[  595.928907]  [<ffffffff81068285>] ? uncore_pmu_event_init+0x5/0x270
[  595.935806]  [<ffffffff8114d18c>] perf_init_event+0xcc/0x190

That's in uncore_validate_group() where we allocate the fake_box().

I'm thinking we might as well use raw_smp_processor_id() since it really doesn't matter where the fake box lives.

---
 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/perf_event_intel_uncore.c +0 -0
index 8ed4458..63c8913 100644

arch/x86/kernel/cpu/perf_event_intel_uncore.c static int uncore_validate_group(struct intel_uncore_pmu *pmu, · line 3037

Quoted 8 lines
arch/x86/kernel/cpu/perf_event_intel_uncore.c +1 -1
@@ -3031,7 +3031,7 @@ static int uncore_validate_group(struct intel_uncore_pmu *pmu,
 	struct intel_uncore_box *fake_box;
 	int ret = -EINVAL, n;
 
-	fake_box = uncore_alloc_box(pmu->type, smp_processor_id());
+	fake_box = uncore_alloc_box(pmu->type, raw_smp_processor_id());
 	if (!fake_box)
 		return -ENOMEM;
 

how about using kzalloc() in this case.

---

arch/x86/kernel/cpu/perf_event_intel_uncore.c +5 -2
index fd8011e..a12a22f 100644
@@ -2713,7 +2713,10 @@ struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, int cp
 
 	size = sizeof(*box) + type->num_shared_regs * sizeof(struct intel_uncore_extra_reg);
 
-	box = kzalloc_node(size, GFP_KERNEL, cpu_to_node(cpu));
+	if (cpu < 0)
+		box = kzalloc(size, GFP_KERNEL);
+	else
+		box = kzalloc_node(size, GFP_KERNEL, cpu_to_node(cpu));
 	if (!box)
 		return NULL;
 
@@ -3031,7 +3034,7 @@ static int uncore_validate_group(struct intel_uncore_pmu *pmu,
 	struct intel_uncore_box *fake_box;
 	int ret = -EINVAL, n;
 
-	fake_box = uncore_alloc_box(pmu->type, smp_processor_id());
+	fake_box = uncore_alloc_box(pmu->type, -1);
 	if (!fake_box)
 		return -ENOMEM;
 
author maintainer
#2 lore raw
Quoted 6 lines · Zheng

---

arch/x86/kernel/cpu/perf_event_intel_uncore.c +0 -0
index fd8011e..a12a22f 100644

arch/x86/kernel/cpu/perf_event_intel_uncore.c struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, int cp · line 2721

Quoted 10 lines
arch/x86/kernel/cpu/perf_event_intel_uncore.c +4 -1
@@ -2713,7 +2713,10 @@ struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, int cp
 
 	size = sizeof(*box) + type->num_shared_regs * sizeof(struct intel_uncore_extra_reg);
 
-	box = kzalloc_node(size, GFP_KERNEL, cpu_to_node(cpu));
+	if (cpu < 0)
+		box = kzalloc(size, GFP_KERNEL);
+	else
+		box = kzalloc_node(size, GFP_KERNEL, cpu_to_node(cpu));
 	if (!box)
 		return NULL;

I believe -1 is a valid node number for all allocators, in which case they fall back to the current node.

arch/x86/kernel/cpu/perf_event_intel_uncore.c static int uncore_validate_group(struct intel_uncore_pmu *pmu, · line 3040

Quoted 10 lines
arch/x86/kernel/cpu/perf_event_intel_uncore.c +1 -1
@@ -3031,7 +3034,7 @@ static int uncore_validate_group(struct intel_uncore_pmu *pmu,
 	struct intel_uncore_box *fake_box;
 	int ret = -EINVAL, n;
 
-	fake_box = uncore_alloc_box(pmu->type, smp_processor_id());
+	fake_box = uncore_alloc_box(pmu->type, -1);
 	if (!fake_box)
 		return -ENOMEM;
 

Yes, much better indeed.