hulk inclusion category: feature bugzilla: https://atomgit.com/openeuler/kernel/issues/9153 ---------------------------------------- This reverts commit 05db143d68ef17d206b5d925256bbac834016e0b. Revert self-developed patchset, using mainline patchset. Signed-off-by: Yang Erkun <yangerkun@huawei.com> --- drivers/block/nbd.c | 155 +++++++++++++++++--------------------------- 1 file changed, 59 insertions(+), 96 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 25885a2c7e70..2cc7abcf8bc7 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -38,7 +38,6 @@ #include <linux/types.h> #include <linux/debugfs.h> #include <linux/blk-mq.h> -#include <linux/xarray.h> #include <linux/uaccess.h> #include <asm/types.h> @@ -94,7 +93,7 @@ struct nbd_config { unsigned long runtime_flags; u64 dead_conn_timeout; - struct xarray socks; + struct nbd_sock **socks; int num_connections; atomic_t live_connections; wait_queue_head_t conn_wait; @@ -380,15 +379,15 @@ static void nbd_complete_rq(struct request *req) static void sock_shutdown(struct nbd_device *nbd) { struct nbd_config *config = nbd->config; - struct nbd_sock *nsock; - unsigned long i; + int i; if (config->num_connections == 0) return; if (test_and_set_bit(NBD_RT_DISCONNECTED, &config->runtime_flags)) return; - xa_for_each(&config->socks, i, nsock) { + for (i = 0; i < config->num_connections; i++) { + struct nbd_sock *nsock = config->socks[i]; mutex_lock(&nsock->tx_lock); nbd_mark_nsock_dead(nbd, nsock, 0); mutex_unlock(&nsock->tx_lock); @@ -433,7 +432,6 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req) struct nbd_cmd *cmd = blk_mq_rq_to_pdu(req); struct nbd_device *nbd = cmd->nbd; struct nbd_config *config; - struct nbd_sock *nsock; if (!mutex_trylock(&cmd->lock)) return BLK_EH_RESET_TIMER; @@ -463,9 +461,10 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req) * connection is configured, the submit path will wait util * a new connection is reconfigured or util dead timeout. */ - if (!xa_empty(&config->socks)) { - nsock = xa_load(&config->socks, cmd->index); - if (nsock) { + if (config->socks) { + if (cmd->index < config->num_connections) { + struct nbd_sock *nsock = + config->socks[cmd->index]; mutex_lock(&nsock->tx_lock); /* We can have multiple outstanding requests, so * we don't want to mark the nsock dead if we've @@ -489,24 +488,22 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req) * Userspace sets timeout=0 to disable socket disconnection, * so just warn and reset the timer. */ + struct nbd_sock *nsock = config->socks[cmd->index]; cmd->retries++; dev_info(nbd_to_dev(nbd), "Possible stuck request %p: control (%s@%llu,%uB). Runtime %u seconds\n", req, nbdcmd_to_ascii(req_to_nbd_cmd_type(req)), (unsigned long long)blk_rq_pos(req) << 9, blk_rq_bytes(req), (req->timeout / HZ) * cmd->retries); - nsock = xa_load(&config->socks, cmd->index); - if (nsock) { - mutex_lock(&nsock->tx_lock); - if (cmd->cookie != nsock->cookie) { - nbd_requeue_cmd(cmd); - mutex_unlock(&nsock->tx_lock); - mutex_unlock(&cmd->lock); - nbd_config_put(nbd); - return BLK_EH_DONE; - } + mutex_lock(&nsock->tx_lock); + if (cmd->cookie != nsock->cookie) { + nbd_requeue_cmd(cmd); mutex_unlock(&nsock->tx_lock); + mutex_unlock(&cmd->lock); + nbd_config_put(nbd); + return BLK_EH_DONE; } + mutex_unlock(&nsock->tx_lock); mutex_unlock(&cmd->lock); nbd_config_put(nbd); return BLK_EH_RESET_TIMER; @@ -573,16 +570,8 @@ static int sock_xmit(struct nbd_device *nbd, int index, int send, struct iov_iter *iter, int msg_flags, int *sent) { struct nbd_config *config = nbd->config; - struct nbd_sock *nsock; - struct socket *sock; + struct socket *sock = config->socks[index]->sock; - nsock = xa_load(&config->socks, index); - if (unlikely(!nsock)) { - dev_err_ratelimited(disk_to_dev(nbd->disk), - "Attempted xmit on invalid socket\n"); - return -EINVAL; - } - sock = nsock->sock; return __sock_xmit(nbd, sock, send, iter, msg_flags, sent); } @@ -603,7 +592,7 @@ 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 nbd_config *config = nbd->config; - struct nbd_sock *nsock; + struct nbd_sock *nsock = config->socks[index]; int result; struct nbd_request request = {.magic = htonl(NBD_REQUEST_MAGIC)}; struct kvec iov = {.iov_base = &request, .iov_len = sizeof(request)}; @@ -613,14 +602,7 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) u64 handle; u32 type; u32 nbd_cmd_flags = 0; - int sent, skip = 0; - - nsock = xa_load(&config->socks, index); - if (unlikely(!nsock)) { - dev_err_ratelimited(disk_to_dev(nbd->disk), - "Attempted send on invalid socket\n"); - return BLK_STS_IOERR; - } + int sent = nsock->sent, skip = 0; lockdep_assert_held(&cmd->lock); lockdep_assert_held(&nsock->tx_lock); @@ -645,7 +627,6 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) * request struct, so just go and send the rest of the pages in the * request. */ - sent = nsock->sent; if (sent) { if (sent >= sizeof(request)) { skip = sent - sizeof(request); @@ -973,10 +954,9 @@ static int find_fallback(struct nbd_device *nbd, int index) { struct nbd_config *config = nbd->config; int new_index = -1; - struct nbd_sock *nsock; - struct nbd_sock *fallback_nsock; - unsigned long i; - int fallback; + struct nbd_sock *nsock = config->socks[index]; + int fallback = nsock->fallback_index; + int i; if (test_bit(NBD_RT_DISCONNECTED, &config->runtime_flags)) return new_index; @@ -984,19 +964,12 @@ static int find_fallback(struct nbd_device *nbd, int index) if (config->num_connections <= 1) goto no_fallback; - nsock = xa_load(&config->socks, index); - if (unlikely(!nsock)) - goto no_fallback; - - fallback = nsock->fallback_index; - if (fallback >= 0 && fallback < config->num_connections) { - fallback_nsock = xa_load(&config->socks, fallback); - if (fallback_nsock && !fallback_nsock->dead) - return fallback; - } + if (fallback >= 0 && fallback < config->num_connections && + !config->socks[fallback]->dead) + return fallback; - xa_for_each(&config->socks, i, fallback_nsock) { - if (i != index && !fallback_nsock->dead) { + for (i = 0; i < config->num_connections; i++) { + if (i != index && !config->socks[i]->dead) { new_index = i; break; } @@ -1052,14 +1025,7 @@ static blk_status_t nbd_handle_cmd(struct nbd_cmd *cmd, int index) } cmd->status = BLK_STS_OK; again: - nsock = xa_load(&config->socks, index); - if (unlikely(!nsock)) { - dev_err_ratelimited(disk_to_dev(nbd->disk), - "Attempted send on invalid socket\n"); - nbd_config_put(nbd); - return BLK_STS_IOERR; - } - + nsock = config->socks[index]; mutex_lock(&nsock->tx_lock); if (nsock->dead) { int old_index = index; @@ -1180,8 +1146,8 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg, { struct nbd_config *config = nbd->config; struct socket *sock; + struct nbd_sock **socks; struct nbd_sock *nsock; - unsigned int index; int err; /* Arg will be cast to int, check it to avoid overflow */ @@ -1216,6 +1182,16 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg, goto put_socket; } + socks = krealloc(config->socks, (config->num_connections + 1) * + sizeof(struct nbd_sock *), GFP_KERNEL); + if (!socks) { + kfree(nsock); + err = -ENOMEM; + goto put_socket; + } + + config->socks = socks; + nsock->fallback_index = -1; nsock->dead = false; mutex_init(&nsock->tx_lock); @@ -1223,14 +1199,7 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg, nsock->pending = NULL; nsock->sent = 0; nsock->cookie = 0; - - err = xa_alloc(&config->socks, &index, nsock, xa_limit_32b, GFP_KERNEL); - if (err < 0) { - kfree(nsock); - goto put_socket; - } - - config->num_connections++; + socks[config->num_connections++] = nsock; atomic_inc(&config->live_connections); blk_mq_unfreeze_queue(nbd->disk->queue); @@ -1247,8 +1216,7 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg) struct nbd_config *config = nbd->config; struct socket *sock, *old; struct recv_thread_args *args; - struct nbd_sock *nsock; - unsigned long i; + int i; int err; sock = nbd_get_socket(nbd, arg, &err); @@ -1261,7 +1229,9 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg) return -ENOMEM; } - xa_for_each(&config->socks, i, nsock) { + for (i = 0; i < config->num_connections; i++) { + struct nbd_sock *nsock = config->socks[i]; + if (!nsock->dead) continue; @@ -1336,11 +1306,10 @@ static void send_disconnects(struct nbd_device *nbd) }; struct kvec iov = {.iov_base = &request, .iov_len = sizeof(request)}; struct iov_iter from; - struct nbd_sock *nsock; - unsigned long i; - int ret; + int i, ret; - xa_for_each(&config->socks, i, nsock) { + for (i = 0; i < config->num_connections; i++) { + struct nbd_sock *nsock = config->socks[i]; iov_iter_kvec(&from, ITER_SOURCE, &iov, 1, sizeof(request)); mutex_lock(&nsock->tx_lock); @@ -1375,9 +1344,6 @@ static void nbd_config_put(struct nbd_device *nbd) if (refcount_dec_and_mutex_lock(&nbd->config_refs, &nbd->config_lock)) { struct nbd_config *config = nbd->config; - struct nbd_sock *nsock; - unsigned long i; - nbd_dev_dbg_close(nbd); invalidate_disk(nbd->disk); if (nbd->config->bytesize) @@ -1393,15 +1359,14 @@ static void nbd_config_put(struct nbd_device *nbd) nbd->backend = NULL; } nbd_clear_sock(nbd); - if (config->num_connections) { - xa_for_each(&config->socks, i, nsock) { - sockfd_put(nsock->sock); - kfree(nsock); + int i; + for (i = 0; i < config->num_connections; i++) { + sockfd_put(config->socks[i]->sock); + kfree(config->socks[i]); } + kfree(config->socks); } - xa_destroy(&config->socks); - kfree(nbd->config); nbd->config = NULL; @@ -1419,13 +1384,11 @@ static int nbd_start_device(struct nbd_device *nbd) { struct nbd_config *config = nbd->config; int num_connections = config->num_connections; - int error = 0; - unsigned long i; - struct nbd_sock *nsock; + int error = 0, i; if (nbd->pid) return -EBUSY; - if (xa_empty(&config->socks)) + if (!config->socks) return -EINVAL; if (num_connections > 1 && !(config->flags & NBD_FLAG_CAN_MULTI_CONN)) { @@ -1446,7 +1409,7 @@ static int nbd_start_device(struct nbd_device *nbd) set_bit(NBD_RT_HAS_PID_FILE, &config->runtime_flags); nbd_dev_dbg_init(nbd); - xa_for_each(&config->socks, i, nsock) { + for (i = 0; i < num_connections; i++) { struct recv_thread_args *args; args = kzalloc(sizeof(*args), GFP_KERNEL); @@ -1464,14 +1427,15 @@ static int nbd_start_device(struct nbd_device *nbd) flush_workqueue(nbd->recv_workq); return -ENOMEM; } - sk_set_memalloc(nsock->sock->sk); + sk_set_memalloc(config->socks[i]->sock->sk); if (nbd->tag_set.timeout) - nsock->sock->sk->sk_sndtimeo = 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->nsock = nsock; + args->nsock = config->socks[i]; args->index = i; queue_work(nbd->recv_workq, &args->work); } @@ -1626,7 +1590,6 @@ static int nbd_alloc_and_init_config(struct nbd_device *nbd) return -ENOMEM; } - xa_init_flags(&config->socks, XA_FLAGS_ALLOC); atomic_set(&config->recv_threads, 0); init_waitqueue_head(&config->recv_wq); init_waitqueue_head(&config->conn_wait); -- 2.52.0