Skip to contentSkip to conversation

virtio-net: pass gfp to add_buf

PATCH In review Rusty Russell 2 participants 3 messages May 31, 2010 – Jun 1, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 virtio-net: pass gfp to add_buf

From: "Michael S. Tsirkin" <[email protected]>

(Dave: the virtqueue_add_buf_gfp is in Linus' tree, so please queue
this trivial use now. Thanks!)

virtio-net bounces buffer allocations off to
a thread if it can't allocate buffers from the atomic pool. However, if posting buffers still requires atomic buffers, this is unlikely to succeed.
Fix by passing in the proper gfp_t parameter.

---
 drivers/net/virtio_net.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/virtio_net.c +4 -4
@@ -341,7 +341,7 @@ static int add_recvbuf_small(struct virt
 
 	skb_to_sgvec(skb, vi->rx_sg + 1, 0, skb->len);
 
-	err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, 2, skb);
+	err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, 2, skb, gfp);
 	if (err < 0)
 		dev_kfree_skb(skb);
 
@@ -386,8 +386,8 @@ static int add_recvbuf_big(struct virtne
 
 	/* chain first in list head */
 	first->private = (unsigned long)list;
-	err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, MAX_SKB_FRAGS + 2,
-				       first);
+	err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, MAX_SKB_FRAGS + 2,
+				    first, gfp);
 	if (err < 0)
 		give_pages(vi, first);
 
@@ -405,7 +405,7 @@ static int add_recvbuf_mergeable(struct 
 
 	sg_init_one(vi->rx_sg, page_address(page), PAGE_SIZE);
 
-	err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, 1, page);
+	err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, 1, page, gfp);
 	if (err < 0)
 		give_pages(vi, page);
 
maintainer
#1 lore raw

From: Rusty Russell <[email protected]>
Date: Mon, 31 May 2010 20:40:01 +0930

Quoted 5 lines

From: "Michael S. Tsirkin" <[email protected]>

(Dave: the virtqueue_add_buf_gfp is in Linus' tree, so please queue
this trivial use now. Thanks!)

Quoted 8 lines

virtio-net bounces buffer allocations off to
a thread if it can't allocate buffers from the atomic pool. However, if posting buffers still requires atomic buffers, this is unlikely to succeed.
Fix by passing in the proper gfp_t parameter.

Your code sucks, and you're wrong.

Please give me positive feedback and tell me how right I am to pump up my ego or else I will verbally destroy you and make you feel small.

Applied :-)))))))))))))))

#2 lore raw
Quoted 17 lines · David Miller

From: Rusty Russell <[email protected]>
Date: Mon, 31 May 2010 20:40:01 +0930

Quoted 5 lines

From: "Michael S. Tsirkin" <[email protected]>

(Dave: the virtqueue_add_buf_gfp is in Linus' tree, so please queue
this trivial use now. Thanks!)

Quoted 8 lines

virtio-net bounces buffer allocations off to
a thread if it can't allocate buffers from the atomic pool. However, if posting buffers still requires atomic buffers, this is unlikely to succeed.
Fix by passing in the proper gfp_t parameter.

Quoted 6 lines

Your code sucks, and you're wrong.

Please give me positive feedback and tell me how right I am to pump up my ego or else I will verbally destroy you and make you feel small.

Applied :-)))))))))))))))

Thanks Dave, that made my day :)

Cheers,
Rusty.