From mboxrd@z Thu Jan  1 00:00:00 1970
From: Don Zickus <dzickus@redhat.com>
Subject: Re: [PATCH v4] watchdog: Fix a watchdog crash in some configurations
Date: Mon, 18 May 2015 10:45:02 -0400
Message-ID: <20150518144502.GM184517@redhat.com>
References: <55494857.90404@ezchip.com>
 <1430866824-30313-1-git-send-email-jhubbard@nvidia.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:55516 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752344AbbEROpu (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Mon, 18 May 2015 10:45:50 -0400
Content-Disposition: inline
In-Reply-To: <1430866824-30313-1-git-send-email-jhubbard@nvidia.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: john.hubbard@gmail.com
Cc: Chris Metcalf <cmetcalf@ezchip.com>, Andrew Morton <akpm@linux-foundation.org>, Ingo Molnar <mingo@kernel.org>, Ulrich Obergfell <uobergfe@redhat.com>, Thomas Gleixner <tglx@linutronix.de>, Peter Zijlstra <peterz@infradead.org>, Stephen Rothwell <sfr@canb.auug.org.au>, Frederic Weisbecker <fweisbec@gmail.com>, linux-next@vger.kernel.org, John Hubbard <jhubbard@nvidia.com>

On Tue, May 05, 2015 at 04:00:24PM -0700, john.hubbard@gmail.com wrote:
> From: John Hubbard <jhubbard@nvidia.com>
> 
> Commit <8fcf2cc768acd845c> in linux-next
> introduced a regression in some configurations. Specifically,
> with CONFIG_NO_HZ_FULL set, and CONFIG_NO_HZ_FULL_ALL *not* set,
> the kernel will crash in lockup_detector_init(), due to a
> NULL tick_nohz_full_mask pointer.
> 
> This is because the above commit uses tick_nohz_full_mask
> (in lockup_detector_init), if CONFIG_NO_HZ_FULL is set, but
> tick_nohz_full_mask only gets allocated if either:
> 
>     a) CONFIG_NO_HZ_FULL_ALL is set, or
> 
>     b) Someone passes in nohz_full=<any_value> on the boot
>       args line.
> 
> To correct this, change lockup_detector_init so that it does
> a runtime check in addition to the ifdef check. This fix is
> simpler than my original proposed fix, thanks to Chris Metcalf
> for that.

Acked-by: Don Zickus <dzickus@redhat.com>

> 
> Signed-off-by: John Hubbard <jhubbard@nvidia.com>
> ---
>  kernel/watchdog.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/kernel/watchdog.c b/kernel/watchdog.c
> index 40fda2f..be34f7f 100644
> --- a/kernel/watchdog.c
> +++ b/kernel/watchdog.c
> @@ -921,10 +921,13 @@ void __init lockup_detector_init(void)
>  	set_sample_period();
>  
>  #ifdef CONFIG_NO_HZ_FULL
> -	if (!cpumask_empty(tick_nohz_full_mask))
> -		pr_info("Disabling watchdog on nohz_full cores by default\n");
> -	cpumask_andnot(&watchdog_cpumask, cpu_possible_mask,
> -		       tick_nohz_full_mask);
> +	if (tick_nohz_full_enabled()) {
> +		if (!cpumask_empty(tick_nohz_full_mask))
> +			pr_info("Disabling watchdog on nohz_full cores by default\n");
> +		cpumask_andnot(&watchdog_cpumask, cpu_possible_mask,
> +			       tick_nohz_full_mask);
> +	} else
> +		cpumask_copy(&watchdog_cpumask, cpu_possible_mask);
>  #else
>  	cpumask_copy(&watchdog_cpumask, cpu_possible_mask);
>  #endif
> -- 
> 2.3.7
>