From 9d6ca280512d3a539c771879d82645a0f7b5a27d Mon Sep 17 00:00:00 2001 From: David Ahern Date: Mon, 2 Nov 2020 18:31:00 -0700 Subject: [PATCH] io_uring: Handle incomplete sends for stream sockets Signed-off-by: David Ahern --- fs/io_uring.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index aae0ef2ec34d..d15511d1e284 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -421,6 +421,7 @@ struct io_sr_msg { int msg_flags; int bgid; size_t len; + size_t offset; struct io_buffer *kbuf; }; @@ -4149,7 +4150,8 @@ static int io_send(struct io_kiocb *req, bool force_nonblock, if (unlikely(!sock)) return ret; - ret = import_single_range(WRITE, sr->buf, sr->len, &iov, &msg.msg_iter); + ret = import_single_range(WRITE, sr->buf + sr->offset, sr->len, &iov, + &msg.msg_iter); if (unlikely(ret)) return ret;; @@ -4171,8 +4173,18 @@ static int io_send(struct io_kiocb *req, bool force_nonblock, if (ret == -ERESTARTSYS) ret = -EINTR; - if (ret < 0) + if (ret < 0) { req_set_fail_links(req); + } else if (ret > 0 && sock->type == SOCK_STREAM) { + if (unlikely(ret < sr->len)) { + pr_debug("req %px sr->offset %lu sr->len %lu ret %d\n", + req, sr->offset, sr->len, ret); + sr->len -= ret; + sr->offset += ret; + return -EAGAIN; + } + ret += sr->offset; + } __io_req_complete(req, ret, 0, cs); return 0; } @@ -6460,6 +6472,9 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req, /* same numerical values with corresponding REQ_F_*, safe to copy */ req->flags |= sqe_flags; + if (req->opcode == IORING_OP_SEND || req->opcode == IORING_OP_SENDMSG) + req->sr_msg.offset = 0; + if (!io_op_defs[req->opcode].needs_file) return 0; -- 2.25.1