mirror of
https://git.openwrt.org/feed/routing.git
synced 2024-06-13 10:49:15 +02:00
596dc84b65
* set .owner to THIS_MODULE * Consider fragmentation for needed_headroom * Reserve needed_*room for fragments * Don't always reallocate the fragmentation skb head Signed-off-by: Sven Eckelmann <sven@narfation.org>
82 lines
3.3 KiB
Diff
82 lines
3.3 KiB
Diff
From: Sven Eckelmann <sven@narfation.org>
|
|
Date: Wed, 25 Nov 2020 13:16:43 +0100
|
|
Subject: batman-adv: Reserve needed_*room for fragments
|
|
|
|
The batadv net_device is trying to propagate the needed_headroom and
|
|
needed_tailroom from the lower devices. This is needed to avoid cost
|
|
intensive reallocations using pskb_expand_head during the transmission.
|
|
|
|
But the fragmentation code split the skb's without adding extra room at the
|
|
end/beginning of the various fragments. This reduced the performance of
|
|
transmissions over complex scenarios (batadv on vxlan on wireguard) because
|
|
the lower devices had to perform the reallocations at least once.
|
|
|
|
Fixes: db56e4ecf5c2 ("batman-adv: Fragment and send skbs larger than mtu")
|
|
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/0966d5424bb87e863037301488519ccdd69e4d26
|
|
|
|
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
|
|
index 385fccdcf69d05d63f59d024dfb721b1e8f1c8b9..f1d202ff396cd69949915a9e90e763f3a68255b7 100644
|
|
--- a/net/batman-adv/fragmentation.c
|
|
+++ b/net/batman-adv/fragmentation.c
|
|
@@ -391,6 +391,7 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb,
|
|
|
|
/**
|
|
* batadv_frag_create() - create a fragment from skb
|
|
+ * @net_dev: outgoing device for fragment
|
|
* @skb: skb to create fragment from
|
|
* @frag_head: header to use in new fragment
|
|
* @fragment_size: size of new fragment
|
|
@@ -401,22 +402,25 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb,
|
|
*
|
|
* Return: the new fragment, NULL on error.
|
|
*/
|
|
-static struct sk_buff *batadv_frag_create(struct sk_buff *skb,
|
|
+static struct sk_buff *batadv_frag_create(struct net_device *net_dev,
|
|
+ struct sk_buff *skb,
|
|
struct batadv_frag_packet *frag_head,
|
|
unsigned int fragment_size)
|
|
{
|
|
+ unsigned int ll_reserved = LL_RESERVED_SPACE(net_dev);
|
|
+ unsigned int tailroom = net_dev->needed_tailroom;
|
|
struct sk_buff *skb_fragment;
|
|
unsigned int header_size = sizeof(*frag_head);
|
|
unsigned int mtu = fragment_size + header_size;
|
|
|
|
- skb_fragment = netdev_alloc_skb(NULL, mtu + ETH_HLEN);
|
|
+ skb_fragment = dev_alloc_skb(ll_reserved + mtu + tailroom);
|
|
if (!skb_fragment)
|
|
goto err;
|
|
|
|
skb_fragment->priority = skb->priority;
|
|
|
|
/* Eat the last mtu-bytes of the skb */
|
|
- skb_reserve(skb_fragment, header_size + ETH_HLEN);
|
|
+ skb_reserve(skb_fragment, ll_reserved + header_size);
|
|
skb_split(skb, skb_fragment, skb->len - fragment_size);
|
|
|
|
/* Add the header */
|
|
@@ -439,11 +443,12 @@ int batadv_frag_send_packet(struct sk_buff *skb,
|
|
struct batadv_orig_node *orig_node,
|
|
struct batadv_neigh_node *neigh_node)
|
|
{
|
|
+ struct net_device *net_dev = neigh_node->if_incoming->net_dev;
|
|
struct batadv_priv *bat_priv;
|
|
struct batadv_hard_iface *primary_if = NULL;
|
|
struct batadv_frag_packet frag_header;
|
|
struct sk_buff *skb_fragment;
|
|
- unsigned int mtu = neigh_node->if_incoming->net_dev->mtu;
|
|
+ unsigned int mtu = net_dev->mtu;
|
|
unsigned int header_size = sizeof(frag_header);
|
|
unsigned int max_fragment_size, num_fragments;
|
|
int ret;
|
|
@@ -503,7 +508,7 @@ int batadv_frag_send_packet(struct sk_buff *skb,
|
|
goto put_primary_if;
|
|
}
|
|
|
|
- skb_fragment = batadv_frag_create(skb, &frag_header,
|
|
+ skb_fragment = batadv_frag_create(net_dev, skb, &frag_header,
|
|
max_fragment_size);
|
|
if (!skb_fragment) {
|
|
ret = -ENOMEM;
|