diff options
author | Jason Wang <jasowang@redhat.com> | 2018-09-12 11:17:06 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-09-13 09:25:40 -0700 |
commit | fe8dd45bb7556246c6b76277b1ba4296c91c2505 (patch) | |
tree | 9e31911fda3e7b8ca55238498bf8becead0e3db4 /drivers/net/tun.c | |
parent | 1a097910adda6b3328fc235575bba0e9ee408492 (diff) | |
download | linux-fe8dd45bb7556246c6b76277b1ba4296c91c2505.tar.gz linux-fe8dd45bb7556246c6b76277b1ba4296c91c2505.tar.bz2 linux-fe8dd45bb7556246c6b76277b1ba4296c91c2505.zip |
tun: switch to new type of msg_control
This patch introduces to a new tun/tap specific msg_control:
#define TUN_MSG_UBUF 1
#define TUN_MSG_PTR 2
struct tun_msg_ctl {
int type;
void *ptr;
};
This allows us to pass different kinds of msg_control through
sendmsg(). The first supported type is ubuf (TUN_MSG_UBUF) which will
be used by the existed vhost_net zerocopy code. The second is XDP
buff, which allows vhost_net to pass XDP buff to TUN. This could be
used to implement accepting an array of XDP buffs from vhost_net in
the following patches.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r-- | drivers/net/tun.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 3ae539374f6b..89779b58c7ca 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2431,11 +2431,15 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) int ret; struct tun_file *tfile = container_of(sock, struct tun_file, socket); struct tun_struct *tun = tun_get(tfile); + struct tun_msg_ctl *ctl = m->msg_control; if (!tun) return -EBADFD; - ret = tun_get_user(tun, tfile, m->msg_control, &m->msg_iter, + if (ctl && ctl->type != TUN_MSG_UBUF) + return -EINVAL; + + ret = tun_get_user(tun, tfile, ctl ? ctl->ptr : NULL, &m->msg_iter, m->msg_flags & MSG_DONTWAIT, m->msg_flags & MSG_MORE); tun_put(tun); |