Skip to contentSkip to conversation

fix a warning on kernel/trace/trace_branch.c andtrace_hw_branches.c

PATCH Superseded Zhenwen Xu 4 participants 9 messages Oct 7, 2009 – Oct 8, 2009 Tracing

lore
Share & tools
lore

Zhenwen Xu

author
#0 lore raw

PATCH v3 1/1 fix a warning on kernel/trace/trace_branch.c andtrace_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 |    6 ++++--
 2 files changed, 5 insertions(+), 3 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 +4 -2
index 23b6385..e40f5fb 100644
@@ -165,6 +165,7 @@ void trace_hw_branch(u64 from, u64 to)
 	struct ftrace_event_call *call = &event_hw_branch;
 	struct trace_array *tr = hw_branch_trace;
 	struct ring_buffer_event *event;
+	struct ring_buffer      *buf;
 	struct hw_branch_entry *entry;
 	unsigned long irq1;
 	int cpu;
@@ -180,7 +181,8 @@ 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,
+	buf = tr->buffer
+	event = trace_buffer_lock_reserve(buf, TRACE_HW_BRANCHES,
 					  sizeof(*entry), 0, 0);
 	if (!event)
 		goto out;
@@ -190,7 +192,7 @@ void trace_hw_branch(u64 from, u64 to)
 	entry->from = from;
 	entry->to   = to;
 	if (!filter_check_discard(call, entry, tr->buffer, event))
-		trace_buffer_unlock_commit(tr, event, 0, 0);
+		trace_buffer_unlock_commit(buf, event, 0, 0);
 
  out:
 	atomic_dec(&tr->data[cpu]->disabled);
Signature · 5 lines
1.6.3.3

-- 
--------------------------------
http://zhwen.org - Open and Free
#1 lore raw
Quoted 15 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

---
 kernel/trace/trace_branch.c      |    2 +-
 kernel/trace/trace_hw_branches.c |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
kernel/trace/trace_branch.c +0 -0
index 7a7a9fd..216e2dd 100644

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

Quoted 6 lines
kernel/trace/trace_branch.c +1 -1
@@ -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);

Your change in kernel/trace/trace_hw_branches.c is fine, because you have handled the fact the buffer can be changed and then saved it in a temporary var.

But you forgot to do it in trace_branch.c

Frederic.

#2 lore raw
In reply to Zhenwen Xu
Quoted 15 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

---
 kernel/trace/trace_branch.c      |    2 +-
 kernel/trace/trace_hw_branches.c |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
kernel/trace/trace_branch.c +0 -0
index 7a7a9fd..216e2dd 100644

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

Quoted 6 lines
kernel/trace/trace_branch.c +1 -1
@@ -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);

As Steven has picked up the previous patch, this part can be removed now.

kernel/trace/trace_hw_branches.c void trace_hw_branch(u64 from, u64 to) · line 168

Quoted 11 lines
kernel/trace/trace_branch.c +0 -0
 	if (!event)
 		goto out;
kernel/trace/trace_hw_branches.c +1 -0
index 23b6385..e40f5fb 100644
@@ -165,6 +165,7 @@ void trace_hw_branch(u64 from, u64 to)
 	struct ftrace_event_call *call = &event_hw_branch;
 	struct trace_array *tr = hw_branch_trace;
 	struct ring_buffer_event *event;
+	struct ring_buffer      *buf;

Just use one space:

+ struct ring_buffer *buf;

Quoted 14 lines
kernel/trace/trace_hw_branches.c +2 -1
 	struct hw_branch_entry *entry;
 	unsigned long irq1;
 	int cpu;
@@ -180,7 +181,8 @@ 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,
+	buf = tr->buffer
+	event = trace_buffer_lock_reserve(buf, TRACE_HW_BRANCHES,
 					  sizeof(*entry), 0, 0);
 	if (!event)
 		goto out;

kernel/trace/trace_hw_branches.c void trace_hw_branch(u64 from, u64 to) · line 194

