hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jason Wang 2014-12-01 16:53:15 +08:00 committed by David S. Miller
parent 6db16718c9
commit f51a5e82ea
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/macvtap.c
View File

@ -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);

5
drivers/net/tun.c
View File

@ -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;
} }