nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

tun: support receiving skb through msg_control

Browse source 
This patch makes tun_recvmsg() can receive from skb from its caller
through msg_control. Vhost_net will be the first user.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jason Wang 2017-05-17 12:14:43 +08:00 committed by David S. Miller
parent 49f96fd0cb
commit ac77cfd425
1 changed files with 10 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/tun.c
View file

@ -1510,9 +1510,8 @@ static struct sk_buff *tun_ring_recv(struct tun_file *tfile, int noblock,
static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile, static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
struct iov_iter *to, struct iov_iter *to,
int noblock) int noblock, struct sk_buff *skb)
{ {
struct sk_buff *skb;
ssize_t ret; ssize_t ret;
int err; int err;
@ -1521,10 +1520,12 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
if (!iov_iter_count(to)) if (!iov_iter_count(to))
return 0; return 0;
if (!skb) {
/* Read frames from ring */ /* Read frames from ring */
skb = tun_ring_recv(tfile, noblock, &err); skb = tun_ring_recv(tfile, noblock, &err);
if (!skb) if (!skb)
return err; return err;
}
ret = tun_put_user(tun, tfile, skb, to); ret = tun_put_user(tun, tfile, skb, to);
if (unlikely(ret < 0)) if (unlikely(ret < 0))
@ -1544,7 +1545,7 @@ static ssize_t tun_chr_read_iter(struct kiocb *iocb, struct iov_iter *to)
if (!tun) if (!tun)
return -EBADFD; return -EBADFD;
ret = tun_do_read(tun, tfile, to, file->f_flags & O_NONBLOCK); ret = tun_do_read(tun, tfile, to, file->f_flags & O_NONBLOCK, NULL);
ret = min_t(ssize_t, ret, len); ret = min_t(ssize_t, ret, len);
if (ret > 0) if (ret > 0)
iocb->ki_pos = ret; iocb->ki_pos = ret;
@ -1646,7 +1647,8 @@ static int tun_recvmsg(struct socket *sock, struct msghdr *m, size_t total_len,
SOL_PACKET, TUN_TX_TIMESTAMP); SOL_PACKET, TUN_TX_TIMESTAMP);
goto out; goto out;
} }
ret = tun_do_read(tun, tfile, &m->msg_iter, flags & MSG_DONTWAIT); ret = tun_do_read(tun, tfile, &m->msg_iter, flags & MSG_DONTWAIT,
m->msg_control);
if (ret > (ssize_t)total_len) { if (ret > (ssize_t)total_len) {
m->msg_flags |= MSG_TRUNC; m->msg_flags |= MSG_TRUNC;
ret = flags & MSG_TRUNC ? ret : total_len; ret = flags & MSG_TRUNC ? ret : total_len;