Message ID | 1503590569.2499.81.camel@edumazet-glaptop3.roam.corp.google.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Thu, 24 Aug 2017 09:02:49 -0700 > From: Eric Dumazet <edumazet@google.com> > > This change is needed to not fool drop monitor. > (perf record ... -e skb:kfree_skb ) > > Packets were properly sent and are consumed after TX completion. > > Signed-off-by: Eric Dumazet <edumazet@google.com> I'm pretty sure you meant "friendly" in the Subject line so I fixed it up to say that :-) Applied, thanks.
On Thu, 2017-08-24 at 11:50 -0700, David Miller wrote: > From: Eric Dumazet <eric.dumazet@gmail.com> > Date: Thu, 24 Aug 2017 09:02:49 -0700 > > > From: Eric Dumazet <edumazet@google.com> > > > > This change is needed to not fool drop monitor. > > (perf record ... -e skb:kfree_skb ) > > > > Packets were properly sent and are consumed after TX completion. > > > > Signed-off-by: Eric Dumazet <edumazet@google.com> > > I'm pretty sure you meant "friendly" in the Subject line so I fixed > it up to say that :-) > > Applied, thanks. Ah, great, thanks for fixing this ;)
On Thu, Aug 24, 2017 at 09:02:49AM -0700, Eric Dumazet wrote: > From: Eric Dumazet <edumazet@google.com> > > This change is needed to not fool drop monitor. > (perf record ... -e skb:kfree_skb ) > > Packets were properly sent and are consumed after TX completion. > > Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > drivers/net/virtio_net.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 98f17b05c68b..b06169ea60dc 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -1058,7 +1058,7 @@ static void free_old_xmit_skbs(struct send_queue *sq) > bytes += skb->len; > packets++; > > - dev_kfree_skb_any(skb); > + dev_consume_skb_any(skb); > } > > /* Avoid overhead when no packets have been processed >
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 98f17b05c68b..b06169ea60dc 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1058,7 +1058,7 @@ static void free_old_xmit_skbs(struct send_queue *sq) bytes += skb->len; packets++; - dev_kfree_skb_any(skb); + dev_consume_skb_any(skb); } /* Avoid overhead when no packets have been processed