net: introduce skb_coalesce_rx_frag()
Subsystems (4)
PATCH v3 1/2 net: introduce skb_coalesce_rx_frag()
Sometimes we need to coalesce the rx frags to avoid frag list. One example is virtio-net driver which tries to use small frags for both MTU sized packet and GSO packet. So this patch introduce skb_coalesce_rx_frag() to do this.
---
Changes from V2:
- remove the skb_frag_unref() and let the called to put the page reference Changes from V1:
- remove the useless off parameter.
--- include/linux/skbuff.h | 3 +++ net/core/skbuff.c | 12 ++++++++++++ 2 files changed, 15 insertions(+)
include/linux/skbuff.h +3 -0
@@ -1372,6 +1372,9 @@ static inline void skb_fill_page_desc(struct sk_buff *skb, int i,void skb_add_rx_frag (struct sk_buff *skb,int i,struct page *page,int off,int size,unsigned int truesize); +void skb_coalesce_rx_frag (struct sk_buff *skb,int i,int size, +unsigned int truesize); +#define SKB_PAGE_ASSERT (skb) BUG_ON(skb_shinfo(skb)->nr_frags)#define SKB_FRAG_ASSERT (skb) BUG_ON(skb_has_frag_list(skb))#define SKB_LINEAR_ASSERT (skb) BUG_ON(skb_is_nonlinear(skb))
net/core/skbuff.c +12 -0
@@ -476,6 +476,18 @@ void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off, }EXPORT_SYMBOL (skb_add_rx_frag); +void skb_coalesce_rx_frag (struct sk_buff *skb,int i,int size, +unsigned int truesize) +{ +skb_frag_t *frag = &skb_shinfo (skb)->frags[i]; + +skb_frag_size_add (frag, size); + skb->len += size; + skb->data_len += size; + skb->truesize += truesize; +} +EXPORT_SYMBOL (skb_coalesce_rx_frag); +static void skb_drop_list (struct sk_buff **listp) {kfree_skb_list (*listp);
Signature · 1 line
1.8.1.2
PATCH v3 2/2 virtio-net: coalesce rx frags when possible during rx
Commit 2613af0ed18a11d5c566a81f9a6510b73180660a (virtio_net: migrate mergeable rx buffers to page frag allocators) try to increase the payload/truesize for MTU-sized traffic. But this will introduce the extra overhead for GSO packets received because of the frag list. This commit tries to reduce this issue by coalesce the possible rx frags when possible during rx. Test result shows the about 15% improvement on full size GSO packet receiving (and even better than before commit 2613af0ed18a11d5c566a81f9a6510b73180660a).
Before this commit:
./netperf -H 192.168.100.4
MIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to 192.168.100.4 () port 0 AF_INET : demo
Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec
87380 16384 16384 10.00 20303.87
After this commit:
./netperf -H 192.168.100.4
MIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to 192.168.100.4 () port 0 AF_INET : demo
Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec
87380 16384 16384 10.00 23841.26
---
Changes from V2:
- call put_page() instead of depending on skb_coalesce_rx_frag()
--- drivers/net/virtio_net.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/virtio_net.c +11 -4
@@ -305,7 +305,7 @@ static int receive_mergeable(struct receive_queue *rq, struct sk_buff *head_skb)struct sk_buff *curr_skb = head_skb;char *buf;struct page *page; -int num_buf, len; +int num_buf, len, offset; num_buf = hdr->mhdr.num_buffers;while (--num_buf) {
@@ -342,9 +342,16 @@ static int receive_mergeable(struct receive_queue *rq, struct sk_buff *head_skb) head_skb->truesize +=MAX_PACKET_LEN ; } page =virt_to_head_page (buf); -skb_add_rx_frag (curr_skb, num_skb_frags, page, - buf - (char *)page_address (page), len, -MAX_PACKET_LEN ); + offset = buf - (char *)page_address (page); +if (skb_can_coalesce (curr_skb, num_skb_frags, page, offset)) { +put_page (page); +skb_coalesce_rx_frag (curr_skb, num_skb_frags -1 , + len,MAX_PACKET_LEN ); + }else { +skb_add_rx_frag (curr_skb, num_skb_frags, page, + offset, len, +MAX_PACKET_LEN ); + } --rq->num; }return 0 ;
Signature · 1 line
1.8.1.2
Re: [PATCH net-next V3 2/2] virtio-net: coalesce rx frags when possible during rx
Quoted 37 lines · Jason Wang
Commit
2613af0ed18a11d5c566a81f9a6510b73180660a(virtio_net: migrate mergeable rx buffers to page frag allocators) try to increase the payload/truesize for MTU-sized traffic. But this will introduce the extra overhead for GSO packets received because of the frag list. This commit tries to reduce this issue by coalesce the possible rx frags when possible during rx. Test result shows the about 15% improvement on full size GSO packet receiving (and even better than before commit2613af0ed18a11d5c566a81f9a6510b73180660a).Before this commit:
./netperf -H 192.168.100.4
MIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0AF_INETto 192.168.100.4 () port 0AF_INET: demoRecv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec87380 16384 16384 10.00 20303.87
After this commit:
./netperf -H 192.168.100.4
MIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0AF_INETto 192.168.100.4 () port 0AF_INET: demoRecv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec87380 16384 16384 10.00 23841.26
Cc Rusty Russell <[email protected]>Cc Michael S. Tsirkin <[email protected]>Cc Michael Dalton <[email protected]>Cc Eric Dumazet <[email protected]>Acked-by Eric Dumazet <[email protected]>Signed-off-by Jason Wang <[email protected]>
Quoted 4 lines
---
Changes from V2:
- callput_page()instead of depending onskb_coalesce_rx_frag()
---
Yes, very nice improvement, thanks again !
David Miller
maintainerRe: [PATCH net-next V3 2/2] virtio-net: coalesce rx frags when possible during rx
In reply to Jason WangFrom: Jason Wang <[email protected]>
Date: Fri, 1 Nov 2013 14:07:48 +0800
Quoted 7 lines
Commit
2613af0ed18a11d5c566a81f9a6510b73180660a(virtio_net: migrate mergeable rx buffers to page frag allocators) try to increase the payload/truesize for MTU-sized traffic. But this will introduce the extra overhead for GSO packets received because of the frag list. This commit tries to reduce this issue by coalesce the possible rx frags when possible during rx. Test result shows the about 15% improvement on full size GSO packet receiving (and even better than before commit2613af0ed18a11d5c566a81f9a6510b73180660a).
...
Quoted 10 lines
Cc Rusty Russell <[email protected]>Cc Michael S. Tsirkin <[email protected]>Cc Michael Dalton <[email protected]>Cc Eric Dumazet <[email protected]>Acked-by Eric Dumazet <[email protected]>Signed-off-by Jason Wang <[email protected]>---
Changes from V2:
- callput_page()instead of depending onskb_coalesce_rx_frag()
Looks fantastic, applied, thanks Jason!
Quoted 10 lines · Jason Wang
Sometimes we need to coalesce the rx frags to avoid frag list. One example is virtio-net driver which tries to use small frags for both MTU sized packet and GSO packet. So this patch introduce
skb_coalesce_rx_frag()to do this.Cc Rusty Russell <[email protected]>Cc Michael S. Tsirkin <[email protected]>Cc Michael Dalton <[email protected]>Cc Eric Dumazet <[email protected]>Signed-off-by Jason Wang <[email protected]>
Quoted 6 lines
---
Changes from V2:
- remove theskb_frag_unref()and let the called to put the page reference Changes from V1:
- remove the useless off parameter.
---
From: Jason Wang <[email protected]>
Date: Fri, 1 Nov 2013 14:07:47 +0800
Quoted 10 lines
Sometimes we need to coalesce the rx frags to avoid frag list. One example is virtio-net driver which tries to use small frags for both MTU sized packet and GSO packet. So this patch introduce
skb_coalesce_rx_frag()to do this.Cc Rusty Russell <[email protected]>Cc Michael S. Tsirkin <[email protected]>Cc Michael Dalton <[email protected]>Cc Eric Dumazet <[email protected]>Signed-off-by Jason Wang <[email protected]>
Quoted 5 lines
---
Changes from V2:
- remove theskb_frag_unref()and let the called to put the page reference Changes from V1:
- remove the useless off parameter.
Applied.