When building rt kernel with IRQSOFF_TRACER enabled but INTERRUPT_OFF_HIST or
PREEMPT_OFF_HIST disabled, the below build failure will be triggered:
| /home/yshi/linux-rt/kernel/trace/trace_irqsoff.c: In function 'time_hardirqs_on':
| /home/yshi/linux-rt/kernel/trace/trace_irqsoff.c:453:2: error: implicit declaration of function 'trace_preemptirqsoff_hist_rcuidle' [-Werror=implicit-function-declaration]
| trace_preemptirqsoff_hist_rcuidle(IRQS_ON, 0);
| ^
| cc1: some warnings being treated as errors
| /home/yshi/linux-rt/scripts/Makefile.build:258: recipe for target 'kernel/trace/trace_irqsoff.o' failed
| make[4]: *** [kernel/trace/trace_irqsoff.o] Error 1
| make[4]: *** Waiting for unfinished jobs....
| /home/yshi/linux-rt/scripts/Makefile.build:403: recipe for target 'kernel/trace' failed
Because rcuidle version is just defined by TRACE_EVENT when both
PREEMPT_OFF_HIST and PREEMPT_OFF_HIST is selected, otherwise just
trace_preemptirqsoff_hist is defined as a preprocessor macro.
Added rcuidle version macro when the condition is false, and added rcuidle
version macro for trace_hrtimer_interrupt_rcuidle even though it is not called
by anyone.
Reported-by: Henning Schild <[email protected]>
Signed-off-by: Yang Shi <[email protected]>
---
Forward port the 4.1 version patch [1] to 4.4.
[1] http://www.spinics.net/lists/linux-rt-users/msg14037.html
include/trace/events/hist.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/trace/events/hist.h b/include/trace/events/hist.h
index 6122e42..37f6eb8 100644
--- a/include/trace/events/hist.h
+++ b/include/trace/events/hist.h
@@ -9,6 +9,7 @@
#if !defined(CONFIG_PREEMPT_OFF_HIST) && !defined(CONFIG_INTERRUPT_OFF_HIST)
#define trace_preemptirqsoff_hist(a, b)
+#define trace_preemptirqsoff_hist_rcuidle(a, b)
#else
TRACE_EVENT(preemptirqsoff_hist,
@@ -33,6 +34,7 @@ TRACE_EVENT(preemptirqsoff_hist,
#ifndef CONFIG_MISSED_TIMER_OFFSETS_HIST
#define trace_hrtimer_interrupt(a, b, c, d)
+#define trace_hrtimer_interrupt_rcuidle(a, b, c, d)
#else
TRACE_EVENT(hrtimer_interrupt,
--
2.0.2
On 03/08/2016 12:45 AM, Yang Shi wrote:
> diff --git a/include/trace/events/hist.h b/include/trace/events/hist.h
> index 6122e42..37f6eb8 100644
> --- a/include/trace/events/hist.h
> +++ b/include/trace/events/hist.h
> @@ -9,6 +9,7 @@
>
> #if !defined(CONFIG_PREEMPT_OFF_HIST) && !defined(CONFIG_INTERRUPT_OFF_HIST)
> #define trace_preemptirqsoff_hist(a, b)
> +#define trace_preemptirqsoff_hist_rcuidle(a, b)
> #else
> TRACE_EVENT(preemptirqsoff_hist,
I have this piece already in my tree.
>
> @@ -33,6 +34,7 @@ TRACE_EVENT(preemptirqsoff_hist,
>
> #ifndef CONFIG_MISSED_TIMER_OFFSETS_HIST
> #define trace_hrtimer_interrupt(a, b, c, d)
> +#define trace_hrtimer_interrupt_rcuidle(a, b, c, d)
> #else
> TRACE_EVENT(hrtimer_interrupt,
I was thinking about this but then I saw no users of it. Do we have
any? (haven't seen them in v4.1 either).
Sebastian
On Tue, 8 Mar 2016 09:10:36 +0100
Sebastian Andrzej Siewior <[email protected]> wrote:
> On 03/08/2016 12:45 AM, Yang Shi wrote:
> > diff --git a/include/trace/events/hist.h b/include/trace/events/hist.h
> > index 6122e42..37f6eb8 100644
> > --- a/include/trace/events/hist.h
> > +++ b/include/trace/events/hist.h
> > @@ -9,6 +9,7 @@
> >
> > #if !defined(CONFIG_PREEMPT_OFF_HIST) && !defined(CONFIG_INTERRUPT_OFF_HIST)
> > #define trace_preemptirqsoff_hist(a, b)
> > +#define trace_preemptirqsoff_hist_rcuidle(a, b)
> > #else
> > TRACE_EVENT(preemptirqsoff_hist,
>
> I have this piece already in my tree.
I don't see it in your git repo.
>
> >
> > @@ -33,6 +34,7 @@ TRACE_EVENT(preemptirqsoff_hist,
> >
> > #ifndef CONFIG_MISSED_TIMER_OFFSETS_HIST
> > #define trace_hrtimer_interrupt(a, b, c, d)
> > +#define trace_hrtimer_interrupt_rcuidle(a, b, c, d)
> > #else
> > TRACE_EVENT(hrtimer_interrupt,
>
> I was thinking about this but then I saw no users of it. Do we have
> any? (haven't seen them in v4.1 either).
I don't see this defined either.
-- Steve
On 3/8/2016 12:10 AM, Sebastian Andrzej Siewior wrote:
> On 03/08/2016 12:45 AM, Yang Shi wrote:
>> diff --git a/include/trace/events/hist.h b/include/trace/events/hist.h
>> index 6122e42..37f6eb8 100644
>> --- a/include/trace/events/hist.h
>> +++ b/include/trace/events/hist.h
>> @@ -9,6 +9,7 @@
>>
>> #if !defined(CONFIG_PREEMPT_OFF_HIST) && !defined(CONFIG_INTERRUPT_OFF_HIST)
>> #define trace_preemptirqsoff_hist(a, b)
>> +#define trace_preemptirqsoff_hist_rcuidle(a, b)
>> #else
>> TRACE_EVENT(preemptirqsoff_hist,
> I have this piece already in my tree.
>
>>
>> @@ -33,6 +34,7 @@ TRACE_EVENT(preemptirqsoff_hist,
>>
>> #ifndef CONFIG_MISSED_TIMER_OFFSETS_HIST
>> #define trace_hrtimer_interrupt(a, b, c, d)
>> +#define trace_hrtimer_interrupt_rcuidle(a, b, c, d)
>> #else
>> TRACE_EVENT(hrtimer_interrupt,
> I was thinking about this but then I saw no users of it. Do we have
> any? (haven't seen them in v4.1 either).
AFAIK, no users. It got brought in by the forward port of 4.1 patch. We
could remove it.
Thanks,
Yang
>
> Sebastian
>
* Steven Rostedt | 2016-03-08 14:17:13 [-0500]:
>> > index 6122e42..37f6eb8 100644
>> > --- a/include/trace/events/hist.h
>> > +++ b/include/trace/events/hist.h
>> > @@ -9,6 +9,7 @@
>> >
>> > #if !defined(CONFIG_PREEMPT_OFF_HIST) && !defined(CONFIG_INTERRUPT_OFF_HIST)
>> > #define trace_preemptirqsoff_hist(a, b)
>> > +#define trace_preemptirqsoff_hist_rcuidle(a, b)
>> > #else
>> > TRACE_EVENT(preemptirqsoff_hist,
>>
>> I have this piece already in my tree.
>
>I don't see it in your git repo.
https://git.kernel.org/cgit/linux/kernel/git/rt/linux-rt-devel.git/commit/?h=linux-4.4.y-rt&id=bb2d8f27070df470619f216b02261b10dcc5161d
Sebastian
On Wed, 9 Mar 2016 15:46:23 +0100
Sebastian Andrzej Siewior <[email protected]> wrote:
> * Steven Rostedt | 2016-03-08 14:17:13 [-0500]:
>
> >> > index 6122e42..37f6eb8 100644
> >> > --- a/include/trace/events/hist.h
> >> > +++ b/include/trace/events/hist.h
> >> > @@ -9,6 +9,7 @@
> >> >
> >> > #if !defined(CONFIG_PREEMPT_OFF_HIST) && !defined(CONFIG_INTERRUPT_OFF_HIST)
> >> > #define trace_preemptirqsoff_hist(a, b)
> >> > +#define trace_preemptirqsoff_hist_rcuidle(a, b)
> >> > #else
> >> > TRACE_EVENT(preemptirqsoff_hist,
> >>
> >> I have this piece already in my tree.
> >
> >I don't see it in your git repo.
> https://git.kernel.org/cgit/linux/kernel/git/rt/linux-rt-devel.git/commit/?h=linux-4.4.y-rt&id=bb2d8f27070df470619f216b02261b10dcc5161d
OK, *now* it's in your tree ;-)
-- Steve