Quoted 3 lines
kernel/trace/trace_hw_branches.c +0 -0
@@ -190,7 +192,7 @@ void trace_hw_branch(u64 from, u64 to)
 	entry->from = from;
 	entry->to   = to;
 	if (!filter_check_discard(call, entry, tr->buffer, event))

s/tr->buffer/buf

kernel/trace/trace_hw_branches.c void trace_hw_branch(u64 from, u64 to) · line 198

Quoted 5 lines
kernel/trace/trace_hw_branches.c +1 -1
-		trace_buffer_unlock_commit(tr, event, 0, 0);
+		trace_buffer_unlock_commit(buf, event, 0, 0);
 
  out:
 	atomic_dec(&tr->data[cpu]->disabled);

Otherwise looks good.

maintainer
#3 lore raw
Quoted 18 lines · Li Zefan
Quoted 17 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

---
 kernel/trace/trace_branch.c      |    2 +-
 kernel/trace/trace_hw_branches.c |    6 ++++--
 2 files changed, 5 insertions(+), 3 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 6 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);

As Steven has picked up the previous patch, this part can be removed now.

Actually, you can keep it in. Since I noticed that this requires the local "buffer" variable, I decided not to pull it in yet.

Quoted 37 lines

kernel/trace/trace_hw_branches.c void trace_hw_branch(u64 from, u64 to) · line 168

Quoted 12 lines
kernel/trace/trace_branch.c +0 -0
 	if (!event)
 		goto out;
kernel/trace/trace_hw_branches.c +1 -0
index 23b6385..e40f5fb 100644
@@ -165,6 +165,7 @@ void trace_hw_branch(u64 from, u64 to)
 	struct ftrace_event_call *call = &event_hw_branch;
 	struct trace_array *tr = hw_branch_trace;
 	struct ring_buffer_event *event;
+	struct ring_buffer      *buf;

Just use one space:

+ struct ring_buffer *buf;

Quoted 14 lines
kernel/trace/trace_hw_branches.c +2 -1
 	struct hw_branch_entry *entry;
 	unsigned long irq1;
 	int cpu;
@@ -180,7 +181,8 @@ 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,
+	buf = tr->buffer
+	event = trace_buffer_lock_reserve(buf, TRACE_HW_BRANCHES,
 					  sizeof(*entry), 0, 0);
 	if (!event)
 		goto out;

kernel/trace/trace_hw_branches.c void trace_hw_branch(u64 from, u64 to) · line 194

Quoted 3 lines
kernel/trace/trace_hw_branches.c +0 -0
@@ -190,7 +192,7 @@ void trace_hw_branch(u64 from, u64 to)
 	entry->from = from;
 	entry->to   = to;
 	if (!filter_check_discard(call, entry, tr->buffer, event))

s/tr->buffer/buf

Quoted 7 lines

kernel/trace/trace_hw_branches.c void trace_hw_branch(u64 from, u64 to) · line 198

Quoted 5 lines
kernel/trace/trace_hw_branches.c +1 -1
-		trace_buffer_unlock_commit(tr, event, 0, 0);
+		trace_buffer_unlock_commit(buf, event, 0, 0);
 
  out:
 	atomic_dec(&tr->data[cpu]->disabled);

Otherwise looks good.

Yep, I agree.

Looking for the second patch with both files updated.

Thanks,

-- Steve

author
#4 lore raw

PATCH v4 1/1 fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c

In reply to 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

---
 kernel/trace/trace_branch.c      |    2 +-
 kernel/trace/trace_hw_branches.c |    8 +++++---
 2 files changed, 6 insertions(+), 4 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 +5 -3
index 23b6385..52a5903 100644
@@ -165,6 +165,7 @@ void trace_hw_branch(u64 from, u64 to)
 	struct ftrace_event_call *call = &event_hw_branch;
 	struct trace_array *tr = hw_branch_trace;
 	struct ring_buffer_event *event;
+	struct ring_buffer *buf;
 	struct hw_branch_entry *entry;
 	unsigned long irq1;
 	int cpu;
