openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

batman-adv: Don't always reallocate the fragmentation skb head 

When a packet is fragmented by batman-adv, the original batman-adv header
is not modified. Only a new fragmentation is inserted between the original
one and the ethernet header. The code must therefore make sure that it has
a writable region of this size in the skbuff head.

But it is not useful to always reallocate the skbuff by this size even when
there would be more than enough headroom still in the skb. The reallocation
is just to costly during in this codepath.

Fixes: ee75ed8887 ("batman-adv: Fragment and send skbs larger than mtu")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
This commit is contained in:
Sven Eckelmann 2020-11-26 18:24:49 +01:00 committed by Simon Wunderlich
parent c5cbfc8755
commit 992b03b88e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/batman-adv/fragmentation.c
View File

@ -527,13 +527,14 @@ int batadv_frag_send_packet(struct sk_buff *skb,
frag_header.no++; frag_header.no++;
} }
/* Make room for the fragment header. */ /* make sure that there is at least enough head for the fragmentation
if (batadv_skb_head_push(skb, header_size) < 0 || * and ethernet headers
pskb_expand_head(skb, header_size + ETH_HLEN, 0, GFP_ATOMIC) < 0) { */
ret = -ENOMEM; ret = skb_cow_head(skb, ETH_HLEN + header_size);
if (ret < 0)
goto put_primary_if; goto put_primary_if;
}
skb_push(skb, header_size);
memcpy(skb->data, &frag_header, header_size); memcpy(skb->data, &frag_header, header_size);
/* Send the last fragment */ /* Send the last fragment */