io_uring/net: don't lose partial send/recv on fail

commit 7e6b638ed501cced4e472298d6b08dd16346f3a6 upstream.

Just as with rw, partial send/recv may end up in
io_req_complete_failed() and loose the result, make sure we return the
number of bytes processed.

Cc: stable@vger.kernel.org
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/a4ff95897b5419356fca9ea55db91ac15b2975f9.1663668091.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/io_uring/net.c b/io_uring/net.c
index 60e392f7f2dcdc91c5390be2386a604a741af355..f1036f429156fa04602e289ba5516d73a744e471 100644 (file)
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -1087,6 +1087,16 @@ int io_sendzc(struct io_kiocb *req, unsigned int issue_flags)
        return IOU_OK;
 }
 
+void io_sendrecv_fail(struct io_kiocb *req)
+{
+       struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);
+       int res = req->cqe.res;
+
+       if (req->flags & REQ_F_PARTIAL_IO)
+               res = sr->done_io;
+       io_req_set_res(req, res, req->cqe.flags);
+}
+
 int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 {
        struct io_accept *accept = io_kiocb_to_cmd(req, struct io_accept);

diff --git a/io_uring/net.h b/io_uring/net.h
index d744a0a874e75908809fecf488672a3eb339912e..109ffb3a1a3ff2687ceb33e24f142c5f986bb1ed 100644 (file)
--- a/io_uring/net.h
+++ b/io_uring/net.h
@@ -43,6 +43,8 @@ int io_recvmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
 int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags);
 int io_recv(struct io_kiocb *req, unsigned int issue_flags);
 
+void io_sendrecv_fail(struct io_kiocb *req);
+
 int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
 int io_accept(struct io_kiocb *req, unsigned int issue_flags);
 

diff --git a/io_uring/opdef.c b/io_uring/opdef.c
index 2312196fd23bbea910aa7350414e3ce3a5c965cb..5cb9de70bef333cc9f7c8b89b6fe8de6d05b54a2 100644 (file)
--- a/io_uring/opdef.c
+++ b/io_uring/opdef.c
@@ -157,6 +157,7 @@ const struct io_op_def io_op_defs[] = {
                .issue                  = io_sendmsg,
                .prep_async             = io_sendmsg_prep_async,
                .cleanup                = io_sendmsg_recvmsg_cleanup,
+               .fail                   = io_sendrecv_fail,
 #else
                .prep                   = io_eopnotsupp_prep,
 #endif
@@ -174,6 +175,7 @@ const struct io_op_def io_op_defs[] = {
                .issue                  = io_recvmsg,
                .prep_async             = io_recvmsg_prep_async,
                .cleanup                = io_sendmsg_recvmsg_cleanup,
+               .fail                   = io_sendrecv_fail,
 #else
                .prep                   = io_eopnotsupp_prep,
 #endif
@@ -316,6 +318,7 @@ const struct io_op_def io_op_defs[] = {
 #if defined(CONFIG_NET)
                .prep                   = io_sendmsg_prep,
                .issue                  = io_send,
+               .fail                   = io_sendrecv_fail,
 #else
                .prep                   = io_eopnotsupp_prep,
 #endif
@@ -331,6 +334,7 @@ const struct io_op_def io_op_defs[] = {
 #if defined(CONFIG_NET)
                .prep                   = io_recvmsg_prep,
                .issue                  = io_recv,
+               .fail                   = io_sendrecv_fail,
 #else
                .prep                   = io_eopnotsupp_prep,
 #endif