Skip to contentSkip to conversation

tracing: a couple minor for-next fixes

PATCH New Tom Zanussi 1 participant 3 messages Nov 11, 2013 Tracing

lore
Share & tools
lore
#0 lore raw

cover tracing: a couple minor for-next fixes

This patchset fixes a couple sparse warnings reported by the 'kbuild test robot' and removes a redundant function call noticed by Steve Rostedt.

The following changes since commit 20b72e76c42bc4f0dd091f9faee542ea45ad6b5e:

Merge branch 'trace/ftrace/core' into trace/for-next (2013-11-06 22:58:52 -0500)

are available in the git repository at:

git://git.yoctoproject.org/linux-yocto-contrib.git tzanussi/tracing-next-fixes
http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-contrib/log/?h=tzanussi/tracing-next-fixes

Tom Zanussi (2):
tracing: Add __rcu to enter/exit_syscall_files
tracing: Remove redundant destroy_call_preds() call

 kernel/trace/trace.h        | 4 ++--
 kernel/trace/trace_events.c | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/2 tracing: Add __rcu to enter/exit_syscall_files

Add __rcu annotation to the contents of enter/exit_syscall_files to signify that they're protected by rcu and to silence the following sparse warnings when CONFIG_SPARSE_RCU_POINTER=y:

kernel/trace/trace_syscalls.c:320:23: error: incompatible types in
comparison expression (different address spaces)
kernel/trace/trace_syscalls.c:368:23: error: incompatible types in
comparison expression (different address spaces)

---
 kernel/trace/trace.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace.h +2 -2
index 11a04d6..7ca1993 100644
@@ -192,8 +192,8 @@ struct trace_array {
 #ifdef CONFIG_FTRACE_SYSCALLS
 	int			sys_refcount_enter;
 	int			sys_refcount_exit;
-	struct ftrace_event_file *enter_syscall_files[NR_syscalls];
-	struct ftrace_event_file *exit_syscall_files[NR_syscalls];
+	struct ftrace_event_file __rcu *enter_syscall_files[NR_syscalls];
+	struct ftrace_event_file __rcu *exit_syscall_files[NR_syscalls];
 #endif
 	int			stop_count;
 	int			clock_id;
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/2 tracing: Remove redundant destroy_call_preds() call

In reply to Tom Zanussi

Before calling destroy_call_preds(), __trace_remove_event_call() calls event_remove(), which ends up calling destroy_call_preds() (via destroy_preds()) if USE_CALL_FILTER is set. That means the second call is redundant and can be removed.

---
 kernel/trace/trace_events.c | 1 -
 1 file changed, 1 deletion(-)
kernel/trace/trace_events.c +0 -1
index f919a2e..a14f6a1 100644
@@ -1708,7 +1708,6 @@ static void __trace_remove_event_call(struct ftrace_event_call *call)
 {
 	event_remove(call);
 	trace_destroy_fields(call);
-	destroy_call_preds(call);
 }
 
 static int probe_remove_event_call(struct ftrace_event_call *call)
Signature · 1 line
1.8.3.1