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>

2 files changed, 8 insertions, 2 deletions

diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 22b4cf2fa108..ba1e5db2152e 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -859,7 +859,10 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q,
         }
         if (skb) {
                 ret = macvtap_put_user(q, skb, to);
-                kfree_skb(skb);
+                if (unlikely(ret < 0))
+                        kfree_skb(skb);
+                else
+                        consume_skb(skb);
         }
         if (!noblock)
                 finish_wait(sk_sleep(&q->sk), &wait);
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 6d44da184594..9c58286b8a42 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1362,7 +1362,10 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
                 return 0;
 
         ret = tun_put_user(tun, tfile, skb, to);
-        kfree_skb(skb);
+        if (unlikely(ret < 0))
+                kfree_skb(skb);
+        else
+                consume_skb(skb);
 
         return ret;
 }