From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>,
Viresh Kumar <viresh.kumar@linaro.org>,
Ingo Molnar <mingo@kernel.org>,
"the arch/x86 maintainers" <x86@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Will Deacon <will@kernel.org>,
svens@linux.ibm.com,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/2] intel_idle: Fix intel_idle() vs tracing
Date: Mon, 23 Nov 2020 14:54:47 +0100 [thread overview]
Message-ID: <CAJZ5v0invgyZ50AHZmbOBYkgvM2uAqqE+t_mvD=ZCxac_gAtUQ@mail.gmail.com> (raw)
In-Reply-To: <20201123134618.GL3021@hirez.programming.kicks-ass.net>
On Mon, Nov 23, 2020 at 2:46 PM Peter Zijlstra <peterz@infradead.org> wrote:
>
> On Mon, Nov 23, 2020 at 11:26:39AM +0100, Rafael J. Wysocki wrote:
> > On Fri, Nov 20, 2020 at 12:50 PM Peter Zijlstra <peterz@infradead.org> wrote:
> > >
> > > cpuidle->enter() callbacks should not call into tracing because RCU
> > > has already been disabled. Instead of doing the broadcast thing
> > > itself, simply advertise to the cpuidle core that those states stop
> > > the timer.
> > >
> > > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> > > ---
> > > drivers/idle/intel_idle.c | 37 ++++++++++++++++++++-----------------
> > > 1 file changed, 20 insertions(+), 17 deletions(-)
> > >
> > > --- a/drivers/idle/intel_idle.c
> > > +++ b/drivers/idle/intel_idle.c
> > > @@ -126,26 +126,9 @@ static __cpuidle int intel_idle(struct c
> > > struct cpuidle_state *state = &drv->states[index];
> > > unsigned long eax = flg2MWAIT(state->flags);
> > > unsigned long ecx = 1; /* break on interrupt flag */
> > > - bool tick;
> > > -
> > > - if (!static_cpu_has(X86_FEATURE_ARAT)) {
> > > - /*
> > > - * Switch over to one-shot tick broadcast if the target C-state
> > > - * is deeper than C1.
> > > - */
> > > - if ((eax >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) {
> > > - tick = true;
> > > - tick_broadcast_enter();
> > > - } else {
> > > - tick = false;
> > > - }
> > > - }
> > >
> > > mwait_idle_with_hints(eax, ecx);
> > >
> > > - if (!static_cpu_has(X86_FEATURE_ARAT) && tick)
> > > - tick_broadcast_exit();
> > > -
> > > return index;
> > > }
> > >
> > > @@ -1460,6 +1443,23 @@ static bool __init intel_idle_verify_cst
> > > return true;
> > > }
> > >
> > > +static bool __init intel_idle_state_needs_timer_stop(struct cpuidle_state *state)
> > > +{
> > > + unsigned long eax = flg2MWAIT(state->flags);
> > > +
> > > + if (boot_cpu_has(X86_FEATURE_ARAT))
> > > + return false;
> > > +
> > > + /*
> > > + * Switch over to one-shot tick broadcast if the target C-state
> > > + * is deeper than C1.
> > > + */
> > > + if ((eax >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK)
> > > + return true;
> > > +
> > > + return false;
> > > +}
> > > +
> > > static void __init intel_idle_init_cstates_icpu(struct cpuidle_driver *drv)
> > > {
> > > int cstate;
> > > @@ -1507,6 +1507,9 @@ static void __init intel_idle_init_cstat
> > > !(cpuidle_state_table[cstate].flags & CPUIDLE_FLAG_ALWAYS_ENABLE)))
> > > drv->states[drv->state_count].flags |= CPUIDLE_FLAG_OFF;
> > >
> > > + if (intel_idle_state_needs_timer_stop(&drv->states[drv->state_count]))
> > > + drv->states[drv->state_count].flags |= CPUIDLE_FLAG_TIMER_STOP;
> > > +
> > > drv->state_count++;
> > > }
> >
> > This doesn't cover the ACPI case AFAICS.
>
> aa6b43d57f99 ("ACPI: processor: Use CPUIDLE_FLAG_TIMER_STOP")
>
> did that, no?
Nope.
intel_idle_init_cstates_acpi() needs to be updated too as it doesn't
pick up the flags automatically. It looks like CPUIDLE_FLAG_RCU_IDLE
needs to be copied too.
next prev parent reply other threads:[~2020-11-23 13:55 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 11:41 [PATCH 0/2] More RCU vs idle fixes Peter Zijlstra
2020-11-20 11:41 ` [PATCH 1/2] sched/idle: Fix arch_cpu_idle() vs tracing Peter Zijlstra
2020-11-20 12:39 ` Mark Rutland
2020-11-25 13:57 ` [tip: locking/urgent] " tip-bot2 for Peter Zijlstra
2020-11-30 21:00 ` [PATCH 1/2] " Guenter Roeck
2020-12-01 11:02 ` Peter Zijlstra
2020-12-01 11:12 ` Sven Schnelle
2020-12-01 11:56 ` Sven Schnelle
2020-12-01 12:52 ` Peter Zijlstra
2020-12-01 13:06 ` Guenter Roeck
2020-12-01 13:38 ` Will Deacon
2020-12-01 14:51 ` Peter Zijlstra
2020-11-20 11:41 ` [PATCH 2/2] intel_idle: Fix intel_idle() " Peter Zijlstra
2020-11-23 10:26 ` Rafael J. Wysocki
2020-11-23 13:46 ` Peter Zijlstra
2020-11-23 13:54 ` Rafael J. Wysocki [this message]
2020-11-23 14:35 ` Peter Zijlstra
2020-11-23 14:54 ` Rafael J. Wysocki
2020-11-25 13:57 ` [tip: locking/urgent] " tip-bot2 for Peter Zijlstra
2020-11-24 13:47 ` [PATCH 0/2] More RCU vs idle fixes Sven Schnelle
2020-11-24 14:18 ` Peter Zijlstra
2020-11-24 14:23 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJZ5v0invgyZ50AHZmbOBYkgvM2uAqqE+t_mvD=ZCxac_gAtUQ@mail.gmail.com' \
--to=rafael@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=svens@linux.ibm.com \
--cc=viresh.kumar@linaro.org \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).