kevin/linux
1
Fork 0
Code

io_uring/net: add io_req_msg_cleanup() helper

Browse Source 
For the fast inline path, we manually recycle the io_async_msghdr and
free the iovec, and then clear the REQ_F_NEED_CLEANUP flag to avoid
that needing doing in the slower path. We already do that in 2 spots, and
in preparation for adding more, add a helper and use it.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2024-03-06 07:57:57 -07:00
parent fb6328bc2a
commit d9b441889c
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
io_uring/net.c
View File

@ -414,6 +414,17 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
return 0; return 0;
} }
static void io_req_msg_cleanup(struct io_kiocb *req,
struct io_async_msghdr *kmsg,
unsigned int issue_flags)
{
req->flags &= ~REQ_F_NEED_CLEANUP;
/* fast path, check for non-NULL to avoid function call */
if (kmsg->free_iov)
kfree(kmsg->free_iov);
io_netmsg_recycle(req, issue_flags);
}
int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags) int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags)
{ {
struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg); struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);
@ -463,11 +474,7 @@ int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags)
ret = -EINTR; ret = -EINTR;
req_set_fail(req); req_set_fail(req);
} }
/* fast path, check for non-NULL to avoid function call */ io_req_msg_cleanup(req, kmsg, issue_flags);
if (kmsg->free_iov)
kfree(kmsg->free_iov);
req->flags &= ~REQ_F_NEED_CLEANUP;
io_netmsg_recycle(req, issue_flags);
if (ret >= 0) if (ret >= 0)
ret += sr->done_io; ret += sr->done_io;
else if (sr->done_io) else if (sr->done_io)
@ -927,13 +934,9 @@ retry_multishot:
if (!io_recv_finish(req, &ret, &kmsg->msg, mshot_finished, issue_flags)) if (!io_recv_finish(req, &ret, &kmsg->msg, mshot_finished, issue_flags))
goto retry_multishot; goto retry_multishot;
if (mshot_finished) { if (mshot_finished)
/* fast path, check for non-NULL to avoid function call */ io_req_msg_cleanup(req, kmsg, issue_flags);
if (kmsg->free_iov) else if (ret == -EAGAIN)
kfree(kmsg->free_iov);
io_netmsg_recycle(req, issue_flags);
req->flags &= ~REQ_F_NEED_CLEANUP;
} else if (ret == -EAGAIN)
return io_setup_async_msg(req, kmsg, issue_flags); return io_setup_async_msg(req, kmsg, issue_flags);
return ret; return ret;