@@ -180,7 +181,8 @@ 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,
+	buf = tr->buffer
+	event = trace_buffer_lock_reserve(buf, TRACE_HW_BRANCHES,
 					  sizeof(*entry), 0, 0);
 	if (!event)
 		goto out;
@@ -189,8 +191,8 @@ void trace_hw_branch(u64 from, u64 to)
 	entry->ent.type = TRACE_HW_BRANCHES;
 	entry->from = from;
 	entry->to   = to;
-	if (!filter_check_discard(call, entry, tr->buffer, event))
-		trace_buffer_unlock_commit(tr, event, 0, 0);
+	if (!filter_check_discard(call, entry, buf, event))
+		trace_buffer_unlock_commit(buf, event, 0, 0);
 
  out:
 	atomic_dec(&tr->data[cpu]->disabled);
Signature · 5 lines
1.6.3.3

-- 
--------------------------------
http://zhwen.org - Open and Free
maintainer
#5 lore raw

Re: [PATCH V4] fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c

Quoted 15 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

---
 kernel/trace/trace_branch.c      |    2 +-
 kernel/trace/trace_hw_branches.c |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
kernel/trace/trace_branch.c +0 -0
index 7a7a9fd..216e2dd 100644

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

Quoted 6 lines
kernel/trace/trace_branch.c +1 -1
@@ -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);

Thanks,

I'll take this as is, and do the update on the local var.

-- Steve

Quoted 38 lines
kernel/trace/trace_branch.c +0 -0
 	if (!event)
 		goto out;
kernel/trace/trace_hw_branches.c +5 -3
index 23b6385..52a5903 100644
@@ -165,6 +165,7 @@ void trace_hw_branch(u64 from, u64 to)
 	struct ftrace_event_call *call = &event_hw_branch;
 	struct trace_array *tr = hw_branch_trace;
 	struct ring_buffer_event *event;
+	struct ring_buffer *buf;
 	struct hw_branch_entry *entry;
 	unsigned long irq1;
 	int cpu;
@@ -180,7 +181,8 @@ 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,
+	buf = tr->buffer
+	event = trace_buffer_lock_reserve(buf, TRACE_HW_BRANCHES,
 					  sizeof(*entry), 0, 0);
 	if (!event)
 		goto out;
@@ -189,8 +191,8 @@ void trace_hw_branch(u64 from, u64 to)
 	entry->ent.type = TRACE_HW_BRANCHES;
 	entry->from = from;
 	entry->to   = to;
-	if (!filter_check_discard(call, entry, tr->buffer, event))
-		trace_buffer_unlock_commit(tr, event, 0, 0);
+	if (!filter_check_discard(call, entry, buf, event))
+		trace_buffer_unlock_commit(buf, event, 0, 0);
 
  out:
 	atomic_dec(&tr->data[cpu]->disabled);
Signature · 1 line
1.6.3.3
#6 lore raw

Re: [PATCH V4] fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c

Quoted 16 lines
Quoted 16 lines
kernel/trace/trace_hw_branches.c +1 -0
index 23b6385..52a5903 100644
@@ -165,6 +165,7 @@ void trace_hw_branch(u64 from, u64 to)
 	struct ftrace_event_call *call = &event_hw_branch;
 	struct trace_array *tr = hw_branch_trace;
 	struct ring_buffer_event *event;
+	struct ring_buffer *buf;
 	struct hw_branch_entry *entry;
 	unsigned long irq1;
 	int cpu;
@@ -180,7 +181,8 @@ void trace_hw_branch(u64 from, u64 to)
 	if (atomic_inc_return(&tr->data[cpu]->disabled) != 1)
 		goto out;
 
Quoted 2 lines

kernel/trace/trace_hw_branches.c void trace_hw_branch(u64 from, u64 to) · line 184

