Skip to contentSkip to conversation

fix a warning on kernel/trace/trace_branch.c and trace_hw_branches.c

PATCH Superseded Zhenwen Xu 3 participants 4 messages Oct 7, 2009 Tracing

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Zhenwen Xu

author
#0 lore raw

PATCH v2 1/1 fix a warning on kernel/trace/trace_branch.c and trace_hw_branches.c

fix warnings that caused the API change of trace_buffer_lock_reserve() change files: kernel/trace/trace_hw_branch.c
kernel/trace/trace_branch.c

---
 kernel/trace/trace_branch.c      |    2 +-
 kernel/trace/trace_hw_branches.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace_branch.c +1 -1
index 7a7a9fd..216e2dd 100644
@@ -54,7 +54,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 		goto out;
 
 	pc = preempt_count();
-	event = trace_buffer_lock_reserve(tr, TRACE_BRANCH,
+	event = trace_buffer_lock_reserve(tr->buffer, TRACE_BRANCH,
 					  sizeof(*entry), flags, pc);
 	if (!event)
 		goto out;
kernel/trace/trace_hw_branches.c +1 -1
index 23b6385..1cc17ca 100644
@@ -180,7 +180,7 @@ void trace_hw_branch(u64 from, u64 to)
 	if (atomic_inc_return(&tr->data[cpu]->disabled) != 1)
 		goto out;
 
-	event = trace_buffer_lock_reserve(tr, TRACE_HW_BRANCHES,
+	event = trace_buffer_lock_reserve(tr->buffer, TRACE_HW_BRANCHES,
 					  sizeof(*entry), 0, 0);
 	if (!event)
 		goto out;
Signature · 5 lines
1.6.3.3

-- 
--------------------------------
http://zhwen.org - Open and Free
#1 lore raw
Quoted 4 lines · Zhenwen Xu

fix warnings that caused the API change of trace_buffer_lock_reserve() change files: kernel/trace/trace_hw_branch.c
kernel/trace/trace_branch.c

Hmm, did you really compile trace_hw_branch.c while testing this patch?

This change is necessary too:

- trace_buffer_unlock_commit(tr, event, 0, 0);
+ trace_buffer_unlock_commit(tr->buffer, event, 0, 0);

And use a varaible "buffer = tr->buffer" should be better.

Quoted 32 lines
---
 kernel/trace/trace_branch.c      |    2 +-
 kernel/trace/trace_hw_branches.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace_branch.c +1 -1
index 7a7a9fd..216e2dd 100644
@@ -54,7 +54,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 		goto out;
 
 	pc = preempt_count();
-	event = trace_buffer_lock_reserve(tr, TRACE_BRANCH,
+	event = trace_buffer_lock_reserve(tr->buffer, TRACE_BRANCH,
 					  sizeof(*entry), flags, pc);
 	if (!event)
 		goto out;
kernel/trace/trace_hw_branches.c +1 -1
index 23b6385..1cc17ca 100644
@@ -180,7 +180,7 @@ void trace_hw_branch(u64 from, u64 to)
 	if (atomic_inc_return(&tr->data[cpu]->disabled) != 1)
 		goto out;
 
-	event = trace_buffer_lock_reserve(tr, TRACE_HW_BRANCHES,
+	event = trace_buffer_lock_reserve(tr->buffer, TRACE_HW_BRANCHES,
 					  sizeof(*entry), 0, 0);
 	if (!event)
 		goto out;
author
#2 lore raw
Quoted 16 lines · Li Zefan
Quoted 5 lines · Zhenwen Xu

fix warnings that caused the API change of trace_buffer_lock_reserve() change files: kernel/trace/trace_hw_branch.c
kernel/trace/trace_branch.c

Hmm, did you really compile trace_hw_branch.c while testing this patch?

This change is necessary too:

(quoted diff) +1 -1
-	trace_buffer_unlock_commit(tr, event, 0, 0);
+	trace_buffer_unlock_commit(tr->buffer, event, 0, 0);
Quoted 2 lines

And use a varaible "buffer = tr->buffer" should be better.

oh! sorry for my careless!

Quoted 36 lines
Quoted 34 lines
---
 kernel/trace/trace_branch.c      |    2 +-
 kernel/trace/trace_hw_branches.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace_branch.c +1 -1
index 7a7a9fd..216e2dd 100644
@@ -54,7 +54,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 		goto out;
 
 	pc = preempt_count();
-	event = trace_buffer_lock_reserve(tr, TRACE_BRANCH,
+	event = trace_buffer_lock_reserve(tr->buffer, TRACE_BRANCH,
 					  sizeof(*entry), flags, pc);
 	if (!event)
 		goto out;
kernel/trace/trace_hw_branches.c +1 -1
index 23b6385..1cc17ca 100644
@@ -180,7 +180,7 @@ void trace_hw_branch(u64 from, u64 to)
 	if (atomic_inc_return(&tr->data[cpu]->disabled) != 1)
 		goto out;
 
-	event = trace_buffer_lock_reserve(tr, TRACE_HW_BRANCHES,
+	event = trace_buffer_lock_reserve(tr->buffer, TRACE_HW_BRANCHES,
 					  sizeof(*entry), 0, 0);
 	if (!event)
 		goto out;
Signature · 3 lines
---------------------------------
Zhenwen Xu - Open and Free
Home Page:	http://zhwen.org
maintainer
#3 lore raw
Quoted 34 lines · Helight.Xu
Quoted 16 lines · Li Zefan
Quoted 5 lines · Zhenwen Xu

fix warnings that caused the API change of trace_buffer_lock_reserve() change files: kernel/trace/trace_hw_branch.c
kernel/trace/trace_branch.c

Hmm, did you really compile trace_hw_branch.c while testing this patch?

This change is necessary too:

(quoted diff) +1 -1
-	trace_buffer_unlock_commit(tr, event, 0, 0);
+	trace_buffer_unlock_commit(tr->buffer, event, 0, 0);
Quoted 2 lines

And use a varaible "buffer = tr->buffer" should be better.

oh! sorry for my careless!

Quoted 14 lines
Quoted 14 lines
---
 kernel/trace/trace_branch.c      |    2 +-
 kernel/trace/trace_hw_branches.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace_branch.c +0 -0
index 7a7a9fd..216e2dd 100644
@@ -54,7 +54,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 		goto out;
 
Quoted 4 lines
Quoted 4 lines

kernel/trace/trace_branch.c probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) · line 58

Quoted 4 lines
kernel/trace/trace_branch.c +1 -1
 	pc = preempt_count();
-	event = trace_buffer_lock_reserve(tr, TRACE_BRANCH,
+	event = trace_buffer_lock_reserve(tr->buffer, TRACE_BRANCH,
 					  sizeof(*entry), flags, pc);

Also, You should not pass in the buffer directly. This is because the tr->buffer can change, and if it changes between the reserve and commit, then you can corrupt the ring buffer.

What you want to do is:

	struct ring_buffer *buffer = tr->buffer;

	event = trace_buffer_lock_reserve(buffer, TRACE_BRANCH ...)

[...]

ring_buffer_unlock_commit(buffer, ...)

-- Steve

Quoted 20 lines
Quoted 18 lines
Quoted 16 lines
kernel/trace/trace_branch.c +0 -0
 	if (!event)
 		goto out;
kernel/trace/trace_hw_branches.c +1 -1
index 23b6385..1cc17ca 100644
@@ -180,7 +180,7 @@ void trace_hw_branch(u64 from, u64 to)
 	if (atomic_inc_return(&tr->data[cpu]->disabled) != 1)
 		goto out;
 
-	event = trace_buffer_lock_reserve(tr, TRACE_HW_BRANCHES,
+	event = trace_buffer_lock_reserve(tr->buffer, TRACE_HW_BRANCHES,
 					  sizeof(*entry), 0, 0);
 	if (!event)
 		goto out;