2009-10-07 11:41:35

by helight.xu

Subject: [PATCH V3] 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

Signed-off-by: Zhenwen Xu <[email protected]>
---
kernel/trace/trace_branch.c | 2 +-
kernel/trace/trace_hw_branches.c | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
index 7a7a9fd..216e2dd 100644
--- a/kernel/trace/trace_branch.c
+++ b/kernel/trace/trace_branch.c
@@ -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;
diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
index 23b6385..e40f5fb 100644
--- a/kernel/trace/trace_hw_branches.c
+++ b/kernel/trace/trace_hw_branches.c
@@ -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);
--
1.6.3.3

--
--------------------------------
http://zhwen.org - Open and Free

2009-10-07 15:37:18

by Frederic Weisbecker

Subject: Re: [PATCH V3] fix a warning on kernel/trace/trace_branch.c andtrace_hw_branches.c

On Wed, Oct 07, 2009 at 07:39:15PM +0800, Zhenwen Xu wrote:
> 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
>
> Signed-off-by: Zhenwen Xu <[email protected]>
> ---
> kernel/trace/trace_branch.c | 2 +-
> kernel/trace/trace_hw_branches.c | 6 ++++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
> index 7a7a9fd..216e2dd 100644
> --- a/kernel/trace/trace_branch.c
> +++ b/kernel/trace/trace_branch.c
> @@ -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.

2009-10-08 00:54:16

by Li Zefan

Subject: Re: [PATCH V3] fix a warning on kernel/trace/trace_branch.c andtrace_hw_branches.c

Zhenwen Xu wrote:
> 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
>
> Signed-off-by: Zhenwen Xu <[email protected]>
> ---
> kernel/trace/trace_branch.c | 2 +-
> kernel/trace/trace_hw_branches.c | 6 ++++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
> index 7a7a9fd..216e2dd 100644
> --- a/kernel/trace/trace_branch.c
> +++ b/kernel/trace/trace_branch.c
> @@ -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.

> if (!event)
> goto out;
> diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
> index 23b6385..e40f5fb 100644
> --- a/kernel/trace/trace_hw_branches.c
> +++ b/kernel/trace/trace_hw_branches.c
> @@ -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;

> 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))

s/tr->buffer/buf

> - 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.

2009-10-08 01:10:18

by Steven Rostedt

Subject: Re: [PATCH V3] fix a warning on kernel/trace/trace_branch.c andtrace_hw_branches.c

On Thu, 2009-10-08 at 08:52 +0800, Li Zefan wrote:
> Zhenwen Xu wrote:
> > 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
> >
> > Signed-off-by: Zhenwen Xu <[email protected]>
> > ---
> > kernel/trace/trace_branch.c | 2 +-
> > kernel/trace/trace_hw_branches.c | 6 ++++--
> > 2 files changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
> > index 7a7a9fd..216e2dd 100644
> > --- a/kernel/trace/trace_branch.c
> > +++ b/kernel/trace/trace_branch.c
> > @@ -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.

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


>
> > if (!event)
> > goto out;
> > diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
> > index 23b6385..e40f5fb 100644
> > --- a/kernel/trace/trace_hw_branches.c
> > +++ b/kernel/trace/trace_hw_branches.c
> > @@ -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;
>
> > 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))
>
> s/tr->buffer/buf
>
> > - 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

2009-10-08 01:24:08

by helight.xu

Subject: [PATCH V4] 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

Signed-off-by: Zhenwen Xu <[email protected]>
---
kernel/trace/trace_branch.c | 2 +-
kernel/trace/trace_hw_branches.c | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
index 7a7a9fd..216e2dd 100644
--- a/kernel/trace/trace_branch.c
+++ b/kernel/trace/trace_branch.c
@@ -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;
diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
index 23b6385..52a5903 100644
--- a/kernel/trace/trace_hw_branches.c
+++ b/kernel/trace/trace_hw_branches.c
@@ -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);
--
1.6.3.3

--
--------------------------------
http://zhwen.org - Open and Free

2009-10-08 01:34:20

by Steven Rostedt

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

On Thu, 2009-10-08 at 09:21 +0800, Zhenwen Xu wrote:
> 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
>
> Signed-off-by: Zhenwen Xu <[email protected]>
> ---
> kernel/trace/trace_branch.c | 2 +-
> kernel/trace/trace_hw_branches.c | 8 +++++---
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
> index 7a7a9fd..216e2dd 100644
> --- a/kernel/trace/trace_branch.c
> +++ b/kernel/trace/trace_branch.c
> @@ -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

> if (!event)
> goto out;
> diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
> index 23b6385..52a5903 100644
> --- a/kernel/trace/trace_hw_branches.c
> +++ b/kernel/trace/trace_hw_branches.c
> @@ -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);
> --
> 1.6.3.3
>

2009-10-08 01:39:34

by Li Zefan

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

>> diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
>> index 23b6385..52a5903 100644
>> --- a/kernel/trace/trace_hw_branches.c
>> +++ b/kernel/trace/trace_hw_branches.c
>> @@ -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

And here won't compile..

>> + event = trace_buffer_lock_reserve(buf, TRACE_HW_BRANCHES,
>> sizeof(*entry), 0, 0);

2009-10-08 01:43:15

by Steven Rostedt

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

On Thu, 2009-10-08 at 09:37 +0800, Li Zefan wrote:
> >> diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
> >> index 23b6385..52a5903 100644
> >> --- a/kernel/trace/trace_hw_branches.c
> >> +++ b/kernel/trace/trace_hw_branches.c
> >> @@ -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
>
> And here won't compile..

Thanks,

I'll fix up the patch.

-- Steve

>
> >> + event = trace_buffer_lock_reserve(buf, TRACE_HW_BRANCHES,
> >> sizeof(*entry), 0, 0);

2009-10-08 13:48:29

by helight.xu

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

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

Signed-off-by: Zhenwen Xu <[email protected]>
LKML-Reference: <20091008012146.GA4170@helight>
Signed-off-by: Steven Rostedt <[email protected]>
---
kernel/trace/trace_branch.c | 2 +-
kernel/trace/trace_hw_branches.c | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
index 7a7a9fd..216e2dd 100644
--- a/kernel/trace/trace_branch.c
+++ b/kernel/trace/trace_branch.c
@@ -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;
diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
index 23b6385..69543a9 100644
--- a/kernel/trace/trace_hw_branches.c
+++ b/kernel/trace/trace_hw_branches.c
@@ -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);