Skip to content

Commit

Permalink
io_uring: zerocopy receive
Browse files Browse the repository at this point in the history
Integrate the current zerocopy receive solution to io_uring for eazier
use. The current calling process is:
  1) mmap a range of virtual address
  2) poll() to wait for data ready of the sockfd
  3) call getsockopt() to map the address in 1) to physical pages
  4) access the data.

By integrating it to io_uring, 2) and 3) can be merged:
  1) mmap a range of virtual address
  2) prepare a sqe and submit
  3) get a cqe which indicates data is ready and mapped
  4) access the data

which reduce one system call and make users be unaware of 3)

Signed-off-by: Hao Xu <haoxu@linux.alibaba.com>
  • Loading branch information
Hao Xu authored and intel-lab-lkp committed Jan 24, 2022
1 parent d3d80a0 commit 2957041
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 0 deletions.
72 changes: 72 additions & 0 deletions fs/io_uring.c
Expand Up @@ -81,6 +81,7 @@
#include <linux/tracehook.h>
#include <linux/audit.h>
#include <linux/security.h>
#include <net/tcp.h>

#define CREATE_TRACE_POINTS
#include <trace/events/io_uring.h>
Expand Down Expand Up @@ -581,6 +582,12 @@ struct io_sr_msg {
size_t len;
};

struct io_recvzc {
struct file *file;
char __user *u_zc;
int __user *u_len;
};

struct io_open {
struct file *file;
int dfd;
Expand Down Expand Up @@ -855,6 +862,7 @@ struct io_kiocb {
struct io_mkdir mkdir;
struct io_symlink symlink;
struct io_hardlink hardlink;
struct io_recvzc recvzc;
};

u8 opcode;
Expand Down Expand Up @@ -1105,6 +1113,12 @@ static const struct io_op_def io_op_defs[] = {
[IORING_OP_MKDIRAT] = {},
[IORING_OP_SYMLINKAT] = {},
[IORING_OP_LINKAT] = {},
[IORING_OP_RECVZC] = {
.needs_file = 1,
.unbound_nonreg_file = 1,
.pollin = 1,
.audit_skip = 1,
},
};

/* requests with any of those set should undergo io_disarm_next() */
Expand Down Expand Up @@ -5243,6 +5257,59 @@ static int io_recv(struct io_kiocb *req, unsigned int issue_flags)
return 0;
}

static int io_recvzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{
struct io_recvzc *recvzc = &req->recvzc;

#ifndef CONFIG_MMU
return -EOPNOTSUPP;
#endif
if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
return -EINVAL;
if (sqe->ioprio || sqe->len || sqe->buf_index)
return -EINVAL;

recvzc->u_zc = u64_to_user_ptr(READ_ONCE(sqe->addr));
recvzc->u_len = u64_to_user_ptr(READ_ONCE(sqe->off));

return 0;
}

static int io_recvzc(struct io_kiocb *req, unsigned int issue_flags)
{
struct scm_timestamping_internal tss;
struct io_recvzc *recvzc = &req->recvzc;
struct tcp_zerocopy_receive zc;
char __user *u_zc = recvzc->u_zc;
int __user *u_len = recvzc->u_len;
int len = 0;
struct socket *sock;
struct sock *sk;
int err;

if (!(req->flags & REQ_F_POLLED))
return -EAGAIN;

err = zc_receive_check(&zc, &len, u_zc, u_len);
if (err)
goto out;

sock = sock_from_file(req->file);
if (unlikely(!sock))
return -ENOTSOCK;

sk = sock->sk;
lock_sock(sk);
err = tcp_zerocopy_receive(sk, &zc, &tss);
release_sock(sk);
err = zc_receive_update(sk, &zc, len, u_zc, &tss, err);

out:
__io_req_complete(req, issue_flags, err, 0);

return 0;
}

static int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{
struct io_accept *accept = &req->accept;
Expand Down Expand Up @@ -6568,6 +6635,8 @@ static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
return io_symlinkat_prep(req, sqe);
case IORING_OP_LINKAT:
return io_linkat_prep(req, sqe);
case IORING_OP_RECVZC:
return io_recvzc_prep(req, sqe);
}

printk_once(KERN_WARNING "io_uring: unhandled opcode %d\n",
Expand Down Expand Up @@ -6851,6 +6920,9 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags)
case IORING_OP_LINKAT:
ret = io_linkat(req, issue_flags);
break;
case IORING_OP_RECVZC:
ret = io_recvzc(req, issue_flags);
break;
default:
ret = -EINVAL;
break;
Expand Down
1 change: 1 addition & 0 deletions include/uapi/linux/io_uring.h
Expand Up @@ -143,6 +143,7 @@ enum {
IORING_OP_MKDIRAT,
IORING_OP_SYMLINKAT,
IORING_OP_LINKAT,
IORING_OP_RECVZC,

/* this goes last, obviously */
IORING_OP_LAST,
Expand Down

0 comments on commit 2957041

Please sign in to comment.