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 3DB9D183CD4; Mon, 12 Aug 2024 16:17:53 +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=1723479474; cv=none; b=M7MV9UkJFXet1N6HFIknxmOAMHLrJw8xZcLuNt/Gnp5xYmRKlJIJ9+ZWvQ9Xtd1ctc+09GoJTQMXtGcUTRIKaSqHT0NAiLF9ObQdUbwGY7/rXhqy4xqzhdxcbhFOSGelLb9G+FEFt07GHBQDu+d92dXwuuDN9vT5Dy0VhtkLiRk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723479474; c=relaxed/simple; bh=VNhK7i+uOwNVB9IkUfbKW8CZvAH0m7Tw/AQu6nqXvXs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nwRPMjmCpSfvsSe3l+4+bwSF5k68s9OkUGN38zGph8Xo4hSkwlQvRwKtqhDRIrYTp3o2yvrVgSVH/fdtbklpXHsZeOej1OHR6Qd2epBewPV8C22/YM76fRWyqXRPp121yvh1s9QT3dIz9HgFj+KW928m7VPkNesVnWEbs/33hno= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jPuf7rxW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="jPuf7rxW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AA0EC32782; Mon, 12 Aug 2024 16:17:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723479473; bh=VNhK7i+uOwNVB9IkUfbKW8CZvAH0m7Tw/AQu6nqXvXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jPuf7rxW1ZHXfz+NN/Ay64noi0nUKDc5Si0E0gQyU1vGOIvPx8H4AIvnsy6MXj+Gc JJRnFQhaVAAaj7KakAEvBRIxjWlE89e95nKUcj4Vz79kWMrWqkt9zhPDE6ukXFvX1t 3sDd7X4PxavKSSrqhzBPII73V6eMORhyrVZcpMAE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Benjamin Coddington , Jeff Layton , Anna Schumaker , Sasha Levin Subject: [PATCH 6.6 067/189] SUNRPC: Fix a race to wake a sync task Date: Mon, 12 Aug 2024 18:02:03 +0200 Message-ID: <20240812160134.722392552@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240812160132.135168257@linuxfoundation.org> References: <20240812160132.135168257@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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