This patch makes tap_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>
static ssize_t tap_do_read(struct tap_queue *q,
struct iov_iter *to,
static ssize_t tap_do_read(struct tap_queue *q,
struct iov_iter *to,
+ int noblock, struct sk_buff *skb)
ssize_t ret = 0;
if (!iov_iter_count(to))
return 0;
ssize_t ret = 0;
if (!iov_iter_count(to))
return 0;
while (1) {
if (!noblock)
prepare_to_wait(sk_sleep(&q->sk), &wait,
while (1) {
if (!noblock)
prepare_to_wait(sk_sleep(&q->sk), &wait,
if (!noblock)
finish_wait(sk_sleep(&q->sk), &wait);
if (!noblock)
finish_wait(sk_sleep(&q->sk), &wait);
if (skb) {
ret = tap_put_user(q, skb, to);
if (unlikely(ret < 0))
if (skb) {
ret = tap_put_user(q, skb, to);
if (unlikely(ret < 0))
struct tap_queue *q = file->private_data;
ssize_t len = iov_iter_count(to), ret;
struct tap_queue *q = file->private_data;
ssize_t len = iov_iter_count(to), ret;
- ret = tap_do_read(q, to, file->f_flags & O_NONBLOCK);
+ ret = tap_do_read(q, to, file->f_flags & O_NONBLOCK, NULL);
ret = min_t(ssize_t, ret, len);
if (ret > 0)
iocb->ki_pos = ret;
ret = min_t(ssize_t, ret, len);
if (ret > 0)
iocb->ki_pos = ret;
int ret;
if (flags & ~(MSG_DONTWAIT|MSG_TRUNC))
return -EINVAL;
int ret;
if (flags & ~(MSG_DONTWAIT|MSG_TRUNC))
return -EINVAL;
- ret = tap_do_read(q, &m->msg_iter, flags & MSG_DONTWAIT);
+ ret = tap_do_read(q, &m->msg_iter, flags & MSG_DONTWAIT,
+ m->msg_control);
if (ret > total_len) {
m->msg_flags |= MSG_TRUNC;
ret = flags & MSG_TRUNC ? ret : total_len;
if (ret > total_len) {
m->msg_flags |= MSG_TRUNC;
ret = flags & MSG_TRUNC ? ret : total_len;