linux-kernel - Re: [PATCH] softlockup: stop spurious softlockup messages due to overflow

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1268663388.3154.30.camel@edumazet-laptop>
Date:	Mon, 15 Mar 2010 15:29:48 +0100
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	Colin Ian King <colin.king@...onical.com>
Cc:	Ingo Molnar <mingo@...e.hu>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Thomas Gleixner <tglx@...utronix.de>,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] softlockup: stop spurious softlockup messages due to
 overflow

Le lundi 15 mars 2010 à 14:01 +0000, Colin Ian King a écrit :
> Ensure additions on touch_ts do not overflow.  This can occur when
> the top 32 bits of the TSC reach 0xffffffff causing additions to
> touch_ts to overflow and this in turn generates spurious softlockup
> warnings.
> 
> Signed-off-by: Colin Ian King <colin.king@...onical.com>
> ---
>  kernel/softlockup.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/kernel/softlockup.c b/kernel/softlockup.c
> index 0d4c789..90d9aa0 100644
> --- a/kernel/softlockup.c
> +++ b/kernel/softlockup.c
> @@ -111,10 +111,10 @@ int proc_dosoftlockup_thresh(struct ctl_table *table, int write,
>  void softlockup_tick(void)
>  {
>  	int this_cpu = smp_processor_id();
> -	unsigned long touch_ts = per_cpu(softlockup_touch_ts, this_cpu);
> +	unsigned long long touch_ts = per_cpu(softlockup_touch_ts, this_cpu);
>  	unsigned long print_ts;
>  	struct pt_regs *regs = get_irq_regs();
> -	unsigned long now;
> +	unsigned long long now;
>  
>  	/* Is detection switched off? */
>  	if (!per_cpu(softlockup_watchdog, this_cpu) || softlockup_thresh <= 0) {
> @@ -165,7 +165,7 @@ void softlockup_tick(void)
>  	per_cpu(softlockup_print_ts, this_cpu) = touch_ts;
>  
>  	spin_lock(&print_lock);
> -	printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %lus! [%s:%d]\n",
> +	printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %llus! [%s:%d]\n",
>  			this_cpu, now - touch_ts,
>  			current->comm, task_pid_nr(current));
>  	print_modules();

This looks wrong, touch_ts is a long, not a long long.

You probably want to change the comparisons instead.

if (now > touch_ts + softlockup_thresh/2)
	wake_up_process(per_cpu(softlockup_watchdog, this_cpu));
if (now <= (touch_ts + softlockup_thresh))
	return;
	
->

if ((long)(now - touch_ts) > softlockup_thresh/2)
	wake_up_process(per_cpu(softlockup_watchdog, this_cpu));
if ((long)(now - touch_ts) <= softlockup_thresh))
	return;

Or use standard time_after()/time_before() macros.


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/