From: Toshi Kani <toshi.kani@hp.com>
To: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Cc: len.brown@intel.com, linux-acpi@vger.kernel.org,
linux-kernel@vger.kernel.org,
Boris Ostrovsky <boris.ostrovsky@amd.com>,
lenb@kernel.org, Daniel Lezcano <daniel.lezcano@linaro.org>,
amit.kucheria@linaro.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH] cpuidle: Fix panic in CPU off-lining with no idle driver
Date: Tue, 03 Apr 2012 10:10:42 -0600 [thread overview]
Message-ID: <4F7B2102.3080006@hp.com> (raw)
In-Reply-To: <4F7B0451.1010304@linux.vnet.ibm.com>
On 4/3/2012 8:08 AM, Srivatsa S. Bhat wrote:
> On 04/01/2012 09:07 AM, Toshi Kani wrote:
>
>> Fix a NULL pointer dereference panic in cpuidle_play_dead() during
>> CPU off-lining when no cpuidle driver is registered. A cpuidle
>> driver may be registered at boot-time based on CPU type. This patch
>> allows an off-lined CPU to enter HLT-based idle in this condition.
>>
>> Signed-off-by: Toshi Kani<toshi.kani@hp.com>
>> Cc: Boris Ostrovsky<boris.ostrovsky@amd.com>
>> ---
>> drivers/cpuidle/cpuidle.c | 5 ++++-
>> 1 files changed, 4 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
>> index 87411ce..2f0083a 100644
>> --- a/drivers/cpuidle/cpuidle.c
>> +++ b/drivers/cpuidle/cpuidle.c
>> @@ -74,7 +74,7 @@ static cpuidle_enter_t cpuidle_enter_ops;
>> /**
>> * cpuidle_play_dead - cpu off-lining
>> *
>> - * Only returns in case of an error
>> + * Returns in case of an error or no driver
>> */
>> int cpuidle_play_dead(void)
>> {
>> @@ -83,6 +83,9 @@ int cpuidle_play_dead(void)
>> int i, dead_state = -1;
>> int power_usage = -1;
>>
>> + if (!drv)
>> + return -ENODEV;
>> +
>> /* Find lowest-power state that supports long-term idle */
>> for (i = CPUIDLE_DRIVER_STATE_START; i< drv->state_count; i++) {
>> struct cpuidle_state *s =&drv->states[i];
>
>
> Reviewed-by: Srivatsa S. Bhat<srivatsa.bhat@linux.vnet.ibm.com>
> Tested-by: Srivatsa S. Bhat<srivatsa.bhat@linux.vnet.ibm.com>
>
>
> [The machine I tested on did support mwait. So, to disable mwait and ensure
> that no idle driver is registered, I applied my fix for "idle=" parameters
> (https://lkml.org/lkml/2012/4/3/158) and then passed idle=halt in the kernel
> command line. Then the machine crashed during CPU offline. Then I tried your
> patch and it fixed the issue.]
Great! Thanks a lot Srivatsa for reviewing and testing!
-Toshi
> Regards,
> Srivatsa S. Bhat
> IBM Linux Technology Center
>
next prev parent reply other threads:[~2012-04-03 16:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-01 3:37 [PATCH] cpuidle: Fix panic in CPU off-lining with no idle driver Toshi Kani
2012-04-03 14:08 ` Srivatsa S. Bhat
2012-04-03 16:10 ` Toshi Kani [this message]
2012-04-06 18:58 ` Len Brown
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=4F7B2102.3080006@hp.com \
--to=toshi.kani@hp.com \
--cc=amit.kucheria@linaro.org \
--cc=boris.ostrovsky@amd.com \
--cc=daniel.lezcano@linaro.org \
--cc=len.brown@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=srivatsa.bhat@linux.vnet.ibm.com \
/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).