diff --git a/batctl/Makefile b/batctl/Makefile index 97be7f3..129015f 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl PKG_VERSION:=2019.2 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_HASH:=fb656208ff7d4cd8b1b422f60c9e6d8747302a347cbf6c199d7afa9b80f80ea3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/batctl/patches/0010-batctl-Don-t-stop-when-create_interface-detected-exi.patch b/batctl/patches/0010-batctl-Don-t-stop-when-create_interface-detected-exi.patch new file mode 100644 index 0000000..b77d3cd --- /dev/null +++ b/batctl/patches/0010-batctl-Don-t-stop-when-create_interface-detected-exi.patch @@ -0,0 +1,31 @@ +From: Sven Eckelmann +Date: Fri, 15 Jan 2021 23:38:31 +0100 +Subject: batctl: Don't stop when create_interface detected existing interface + +"batctl meshif bat0 interface add ..." should never be called in parallel. +But when something still does this, it could be that the code first detects +the missing meshif and then tries to create it - which fails when another +process requested the creation of the same interface slightly before batctl +did it. + +But this should not prevent batctl to add the lower interface to the +meshif. It is not really important that the batctl process was the one +which created it - only that it exists is important. + +Fixes: 25022e0b154d ("batctl: Use rtnl to add/remove interfaces") +Signed-off-by: Sven Eckelmann +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/5d465bfd9a19c4bda20fb4e36c6e4b22c56ceb17 + +diff --git a/interface.c b/interface.c +index 138a6cd45744081a04f986fe4be67901b3305b74..2c6a78ad17cb716fbb7f6a1c78e0076494397b01 100644 +--- a/interface.c ++++ b/interface.c +@@ -479,7 +479,7 @@ static int interface(struct state *state, int argc, char **argv) + ifmaster = if_nametoindex(state->mesh_iface); + if (!manual_mode && !ifmaster && rest_argv[0][0] == 'a') { + ret = create_interface(state->mesh_iface); +- if (ret < 0) { ++ if (ret < 0 && ret != -EEXIST) { + fprintf(stderr, + "Error - failed to create batman-adv interface: %s\n", + strerror(-ret)); diff --git a/batctl/patches/0011-batctl-Fix-retrieval-of-meshif-ap_isolation.patch b/batctl/patches/0011-batctl-Fix-retrieval-of-meshif-ap_isolation.patch new file mode 100644 index 0000000..8b77612 --- /dev/null +++ b/batctl/patches/0011-batctl-Fix-retrieval-of-meshif-ap_isolation.patch @@ -0,0 +1,26 @@ +From: Sven Eckelmann +Date: Sat, 31 Oct 2020 18:00:26 +0100 +Subject: batctl: Fix retrieval of meshif ap_isolation + +The batadv command to retrieve the attributes is called +BATADV_CMD_GET_MESH. The used BATADV_CMD_SET_MESH will only return the +current settings via the "config" multicast group which is not evaluated by +the ap_isolation command. + +Fixes: c56a63a5f12a ("batctl: Support generic netlink for ap_isolation command") +Signed-off-by: Sven Eckelmann +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/107cee536a0f8024208923f49a2a548b40bfc432 + +diff --git a/ap_isolation.c b/ap_isolation.c +index 36fd4d607d03768251150951ebe450740501d446..4854bcd1d6514a02786388dc014966f326818122 100644 +--- a/ap_isolation.c ++++ b/ap_isolation.c +@@ -36,7 +36,7 @@ static int get_attrs_ap_isolation(struct nl_msg *msg, void *arg) + + static int get_ap_isolation(struct state *state) + { +- enum batadv_nl_commands nl_cmd = BATADV_CMD_SET_MESH; ++ enum batadv_nl_commands nl_cmd = BATADV_CMD_GET_MESH; + + if (state->selector == SP_VLAN) + nl_cmd = BATADV_CMD_GET_VLAN; diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 0a0e455..c2f005c 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2019.2 -PKG_RELEASE:=10 +PKG_RELEASE:=11 PKG_HASH:=70c3f6a6cf88d2b25681a76768a52ed92d9fe992ba8e358368b6a8088757adc8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/batman-adv/patches/0030-batman-adv-set-.owner-to-THIS_MODULE.patch b/batman-adv/patches/0030-batman-adv-set-.owner-to-THIS_MODULE.patch new file mode 100644 index 0000000..b603332 --- /dev/null +++ b/batman-adv/patches/0030-batman-adv-set-.owner-to-THIS_MODULE.patch @@ -0,0 +1,25 @@ +From: Taehee Yoo +Date: Sun, 15 Nov 2020 10:30:04 +0000 +Subject: batman-adv: set .owner to THIS_MODULE + +If THIS_MODULE is not set, the module would be removed while debugfs is +being used. +It eventually makes kernel panic. + +Fixes: 24571be14371 ("batman-adv: add routing debug log accessible via debugfs") +Signed-off-by: Taehee Yoo +Signed-off-by: Sven Eckelmann +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/6e2937539a2c9f8a8536515258bc1f08bed19a06 + +diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c +index 60ce11e16a905e790424a2d7aca81c1f945c1ec2..a51fadeaefb58e75a84820998390acd3759ef3a8 100644 +--- a/net/batman-adv/log.c ++++ b/net/batman-adv/log.c +@@ -180,6 +180,7 @@ static const struct file_operations batadv_log_fops = { + .read = batadv_log_read, + .poll = batadv_log_poll, + .llseek = no_llseek, ++ .owner = THIS_MODULE, + }; + + /** diff --git a/batman-adv/patches/0031-batman-adv-Consider-fragmentation-for-needed_headroo.patch b/batman-adv/patches/0031-batman-adv-Consider-fragmentation-for-needed_headroo.patch new file mode 100644 index 0000000..7ce5090 --- /dev/null +++ b/batman-adv/patches/0031-batman-adv-Consider-fragmentation-for-needed_headroo.patch @@ -0,0 +1,30 @@ +From: Sven Eckelmann +Date: Thu, 26 Nov 2020 18:15:06 +0100 +Subject: batman-adv: Consider fragmentation for needed_headroom + +If a batman-adv packets has to be fragmented, then the original batman-adv +packet header is not stripped away. Instead, only a new header is added in +front of the packet after it was split. + +This size must be considered to avoid cost intensive reallocations during +the transmission through the various device layers. + +Fixes: e2b4301f4e2d ("batman-adv: Add lower layer needed_(head|tail)room to own ones") +Reported-by: Linus Lüssing +Signed-off-by: Sven Eckelmann +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/92064deda9b063ca2d5a53b307c6127a9453357c + +diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c +index 62b926dd4aaeffd82da83654c8e568de2c3714fb..e0f70ae28df4e2fb0a7972a1ca9d5fcc986c0d6c 100644 +--- a/net/batman-adv/hard-interface.c ++++ b/net/batman-adv/hard-interface.c +@@ -553,6 +553,9 @@ static void batadv_hardif_recalc_extra_skbroom(struct net_device *soft_iface) + needed_headroom = lower_headroom + (lower_header_len - ETH_HLEN); + needed_headroom += batadv_max_header_len(); + ++ /* fragmentation headers don't strip the unicast/... header */ ++ needed_headroom += sizeof(struct batadv_frag_packet); ++ + soft_iface->needed_headroom = needed_headroom; + soft_iface->needed_tailroom = lower_tailroom; + } diff --git a/batman-adv/patches/0032-batman-adv-Reserve-needed_-room-for-fragments.patch b/batman-adv/patches/0032-batman-adv-Reserve-needed_-room-for-fragments.patch new file mode 100644 index 0000000..0ad2b0c --- /dev/null +++ b/batman-adv/patches/0032-batman-adv-Reserve-needed_-room-for-fragments.patch @@ -0,0 +1,81 @@ +From: Sven Eckelmann +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 +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; diff --git a/batman-adv/patches/0033-batman-adv-Don-t-always-reallocate-the-fragmentation.patch b/batman-adv/patches/0033-batman-adv-Don-t-always-reallocate-the-fragmentation.patch new file mode 100644 index 0000000..00bc3f2 --- /dev/null +++ b/batman-adv/patches/0033-batman-adv-Don-t-always-reallocate-the-fragmentation.patch @@ -0,0 +1,41 @@ +From: Sven Eckelmann +Date: Thu, 26 Nov 2020 18:24:49 +0100 +Subject: 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: db56e4ecf5c2 ("batman-adv: Fragment and send skbs larger than mtu") +Signed-off-by: Sven Eckelmann +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/3e3ff987876d3be70d928561acbefe5a48ab1654 + +diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c +index f1d202ff396cd69949915a9e90e763f3a68255b7..0da90e73c79bffe86072f0d704f0777d76b35f4c 100644 +--- a/net/batman-adv/fragmentation.c ++++ b/net/batman-adv/fragmentation.c +@@ -527,13 +527,14 @@ int batadv_frag_send_packet(struct sk_buff *skb, + frag_header.no++; + } + +- /* Make room for the fragment header. */ +- if (batadv_skb_head_push(skb, header_size) < 0 || +- pskb_expand_head(skb, header_size + ETH_HLEN, 0, GFP_ATOMIC) < 0) { +- ret = -ENOMEM; ++ /* make sure that there is at least enough head for the fragmentation ++ * and ethernet headers ++ */ ++ ret = skb_cow_head(skb, ETH_HLEN + header_size); ++ if (ret < 0) + goto put_primary_if; +- } + ++ skb_push(skb, header_size); + memcpy(skb->data, &frag_header, header_size); + + /* Send the last fragment */