Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1208330pxb; Thu, 4 Mar 2021 06:11:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxEmlqL1BSQqwtdkMtwybVSgnN2Ioxzyy3t8oHc3NwPXLuZvXjCStJ3A1SGhDxMmFO/cYEe X-Received: by 2002:aa7:d1cd:: with SMTP id g13mr4504296edp.369.1614867117996; Thu, 04 Mar 2021 06:11:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614867117; cv=none; d=google.com; s=arc-20160816; b=ee4rkDSCpQCMm7WiCi536gY9/R5qXKngnOYOKLmfPCgaZRkH07lGG4nI2sUGTNJH+9 nl7RMH9D94Td8a74SVzns5oM7JGRQxZ9nQX7+vICaA9z1jvCRXkrBMs9U3ill/jeMkEA gwuT5qyuTqtdGQrl6Xq1SuTrcJWwqn2s9a2IpwvJ4mYUPXa8rrF8uFBB9C9sB0wkz2z6 iD1Gq1p6Xip3To6QByVS1YPVkYn+V21UcizRTHyQwHYWJhMtZPOanVHipUDr3CNcXZ4O f3VIbyyVEoOX5d6os8rdGAG+Tnl0GpjkcqjnDjIPG5GPzuUmwX1FaULNe+It5uKvAUQ9 JRIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=PIYU/KWk/JCrPh1hKMz89Ozrag6QOdYBI5Rl1Isiqzo=; b=KOwSVEIVN2pI0XoD7drakRR5TIgXAoOMaoVCJc3+4Cb2jfd2BZg7AGLpZKrPo458Pd h4rbp+cSrUCj2HqEdBDl2zK617HG0eJRy5dYLZw6AZuX6Camn1eXt5Iycyz9uTuHevTT AVibe1rp9o1Nir8J9Yvp120//nBMRAddOcGTW0C3FZYtaQ8ORsmk9wqaG8qGAAm/Wuph 4Itc7yK4XCH/9r0rgE5ipHInYhgsMSH6vNZ1C77N7YWZaYFqWsWUgPOduu7CX0ZwZtHo A8CDec3cZmn6aynevcwPYW3ng/HEiAn1d5SeiW+kZUG0BOyR6fZ+UjyqbgW4k4T2eyKr I4mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JyMwjSXt; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w25si12851566eja.753.2021.03.04.06.11.34; Thu, 04 Mar 2021 06:11:57 -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=@kernel.org header.s=k20201202 header.b=JyMwjSXt; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240561AbhCDBDn (ORCPT + 99 others); Wed, 3 Mar 2021 20:03:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:48836 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1448487AbhCDAZz (ORCPT ); Wed, 3 Mar 2021 19:25:55 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 349D464EBD; Thu, 4 Mar 2021 00:23:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614817395; bh=FAZG03zSoIbEYQ+G/Ef9ono8IzzxV7GIMyktvPk563g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JyMwjSXtopsX1BrIHqc2M77tJJdjSL18gVYYSMlEBYaKOCKUpfXdmtKK3sXeSFD+2 8B+wNmz4+EMEWoa4/UYSRXVc4ykFr0ZdnHsVIgHZuvchTxWOdreg3/57Brjo5J51qB pv+6KOWwHU+qC99Nh8YoRBzlsNu10E7Roup3Zp2Kujx2djDzo49bSlXFWAK5gYPUYA K0I3cU11lD65L7Ttv4HMDZzlvKZ5qMfj/jOC6SfoUDwLkKMvdDP1bJ1wNZKfRBpjEJ NIL9WXcURYnRbUgt2ZDrDBJIbzNf+avAoZfU9IVty0R5OSDiMgw+MKlrgzzgPIYaGk 3SzxccJm5PtZQ== From: paulmck@kernel.org To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com, mingo@kernel.org, jiangshanlai@gmail.com, akpm@linux-foundation.org, mathieu.desnoyers@efficios.com, josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com, fweisbec@gmail.com, oleg@redhat.com, joel@joelfernandes.org, Frederic Weisbecker , stable@vger.kernel.org, Boqun Feng , "Paul E . McKenney" Subject: [PATCH tip/core/rcu 09/12] rcu/nocb: Fix missed nocb_timer requeue Date: Wed, 3 Mar 2021 16:23:08 -0800 Message-Id: <20210304002311.23655-9-paulmck@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20210304002225.GA23492@paulmck-ThinkPad-P72> References: <20210304002225.GA23492@paulmck-ThinkPad-P72> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Frederic Weisbecker This sequence of events can lead to a failure to requeue a CPU's ->nocb_timer: 1. There are no callbacks queued for any CPU covered by CPU 0-2's ->nocb_gp_kthread. Note that ->nocb_gp_kthread is associated with CPU 0. 2. CPU 1 enqueues its first callback with interrupts disabled, and thus must defer awakening its ->nocb_gp_kthread. It therefore queues its rcu_data structure's ->nocb_timer. At this point, CPU 1's rdp->nocb_defer_wakeup is RCU_NOCB_WAKE. 3. CPU 2, which shares the same ->nocb_gp_kthread, also enqueues a callback, but with interrupts enabled, allowing it to directly awaken the ->nocb_gp_kthread. 4. The newly awakened ->nocb_gp_kthread associates both CPU 1's and CPU 2's callbacks with a future grace period and arranges for that grace period to be started. 5. This ->nocb_gp_kthread goes to sleep waiting for the end of this future grace period. 6. This grace period elapses before the CPU 1's timer fires. This is normally improbably given that the timer is set for only one jiffy, but timers can be delayed. Besides, it is possible that kernel was built with CONFIG_RCU_STRICT_GRACE_PERIOD=y. 7. The grace period ends, so rcu_gp_kthread awakens the ->nocb_gp_kthread, which in turn awakens both CPU 1's and CPU 2's ->nocb_cb_kthread. Then ->nocb_gb_kthread sleeps waiting for more newly queued callbacks. 8. CPU 1's ->nocb_cb_kthread invokes its callback, then sleeps waiting for more invocable callbacks. 9. Note that neither kthread updated any ->nocb_timer state, so CPU 1's ->nocb_defer_wakeup is still set to RCU_NOCB_WAKE. 10. CPU 1 enqueues its second callback, this time with interrupts enabled so it can wake directly ->nocb_gp_kthread. It does so with calling wake_nocb_gp() which also cancels the pending timer that got queued in step 2. But that doesn't reset CPU 1's ->nocb_defer_wakeup which is still set to RCU_NOCB_WAKE. So CPU 1's ->nocb_defer_wakeup and its ->nocb_timer are now desynchronized. 11. ->nocb_gp_kthread associates the callback queued in 10 with a new grace period, arranges for that grace period to start and sleeps waiting for it to complete. 12. The grace period ends, rcu_gp_kthread awakens ->nocb_gp_kthread, which in turn wakes up CPU 1's ->nocb_cb_kthread which then invokes the callback queued in 10. 13. CPU 1 enqueues its third callback, this time with interrupts disabled so it must queue a timer for a deferred wakeup. However the value of its ->nocb_defer_wakeup is RCU_NOCB_WAKE which incorrectly indicates that a timer is already queued. Instead, CPU 1's ->nocb_timer was cancelled in 10. CPU 1 therefore fails to queue the ->nocb_timer. 14. CPU 1 has its pending callback and it may go unnoticed until some other CPU ever wakes up ->nocb_gp_kthread or CPU 1 ever calls an explicit deferred wakeup, for example, during idle entry. This commit fixes this bug by resetting rdp->nocb_defer_wakeup everytime we delete the ->nocb_timer. It is quite possible that there is a similar scenario involving ->nocb_bypass_timer and ->nocb_defer_wakeup. However, despite some effort from several people, a failure scenario has not yet been located. However, that by no means guarantees that no such scenario exists. Finding a failure scenario is left as an exercise for the reader, and the "Fixes:" tag below relates to ->nocb_bypass_timer instead of ->nocb_timer. Fixes: d1b222c6be1f (rcu/nocb: Add bypass callback queueing) Cc: Cc: Josh Triplett Cc: Lai Jiangshan Cc: Joel Fernandes Cc: Boqun Feng Reviewed-by: Neeraj Upadhyay Signed-off-by: Frederic Weisbecker Signed-off-by: Paul E. McKenney --- kernel/rcu/tree_plugin.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index a1a17ad..e392bd1 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h @@ -1708,7 +1708,11 @@ static bool wake_nocb_gp(struct rcu_data *rdp, bool force, rcu_nocb_unlock_irqrestore(rdp, flags); return false; } - del_timer(&rdp->nocb_timer); + + if (READ_ONCE(rdp->nocb_defer_wakeup) > RCU_NOCB_WAKE_NOT) { + WRITE_ONCE(rdp->nocb_defer_wakeup, RCU_NOCB_WAKE_NOT); + del_timer(&rdp->nocb_timer); + } rcu_nocb_unlock_irqrestore(rdp, flags); raw_spin_lock_irqsave(&rdp_gp->nocb_gp_lock, flags); if (force || READ_ONCE(rdp_gp->nocb_gp_sleep)) { @@ -2335,7 +2339,6 @@ static bool do_nocb_deferred_wakeup_common(struct rcu_data *rdp) return false; } ndw = READ_ONCE(rdp->nocb_defer_wakeup); - WRITE_ONCE(rdp->nocb_defer_wakeup, RCU_NOCB_WAKE_NOT); ret = wake_nocb_gp(rdp, ndw == RCU_NOCB_WAKE_FORCE, flags); trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, TPS("DeferredWake")); -- 2.9.5