Skip to content

Commit 91e4c22

Browse files
cminyardrostedt
authored andcommitted
ring-buffer: Always run per-cpu ring buffer resize with schedule_work_on()
The code for resizing the trace ring buffers has to run the per-cpu resize on the CPU itself. The code was using preempt_off() and running the code for the current CPU directly, otherwise calling schedule_work_on(). At least on RT this could result in the following: |BUG: sleeping function called from invalid context at kernel/rtmutex.c:673 |in_atomic(): 1, irqs_disabled(): 0, pid: 607, name: bash |3 locks held by bash/607: |CPU: 0 PID: 607 Comm: bash Not tainted 3.12.15-rt25+ torvalds#124 |(rt_spin_lock+0x28/0x68) |(free_hot_cold_page+0x84/0x3b8) |(free_buffer_page+0x14/0x20) |(rb_update_pages+0x280/0x338) |(ring_buffer_resize+0x32c/0x3dc) |(free_snapshot+0x18/0x38) |(tracing_set_tracer+0x27c/0x2ac) probably via |cd /sys/kernel/debug/tracing/ |echo 1 > events/enable ; sleep 2 |echo 1024 > buffer_size_kb If we just always use schedule_work_on(), there's no need for the preempt_off(). So do that. Link: http://lkml.kernel.org/p/[email protected] Reported-by: Stanislav Meduna <[email protected]> Signed-off-by: Corey Minyard <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
1 parent a5911a5 commit 91e4c22

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

kernel/trace/ring_buffer.c

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1693,22 +1693,14 @@ int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size,
16931693
if (!cpu_buffer->nr_pages_to_update)
16941694
continue;
16951695

1696-
/* The update must run on the CPU that is being updated. */
1697-
preempt_disable();
1698-
if (cpu == smp_processor_id() || !cpu_online(cpu)) {
1696+
/* Can't run something on an offline CPU. */
1697+
if (!cpu_online(cpu)) {
16991698
rb_update_pages(cpu_buffer);
17001699
cpu_buffer->nr_pages_to_update = 0;
17011700
} else {
1702-
/*
1703-
* Can not disable preemption for schedule_work_on()
1704-
* on PREEMPT_RT.
1705-
*/
1706-
preempt_enable();
17071701
schedule_work_on(cpu,
17081702
&cpu_buffer->update_pages_work);
1709-
preempt_disable();
17101703
}
1711-
preempt_enable();
17121704
}
17131705

17141706
/* wait for all the updates to complete */
@@ -1746,22 +1738,14 @@ int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size,
17461738

17471739
get_online_cpus();
17481740

1749-
preempt_disable();
1750-
/* The update must run on the CPU that is being updated. */
1751-
if (cpu_id == smp_processor_id() || !cpu_online(cpu_id))
1741+
/* Can't run something on an offline CPU. */
1742+
if (!cpu_online(cpu_id))
17521743
rb_update_pages(cpu_buffer);
17531744
else {
1754-
/*
1755-
* Can not disable preemption for schedule_work_on()
1756-
* on PREEMPT_RT.
1757-
*/
1758-
preempt_enable();
17591745
schedule_work_on(cpu_id,
17601746
&cpu_buffer->update_pages_work);
17611747
wait_for_completion(&cpu_buffer->update_done);
1762-
preempt_disable();
17631748
}
1764-
preempt_enable();
17651749

17661750
cpu_buffer->nr_pages_to_update = 0;
17671751
put_online_cpus();

0 commit comments

Comments
 (0)