summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorIlan Tayari <ilant@mellanox.com>2017-04-08 02:07:08 +0300
committerDavid S. Miller <davem@davemloft.net>2017-04-12 13:53:35 -0400
commiteaffadbbb3f2711fc76e7b0ddf37c452ee11b805 (patch)
tree62d74910d1cb8b124c36ceb05f1502163ac6b82f /net/core
parentb94b8fce8784d51f93226e11ddfa7bb6f136665b (diff)
downloadlinux-rpi-eaffadbbb3f2711fc76e7b0ddf37c452ee11b805.tar.gz
linux-rpi-eaffadbbb3f2711fc76e7b0ddf37c452ee11b805.tar.bz2
linux-rpi-eaffadbbb3f2711fc76e7b0ddf37c452ee11b805.zip
gso: Support frag_list splitting with head_frag
A driver may use build_skb() for received packets. These SKBs then have a head_frag. Since commit d7e8883cfcf4 ("net: make GRO aware of skb->head_frag"), GRO may build frag_list SKBs out of head_frag received SKBs. In such a case, the chained SKBs end up with a head_frag. Commit 07b26c9454a2 ("gso: Support partial splitting at the frag_list pointer") adds partial segmentation of frag_list SKB chains into individual SKBs. However, this is not done if the chained SKBs have any linear part, because the device may not be able to DMA the private linear buffer. A chained frag_list SKB with head_frag is wrongfully detected in this case as having a private linear part and thus falls back to software GSO, while in fact the linear part is backed by a DMA page just like any other frag. This causes low performance when forwarding those packets that were built with build_skb() Allow partial segmentation at the frag_list pointer for chained SKBs with head_frag. Note that such SKBs can only be created by GRO, when applied to received packets with head_frag. Also note that this change only affects the data path that performs the partial segmentation at frag_list pointer, and not any of the other more common data paths. Signed-off-by: Ilan Tayari <ilant@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/skbuff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 9f781092fda9..5d9a11eafbf5 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3093,7 +3093,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
* containing the same amount of data.
*/
skb_walk_frags(head_skb, iter) {
- if (skb_headlen(iter))
+ if (skb_headlen(iter) && !iter->head_frag)
goto normal;
len -= iter->len;