tracing/filters: add filter_mutex to protect filter predicates
PATCH v2 1/1 tracing/filters: add filter_mutex to protect filter predicates
This patch adds a filter_mutex to prevent the filter predicates from being accessed concurrently by various external functions.
It's based on a previous patch by Li Zefan:
"[PATCH 7/7] tracing/filters: make filter preds RCU safe"
v2 changes:
- fixed wrong value returned in a add_subsystem_pred() failure case noticed by Li Zefan.
--- kernel/trace/trace.h | 4 +- kernel/trace/trace_events.c | 4 +- kernel/trace/trace_events_filter.c | 90 ++++++++++++++++++++++++++++-------- 3 files changed, 75 insertions(+), 23 deletions(-)
kernel/trace/trace.h +3 -1
@@ -759,13 +759,15 @@ struct filter_pred { };extern void filter_free_pred (struct filter_pred *pred); -extern void filter_print_preds (struct filter_pred **preds,int n_preds, +extern void filter_print_preds (struct ftrace_event_call *call,struct trace_seq *s);extern int filter_parse (char **pbuf,struct filter_pred *pred);extern int filter_add_pred (struct ftrace_event_call *call,struct filter_pred *pred);extern void filter_disable_preds (struct ftrace_event_call *call);extern void filter_free_subsystem_preds (struct event_subsystem *system); +extern void filter_print_subsystem_preds (struct event_subsystem *system, +struct trace_seq *s);extern int filter_add_subsystem_pred (struct event_subsystem *system,struct filter_pred *pred);
kernel/trace/trace_events.c +2 -2
@@ -488,7 +488,7 @@ event_filter_read(struct file *filp, char __user *ubuf, size_t cnt,trace_seq_init (s); -filter_print_preds (call->preds, call->n_preds, s); +filter_print_preds (call, s); r =simple_read_from_buffer (ubuf, cnt, ppos, s->buffer, s->len);kfree (s);
@@ -558,7 +558,7 @@ subsystem_filter_read(struct file *filp, char __user *ubuf, size_t cnt,trace_seq_init (s); -filter_print_preds (system->preds, system->n_preds, s); +filter_print_subsystem_preds (system, s); r =simple_read_from_buffer (ubuf, cnt, ppos, s->buffer, s->len);kfree (s);
kernel/trace/trace_events_filter.c +70 -20
190 lines not on this page · raw message
Signature · 1 line
1.5.6.3
Quoted 6 lines · Tom Zanussi
This patch adds a
filter_mutexto prevent the filter predicates from being accessed concurrently by various external functions.It's based on a previous patch by Li Zefan:
"[PATCH 7/7] tracing/filters: make filter preds RCU safe"
Quoted 7 lines
v2 changes:
- fixed wrong value returned in a
add_subsystem_pred()failure case noticed by Li Zefan.Signed-off-by Tom Zanussi <[email protected]>
Ingo Molnar
AppliedQuoted 9 lines · Li Zefan
Quoted 8 lines · Tom Zanussi
This patch adds a
filter_mutexto prevent the filter predicates from being accessed concurrently by various external functions.It's based on a previous patch by Li Zefan:
"[PATCH 7/7] tracing/filters: make filter preds RCU safe"v2 changes:
Quoted 8 lines
Quoted 5 lines
- fixed wrong value returned in a
add_subsystem_pred()failure case noticed by Li Zefan.Signed-off-by Tom Zanussi <[email protected]>Reviewed-by Li Zefan <[email protected]>Tested-by Li Zefan <[email protected]>
Applied, thanks guys!
Ingo
Commit-ID: ac1adc55fc71c7515caa2eb0e63e49b3d1c6a47c Gitweb: http://git.kernel.org/tip/ac1adc55fc71c7515caa2eb0e63e49b3d1c6a47c Author: Tom Zanussi <[email protected]> AuthorDate: Fri, 17 Apr 2009 00:27:08 -0500 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 17 Apr 2009 18:28:27 +0200
tracing/filters: add filter_mutex to protect filter predicates
This patch adds a filter_mutex to prevent the filter predicates from being accessed concurrently by various external functions.
It's based on a previous patch by Li Zefan:
"[PATCH 7/7] tracing/filters: make filter preds RCU safe"
v2 changes:
- fixed wrong value returned in a add_subsystem_pred() failure case noticed by Li Zefan.
[ Impact: fix trace filter corruption/crashes on parallel access ]
LKML-Reference: <1239946028.6639.13.camel@tropicana>
--- kernel/trace/trace.h | 4 +- kernel/trace/trace_events.c | 4 +- kernel/trace/trace_events_filter.c | 90 ++++++++++++++++++++++++++++-------- 3 files changed, 75 insertions(+), 23 deletions(-)
kernel/trace/trace.h +3 -1
@@ -757,13 +757,15 @@ struct filter_pred { };extern void filter_free_pred (struct filter_pred *pred); -extern void filter_print_preds (struct filter_pred **preds,int n_preds, +extern void filter_print_preds (struct ftrace_event_call *call,struct trace_seq *s);extern int filter_parse (char **pbuf,struct filter_pred *pred);extern int filter_add_pred (struct ftrace_event_call *call,struct filter_pred *pred);extern void filter_disable_preds (struct ftrace_event_call *call);extern void filter_free_subsystem_preds (struct event_subsystem *system); +extern void filter_print_subsystem_preds (struct event_subsystem *system, +struct trace_seq *s);extern int filter_add_subsystem_pred (struct event_subsystem *system,struct filter_pred *pred);
kernel/trace/trace_events.c +2 -2
@@ -488,7 +488,7 @@ event_filter_read(struct file *filp, char __user *ubuf, size_t cnt,trace_seq_init (s); -filter_print_preds (call->preds, call->n_preds, s); +filter_print_preds (call, s); r =simple_read_from_buffer (ubuf, cnt, ppos, s->buffer, s->len);kfree (s);
@@ -558,7 +558,7 @@ subsystem_filter_read(struct file *filp, char __user *ubuf, size_t cnt,trace_seq_init (s); -filter_print_preds (system->preds, system->n_preds, s); +filter_print_subsystem_preds (system, s); r =simple_read_from_buffer (ubuf, cnt, ppos, s->buffer, s->len);kfree (s);
kernel/trace/trace_events_filter.c +70 -20
190 lines not on this page · raw message