Re: [PATCH] fix BUG using smp_processor_id() in touch_nmi_watchdogand touch_softlockup_watchdog

[Yong Zhang]

On Mon, Aug 16, 2010 at 10:30 PM, Don Zickus <dzickus@xxxxxxxxxx> wrote:
>> Patch also removes double smp_processor_id call (smp_processor_id itself and in
>> __get_cpu_var) in __touch_watchdog.

After checking touch_softlockup_watchdog() and touch_nmi_watchdog() in
before version, __raw_get_cpu_var() is used there.

Thanks,
Yong

>>
>> Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
>
> Acked-by: Don Zickus <dzickus@xxxxxxxxxx>
>
>>
>> ---
>>
>> diff --git a/kernel/watchdog.c b/kernel/watchdog.c
>> index 613bc1f..8822f1e 100644
>> --- a/kernel/watchdog.c
>> +++ b/kernel/watchdog.c
>> @@ -116,13 +116,14 @@ static unsigned long get_sample_period(void)
>> Âstatic void __touch_watchdog(void)
>> Â{
>> Â Â Â int this_cpu = smp_processor_id();
>> -
>> - Â Â __get_cpu_var(watchdog_touch_ts) = get_timestamp(this_cpu);
>> + Â Â per_cpu(watchdog_touch_ts, this_cpu) = get_timestamp(this_cpu);
>> Â}
>>
>> Âvoid touch_softlockup_watchdog(void)
>> Â{
>> - Â Â __get_cpu_var(watchdog_touch_ts) = 0;
>> + Â Â int this_cpu = get_cpu();
>> + Â Â per_cpu(watchdog_touch_ts, this_cpu) = 0;
>> + Â Â put_cpu();
>> Â}
>> ÂEXPORT_SYMBOL(touch_softlockup_watchdog);
>>
>> @@ -142,7 +143,9 @@ void touch_all_softlockup_watchdogs(void)
>> Â#ifdef CONFIG_HARDLOCKUP_DETECTOR
>> Âvoid touch_nmi_watchdog(void)
>> Â{
>> - Â Â __get_cpu_var(watchdog_nmi_touch) = true;
>> + Â Â int this_cpu = get_cpu();
>> + Â Â per_cpu(watchdog_nmi_touch, this_cpu) = true;
>> + Â Â put_cpu();
>> Â Â Â touch_softlockup_watchdog();
>> Â}
>> ÂEXPORT_SYMBOL(touch_nmi_watchdog);
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at Âhttp://vger.kernel.org/majordomo-info.html
> Please read the FAQ at Âhttp://www.tux.org/lkml/
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/