Commit f51a5e82 authored by Jason Wang's avatar Jason Wang Committed by David S. Miller

tun/macvtap: use consume_skb() instead of kfree_skb() when needed

To be more friendly with drop monitor, we should only call kfree_skb() when
the packets were dropped and use consume_skb() in other cases.

Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6db16718
...@@ -859,7 +859,10 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, ...@@ -859,7 +859,10 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q,
} }
if (skb) { if (skb) {
ret = macvtap_put_user(q, skb, to); ret = macvtap_put_user(q, skb, to);
kfree_skb(skb); if (unlikely(ret < 0))
kfree_skb(skb);
else
consume_skb(skb);
} }
if (!noblock) if (!noblock)
finish_wait(sk_sleep(&q->sk), &wait); finish_wait(sk_sleep(&q->sk), &wait);
......
...@@ -1362,7 +1362,10 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile, ...@@ -1362,7 +1362,10 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
return 0; return 0;
ret = tun_put_user(tun, tfile, skb, to); ret = tun_put_user(tun, tfile, skb, to);
kfree_skb(skb); if (unlikely(ret < 0))
kfree_skb(skb);
else
consume_skb(skb);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment