xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nbd: Fix hung on disconnect request if socket is closed before

Browse Source 
[ Upstream commit 491bf8f236fdeec698fa6744993f1ecf3fafd1a5 ]

When userspace closes the socket before sending a disconnect
request, the following I/O requests will be blocked in
wait_for_reconnect() until dead timeout. This will cause the
following disconnect request also hung on blk_mq_quiesce_queue().
That means we have no way to disconnect a nbd device if there
are some I/O requests waiting for reconnecting until dead timeout.
It's not expected. So let's wake up the thread waiting for
reconnecting directly when a disconnect request is sent.

Reported-by: Xu Jianhai <zero.xu@bytedance.com>
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Link: https://lore.kernel.org/r/20220322080639.142-1-xieyongji@bytedance.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Xie Yongji
2022-03-22 16:06:39 +08:00
committed by Greg Kroah-Hartman
parent 1a5a3dfd9f
commit 8d33585ffa
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/block/nbd.c
View File

@@ -880,11 +880,15 @@ static int wait_for_reconnect(struct nbd_device *nbd)
struct nbd_config *config = nbd->config; struct nbd_config *config = nbd->config;
if (!config->dead_conn_timeout) if (!config->dead_conn_timeout)
return 0; return 0;
if (test_bit(NBD_RT_DISCONNECTED, &config->runtime_flags))
if (!wait_event_timeout(config->conn_wait,
test_bit(NBD_RT_DISCONNECTED,
&config->runtime_flags) ||
atomic_read(&config->live_connections) > 0,
config->dead_conn_timeout))
return 0; return 0;
return wait_event_timeout(config->conn_wait,
atomic_read(&config->live_connections) > 0, return !test_bit(NBD_RT_DISCONNECTED, &config->runtime_flags);
config->dead_conn_timeout) > 0;
} }
static int nbd_handle_cmd(struct nbd_cmd *cmd, int index) static int nbd_handle_cmd(struct nbd_cmd *cmd, int index)
@@ -2029,6 +2033,7 @@ static void nbd_disconnect_and_put(struct nbd_device *nbd)
mutex_lock(&nbd->config_lock); mutex_lock(&nbd->config_lock);
nbd_disconnect(nbd); nbd_disconnect(nbd);
sock_shutdown(nbd); sock_shutdown(nbd);
wake_up(&nbd->config->conn_wait);
/* /*
* Make sure recv thread has finished, so it does not drop the last * Make sure recv thread has finished, so it does not drop the last
* config ref and try to destroy the workqueue from inside the work * config ref and try to destroy the workqueue from inside the work