Quoted 2 lines
kernel/trace/trace_hw_branches.c +1 -1
-	event = trace_buffer_lock_reserve(tr, TRACE_HW_BRANCHES,
+	buf = tr->buffer

And here won't compile..

Quoted 2 lines
Quoted 2 lines
kernel/trace/trace_hw_branches.c +1 -0
+	event = trace_buffer_lock_reserve(buf, TRACE_HW_BRANCHES,
 					  sizeof(*entry), 0, 0);
maintainer
#7 lore raw

Re: [PATCH V4] fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c

Quoted 16 lines · Li Zefan
Quoted 16 lines
Quoted 16 lines
kernel/trace/trace_hw_branches.c +1 -0
index 23b6385..52a5903 100644
@@ -165,6 +165,7 @@ void trace_hw_branch(u64 from, u64 to)
 	struct ftrace_event_call *call = &event_hw_branch;
 	struct trace_array *tr = hw_branch_trace;
 	struct ring_buffer_event *event;
+	struct ring_buffer *buf;
 	struct hw_branch_entry *entry;
 	unsigned long irq1;
 	int cpu;
@@ -180,7 +181,8 @@ void trace_hw_branch(u64 from, u64 to)
 	if (atomic_inc_return(&tr->data[cpu]->disabled) != 1)
 		goto out;
 
Quoted 4 lines
Quoted 2 lines

kernel/trace/trace_hw_branches.c void trace_hw_branch(u64 from, u64 to) · line 184

Quoted 2 lines
kernel/trace/trace_hw_branches.c +1 -1
-	event = trace_buffer_lock_reserve(tr, TRACE_HW_BRANCHES,
+	buf = tr->buffer

And here won't compile..

Thanks,

I'll fix up the patch.

-- Steve

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
kernel/trace/trace_hw_branches.c +1 -0
+	event = trace_buffer_lock_reserve(buf, TRACE_HW_BRANCHES,
 					  sizeof(*entry), 0, 0);
#8 lore raw

[tip:tracing/urgent] tracing: fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c

In reply to Zhenwen Xu
Commit-ID:  c8647b28726b09b087155417bb698e7b3789f8a0
Gitweb:     http://git.kernel.org/tip/c8647b28726b09b087155417bb698e7b3789f8a0
Author:     Zhenwen Xu <[email protected]>
AuthorDate: Thu, 8 Oct 2009 09:21:46 +0800
Committer:  Steven Rostedt <[email protected]>
CommitDate: Wed, 7 Oct 2009 21:52:03 -0400

tracing: fix warning on kernel/trace/trace_branch.c andtrace_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

LKML-Reference: <20091008012146.GA4170@helight>

---
 kernel/trace/trace_branch.c      |    2 +-
 kernel/trace/trace_hw_branches.c |    8 +++++---
 2 files changed, 6 insertions(+), 4 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 +5 -3
index 23b6385..69543a9 100644
@@ -165,6 +165,7 @@ void trace_hw_branch(u64 from, u64 to)
 	struct ftrace_event_call *call = &event_hw_branch;
 	struct trace_array *tr = hw_branch_trace;
 	struct ring_buffer_event *event;
+	struct ring_buffer *buf;
 	struct hw_branch_entry *entry;
 	unsigned long irq1;
 	int cpu;
@@ -180,7 +181,8 @@ 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,
+	buf = tr->buffer;
+	event = trace_buffer_lock_reserve(buf, TRACE_HW_BRANCHES,
 					  sizeof(*entry), 0, 0);
 	if (!event)
 		goto out;
@@ -189,8 +191,8 @@ void trace_hw_branch(u64 from, u64 to)
 	entry->ent.type = TRACE_HW_BRANCHES;
 	entry->from = from;
 	entry->to   = to;
-	if (!filter_check_discard(call, entry, tr->buffer, event))
-		trace_buffer_unlock_commit(tr, event, 0, 0);
+	if (!filter_check_discard(call, entry, buf, event))
+		trace_buffer_unlock_commit(buf, event, 0, 0);
 
  out:
 	atomic_dec(&tr->data[cpu]->disabled);