Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3722668pxb; Mon, 24 Jan 2022 16:20:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJym6jDJglke8A7pyqX/jmvsWsx0FHt6YKSh2c9ljQu7HnbHyn0M/dDvWW8xVLhZr5FVN2go X-Received: by 2002:a63:384d:: with SMTP id h13mr13211429pgn.472.1643069936297; Mon, 24 Jan 2022 16:18:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643069936; cv=none; d=google.com; s=arc-20160816; b=fCmwyEUXEM306Mf4Z06/pkvm1l0yWCqqTTVkcJU466TX3bHQA/TuuCpVFat487uBCe Atk5e7vEsTrduB7aK9rKuli1Gc4P4iwP63Zu8TaB583jC6oV8b2rW2mS7oW6HSam2CEE Fmn5kQeiVY2X2cSn+3yOuPIvbeU8MJ54cYHSCfm9m6616wUvnDkNWWhuQyrJyPq5xMq6 XccFvDz+cfyqElAufvv/SvSoIgnJ6uPOjZgLVf3pahTirpzeou+Hp+FC9uX+pLjelVcV EwRi342H+d9p3WYUthMUCI4usQp8HfShztV05ctxQC80up9gkthRFwBmnjKLd/whep3U TQKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7juGHYjYC8OPdg5QNlhkQZ2yv/SRsVa0+nXdUh+1NSI=; b=yABUSyQUJk56PfHDTrVOO7soJB1YigNGBv+uGpbo0kbWXx7cethhxuxBxmR545Tgo9 h44FwGbAD+I1o9S93kIZTNgNJajUWEWdzch+BKuch4NabTNWT32Ughg39qL3pwYh1eY5 7HgRqmIXAeyr4YWeUmEpUtGUxRkYOs8NbDHS1u21FNlIy5rflgRtixmOdSB0v/bbjQtb qLH5YSgNgfY/Mdnm5dsDzGWIZPY7MZVClay4cWebbw9pmG8wUrJjdrLDT+ay09Wd9FhA 5OaptbPHYcB2FvJV0QP0At0TjZJypBdD5lBOumgaYHv3TN+jds0IysoFdIVpMfn5WQk/ Oahw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EH3+w4BD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id kk17si813615pjb.176.2022.01.24.16.18.44; Mon, 24 Jan 2022 16:18:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EH3+w4BD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2372571AbiAYAL7 (ORCPT + 99 others); Mon, 24 Jan 2022 19:11:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1849518AbiAXX0B (ORCPT ); Mon, 24 Jan 2022 18:26:01 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73877C073238; Mon, 24 Jan 2022 13:29:59 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C8EED60C60; Mon, 24 Jan 2022 21:29:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A98F8C340E4; Mon, 24 Jan 2022 21:29:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643059798; bh=tg8iEjvzYlmjjMbrWjc40apMLT5XKRdF0J/xCoow65U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EH3+w4BDIdn/dmvGyIhfVgmGxqBobhvADfi7GxxtEB7wNYKAUCeCNWXvECdzXREN7 Yjzpm4u4GIKICRbNEpN29sdb1hViKGDvzI9uh4qX43/PObAwYk9LAgabi0D4oyxRpX icUyBUDoJViYhMtZQ25ElpYtqn/2Wxs9na/xKirg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Piggin , Laurent Dufour , Michael Ellerman , Sasha Levin Subject: [PATCH 5.16 0738/1039] powerpc/watchdog: Fix missed watchdog reset due to memory ordering race Date: Mon, 24 Jan 2022 19:42:07 +0100 Message-Id: <20220124184150.132273919@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184125.121143506@linuxfoundation.org> References: <20220124184125.121143506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicholas Piggin [ Upstream commit 5dad4ba68a2483fc80d70b9dc90bbe16e1f27263 ] It is possible for all CPUs to miss the pending cpumask becoming clear, and then nobody resetting it, which will cause the lockup detector to stop working. It will eventually expire, but watchdog_smp_panic will avoid doing anything if the pending mask is clear and it will never be reset. Order the cpumask clear vs the subsequent test to close this race. Add an extra check for an empty pending mask when the watchdog fires and finds its bit still clear, to try to catch any other possible races or bugs here and keep the watchdog working. The extra test in arch_touch_nmi_watchdog is required to prevent the new warning from firing off. Signed-off-by: Nicholas Piggin Reviewed-by: Laurent Dufour Debugged-by: Laurent Dufour Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20211110025056.2084347-2-npiggin@gmail.com Signed-off-by: Sasha Levin --- arch/powerpc/kernel/watchdog.c | 41 +++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c index 3fa6d240bade2..ad94a2c6b7337 100644 --- a/arch/powerpc/kernel/watchdog.c +++ b/arch/powerpc/kernel/watchdog.c @@ -135,6 +135,10 @@ static void set_cpumask_stuck(const struct cpumask *cpumask, u64 tb) { cpumask_or(&wd_smp_cpus_stuck, &wd_smp_cpus_stuck, cpumask); cpumask_andnot(&wd_smp_cpus_pending, &wd_smp_cpus_pending, cpumask); + /* + * See wd_smp_clear_cpu_pending() + */ + smp_mb(); if (cpumask_empty(&wd_smp_cpus_pending)) { wd_smp_last_reset_tb = tb; cpumask_andnot(&wd_smp_cpus_pending, @@ -221,13 +225,44 @@ static void wd_smp_clear_cpu_pending(int cpu, u64 tb) cpumask_clear_cpu(cpu, &wd_smp_cpus_stuck); wd_smp_unlock(&flags); + } else { + /* + * The last CPU to clear pending should have reset the + * watchdog so we generally should not find it empty + * here if our CPU was clear. However it could happen + * due to a rare race with another CPU taking the + * last CPU out of the mask concurrently. + * + * We can't add a warning for it. But just in case + * there is a problem with the watchdog that is causing + * the mask to not be reset, try to kick it along here. + */ + if (unlikely(cpumask_empty(&wd_smp_cpus_pending))) + goto none_pending; } return; } + cpumask_clear_cpu(cpu, &wd_smp_cpus_pending); + + /* + * Order the store to clear pending with the load(s) to check all + * words in the pending mask to check they are all empty. This orders + * with the same barrier on another CPU. This prevents two CPUs + * clearing the last 2 pending bits, but neither seeing the other's + * store when checking if the mask is empty, and missing an empty + * mask, which ends with a false positive. + */ + smp_mb(); if (cpumask_empty(&wd_smp_cpus_pending)) { unsigned long flags; +none_pending: + /* + * Double check under lock because more than one CPU could see + * a clear mask with the lockless check after clearing their + * pending bits. + */ wd_smp_lock(&flags); if (cpumask_empty(&wd_smp_cpus_pending)) { wd_smp_last_reset_tb = tb; @@ -318,8 +353,12 @@ void arch_touch_nmi_watchdog(void) { unsigned long ticks = tb_ticks_per_usec * wd_timer_period_ms * 1000; int cpu = smp_processor_id(); - u64 tb = get_tb(); + u64 tb; + if (!cpumask_test_cpu(cpu, &watchdog_cpumask)) + return; + + tb = get_tb(); if (tb - per_cpu(wd_timer_tb, cpu) >= ticks) { per_cpu(wd_timer_tb, cpu) = tb; wd_smp_clear_cpu_pending(cpu, tb); -- 2.34.1