From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D357C43381 for ; Mon, 1 Apr 2019 18:07:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 16F4220663 for ; Mon, 1 Apr 2019 18:07:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554142043; bh=LdiyFkb6NVjAtOkm4fbmXiEsjqv5LynCugiO63gTWpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Vad5MmQcYq+8TvFlEW6PDQz4Dd90sxdrXTN6LbJn973laJqz0MW7DPwSs20DHRjsw 6pxXlZz6XMwnAiZXBCbE4B5gA5/EhqxidKikb5edFN+BXokVQnWsxPEWNEBHmd8FKV YlqMLNhQ9pkhBqNEXvvozYxNMv5NV6D8Qee+423Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729431AbfDARLZ (ORCPT ); Mon, 1 Apr 2019 13:11:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:60056 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729158AbfDARLZ (ORCPT ); Mon, 1 Apr 2019 13:11:25 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2558921925; Mon, 1 Apr 2019 17:11:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554138684; bh=LdiyFkb6NVjAtOkm4fbmXiEsjqv5LynCugiO63gTWpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fIHgYeSk1rcEGTqQ2VHvjVHn3BBX1zdSEfI3sgDLxrOIJXFfsF7IvTe8sqIGReQWs ohtLLW+FrCefgCD1Z01ixSDfa7JjN3Sr8UO9YMGA7AZmTmrdJSp+MbSFSb2ZBsgdeu lehgnfGqkhX3FgxczBBwIfX2ADeTzTsbljha3Nqk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maxime Coquelin , Thomas Gleixner , Peter Zijlstra , Oleg Nesterov , Michael Ellerman , Nicholas Piggin , Don Zickus , Ricardo Neri Subject: [PATCH 5.0 139/146] watchdog: Respect watchdog cpumask on CPU hotplug Date: Mon, 1 Apr 2019 19:02:31 +0200 Message-Id: <20190401170059.837200915@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170048.449559024@linuxfoundation.org> References: <20190401170048.449559024@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Gleixner commit 7dd47617114921fdd8c095509e5e7b4373cc44a1 upstream. The rework of the watchdog core to use cpu_stop_work broke the watchdog cpumask on CPU hotplug. The watchdog_enable/disable() functions are now called unconditionally from the hotplug callback, i.e. even on CPUs which are not in the watchdog cpumask. As a consequence the watchdog can become unstoppable. Only invoke them when the plugged CPU is in the watchdog cpumask. Fixes: 9cf57731b63e ("watchdog/softlockup: Replace "watchdog/%u" threads with cpu_stop_work") Reported-by: Maxime Coquelin Signed-off-by: Thomas Gleixner Tested-by: Maxime Coquelin Cc: Peter Zijlstra Cc: Oleg Nesterov Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Don Zickus Cc: Ricardo Neri Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/alpine.DEB.2.21.1903262245490.1789@nanos.tec.linutronix.de Signed-off-by: Greg Kroah-Hartman --- kernel/watchdog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -547,13 +547,15 @@ static void softlockup_start_all(void) int lockup_detector_online_cpu(unsigned int cpu) { - watchdog_enable(cpu); + if (cpumask_test_cpu(cpu, &watchdog_allowed_mask)) + watchdog_enable(cpu); return 0; } int lockup_detector_offline_cpu(unsigned int cpu) { - watchdog_disable(cpu); + if (cpumask_test_cpu(cpu, &watchdog_allowed_mask)) + watchdog_disable(cpu); return 0; }