From: Jacob Pan <jacob.jun.pan@linux•intel.com>
To: Peter Zijlstra <peterz@infradead•org>
Cc: juri.lelli@redhat•com, rafael@kernel•org,
linus.walleij@linaro•org, bsegall@google•com, guoren@kernel•org,
pavel@ucw•cz, agordeev@linux•ibm.com, srivatsa@csail•mit.edu,
linux-arch@vger•kernel.org, vincent.guittot@linaro•org,
chenhuacai@kernel•org, linux-acpi@vger•kernel.org,
agross@kernel•org, geert@linux-m68k•org, linux-imx@nxp•com,
catalin.marinas@arm•com, xen-devel@lists•xenproject.org,
mattst88@gmail•com, borntraeger@linux•ibm.com,
mturquette@baylibre•com, sammy@sammy•net, pmladek@suse•com,
linux-pm@vger•kernel.org, jiangshanlai@gmail•com,
Sascha Hauer <s.hauer@pengutronix•de>,
linux-um@lists•infradead.org, acme@kernel•org,
tglx@linutronix•de, linux-omap@vger•kernel.org,
dietmar.eggemann@arm•com, rth@twiddle•net,
gregkh@linuxfoundation•org, linux-kernel@vger•kernel.org,
linux-perf-users@vger•kernel.org, senozhatsky@chromium•org,
svens@linux•ibm.com, jolsa@kernel•org, paulus@samba•org,
mark.rutland@arm•com, linux-ia64@vger•kernel.org,
dave.hansen@linux•intel.com,
virtualizatio n@lists•linux-foundation.org,
James.Bottomley@HansenPartnership•com, jcmvbkbc@gmail•com,
thierry.reding@gmail•com, kernel@xen0n•name,
quic_neeraju@quicinc•com, linux-s390@vger•kernel.org,
vschneid@redhat•com, john.ogness@linutronix•de,
ysato@users•sourceforge.jp, linux-sh@vger•kernel.org,
festevam@gmail•com, deller@gmx•de, daniel.lezcano@linaro•org,
jonathanh@nvidia•com, mathieu.desnoyers@efficios•com,
frederic@kernel•org, lenb@kernel•org,
linux-xtensa@linux-xtensa•org, kernel@pengutronix•de,
gor@linux•ibm.com, linux-arm-msm@vger•kernel.org,
linux-alpha@vger•kernel.org, linux-m68k@lists•linux-m68k.org,
shorne@gmail•com, linux-arm-kernel@lists•infradead.org,
chris@zankel•net, sboyd@kernel•org, dinguyen@kernel•org,
bristot@redhat•com, alexander.shishkin@linux•intel.com,
lpieralisi@kernel•org, linux@rasmusvillemoes•dk,
joel@joelfernandes•org, will@kernel•org,
boris.ostrovsky@oracle•com, khilman@kernel•org,
linux-csky@vger•kernel.org, pv-drivers@vmware•com,
linux-snps-arc@lists•infradea d.org, mgorman@suse•de,
jacob.jun.pan@linux•intel.com
Subject: Re: [PATCH 04/36] cpuidle,intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABLE
Date: Thu, 9 Jun 2022 16:49:21 -0700 [thread overview]
Message-ID: <20220609164921.5e61711d@jacob-builder> (raw)
In-Reply-To: <20220608144516.172460444@infradead.org>
, Arnd Bergmann <arnd@arndb•de>, ulli.kroll@googlemail•com, vgupta@kernel•org, linux-clk@vger•kernel.org, josh@joshtriplett•org, rostedt@goodmis•org, rcu@vger•kernel.org, bp@alien8•de, bcain@quicinc•com, tsbogend@alpha•franken.de, linux-parisc@vger•kernel.org, sudeep.holla@arm•com, shawnguo@kernel•org, davem@davemloft•net, dalias@libc•org, tony@atomide•com, amakhalov@vmware•com, bjorn.andersson@linaro•org, hpa@zytor•com, sparclinux@vger•kernel.org, linux-hexagon@vger•kernel.org, linux-riscv@lists•infradead.org, anton.ivanov@cambridgegreys•com, jonas@southpole•se, yury.norov@gmail•com, richard@nod•at, x86@kernel•org, linux@armlinux•org.uk, mingo@redhat•com, aou@eecs•berkeley.edu, paulmck@kernel•org, hca@linux•ibm.com, stefan.kristiansson@saunalahti•fi, openrisc@lists•librecores.org, paul.walmsley@sifive•com, linux-tegra@vger•kernel.org, namhyung@kernel•org, andriy.shevchenko@linux•intel.com, jpoimboe@kernel•org, jgross@suse•com, monstr@monstr•eu, linux-mips@vger•kernel.org, palmer@dab
belt.com, anup@brainfault•org, ink@jurassic•park.msu.ru, johannes@sipsolutions•net, linuxppc-dev@lists•ozlabs.org
Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists•ozlabs.org
Sender: "Linuxppc-dev" <linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists•ozlabs.org>
Hi Peter,
On Wed, 08 Jun 2022 16:27:27 +0200, Peter Zijlstra <peterz@infradead•org>
wrote:
> Commit c227233ad64c ("intel_idle: enable interrupts before C1 on
> Xeons") wrecked intel_idle in two ways:
>
> - must not have tracing in idle functions
> - must return with IRQs disabled
>
> Additionally, it added a branch for no good reason.
>
> Fixes: c227233ad64c ("intel_idle: enable interrupts before C1 on Xeons")
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead•org>
> ---
> drivers/idle/intel_idle.c | 48
> +++++++++++++++++++++++++++++++++++----------- 1 file changed, 37
> insertions(+), 11 deletions(-)
>
> --- a/drivers/idle/intel_idle.c
> +++ b/drivers/idle/intel_idle.c
> @@ -129,21 +137,37 @@ static unsigned int mwait_substates __in
> *
> * Must be called under local_irq_disable().
> */
nit: this comment is no long true, right?
> +
> -static __cpuidle int intel_idle(struct cpuidle_device *dev,
> - struct cpuidle_driver *drv, int index)
> +static __always_inline int __intel_idle(struct cpuidle_device *dev,
> + struct cpuidle_driver *drv, int
> index) {
> struct cpuidle_state *state = &drv->states[index];
> unsigned long eax = flg2MWAIT(state->flags);
> unsigned long ecx = 1; /* break on interrupt flag */
>
> - if (state->flags & CPUIDLE_FLAG_IRQ_ENABLE)
> - local_irq_enable();
> -
> mwait_idle_with_hints(eax, ecx);
>
> return index;
> }
>
> +static __cpuidle int intel_idle(struct cpuidle_device *dev,
> + struct cpuidle_driver *drv, int index)
> +{
> + return __intel_idle(dev, drv, index);
> +}
> +
> +static __cpuidle int intel_idle_irq(struct cpuidle_device *dev,
> + struct cpuidle_driver *drv, int
> index) +{
> + int ret;
> +
> + raw_local_irq_enable();
> + ret = __intel_idle(dev, drv, index);
> + raw_local_irq_disable();
> +
> + return ret;
> +}
> +
> /**
> * intel_idle_s2idle - Ask the processor to enter the given idle state.
> * @dev: cpuidle device of the target CPU.
> @@ -1801,6 +1824,9 @@ static void __init intel_idle_init_cstat
> /* Structure copy. */
> drv->states[drv->state_count] =
> cpuidle_state_table[cstate];
> + if (cpuidle_state_table[cstate].flags &
> CPUIDLE_FLAG_IRQ_ENABLE)
> + drv->states[drv->state_count].enter =
> intel_idle_irq; +
> if ((disabled_states_mask & BIT(drv->state_count)) ||
> ((icpu->use_acpi || force_use_acpi) &&
> intel_idle_off_by_default(mwait_hint) &&
>
>
Thanks,
Jacob
next prev parent reply other threads:[~2022-06-10 11:26 UTC|newest]
Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-08 14:27 [PATCH 00/36] cpuidle,rcu: Cleanup the mess Peter Zijlstra
2022-06-08 14:27 ` [PATCH 01/36] x86/perf/amd: Remove tracing from perf_lopwr_cb() Peter Zijlstra
2022-06-08 14:27 ` [PATCH 02/36] x86/idle: Replace x86_idle with a static_call Peter Zijlstra
2022-06-08 18:13 ` Rafael J. Wysocki
2022-06-08 14:27 ` [PATCH 03/36] cpuidle/poll: Ensure IRQ state is invariant Peter Zijlstra
2022-07-06 13:51 ` Rafael J. Wysocki
2022-06-08 14:27 ` [PATCH 04/36] cpuidle,intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABLE Peter Zijlstra
2022-06-08 15:01 ` Rafael J. Wysocki
2022-06-08 15:48 ` Peter Zijlstra
2022-06-08 16:08 ` Rafael J. Wysocki
2022-06-09 23:49 ` Jacob Pan [this message]
2022-06-13 8:44 ` Peter Zijlstra
2022-06-16 21:26 ` Jacob Pan
2022-07-25 19:43 ` Michel Lespinasse
2022-07-28 17:20 ` Paul E. McKenney
2022-07-29 10:24 ` Michel Lespinasse
2022-07-29 14:59 ` Rafael J. Wysocki
2022-07-30 9:48 ` Michel Lespinasse
2022-07-30 19:52 ` Rafael J. Wysocki
2022-07-30 23:45 ` Michel Lespinasse
2022-07-29 15:26 ` Paul E. McKenney
2022-07-29 15:28 ` Paul E. McKenney
2022-07-30 9:40 ` Michel Lespinasse
2022-07-30 18:16 ` Paul E. McKenney
2022-06-08 14:27 ` [PATCH 05/36] cpuidle: Move IRQ state validation Peter Zijlstra
2022-07-06 13:54 ` Rafael J. Wysocki
2022-06-08 14:27 ` [PATCH 06/36] cpuidle,riscv: Push RCU-idle into driver Peter Zijlstra
2022-06-08 14:27 ` [PATCH 07/36] cpuidle,tegra: " Peter Zijlstra
2022-06-08 14:27 ` [PATCH 08/36] cpuidle,psci: " Peter Zijlstra
2022-06-08 14:27 ` [PATCH 09/36] cpuidle,imx6: " Peter Zijlstra
2022-06-08 14:27 ` [PATCH 10/36] cpuidle,omap3: " Peter Zijlstra
2022-06-13 12:33 ` Tony Lindgren
2022-06-08 14:27 ` [PATCH 11/36] cpuidle,armada: " Peter Zijlstra
2022-06-08 14:27 ` [PATCH 12/36] cpuidle,omap2: " Peter Zijlstra
2022-06-13 12:33 ` Tony Lindgren
2022-06-08 14:27 ` [PATCH 13/36] cpuidle,dt: " Peter Zijlstra
2022-06-08 14:27 ` [PATCH 14/36] cpuidle: Fix rcu_idle_*() usage Peter Zijlstra
2022-06-14 12:41 ` Mark Rutland
2022-06-14 16:40 ` Peter Zijlstra
2022-06-14 16:59 ` Mark Rutland
2022-07-26 9:56 ` Gautham R. Shenoy
2022-06-08 14:27 ` [PATCH 15/36] cpuidle,cpu_pm: Remove RCU fiddling from cpu_pm_{enter,exit}() Peter Zijlstra
2022-06-14 16:13 ` Mark Rutland
2022-06-14 16:42 ` Peter Zijlstra
2022-06-14 16:53 ` Mark Rutland
2022-06-08 14:27 ` [PATCH 16/36] rcu: Fix rcu_idle_exit() Peter Zijlstra
2022-06-14 16:14 ` Mark Rutland
2022-06-15 0:44 ` Paul E. McKenney
2022-06-08 14:27 ` [PATCH 17/36] acpi_idle: Remove tracing Peter Zijlstra
2022-07-06 13:59 ` Rafael J. Wysocki
2022-06-08 14:27 ` [PATCH 18/36] cpuidle: Annotate poll_idle() Peter Zijlstra
2022-07-06 14:00 ` Rafael J. Wysocki
2022-06-08 14:27 ` [PATCH 19/36] objtool/idle: Validate __cpuidle code as noinstr Peter Zijlstra
2022-07-06 9:46 ` Geert Uytterhoeven
2022-06-08 14:27 ` [PATCH 20/36] arch/idle: Change arch_cpu_idle() IRQ behaviour Peter Zijlstra
2022-06-08 16:22 ` Arnd Bergmann
2022-06-14 16:22 ` Mark Rutland
2022-07-06 14:02 ` Rafael J. Wysocki
2022-06-08 14:27 ` [PATCH 21/36] x86/tdx: Remove TDX_HCALL_ISSUE_STI Peter Zijlstra
2022-06-13 8:26 ` Lai Jiangshan
2022-06-13 8:41 ` Peter Zijlstra
2022-06-08 14:27 ` [PATCH 22/36] arm,smp: Remove trace_.*_rcuidle() usage Peter Zijlstra
2022-06-08 14:27 ` [PATCH 23/36] arm64,smp: " Peter Zijlstra
2022-06-14 16:24 ` Mark Rutland
2022-06-15 6:05 ` Marc Zyngier
2022-06-08 14:27 ` [PATCH 24/36] printk: " Peter Zijlstra
2022-06-09 9:16 ` Petr Mladek
2022-06-09 10:02 ` Peter Zijlstra
2022-06-09 11:30 ` Sergey Senozhatsky
2022-06-09 13:02 ` Petr Mladek
2022-06-11 2:33 ` Sergey Senozhatsky
2022-06-14 14:37 ` Steven Rostedt
2022-06-09 13:06 ` Petr Mladek
2022-06-11 2:23 ` Sergey Senozhatsky
2022-06-09 10:14 ` Petr Mladek
2022-06-08 14:27 ` [PATCH 25/36] time/tick-broadcast: Remove RCU_NONIDLE usage Peter Zijlstra
2022-06-14 16:28 ` Mark Rutland
2022-06-08 14:27 ` [PATCH 26/36] cpuidle,sched: Remove annotations from TIF_{POLLING_NRFLAG,NEED_RESCHED} Peter Zijlstra
2022-06-08 14:27 ` [PATCH 27/36] cpuidle,mwait: Make noinstr clean Peter Zijlstra
2022-06-08 14:27 ` [PATCH 28/36] cpuidle,tdx: Make tdx " Peter Zijlstra
2022-06-08 14:27 ` [PATCH 29/36] cpuidle,xenpv: Make more PARAVIRT_XXL " Peter Zijlstra
2022-06-13 18:48 ` Srivatsa S. Bhat
2022-06-13 19:23 ` [Pv-drivers] [PATCH 29/36] cpuidle, xenpv: " Nadav Amit
2022-06-14 16:44 ` Peter Zijlstra
2022-06-08 14:27 ` [PATCH 30/36] cpuidle,nospec: Make " Peter Zijlstra
2022-06-08 14:27 ` [PATCH 31/36] cpuidle,acpi: " Peter Zijlstra
2022-07-06 14:04 ` Rafael J. Wysocki
2022-06-08 14:27 ` [PATCH 32/36] ftrace: WARN on rcuidle Peter Zijlstra
2022-06-08 14:27 ` [PATCH 33/36] cpuidle,omap3: Use WFI for omap3_pm_idle() Peter Zijlstra
2022-06-08 16:28 ` Arnd Bergmann
2022-06-09 7:39 ` Tony Lindgren
2022-06-09 9:47 ` Peter Zijlstra
2022-06-09 9:40 ` Peter Zijlstra
2022-06-13 12:36 ` Tony Lindgren
2022-06-08 14:27 ` [PATCH 34/36] cpuidle,omap3: Push RCU-idle into omap_sram_idle() Peter Zijlstra
2022-06-08 15:04 ` Peter Zijlstra
2022-06-13 12:35 ` Tony Lindgren
2022-06-13 12:39 ` [PATCH 34.5/36] cpuidle,omap4: Push RCU-idle into omap4_enter_lowpower() Tony Lindgren
2022-06-14 22:12 ` Peter Zijlstra
2022-06-15 5:35 ` Tony Lindgren
2022-06-08 14:27 ` [PATCH 35/36] cpuidle,powerdomain: Remove trace_.*_rcuidle() Peter Zijlstra
2022-06-08 14:27 ` [PATCH 36/36] cpuidle,clk: " Peter Zijlstra
2022-06-08 20:03 ` Stephen Boyd
2022-06-14 11:19 ` [PATCH 00/36] cpuidle,rcu: Cleanup the mess Mark Rutland
2022-06-14 16:58 ` Peter Zijlstra
2022-06-14 17:33 ` Mark Rutland
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=20220609164921.5e61711d@jacob-builder \
--to=jacob.jun.pan@linux$(echo .)intel.com \
--cc=acme@kernel$(echo .)org \
--cc=agordeev@linux$(echo .)ibm.com \
--cc=agross@kernel$(echo .)org \
--cc=borntraeger@linux$(echo .)ibm.com \
--cc=bsegall@google$(echo .)com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=chenhuacai@kernel$(echo .)org \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=dietmar.eggemann@arm$(echo .)com \
--cc=geert@linux-m68k$(echo .)org \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=guoren@kernel$(echo .)org \
--cc=jiangshanlai@gmail$(echo .)com \
--cc=jolsa@kernel$(echo .)org \
--cc=juri.lelli@redhat$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-acpi@vger$(echo .)kernel.org \
--cc=linux-arch@vger$(echo .)kernel.org \
--cc=linux-ia64@vger$(echo .)kernel.org \
--cc=linux-imx@nxp$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-omap@vger$(echo .)kernel.org \
--cc=linux-perf-users@vger$(echo .)kernel.org \
--cc=linux-pm@vger$(echo .)kernel.org \
--cc=linux-um@lists$(echo .)infradead.org \
--cc=mark.rutland@arm$(echo .)com \
--cc=mattst88@gmail$(echo .)com \
--cc=mturquette@baylibre$(echo .)com \
--cc=paulus@samba$(echo .)org \
--cc=pavel@ucw$(echo .)cz \
--cc=peterz@infradead$(echo .)org \
--cc=pmladek@suse$(echo .)com \
--cc=rafael@kernel$(echo .)org \
--cc=rth@twiddle$(echo .)net \
--cc=s.hauer@pengutronix$(echo .)de \
--cc=sammy@sammy$(echo .)net \
--cc=senozhatsky@chromium$(echo .)org \
--cc=srivatsa@csail$(echo .)mit.edu \
--cc=svens@linux$(echo .)ibm.com \
--cc=tglx@linutronix$(echo .)de \
--cc=vincent.guittot@linaro$(echo .)org \
--cc=xen-devel@lists$(echo .)xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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