Merge reason: we want to queue up dependent cleanup
Showing the changes to kernel/trace (1 of 656 files). Show all
Unified · Split
| @@ -1283,6 +1283,8 @@ void trace_dump_stack(void) · 1282 unmodified lines | |||
| 1283 | __ftrace_trace_stack(global_trace.buffer, flags, 3, preempt_count()); | 1283 | __ftrace_trace_stack(global_trace.buffer, flags, 3, preempt_count()); |
| 1284 | } | 1284 | } |
| 1285 | 1285 | ||
| 1286 | static DEFINE_PER_CPU(int, user_stack_count); | ||
| 1287 | |||
| 1286 | void | 1288 | void |
| 1287 | ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc) | 1289 | ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc) |
| 1288 | { | 1290 | { |
| @@ -1301,6 +1303,18 @@ ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc) · 12 unmodified lines | |||
| 1301 | if (unlikely(in_nmi())) | 1303 | if (unlikely(in_nmi())) |
| 1302 | return; | 1304 | return; |
| 1303 | 1305 | ||
| 1306 | /* | ||
| 1307 | * prevent recursion, since the user stack tracing may | ||
| 1308 | * trigger other kernel events. | ||
| 1309 | */ | ||
| 1310 | preempt_disable(); | ||
| 1311 | if (__this_cpu_read(user_stack_count)) | ||
| 1312 | goto out; | ||
| 1313 | |||
| 1314 | __this_cpu_inc(user_stack_count); | ||
| 1315 | |||
| 1316 | |||
| 1317 | |||
| 1304 | event = trace_buffer_lock_reserve(buffer, TRACE_USER_STACK, | 1318 | event = trace_buffer_lock_reserve(buffer, TRACE_USER_STACK, |
| 1305 | sizeof(*entry), flags, pc); | 1319 | sizeof(*entry), flags, pc); |
| 1306 | if (!event) | 1320 | if (!event) |
| @@ -1318,6 +1332,11 @@ ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc) · 11 unmodified lines | |||
| 1318 | save_stack_trace_user(&trace); | 1332 | save_stack_trace_user(&trace); |
| 1319 | if (!filter_check_discard(call, entry, buffer, event)) | 1333 | if (!filter_check_discard(call, entry, buffer, event)) |
| 1320 | ring_buffer_unlock_commit(buffer, event); | 1334 | ring_buffer_unlock_commit(buffer, event); |
| 1335 | |||
| 1336 | __this_cpu_dec(user_stack_count); | ||
| 1337 | |||
| 1338 | out: | ||
| 1339 | preempt_enable(); | ||
| 1321 | } | 1340 | } |
| 1322 | 1341 | ||
| 1323 | #ifdef UNUSED | 1342 | #ifdef UNUSED |