Skip to content

L
linux
Commit 5ea8d108 authored by Josef Bacik's avatar Josef Bacik Committed by Jens Axboe
1 Browse files
Options

nbd: separate out the config information 

In order to properly refcount the various aspects of a NBD device we
need to separate out the configuration elements of the nbd device.  The
configuration of a NBD device has a different lifetime from the actual
device, so it doesn't make sense to bundle these two concepts.  Add a
config_refs to keep track of the configuration structure, that way we
can be sure that we never access it when we've torn down the device.
Add a new nbd_config structure to hold all of the transient
configuration information.  Finally create this when we open the device
so that it is in place when we start to configure the device.  This has
a nice side-effect of fixing a long standing problem where you could end
up with a half-configured nbd device that needed to be "disconnected" in
order to be usable again.  Now once we close our device the
configuration will be discarded.
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f3733247
Show whitespace changes
Inline Side-by-side
Showing with 263 additions and 174 deletions
drivers/block/nbd.c
View file @ 5ea8d108
...@@ -53,35 +53,45 @@ struct nbd_sock { ...@@ -53,35 +53,45 @@ struct nbd_sock {
int fallback_index; int fallback_index;
}; };
struct recv_thread_args {
struct work_struct work;
struct nbd_device *nbd;
int index;
};
#define NBD_TIMEDOUT 0 #define NBD_TIMEDOUT 0
#define NBD_DISCONNECT_REQUESTED 1 #define NBD_DISCONNECT_REQUESTED 1
#define NBD_DISCONNECTED 2 #define NBD_DISCONNECTED 2
#define NBD_RUNNING 3 #define NBD_HAS_PID_FILE 3
struct nbd_device { struct nbd_config {
u32 flags; u32 flags;
unsigned long runtime_flags; unsigned long runtime_flags;
struct nbd_sock **socks;
int magic;
struct blk_mq_tag_set tag_set; struct nbd_sock **socks;
struct mutex config_lock;
struct gendisk *disk;
int num_connections; int num_connections;
atomic_t recv_threads; atomic_t recv_threads;
wait_queue_head_t recv_wq; wait_queue_head_t recv_wq;
loff_t blksize; loff_t blksize;
loff_t bytesize; loff_t bytesize;
struct task_struct *task_recv;
struct task_struct *task_setup;
#if IS_ENABLED(CONFIG_DEBUG_FS) #if IS_ENABLED(CONFIG_DEBUG_FS)
struct dentry *dbg_dir; struct dentry *dbg_dir;
#endif #endif
}; };
struct nbd_device {
struct blk_mq_tag_set tag_set;
refcount_t config_refs;
struct nbd_config *config;
struct mutex config_lock;
struct gendisk *disk;
struct task_struct *task_recv;
struct task_struct *task_setup;
};
struct nbd_cmd { struct nbd_cmd {
struct nbd_device *nbd; struct nbd_device *nbd;
int index; int index;
...@@ -103,7 +113,7 @@ static int part_shift; ...@@ -103,7 +113,7 @@ static int part_shift;
static int nbd_dev_dbg_init(struct nbd_device *nbd); static int nbd_dev_dbg_init(struct nbd_device *nbd);
static void nbd_dev_dbg_close(struct nbd_device *nbd); static void nbd_dev_dbg_close(struct nbd_device *nbd);
static void nbd_config_put(struct nbd_device *nbd);
static inline struct device *nbd_to_dev(struct nbd_device *nbd) static inline struct device *nbd_to_dev(struct nbd_device *nbd)
{ {
...@@ -127,6 +137,20 @@ static const char *nbdcmd_to_ascii(int cmd) ...@@ -127,6 +137,20 @@ static const char *nbdcmd_to_ascii(int cmd)
return "invalid"; return "invalid";
} }
static ssize_t pid_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct gendisk *disk = dev_to_disk(dev);
struct nbd_device *nbd = (struct nbd_device *)disk->private_data;
return sprintf(buf, "%d\n", task_pid_nr(nbd->task_recv));
}
static struct device_attribute pid_attr = {
.attr = { .name = "pid", .mode = S_IRUGO},
.show = pid_show,
};
static void nbd_mark_nsock_dead(struct nbd_sock *nsock) static void nbd_mark_nsock_dead(struct nbd_sock *nsock)
{ {
if (!nsock->dead) if (!nsock->dead)
...@@ -138,28 +162,32 @@ static void nbd_mark_nsock_dead(struct nbd_sock *nsock) ...@@ -138,28 +162,32 @@ static void nbd_mark_nsock_dead(struct nbd_sock *nsock)
static int nbd_size_clear(struct nbd_device *nbd, struct block_device *bdev) static int nbd_size_clear(struct nbd_device *nbd, struct block_device *bdev)
{ {
if (nbd->config->bytesize) {
if (bdev->bd_openers <= 1) if (bdev->bd_openers <= 1)
bd_set_size(bdev, 0); bd_set_size(bdev, 0);
set_capacity(nbd->disk, 0); set_capacity(nbd->disk, 0);
kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE); kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE);
}
return 0; return 0;
} }
static void nbd_size_update(struct nbd_device *nbd, struct block_device *bdev) static void nbd_size_update(struct nbd_device *nbd, struct block_device *bdev)
{ {
blk_queue_logical_block_size(nbd->disk->queue, nbd->blksize); struct nbd_config *config = nbd->config;
blk_queue_physical_block_size(nbd->disk->queue, nbd->blksize); blk_queue_logical_block_size(nbd->disk->queue, config->blksize);
bd_set_size(bdev, nbd->bytesize); blk_queue_physical_block_size(nbd->disk->queue, config->blksize);
set_capacity(nbd->disk, nbd->bytesize >> 9); bd_set_size(bdev, config->bytesize);
set_capacity(nbd->disk, config->bytesize >> 9);
kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE); kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE);
} }
static void nbd_size_set(struct nbd_device *nbd, struct block_device *bdev, static void nbd_size_set(struct nbd_device *nbd, struct block_device *bdev,
loff_t blocksize, loff_t nr_blocks) loff_t blocksize, loff_t nr_blocks)
{ {
nbd->blksize = blocksize; struct nbd_config *config = nbd->config;
nbd->bytesize = blocksize * nr_blocks; config->blksize = blocksize;
config->bytesize = blocksize * nr_blocks;
if (nbd_is_connected(nbd)) if (nbd_is_connected(nbd))
nbd_size_update(nbd, bdev); nbd_size_update(nbd, bdev);
} }
...@@ -181,17 +209,19 @@ static void nbd_end_request(struct nbd_cmd *cmd) ...@@ -181,17 +209,19 @@ static void nbd_end_request(struct nbd_cmd *cmd)
*/ */
static void sock_shutdown(struct nbd_device *nbd) static void sock_shutdown(struct nbd_device *nbd)
{ {
struct nbd_config *config = nbd->config;
int i; int i;
if (nbd->num_connections == 0) if (config->num_connections == 0)
return; return;
if (test_and_set_bit(NBD_DISCONNECTED, &nbd->runtime_flags)) if (test_and_set_bit(NBD_DISCONNECTED, &config->runtime_flags))
return; return;
for (i = 0; i < nbd->num_connections; i++) { for (i = 0; i < config->num_connections; i++) {
struct nbd_sock *nsock = nbd->socks[i]; struct nbd_sock *nsock = config->socks[i];
mutex_lock(&nsock->tx_lock); mutex_lock(&nsock->tx_lock);
kernel_sock_shutdown(nsock->sock, SHUT_RDWR); kernel_sock_shutdown(nsock->sock, SHUT_RDWR);
nbd_mark_nsock_dead(nsock);
mutex_unlock(&nsock->tx_lock); mutex_unlock(&nsock->tx_lock);
} }
dev_warn(disk_to_dev(nbd->disk), "shutting down sockets\n"); dev_warn(disk_to_dev(nbd->disk), "shutting down sockets\n");
...@@ -202,38 +232,43 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, ...@@ -202,38 +232,43 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req,
{ {
struct nbd_cmd *cmd = blk_mq_rq_to_pdu(req); struct nbd_cmd *cmd = blk_mq_rq_to_pdu(req);
struct nbd_device *nbd = cmd->nbd; struct nbd_device *nbd = cmd->nbd;
struct nbd_config *config;
if (nbd->num_connections > 1) { if (!refcount_inc_not_zero(&nbd->config_refs)) {
req->errors = -EIO;
return BLK_EH_HANDLED;
}
config = nbd->config;
if (config->num_connections > 1) {
dev_err_ratelimited(nbd_to_dev(nbd), dev_err_ratelimited(nbd_to_dev(nbd),
"Connection timed out, retrying\n"); "Connection timed out, retrying\n");
mutex_lock(&nbd->config_lock);
/* /*
* Hooray we have more connections, requeue this IO, the submit * Hooray we have more connections, requeue this IO, the submit
* path will put it on a real connection. * path will put it on a real connection.
*/ */
if (nbd->socks && nbd->num_connections > 1) { if (config->socks && config->num_connections > 1) {
if (cmd->index < nbd->num_connections) { if (cmd->index < config->num_connections) {
struct nbd_sock *nsock = struct nbd_sock *nsock =
nbd->socks[cmd->index]; config->socks[cmd->index];
mutex_lock(&nsock->tx_lock); mutex_lock(&nsock->tx_lock);
nbd_mark_nsock_dead(nsock); nbd_mark_nsock_dead(nsock);
mutex_unlock(&nsock->tx_lock); mutex_unlock(&nsock->tx_lock);
} }
mutex_unlock(&nbd->config_lock);
blk_mq_requeue_request(req, true); blk_mq_requeue_request(req, true);
nbd_config_put(nbd);
return BLK_EH_NOT_HANDLED; return BLK_EH_NOT_HANDLED;
} }
mutex_unlock(&nbd->config_lock);
} else { } else {
dev_err_ratelimited(nbd_to_dev(nbd), dev_err_ratelimited(nbd_to_dev(nbd),
"Connection timed out\n"); "Connection timed out\n");
} }
set_bit(NBD_TIMEDOUT, &nbd->runtime_flags); set_bit(NBD_TIMEDOUT, &config->runtime_flags);
req->errors = -EIO; req->errors = -EIO;
mutex_lock(&nbd->config_lock);
sock_shutdown(nbd); sock_shutdown(nbd);
mutex_unlock(&nbd->config_lock); nbd_config_put(nbd);
return BLK_EH_HANDLED; return BLK_EH_HANDLED;
} }
...@@ -243,7 +278,8 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, ...@@ -243,7 +278,8 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req,
static int sock_xmit(struct nbd_device *nbd, int index, int send, static int sock_xmit(struct nbd_device *nbd, int index, int send,
struct iov_iter *iter, int msg_flags, int *sent) struct iov_iter *iter, int msg_flags, int *sent)
{ {
struct socket *sock = nbd->socks[index]->sock; struct nbd_config *config = nbd->config;
struct socket *sock = config->socks[index]->sock;
int result; int result;
struct msghdr msg; struct msghdr msg;
unsigned long pflags = current->flags; unsigned long pflags = current->flags;
...@@ -289,7 +325,8 @@ static int sock_xmit(struct nbd_device *nbd, int index, int send, ...@@ -289,7 +325,8 @@ static int sock_xmit(struct nbd_device *nbd, int index, int send,
static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)
{ {
struct request *req = blk_mq_rq_from_pdu(cmd); struct request *req = blk_mq_rq_from_pdu(cmd);
struct nbd_sock *nsock = nbd->socks[index]; struct nbd_config *config = nbd->config;
struct nbd_sock *nsock = config->socks[index];
int result; int result;
struct nbd_request request = {.magic = htonl(NBD_REQUEST_MAGIC)}; struct nbd_request request = {.magic = htonl(NBD_REQUEST_MAGIC)};
struct kvec iov = {.iov_base = &request, .iov_len = sizeof(request)}; struct kvec iov = {.iov_base = &request, .iov_len = sizeof(request)};
...@@ -320,7 +357,7 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) ...@@ -320,7 +357,7 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)
} }
if (rq_data_dir(req) == WRITE && if (rq_data_dir(req) == WRITE &&
(nbd->flags & NBD_FLAG_READ_ONLY)) { (config->flags & NBD_FLAG_READ_ONLY)) {
dev_err_ratelimited(disk_to_dev(nbd->disk), dev_err_ratelimited(disk_to_dev(nbd->disk),
"Write on read-only\n"); "Write on read-only\n");
return -EIO; return -EIO;
...@@ -426,15 +463,16 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) ...@@ -426,15 +463,16 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)
return 0; return 0;
} }
static int nbd_disconnected(struct nbd_device *nbd) static int nbd_disconnected(struct nbd_config *config)
{ {
return test_bit(NBD_DISCONNECTED, &nbd->runtime_flags) || return test_bit(NBD_DISCONNECTED, &config->runtime_flags) ||
test_bit(NBD_DISCONNECT_REQUESTED, &nbd->runtime_flags); test_bit(NBD_DISCONNECT_REQUESTED, &config->runtime_flags);
} }
/* NULL returned = something went wrong, inform userspace */ /* NULL returned = something went wrong, inform userspace */
static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index) static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)
{ {
struct nbd_config *config = nbd->config;
int result; int result;
struct nbd_reply reply; struct nbd_reply reply;
struct nbd_cmd *cmd; struct nbd_cmd *cmd;
...@@ -448,7 +486,7 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index) ...@@ -448,7 +486,7 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)
iov_iter_kvec(&to, READ | ITER_KVEC, &iov, 1, sizeof(reply)); iov_iter_kvec(&to, READ | ITER_KVEC, &iov, 1, sizeof(reply));
result = sock_xmit(nbd, index, 0, &to, MSG_WAITALL, NULL); result = sock_xmit(nbd, index, 0, &to, MSG_WAITALL, NULL);
if (result <= 0) { if (result <= 0) {
if (!nbd_disconnected(nbd)) if (!nbd_disconnected(config))
dev_err(disk_to_dev(nbd->disk), dev_err(disk_to_dev(nbd->disk),
"Receive control failed (result %d)\n", result); "Receive control failed (result %d)\n", result);
return ERR_PTR(result); return ERR_PTR(result);
...@@ -498,8 +536,8 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index) ...@@ -498,8 +536,8 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)
* and let the timeout stuff handle resubmitting * and let the timeout stuff handle resubmitting
* this request onto another connection. * this request onto another connection.
*/ */
if (nbd_disconnected(nbd) || if (nbd_disconnected(config) ||
nbd->num_connections <= 1) { config->num_connections <= 1) {
req->errors = -EIO; req->errors = -EIO;
return cmd; return cmd;
} }
...@@ -515,40 +553,20 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index) ...@@ -515,40 +553,20 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)
return cmd; return cmd;
} }
static ssize_t pid_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct gendisk *disk = dev_to_disk(dev);
struct nbd_device *nbd = (struct nbd_device *)disk->private_data;
return sprintf(buf, "%d\n", task_pid_nr(nbd->task_recv));
}
static struct device_attribute pid_attr = {
.attr = { .name = "pid", .mode = S_IRUGO},
.show = pid_show,
};
struct recv_thread_args {
struct work_struct work;
struct nbd_device *nbd;
int index;
};
static void recv_work(struct work_struct *work) static void recv_work(struct work_struct *work)
{ {
struct recv_thread_args *args = container_of(work, struct recv_thread_args *args = container_of(work,
struct recv_thread_args, struct recv_thread_args,
work); work);
struct nbd_device *nbd = args->nbd; struct nbd_device *nbd = args->nbd;
struct nbd_config *config = nbd->config;
struct nbd_cmd *cmd; struct nbd_cmd *cmd;
int ret = 0; int ret = 0;
BUG_ON(nbd->magic != NBD_MAGIC);
while (1) { while (1) {
cmd = nbd_read_stat(nbd, args->index); cmd = nbd_read_stat(nbd, args->index);
if (IS_ERR(cmd)) { if (IS_ERR(cmd)) {
struct nbd_sock *nsock = nbd->socks[args->index]; struct nbd_sock *nsock = config->socks[args->index];
mutex_lock(&nsock->tx_lock); mutex_lock(&nsock->tx_lock);
nbd_mark_nsock_dead(nsock); nbd_mark_nsock_dead(nsock);
...@@ -559,8 +577,10 @@ static void recv_work(struct work_struct *work) ...@@ -559,8 +577,10 @@ static void recv_work(struct work_struct *work)
nbd_end_request(cmd); nbd_end_request(cmd);
} }
atomic_dec(&nbd->recv_threads); atomic_dec(&config->recv_threads);
wake_up(&nbd->recv_wq); wake_up(&config->recv_wq);
nbd_config_put(nbd);
kfree(args);
} }
static void nbd_clear_req(struct request *req, void *data, bool reserved) static void nbd_clear_req(struct request *req, void *data, bool reserved)
...@@ -576,39 +596,38 @@ static void nbd_clear_req(struct request *req, void *data, bool reserved) ...@@ -576,39 +596,38 @@ static void nbd_clear_req(struct request *req, void *data, bool reserved)
static void nbd_clear_que(struct nbd_device *nbd) static void nbd_clear_que(struct nbd_device *nbd)
{ {
BUG_ON(nbd->magic != NBD_MAGIC);
blk_mq_tagset_busy_iter(&nbd->tag_set, nbd_clear_req, NULL); blk_mq_tagset_busy_iter(&nbd->tag_set, nbd_clear_req, NULL);
dev_dbg(disk_to_dev(nbd->disk), "queue cleared\n"); dev_dbg(disk_to_dev(nbd->disk), "queue cleared\n");
} }
static int find_fallback(struct nbd_device *nbd, int index) static int find_fallback(struct nbd_device *nbd, int index)
{ {
struct nbd_config *config = nbd->config;
int new_index = -1; int new_index = -1;
struct nbd_sock *nsock = nbd->socks[index]; struct nbd_sock *nsock = config->socks[index];
int fallback = nsock->fallback_index; int fallback = nsock->fallback_index;
if (test_bit(NBD_DISCONNECTED, &nbd->runtime_flags)) if (test_bit(NBD_DISCONNECTED, &config->runtime_flags))
return new_index; return new_index;
if (nbd->num_connections <= 1) { if (config->num_connections <= 1) {
dev_err_ratelimited(disk_to_dev(nbd->disk), dev_err_ratelimited(disk_to_dev(nbd->disk),
"Attempted send on invalid socket\n"); "Attempted send on invalid socket\n");
return new_index; return new_index;
} }
if (fallback >= 0 && fallback < nbd->num_connections && if (fallback >= 0 && fallback < config->num_connections &&
!nbd->socks[fallback]->dead) !config->socks[fallback]->dead)
return fallback; return fallback;
if (nsock->fallback_index < 0 || if (nsock->fallback_index < 0 ||
nsock->fallback_index >= nbd->num_connections || nsock->fallback_index >= config->num_connections ||
nbd->socks[nsock->fallback_index]->dead) { config->socks[nsock->fallback_index]->dead) {
int i; int i;
for (i = 0; i < nbd->num_connections; i++) { for (i = 0; i < config->num_connections; i++) {
if (i == index) if (i == index)
continue; continue;
if (!nbd->socks[i]->dead) { if (!config->socks[i]->dead) {
new_index = i; new_index = i;
break; break;
} }
...@@ -628,23 +647,34 @@ static int nbd_handle_cmd(struct nbd_cmd *cmd, int index) ...@@ -628,23 +647,34 @@ static int nbd_handle_cmd(struct nbd_cmd *cmd, int index)
{ {
struct request *req = blk_mq_rq_from_pdu(cmd); struct request *req = blk_mq_rq_from_pdu(cmd);
struct nbd_device *nbd = cmd->nbd; struct nbd_device *nbd = cmd->nbd;
struct nbd_config *config;
struct nbd_sock *nsock; struct nbd_sock *nsock;
int ret; int ret;
if (index >= nbd->num_connections) { if (!refcount_inc_not_zero(&nbd->config_refs)) {
dev_err_ratelimited(disk_to_dev(nbd->disk),
"Socks array is empty\n");
return -EINVAL;
}
config = nbd->config;
if (index >= config->num_connections) {
dev_err_ratelimited(disk_to_dev(nbd->disk), dev_err_ratelimited(disk_to_dev(nbd->disk),
"Attempted send on invalid socket\n"); "Attempted send on invalid socket\n");
nbd_config_put(nbd);
return -EINVAL; return -EINVAL;
} }
req->errors = 0; req->errors = 0;
again: again:
nsock = nbd->socks[index]; nsock = config->socks[index];
mutex_lock(&nsock->tx_lock); mutex_lock(&nsock->tx_lock);
if (nsock->dead) { if (nsock->dead) {
index = find_fallback(nbd, index); index = find_fallback(nbd, index);
if (index < 0) {
ret = -EIO;
goto out;
}
mutex_unlock(&nsock->tx_lock); mutex_unlock(&nsock->tx_lock);
if (index < 0)
return -EIO;
goto again; goto again;
} }
...@@ -672,6 +702,7 @@ static int nbd_handle_cmd(struct nbd_cmd *cmd, int index) ...@@ -672,6 +702,7 @@ static int nbd_handle_cmd(struct nbd_cmd *cmd, int index)
} }
out: out:
mutex_unlock(&nsock->tx_lock); mutex_unlock(&nsock->tx_lock);
nbd_config_put(nbd);
return ret; return ret;
} }
...@@ -711,6 +742,7 @@ static int nbd_queue_rq(struct blk_mq_hw_ctx *hctx, ...@@ -711,6 +742,7 @@ static int nbd_queue_rq(struct blk_mq_hw_ctx *hctx,
static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev, static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev,
unsigned long arg) unsigned long arg)
{ {
struct nbd_config *config = nbd->config;
struct socket *sock; struct socket *sock;
struct nbd_sock **socks; struct nbd_sock **socks;
struct nbd_sock *nsock; struct nbd_sock *nsock;
...@@ -729,7 +761,7 @@ static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev, ...@@ -729,7 +761,7 @@ static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev,
return -EINVAL; return -EINVAL;
} }
socks = krealloc(nbd->socks, (nbd->num_connections + 1) * socks = krealloc(config->socks, (config->num_connections + 1) *
sizeof(struct nbd_sock *), GFP_KERNEL); sizeof(struct nbd_sock *), GFP_KERNEL);
if (!socks) { if (!socks) {
sockfd_put(sock); sockfd_put(sock);
...@@ -741,7 +773,7 @@ static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev, ...@@ -741,7 +773,7 @@ static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev,
return -ENOMEM; return -ENOMEM;
} }
nbd->socks = socks; config->socks = socks;
nsock->fallback_index = -1; nsock->fallback_index = -1;
nsock->dead = false; nsock->dead = false;
...@@ -749,7 +781,7 @@ static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev, ...@@ -749,7 +781,7 @@ static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev,
nsock->sock = sock; nsock->sock = sock;
nsock->pending = NULL; nsock->pending = NULL;
nsock->sent = 0; nsock->sent = 0;
socks[nbd->num_connections++] = nsock; socks[config->num_connections++] = nsock;
if (max_part) if (max_part)
bdev->bd_invalidated = 1; bdev->bd_invalidated = 1;
...@@ -759,11 +791,7 @@ static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev, ...@@ -759,11 +791,7 @@ static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev,
/* Reset all properties of an NBD device */ /* Reset all properties of an NBD device */
static void nbd_reset(struct nbd_device *nbd) static void nbd_reset(struct nbd_device *nbd)
{ {
nbd->runtime_flags = 0; nbd->config = NULL;
nbd->blksize = 1024;
nbd->bytesize = 0;
set_capacity(nbd->disk, 0);
nbd->flags = 0;
nbd->tag_set.timeout = 0; nbd->tag_set.timeout = 0;
queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue); queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue);
} }
...@@ -782,11 +810,12 @@ static void nbd_bdev_reset(struct block_device *bdev) ...@@ -782,11 +810,12 @@ static void nbd_bdev_reset(struct block_device *bdev)
static void nbd_parse_flags(struct nbd_device *nbd, struct block_device *bdev) static void nbd_parse_flags(struct nbd_device *nbd, struct block_device *bdev)
{ {
if (nbd->flags & NBD_FLAG_READ_ONLY) struct nbd_config *config = nbd->config;
if (config->flags & NBD_FLAG_READ_ONLY)
set_device_ro(bdev, true); set_device_ro(bdev, true);
if (nbd->flags & NBD_FLAG_SEND_TRIM) if (config->flags & NBD_FLAG_SEND_TRIM)
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue); queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue);
if (nbd->flags & NBD_FLAG_SEND_FLUSH) if (config->flags & NBD_FLAG_SEND_FLUSH)
blk_queue_write_cache(nbd->disk->queue, true, false); blk_queue_write_cache(nbd->disk->queue, true, false);
else else
blk_queue_write_cache(nbd->disk->queue, false, false); blk_queue_write_cache(nbd->disk->queue, false, false);
...@@ -794,6 +823,7 @@ static void nbd_parse_flags(struct nbd_device *nbd, struct block_device *bdev) ...@@ -794,6 +823,7 @@ static void nbd_parse_flags(struct nbd_device *nbd, struct block_device *bdev)
static void send_disconnects(struct nbd_device *nbd) static void send_disconnects(struct nbd_device *nbd)
{ {
struct nbd_config *config = nbd->config;
struct nbd_request request = { struct nbd_request request = {
.magic = htonl(NBD_REQUEST_MAGIC), .magic = htonl(NBD_REQUEST_MAGIC),
.type = htonl(NBD_CMD_DISC), .type = htonl(NBD_CMD_DISC),
...@@ -802,7 +832,7 @@ static void send_disconnects(struct nbd_device *nbd) ...@@ -802,7 +832,7 @@ static void send_disconnects(struct nbd_device *nbd)
struct iov_iter from; struct iov_iter from;
int i, ret; int i, ret;
for (i = 0; i < nbd->num_connections; i++) { for (i = 0; i < config->num_connections; i++) {
iov_iter_kvec(&from, WRITE | ITER_KVEC, &iov, 1, sizeof(request)); iov_iter_kvec(&from, WRITE | ITER_KVEC, &iov, 1, sizeof(request));
ret = sock_xmit(nbd, i, 1, &from, 0, NULL); ret = sock_xmit(nbd, i, 1, &from, 0, NULL);
if (ret <= 0) if (ret <= 0)
...@@ -813,20 +843,15 @@ static void send_disconnects(struct nbd_device *nbd) ...@@ -813,20 +843,15 @@ static void send_disconnects(struct nbd_device *nbd)
static int nbd_disconnect(struct nbd_device *nbd, struct block_device *bdev) static int nbd_disconnect(struct nbd_device *nbd, struct block_device *bdev)
{ {
dev_info(disk_to_dev(nbd->disk), "NBD_DISCONNECT\n"); struct nbd_config *config = nbd->config;
if (!nbd->socks)
return -EINVAL;
dev_info(disk_to_dev(nbd->disk), "NBD_DISCONNECT\n");
mutex_unlock(&nbd->config_lock); mutex_unlock(&nbd->config_lock);
fsync_bdev(bdev); fsync_bdev(bdev);
mutex_lock(&nbd->config_lock); mutex_lock(&nbd->config_lock);
/* Check again after getting mutex back. */
if (!nbd->socks)
return -EINVAL;
if (!test_and_set_bit(NBD_DISCONNECT_REQUESTED, if (!test_and_set_bit(NBD_DISCONNECT_REQUESTED,
&nbd->runtime_flags)) &config->runtime_flags))
send_disconnects(nbd); send_disconnects(nbd);
return 0; return 0;
} }
...@@ -838,51 +863,63 @@ static int nbd_clear_sock(struct nbd_device *nbd, struct block_device *bdev) ...@@ -838,51 +863,63 @@ static int nbd_clear_sock(struct nbd_device *nbd, struct block_device *bdev)
__invalidate_device(bdev, true); __invalidate_device(bdev, true);
nbd_bdev_reset(bdev); nbd_bdev_reset(bdev);
/* nbd->task_setup = NULL;
* We want to give the run thread a chance to wait for everybody return 0;
* to clean up and then do it's own cleanup. }
*/
if (!test_bit(NBD_RUNNING, &nbd->runtime_flags) &&
nbd->num_connections) {
int i;
for (i = 0; i < nbd->num_connections; i++) { static void nbd_config_put(struct nbd_device *nbd)
sockfd_put(nbd->socks[i]->sock); {
kfree(nbd->socks[i]); if (refcount_dec_and_mutex_lock(&nbd->config_refs,
} &nbd->config_lock)) {
kfree(nbd->socks); struct block_device *bdev;
nbd->socks = NULL; struct nbd_config *config = nbd->config;
nbd->num_connections = 0;
bdev = bdget_disk(nbd->disk, 0);
if (!bdev) {
mutex_unlock(&nbd->config_lock);
return;
} }
nbd->task_setup = NULL;
return 0; nbd_dev_dbg_close(nbd);
nbd_size_clear(nbd, bdev);
if (test_and_clear_bit(NBD_HAS_PID_FILE,
&config->runtime_flags))
device_remove_file(disk_to_dev(nbd->disk), &pid_attr);
nbd->task_recv = NULL;
nbd_clear_sock(nbd, bdev);
if (config->num_connections) {
int i;
for (i = 0; i < config->num_connections; i++) {
sockfd_put(config->socks[i]->sock);
kfree(config->socks[i]);
}
kfree(config->socks);
}
nbd_reset(nbd);
mutex_unlock(&nbd->config_lock);
bdput(bdev);
module_put(THIS_MODULE);
}
} }
static int nbd_start_device(struct nbd_device *nbd, struct block_device *bdev) static int nbd_start_device(struct nbd_device *nbd, struct block_device *bdev)
{ {
struct recv_thread_args *args; struct nbd_config *config = nbd->config;
int num_connections = nbd->num_connections; int num_connections = config->num_connections;
int error = 0, i; int error = 0, i;
if (nbd->task_recv) if (nbd->task_recv)
return -EBUSY; return -EBUSY;
if (!nbd->socks) if (!config->socks)
return -EINVAL; return -EINVAL;
if (num_connections > 1 && if (num_connections > 1 &&
!(nbd->flags & NBD_FLAG_CAN_MULTI_CONN)) { !(config->flags & NBD_FLAG_CAN_MULTI_CONN)) {
dev_err(disk_to_dev(nbd->disk), "server does not support multiple connections per device.\n"); dev_err(disk_to_dev(nbd->disk), "server does not support multiple connections per device.\n");
error = -EINVAL; return -EINVAL;
goto out_err;
} }
set_bit(NBD_RUNNING, &nbd->runtime_flags); blk_mq_update_nr_hw_queues(&nbd->tag_set, config->num_connections);
blk_mq_update_nr_hw_queues(&nbd->tag_set, nbd->num_connections);
args = kcalloc(num_connections, sizeof(*args), GFP_KERNEL);
if (!args) {
error = -ENOMEM;
goto out_err;
}
nbd->task_recv = current; nbd->task_recv = current;
mutex_unlock(&nbd->config_lock); mutex_unlock(&nbd->config_lock);
...@@ -891,41 +928,40 @@ static int nbd_start_device(struct nbd_device *nbd, struct block_device *bdev) ...@@ -891,41 +928,40 @@ static int nbd_start_device(struct nbd_device *nbd, struct block_device *bdev)
error = device_create_file(disk_to_dev(nbd->disk), &pid_attr); error = device_create_file(disk_to_dev(nbd->disk), &pid_attr);
if (error) { if (error) {
dev_err(disk_to_dev(nbd->disk), "device_create_file failed!\n"); dev_err(disk_to_dev(nbd->disk), "device_create_file failed!\n");
goto out_recv; return error;
} }
set_bit(NBD_HAS_PID_FILE, &config->runtime_flags);
nbd_size_update(nbd, bdev); nbd_size_update(nbd, bdev);
nbd_dev_dbg_init(nbd); nbd_dev_dbg_init(nbd);
for (i = 0; i < num_connections; i++) { for (i = 0; i < num_connections; i++) {
sk_set_memalloc(nbd->socks[i]->sock->sk); struct recv_thread_args *args;
atomic_inc(&nbd->recv_threads);
INIT_WORK(&args[i].work, recv_work); args = kzalloc(sizeof(*args), GFP_KERNEL);
args[i].nbd = nbd; if (!args) {
args[i].index = i; sock_shutdown(nbd);
queue_work(recv_workqueue, &args[i].work); return -ENOMEM;
} }
wait_event_interruptible(nbd->recv_wq, sk_set_memalloc(config->socks[i]->sock->sk);
atomic_read(&nbd->recv_threads) == 0); atomic_inc(&config->recv_threads);
for (i = 0; i < num_connections; i++) refcount_inc(&nbd->config_refs);
flush_work(&args[i].work); INIT_WORK(&args->work, recv_work);
nbd_dev_dbg_close(nbd); args->nbd = nbd;
nbd_size_clear(nbd, bdev); args->index = i;
device_remove_file(disk_to_dev(nbd->disk), &pid_attr); queue_work(recv_workqueue, &args->work);
out_recv: }
error = wait_event_interruptible(config->recv_wq,
atomic_read(&config->recv_threads) == 0);
if (error)
sock_shutdown(nbd);
mutex_lock(&nbd->config_lock); mutex_lock(&nbd->config_lock);
nbd->task_recv = NULL;
out_err:
clear_bit(NBD_RUNNING, &nbd->runtime_flags);
nbd_clear_sock(nbd, bdev);
/* user requested, ignore socket errors */ /* user requested, ignore socket errors */
if (test_bit(NBD_DISCONNECT_REQUESTED, &nbd->runtime_flags)) if (test_bit(NBD_DISCONNECT_REQUESTED, &config->runtime_flags))
error = 0; error = 0;
if (test_bit(NBD_TIMEDOUT, &nbd->runtime_flags)) if (test_bit(NBD_TIMEDOUT, &config->runtime_flags))
error = -ETIMEDOUT; error = -ETIMEDOUT;
nbd_reset(nbd);
return error; return error;
} }
...@@ -933,6 +969,8 @@ static int nbd_start_device(struct nbd_device *nbd, struct block_device *bdev) ...@@ -933,6 +969,8 @@ static int nbd_start_device(struct nbd_device *nbd, struct block_device *bdev)
static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct nbd_config *config = nbd->config;
switch (cmd) { switch (cmd) {
case NBD_DISCONNECT: case NBD_DISCONNECT:
return nbd_disconnect(nbd, bdev); return nbd_disconnect(nbd, bdev);
...@@ -942,14 +980,14 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, ...@@ -942,14 +980,14 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
return nbd_add_socket(nbd, bdev, arg); return nbd_add_socket(nbd, bdev, arg);
case NBD_SET_BLKSIZE: case NBD_SET_BLKSIZE:
nbd_size_set(nbd, bdev, arg, nbd_size_set(nbd, bdev, arg,
div_s64(nbd->bytesize, arg)); div_s64(config->bytesize, arg));
return 0; return 0;
case NBD_SET_SIZE: case NBD_SET_SIZE:
nbd_size_set(nbd, bdev, nbd->blksize, nbd_size_set(nbd, bdev, config->blksize,
div_s64(arg, nbd->blksize)); div_s64(arg, config->blksize));
return 0; return 0;
case NBD_SET_SIZE_BLOCKS: case NBD_SET_SIZE_BLOCKS:
nbd_size_set(nbd, bdev, nbd->blksize, arg); nbd_size_set(nbd, bdev, config->blksize, arg);
return 0; return 0;
case NBD_SET_TIMEOUT: case NBD_SET_TIMEOUT:
if (arg) { if (arg) {
...@@ -959,7 +997,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, ...@@ -959,7 +997,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
return 0; return 0;
case NBD_SET_FLAGS: case NBD_SET_FLAGS:
nbd->flags = arg; config->flags = arg;
return 0; return 0;
case NBD_DO_IT: case NBD_DO_IT:
return nbd_start_device(nbd, bdev); return nbd_start_device(nbd, bdev);
...@@ -988,18 +1026,70 @@ static int nbd_ioctl(struct block_device *bdev, fmode_t mode, ...@@ -988,18 +1026,70 @@ static int nbd_ioctl(struct block_device *bdev, fmode_t mode,
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
BUG_ON(nbd->magic != NBD_MAGIC);
mutex_lock(&nbd->config_lock); mutex_lock(&nbd->config_lock);
error = __nbd_ioctl(bdev, nbd, cmd, arg); error = __nbd_ioctl(bdev, nbd, cmd, arg);
mutex_unlock(&nbd->config_lock); mutex_unlock(&nbd->config_lock);
return error; return error;
} }
static struct nbd_config *nbd_alloc_config(void)
{
struct nbd_config *config;
config = kzalloc(sizeof(struct nbd_config), GFP_NOFS);
if (!config)
return NULL;
atomic_set(&config->recv_threads, 0);
init_waitqueue_head(&config->recv_wq);
config->blksize = 1024;
try_module_get(THIS_MODULE);
return config;
}
static int nbd_open(struct block_device *bdev, fmode_t mode)
{
struct nbd_device *nbd;
int ret = 0;
mutex_lock(&nbd_index_mutex);
nbd = bdev->bd_disk->private_data;
if (!nbd) {
ret = -ENXIO;
goto out;
}
if (!refcount_inc_not_zero(&nbd->config_refs)) {
struct nbd_config *config;
mutex_lock(&nbd->config_lock);
if (refcount_inc_not_zero(&nbd->config_refs)) {
mutex_unlock(&nbd->config_lock);
goto out;
}
config = nbd->config = nbd_alloc_config();
if (!config) {
ret = -ENOMEM;
mutex_unlock(&nbd->config_lock);
goto out;
}
refcount_set(&nbd->config_refs, 1);
mutex_unlock(&nbd->config_lock);
}
out:
mutex_unlock(&nbd_index_mutex);
return ret;
}
static void nbd_release(struct gendisk *disk, fmode_t mode)
{
struct nbd_device *nbd = disk->private_data;
nbd_config_put(nbd);
}
static const struct block_device_operations nbd_fops = static const struct block_device_operations nbd_fops =
{ {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = nbd_open,
.release = nbd_release,
.ioctl = nbd_ioctl, .ioctl = nbd_ioctl,
.compat_ioctl = nbd_ioctl, .compat_ioctl = nbd_ioctl,
}; };
...@@ -1031,7 +1121,7 @@ static const struct file_operations nbd_dbg_tasks_ops = { ...@@ -1031,7 +1121,7 @@ static const struct file_operations nbd_dbg_tasks_ops = {
static int nbd_dbg_flags_show(struct seq_file *s, void *unused) static int nbd_dbg_flags_show(struct seq_file *s, void *unused)
{ {
struct nbd_device *nbd = s->private; struct nbd_device *nbd = s->private;
u32 flags = nbd->flags; u32 flags = nbd->config->flags;
seq_printf(s, "Hex: 0x%08x\n\n", flags); seq_printf(s, "Hex: 0x%08x\n\n", flags);
...@@ -1064,6 +1154,7 @@ static const struct file_operations nbd_dbg_flags_ops = { ...@@ -1064,6 +1154,7 @@ static const struct file_operations nbd_dbg_flags_ops = {
static int nbd_dev_dbg_init(struct nbd_device *nbd) static int nbd_dev_dbg_init(struct nbd_device *nbd)
{ {
struct dentry *dir; struct dentry *dir;
struct nbd_config *config = nbd->config;
if (!nbd_dbg_dir) if (!nbd_dbg_dir)
return -EIO; return -EIO;
...@@ -1074,12 +1165,12 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd) ...@@ -1074,12 +1165,12 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd)
nbd_name(nbd)); nbd_name(nbd));
return -EIO; return -EIO;
} }
nbd->dbg_dir = dir; config->dbg_dir = dir;
debugfs_create_file("tasks", 0444, dir, nbd, &nbd_dbg_tasks_ops); debugfs_create_file("tasks", 0444, dir, nbd, &nbd_dbg_tasks_ops);
debugfs_create_u64("size_bytes", 0444, dir, &nbd->bytesize); debugfs_create_u64("size_bytes", 0444, dir, &config->bytesize);
debugfs_create_u32("timeout", 0444, dir, &nbd->tag_set.timeout); debugfs_create_u32("timeout", 0444, dir, &nbd->tag_set.timeout);
debugfs_create_u64("blocksize", 0444, dir, &nbd->blksize); debugfs_create_u64("blocksize", 0444, dir, &config->blksize);
debugfs_create_file("flags", 0444, dir, nbd, &nbd_dbg_flags_ops); debugfs_create_file("flags", 0444, dir, nbd, &nbd_dbg_flags_ops);
return 0; return 0;
...@@ -1087,7 +1178,7 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd) ...@@ -1087,7 +1178,7 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd)
static void nbd_dev_dbg_close(struct nbd_device *nbd) static void nbd_dev_dbg_close(struct nbd_device *nbd)
{ {
debugfs_remove_recursive(nbd->dbg_dir); debugfs_remove_recursive(nbd->config->dbg_dir);
} }
static int nbd_dbg_init(void) static int nbd_dbg_init(void)
...@@ -1148,7 +1239,6 @@ static const struct blk_mq_ops nbd_mq_ops = { ...@@ -1148,7 +1239,6 @@ static const struct blk_mq_ops nbd_mq_ops = {
static void nbd_dev_remove(struct nbd_device *nbd) static void nbd_dev_remove(struct nbd_device *nbd)
{ {
struct gendisk *disk = nbd->disk; struct gendisk *disk = nbd->disk;
nbd->magic = 0;
if (disk) { if (disk) {
del_gendisk(disk); del_gendisk(disk);
blk_cleanup_queue(disk->queue); blk_cleanup_queue(disk->queue);
...@@ -1217,14 +1307,13 @@ static int nbd_dev_add(int index) ...@@ -1217,14 +1307,13 @@ static int nbd_dev_add(int index)
blk_queue_max_hw_sectors(disk->queue, 65536); blk_queue_max_hw_sectors(disk->queue, 65536);
disk->queue->limits.max_sectors = 256; disk->queue->limits.max_sectors = 256;
nbd->magic = NBD_MAGIC;
mutex_init(&nbd->config_lock); mutex_init(&nbd->config_lock);
refcount_set(&nbd->config_refs, 0);
disk->major = NBD_MAJOR; disk->major = NBD_MAJOR;
disk->first_minor = index << part_shift; disk->first_minor = index << part_shift;
disk->fops = &nbd_fops; disk->fops = &nbd_fops;
disk->private_data = nbd; disk->private_data = nbd;
sprintf(disk->disk_name, "nbd%d", index); sprintf(disk->disk_name, "nbd%d", index);
init_waitqueue_head(&nbd->recv_wq);
nbd_reset(nbd); nbd_reset(nbd);
add_disk(disk); add_disk(disk);
return index; return index;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7