The rescuer thread might take over the works queued on
the workqueue when the worker thread creation timed out.
If this happens, we have no chance to create multiple
recv threads which causes I/O hung on this nbd device.
To fix it, we can not simply remove the WQ_MEM_RECLAIM
flag since the recv work is in the memory reclaim path.
So this patch tries to create kthreads directly to
handle the recv work instead of using workqueue.
Fixes: 124d6db07c3b ("nbd: use our own workqueue for recv threads")
Signed-off-by: Xie Yongji <xieyongji@xxxxxxxxxxxxx>
---
drivers/block/nbd.c | 95 +++++++++++++++++++++++++++++++----------------------
1 file changed, 56 insertions(+), 39 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 5a1f98494ddd..e572d1dc20b4 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -63,7 +63,6 @@ struct nbd_sock {
};
struct recv_thread_args {
- struct work_struct work;
struct nbd_device *nbd;
int index;
};
@@ -97,6 +96,7 @@ struct nbd_config {
atomic_t recv_threads;
wait_queue_head_t recv_wq;
+ spinlock_t recv_lock;
unsigned int blksize_bits;
loff_t bytesize;
#if IS_ENABLED(CONFIG_DEBUG_FS)
@@ -118,7 +118,6 @@ struct nbd_device {
struct nbd_config *config;
struct mutex config_lock;
struct gendisk *disk;
- struct workqueue_struct *recv_workq;
struct work_struct remove_work;
struct list_head list;
@@ -260,7 +259,6 @@ static void nbd_dev_remove(struct nbd_device *nbd)
mutex_lock(&nbd_index_mutex);
idr_remove(&nbd_index_idr, nbd->index);
mutex_unlock(&nbd_index_mutex);
- destroy_workqueue(nbd->recv_workq);
kfree(nbd);
}
@@ -818,11 +816,19 @@ static struct nbd_cmd *nbd_handle_reply(struct nbd_device *nbd, int index,
return ret ? ERR_PTR(ret) : cmd;
}
-static void recv_work(struct work_struct *work)
+static void flush_recv_works(struct nbd_device *nbd)
{
- struct recv_thread_args *args = container_of(work,
- struct recv_thread_args,
- work);
+ wait_event(nbd->config->recv_wq,
+ atomic_read(&nbd->config->recv_threads) == 0);
+
+ /* Make sure recv threads have no reference to nbd->config */
+ spin_lock(&nbd->config->recv_lock);
+ spin_unlock(&nbd->config->recv_lock);
+}
+
+static int recv_work(void *data)
+{
+ struct recv_thread_args *args = (struct recv_thread_args *)data;
struct nbd_device *nbd = args->nbd;
struct nbd_config *config = nbd->config;
struct request_queue *q = nbd->disk->queue;
@@ -866,9 +872,14 @@ static void recv_work(struct work_struct *work)
mutex_unlock(&nsock->tx_lock);
nbd_config_put(nbd);
+
+ spin_lock(&config->recv_lock);
atomic_dec(&config->recv_threads);
wake_up(&config->recv_wq);
+ spin_unlock(&config->recv_lock);
kfree(args);
+
+ return 0;
}
static bool nbd_clear_req(struct request *req, void *data, bool reserved)
@@ -1176,6 +1187,7 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg)
for (i = 0; i < config->num_connections; i++) {
struct nbd_sock *nsock = config->socks[i];
+ struct task_struct *worker;
if (!nsock->dead)
continue;
@@ -1185,6 +1197,14 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg)
mutex_unlock(&nsock->tx_lock);
continue;
}
+ worker = kthread_create(recv_work, args, "knbd%d.%d-recv",
+ nbd->index, i);
+ if (!worker) {
+ sockfd_put(sock);
+ kfree(args);
+ return -ENOMEM;
+ }
+
sk_set_memalloc(sock->sk);
if (nbd->tag_set.timeout)
sock->sk->sk_sndtimeo = nbd->tag_set.timeout;
@@ -1194,7 +1214,6 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg)
nsock->fallback_index = -1;
nsock->sock = sock;
nsock->dead = false;
- INIT_WORK(&args->work, recv_work);
args->index = i;
args->nbd = nbd;
nsock->cookie++;
@@ -1206,7 +1225,7 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg)
/* We take the tx_mutex in an error path in the recv_work, so we
* need to queue_work outside of the tx_mutex.
*/
- queue_work(nbd->recv_workq, &args->work);
+ wake_up_process(worker);
atomic_inc(&config->live_connections);
wake_up(&config->conn_wait);
@@ -1359,34 +1378,42 @@ static int nbd_start_device(struct nbd_device *nbd)
nbd_dev_dbg_init(nbd);
for (i = 0; i < num_connections; i++) {
struct recv_thread_args *args;
+ struct task_struct *worker;
args = kzalloc(sizeof(*args), GFP_KERNEL);
- if (!args) {
- sock_shutdown(nbd);
- /*
- * If num_connections is m (2 < m),
- * and NO.1 ~ NO.n(1 < n < m) kzallocs are successful.
- * But NO.(n + 1) failed. We still have n recv threads.
- * So, add flush_workqueue here to prevent recv threads
- * dropping the last config_refs and trying to destroy
- * the workqueue from inside the workqueue.
- */
- if (i)
- flush_workqueue(nbd->recv_workq);
- return -ENOMEM;
+ if (!args)
+ goto err;
+
+ worker = kthread_create(recv_work, args, "knbd%d.%d-recv",
+ nbd->index, i);
+ if (!worker) {
+ kfree(args);
+ goto err;
}
+
sk_set_memalloc(config->socks[i]->sock->sk);
if (nbd->tag_set.timeout)
config->socks[i]->sock->sk->sk_sndtimeo =
nbd->tag_set.timeout;
atomic_inc(&config->recv_threads);
refcount_inc(&nbd->config_refs);
- INIT_WORK(&args->work, recv_work);
args->nbd = nbd;
args->index = i;
- queue_work(nbd->recv_workq, &args->work);
+ wake_up_process(worker);
}
return nbd_set_size(nbd, config->bytesize, nbd_blksize(config));
+err:
+ sock_shutdown(nbd);
+ /*
+ * If num_connections is m (2 < m),
+ * and NO.1 ~ NO.n(1 < n < m) connections are successful.
+ * But NO.(n + 1) failed. We still have n recv threads.
+ * So, add flush_recv_works here to prevent recv threads
+ * dropping the last config_refs.
+ */
+ flush_recv_works(nbd);
+
+ return -ENOMEM;
}
static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *bdev)
@@ -1405,7 +1432,7 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *b
atomic_read(&config->recv_threads) == 0);
if (ret)
sock_shutdown(nbd);
- flush_workqueue(nbd->recv_workq);
+ flush_recv_works(nbd);
mutex_lock(&nbd->config_lock);
nbd_bdev_reset(bdev);
@@ -1525,6 +1552,7 @@ static struct nbd_config *nbd_alloc_config(void)
atomic_set(&config->recv_threads, 0);
init_waitqueue_head(&config->recv_wq);
init_waitqueue_head(&config->conn_wait);
+ spin_lock_init(&config->recv_lock);
config->blksize_bits = NBD_DEF_BLKSIZE_BITS;
atomic_set(&config->live_connections, 0);
try_module_get(THIS_MODULE);
@@ -1769,15 +1797,6 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs)
}
nbd->disk = disk;
- nbd->recv_workq = alloc_workqueue("nbd%d-recv",
- WQ_MEM_RECLAIM | WQ_HIGHPRI |
- WQ_UNBOUND, 0, nbd->index);
- if (!nbd->recv_workq) {
- dev_err(disk_to_dev(nbd->disk), "Could not allocate knbd recv work queue.\n");
- err = -ENOMEM;
- goto out_err_disk;
- }
-
/*
* Tell the block layer that we are not a rotational device
*/
@@ -1808,7 +1827,7 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs)
disk->first_minor = index << part_shift;
if (disk->first_minor < index || disk->first_minor > MINORMASK) {
err = -EINVAL;
- goto out_free_work;
+ goto out_err_disk;
}
disk->minors = 1 << part_shift;
@@ -1817,7 +1836,7 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs)
sprintf(disk->disk_name, "nbd%d", index);
err = add_disk(disk);
if (err)
- goto out_free_work;
+ goto out_err_disk;
/*
* Now publish the device.
@@ -1826,8 +1845,6 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs)
nbd_total_devices++;
return nbd;
-out_free_work:
- destroy_workqueue(nbd->recv_workq);
out_err_disk:
blk_cleanup_disk(disk);
out_free_idr:
@@ -2086,7 +2103,7 @@ static void nbd_disconnect_and_put(struct nbd_device *nbd)
* Make sure recv thread has finished, we can safely call nbd_clear_que()
* to cancel the inflight I/Os.
*/
- flush_workqueue(nbd->recv_workq);
+ flush_recv_works(nbd);
nbd_clear_que(nbd);
nbd->task_setup = NULL;
mutex_unlock(&nbd->config_lock);
--
2.11.0
