From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5CFA714901A; Sun, 28 Jul 2024 15:49:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722181748; cv=none; b=Q9iEKwizxu42DKTp0H0LkDVbB4kcGgQKm9nXZC+NSNI9IWw2CLgD05oOrOoGJVwkyPVBwN7X2go5F60EmN1GL7yDbYY0d2E8mtXnY0E0aW15xJuIngu0eievHws51/5r44e7sxmpqpmNxIsqxfyC/IP0EyvyBZWn+kpCTzKVSEI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722181748; c=relaxed/simple; bh=bW8puwp8UG1FE5R0NW0YGF8HexNK9uU3nHZPanPzjUI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mtn0J42VuZ9RYzuLpjy3Vxy1m/0hD0WNSbWCTTMAjH4qN9Zm0f43HKw+tEe/3Kr/sg9fXjgmM/06KXfztiZUomxd2fopnzaPudeu2LzLyn34h7UY6CkMzWwBOmeqopSLXXkk7XyIf+vn28puon+O8L5RElEdLSo6OSFMpnUY2kM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=D7C3XA8d; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="D7C3XA8d" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27EEAC4AF0B; Sun, 28 Jul 2024 15:49:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722181748; bh=bW8puwp8UG1FE5R0NW0YGF8HexNK9uU3nHZPanPzjUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D7C3XA8dJqBGTqZXq4wTWx2+ABzWFguvPllZdgJk8PpXAzPgfsxzzUdIhUWVXYnQ7 uwhxp022kNSOcBxVqAr3oDrN5B0CNQIeTLB8qlqiK4rkfcPZ31aHGoRlDa3LEnAarA dCItHQVfYhbwEj69CvEP3qjWp+par1WJuVdIKva4ljfl8MThgWUSlRF9chEMAFNO4g IL9b9F+TB2HK7fPC9Q+EL7wHKRSWSf4W8o4eP5oYOB/oUCdeQJrpBmaS1q6FZi1QVG KfGr/1U850/XFvQ+5Q21cisZjcv4vjoSL4wpa/bRJOiM8dDzr4zMZ/mqD58lf2vrRV /r1WU0qOyremw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Benjamin Coddington , Jeff Layton , Anna Schumaker , Sasha Levin , trondmy@kernel.org, anna@kernel.org, chuck.lever@oracle.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-nfs@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 17/17] SUNRPC: Fix a race to wake a sync task Date: Sun, 28 Jul 2024 11:47:27 -0400 Message-ID: <20240728154805.2049226-17-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240728154805.2049226-1-sashal@kernel.org> References: <20240728154805.2049226-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.102 Content-Transfer-Encoding: 8bit From: Benjamin Coddington [ Upstream commit ed0172af5d6fc07d1b40ca82f5ca3979300369f7 ] We've observed NFS clients with sync tasks sleeping in __rpc_execute waiting on RPC_TASK_QUEUED that have not responded to a wake-up from rpc_make_runnable(). I suspect this problem usually goes unnoticed, because on a busy client the task will eventually be re-awoken by another task completion or xprt event. However, if the state manager is draining the slot table, a sync task missing a wake-up can result in a hung client. We've been able to prove that the waker in rpc_make_runnable() successfully calls wake_up_bit() (ie- there's no race to tk_runstate), but the wake_up_bit() call fails to wake the waiter. I suspect the waker is missing the load of the bit's wait_queue_head, so waitqueue_active() is false. There are some very helpful comments about this problem above wake_up_bit(), prepare_to_wait(), and waitqueue_active(). Fix this by inserting smp_mb__after_atomic() before the wake_up_bit(), which pairs with prepare_to_wait() calling set_current_state(). Signed-off-by: Benjamin Coddington Reviewed-by: Jeff Layton Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- net/sunrpc/sched.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index 6debf4fd42d4e..cef623ea15060 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -369,8 +369,10 @@ static void rpc_make_runnable(struct workqueue_struct *wq, if (RPC_IS_ASYNC(task)) { INIT_WORK(&task->u.tk_work, rpc_async_schedule); queue_work(wq, &task->u.tk_work); - } else + } else { + smp_mb__after_atomic(); wake_up_bit(&task->tk_runstate, RPC_TASK_QUEUED); + } } /* -- 2.43.0