Message ID | 200811171735.44025.rusty@rustcorp.com.au |
---|---|
State | Superseded, archived |
Delegated to: | David Miller |
Headers | show |
From: Rusty Russell <rusty@rustcorp.com.au> Date: Mon, 17 Nov 2008 17:35:43 +1030 > On Monday 17 November 2008 14:15:05 David Miller wrote: > > From: Rusty Russell <rusty@rustcorp.com.au> > > Date: Mon, 17 Nov 2008 13:44:57 +1030 > > > > > @@ -82,6 +82,16 @@ static void give_a_page(struct virtnet_info *vi, > > > struct page *page) > > > > -E_EMAIL_CLIENT_NEWLINES > > Each time we re-fill the recv queue with buffers, we allocate > one too many skbs and free it again when adding fails. We should > recycle the pages allocated in this case. > > A previous version of this patch made trim_pages() trim trailing > unused pages from skbs with some paged data, but this actually > caused a barely measurable slowdown. > > Signed-off-by: Mark McLoughlin <markmc@redhat.com> > Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (use netdev_priv) -ETOOLATE, and... > - give_a_page(dev->priv, skb_shinfo(skb)->frags[i].page); this wouldn't have applied to net-next-2.6, the dev->priv reads netdev_priv(dev) there. Anyways, as I said in my other reply I fixed all of this up because I was tired of waiting... :) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 0196a0d..985271a 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -82,6 +82,16 @@ static void give_a_page(struct virtnet_info *vi, struct page *page) vi->pages = page; } +static void trim_pages(struct virtnet_info *vi, struct sk_buff *skb) +{ + unsigned int i; + + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) + give_a_page(vi, skb_shinfo(skb)->frags[i].page); + skb_shinfo(skb)->nr_frags = 0; + skb->data_len = 0; +} + static struct page *get_a_page(struct virtnet_info *vi, gfp_t gfp_mask) { struct page *p = vi->pages; @@ -121,14 +131,8 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb, } len -= sizeof(struct virtio_net_hdr); - if (len <= MAX_PACKET_LEN) { - unsigned int i; - - for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) - give_a_page(dev->priv, skb_shinfo(skb)->frags[i].page); - skb->data_len = 0; - skb_shinfo(skb)->nr_frags = 0; - } + if (len <= MAX_PACKET_LEN) + trim_pages(netdev_priv(dev), skb); err = pskb_trim(skb, len); if (err) { @@ -232,6 +236,7 @@ static void try_fill_recv(struct virtnet_info *vi) err = vi->rvq->vq_ops->add_buf(vi->rvq, sg, 0, num, skb); if (err) { skb_unlink(skb, &vi->recv); + trim_pages(vi, skb); kfree_skb(skb); break; }