B.A.T.M.A.N July 2016

b.a.t.m.a.n@lists.open-mesh.org

19 participants
61 discussions

[B.A.T.M.A.N.] [PATCH next v2 1/4] batman-adv: Free tp_meter ack skb when it was not consumed
by Sven Eckelmann 05 Jul '16

05 Jul '16

batadv_send_skb_to_orig can return -1 to signal that the skb was not consumed. tp_meter has then to free the skb to avoid a memory leak. Fixes: 98d7a766b645 ("batman-adv: throughput meter implementation") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: - rebased on current master - added patch to a common set of related patches net/batman-adv/tp_meter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index bf6bffb..2333777 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -1206,6 +1206,9 @@ static int batadv_tp_send_ack(struct batadv_priv *bat_priv, const u8 *dst, /* send the ack */ r = batadv_send_skb_to_orig(skb, orig_node, NULL); + if (r == -1) + kfree_skb(skb); + if (unlikely(r < 0) || (r == NET_XMIT_DROP)) { ret = BATADV_TP_REASON_DST_UNREACHABLE; goto out; -- 2.8.1

2 7

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix Kconfig dependencies regarding multicast optimizations
by Linus Lüssing 05 Jul '16

05 Jul '16

Since recently the multicast optimizations are using functions from the bridge module. If batman-adv is a kernel built-in, then these bridge functions need to be accessible immediately. Thus adding a Kconfig dependency for the multicast optimizations to depend on batman-adv being built as a module if the bridge is built as a module, too. This fixes build errors like the following: ~~~ net/built-in.o: In function `batadv_mcast_mla_update': >> (.text+0x19b7eb): undefined reference to `br_multicast_has_querier_anywhere' net/built-in.o: In function `batadv_mcast_mla_update': >> (.text+0x19b7fa): undefined reference to `br_multicast_has_querier_adjacent' net/built-in.o: In function `batadv_mcast_mla_update': (.text+0x19b809): undefined reference to `br_multicast_has_querier_anywhere' net/built-in.o: In function `batadv_mcast_mla_update': (.text+0x19b818): undefined reference to `br_multicast_has_querier_adjacent' net/built-in.o: In function `batadv_mcast_mla_update': >> (.text+0x19b8cf): undefined reference to `br_multicast_list_adjacent' ~~~ Fixes: 391b59cdb111 ("batman-adv: Add multicast optimization support for bridged setups") Reported-by: kbuild test robot <fengguang.wu(a)intel.com> Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- net/batman-adv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index b7ba97d..833bb14 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -66,7 +66,7 @@ config BATMAN_ADV_NC config BATMAN_ADV_MCAST bool "Multicast optimisation" - depends on BATMAN_ADV && INET + depends on BATMAN_ADV && INET && !(BRIDGE=m && BATMAN_ADV=y) default n help This option enables the multicast optimisation which aims to -- 2.1.4

3 3

[B.A.T.M.A.N.] [PATCH next] batman-adv: Switch netlink uapi header copyright to ISC
by Sven Eckelmann 05 Jul '16

05 Jul '16

The batman_adv.h netlink header is used by userspace programs to use the genl interface of batman-adv. These programs may not use the GPL-2 license. The header should therefore state clearly that it can be used freely and the license of the program which uses this header is not affected. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Matthias Schiffer <mschiffer(a)universe-factory.net> --- It was acked in https://patchwork.open-mesh.org/patch/16471/ include/uapi/linux/batman_adv.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index acb72f8..0fbf6fd 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -2,17 +2,17 @@ * * Matthias Schiffer * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #ifndef _UAPI_LINUX_BATMAN_ADV_H_ -- 2.8.1

2 1

[B.A.T.M.A.N.] [PATCH v6 0/4] GW code: make it algorithm-agnostic and add B.A.T.M.A.N. V support
by Sven Eckelmann 05 Jul '16

05 Jul '16

Hi, here are the patches from Antonio with the modifications which we've discussed when v5 of the patchset was reviewed. I am submitting this patchset because Antonio had no time to work on them. Changes from v1: - rebased on top of latest master (some patches from the previous patchset were merged already) - accidental change to the GW table header moved to right patch - remove bat_ prefix from API names - API subobjects redefined as proper struct instead of anonymous ones to fix kernel-doc complaints - bonus kernel-doc added - missing include files added Changes from v2: - minimum default value of gw_sel_class restored to 1 Changes from v3: - move "batman-adv: split routing API data structure in subobjects" as patch 1 - check if algo_ops->gw.get_best_gw_node was implemented before calling it - add patch to disable GW mode knobs if API have not been implemented (6/6) Changes from v4: - drop CONFIG_BATMAN_ADV_BATMAN_V dependency when declaring batadv_gw_node_get() in gateway_client.h - rebased on top of current master Changes from v5: - added "(optional)" to the kerneldoc of store_sel_class and show_sel_class, get_best_gw_node, is_eligible - switched seq_print of static strings to seq_puts - move new comment in batadv_gw_election from patch 3 to patch 2 - fix possible integer overflow in batadv_v_gw_is_eligible when comparing current gw throughput (+threshold) against throughput of potential new gateway Kind regards, Sven Antonio Quartulli (4): batman-adv: make the GW selection class algorithm specific batman-adv: make GW election code protocol specific batman-adv: B.A.T.M.A.N. V - implement GW selection logic batman-adv: disable sysfs knobs when GW-mode is not implemented net/batman-adv/bat_iv_ogm.c | 219 ++++++++++++++++++++++++++++++++++ net/batman-adv/bat_v.c | 257 +++++++++++++++++++++++++++++++++++++++- net/batman-adv/gateway_client.c | 222 +++++----------------------------- net/batman-adv/gateway_client.h | 5 + net/batman-adv/gateway_common.c | 5 +- net/batman-adv/sysfs.c | 62 +++++++++- net/batman-adv/types.h | 24 ++++ 7 files changed, 596 insertions(+), 198 deletions(-) -- 2.8.1

2 8

[B.A.T.M.A.N.] Copyright of netlink batman_adv.h
by Sven Eckelmann 04 Jul '16

04 Jul '16

Hi, you've created the batman_adv.h for the netlink interface of batman-adv and you've used the GPL-2-only license header. It is a header which is installed for userspace programs and will maybe be used for things which have a different license then the GPL-2. So it would maybe better for these use cases to have clear statement that they can use it freely. This can for example be done with a more liberal license like the ISC [1] (like in nl80211.h [2]). What do you think about a license change? If you agree then I would like to propose a patch which requires a reply by you with an "Acked-by: ...". Kind regards, Sven [1] https://en.wikipedia.org/wiki/ISC_license [2] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/includ…

2 2

[B.A.T.M.A.N.] [PATCH v6 0/5] Optimizations for setups running dat and bla
by Andreas Pape 04 Jul '16

04 Jul '16

This patchset introduces optimizations for batman-adv in setups having several gateways into a common (switched) Ethernet backbone network especially if dat is additionally enabled. Using the current implementation with bla and dat enabled, several problems can be observed in a real setup: 1. Multiplication of ARP replies from dat enabled gateways and dat enabled mesh nodes leading to an "ARP reply storm" in the common backbone network. 2. In rare corner cases bla does not fully prevent looping of unicast frames in the direction Backbone --> mesh --> backbone and looping of multicast frames in the direction mesh --> backbone --> mesh. The latter can lead to temporary confusion in the switched backbone resulting in packet loss and communication timeouts. The observed problems are solved by introduction of additional rules for the dat handling, bla packet forwarding and bla claiming/unclaiming of clients. v6: - rebased the patchset - removed snooping of all ip traffic v5: - changed function name to batadv_bla_check_claim - put added include file in alphabetical order - added check to exclude ip address 0.0.0.0 from snooping v4: - removed unnecessary include in soft-interface.c - solved issue with double-use and refcounting of pointers in routing.c v3: - rebased patchset - moved snooping of ip addresses for dat speed up into separate function - removed "patch of a patch" - removed automatic claiming during check of a claim - fixed issues of the patchset not being compiled due to chosen batman options Kind regards, Andreas Andreas Pape (5): batman-adv: prevent multiple ARP replies sent by gateways if dat enabled batman-adv: prevent duplication of ARP replies when DAT is used batman-adv: drop unicast packets from other backbone gw batman-adv: changed debug messages for easier bla debugging batman-adv: handle race condition for claims between gateways net/batman-adv/bridge_loop_avoidance.c | 87 +++++++++++++++++++++++++++++--- net/batman-adv/bridge_loop_avoidance.h | 11 ++++ net/batman-adv/distributed-arp-table.c | 47 +++++++++++++++++ net/batman-adv/routing.c | 25 ++++++++- 4 files changed, 159 insertions(+), 11 deletions(-) .................................................................. PHOENIX CONTACT ELECTRONICS GmbH Sitz der Gesellschaft / registered office of the company: 31812 Bad Pyrmont USt-Id-Nr.: DE811742156 Amtsgericht Hannover HRB 100528 / district court Hannover HRB 100528 Geschäftsführer / Executive Board: Ulrich Leidecker, Christoph Leifer __________________________________________________________________ Diese E-Mail enthält vertrauliche und/oder rechtlich geschützte Informationen. Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtümlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten Sie diese Mail. Das unerlaubte Kopieren, jegliche anderweitige Verwendung sowie die unbefugte Weitergabe dieser Mail ist nicht gestattet. ---------------------------------------------------------------------------------------------------- This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure, distribution or other use of the material or parts thereof is strictly forbidden. ___________________________________________________________________

1 5

[B.A.T.M.A.N.] [PATCH v10 0/8] batctl: netns and netlink support
by Sven Eckelmann 03 Jul '16

03 Jul '16

Hi, This patchset adds netns/netlink support to batctl. It complements the batman-adv netns/netlink support v9 as sent today. This series is an update from the v9 sent by Simon on June 6th with the following changes: * fix alignment of originator dumps with B.A.T.M.A.N. V * add support for B.A.T.M.A.N. V gateways dumps over netlink * add patch to document a network namespaces example * add fallback to use debugfs when netlink not supported * fix detection of unsupported cmd BATADV_CMD_GET_MESH_INFO Kind regards, Sven Andrew Lunn (2): batctl: Use netlink to replace some of debugfs batctl: Document a network namespaces example. Simon Wunderlich (1): batctl: add netlink dump function for backbone tables Sven Eckelmann (5): batctl: add netlink dump support for B.A.T.M.A.N. V gateways batctl: Import alfred version of debugfs.* batctl: Split translate_mac from debugfs backend batctl: Translate mac addresses via netlink batctl: Use debugfs fallback when netlink not supported README | 57 +++ batman_adv.h | 94 ++++ debug.c | 23 +- debug.h | 4 +- debugfs.c | 17 +- debugfs.h | 4 +- functions.c | 61 ++- functions.h | 4 +- netlink.c | 1403 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- netlink.h | 25 +- packet.h | 36 -- 11 files changed, 1665 insertions(+), 63 deletions(-) -- 2.8.1

1 8

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Add wrapper for ARP reply creation
by Linus Lüssing 02 Jul '16

02 Jul '16

Removing duplicate code. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changes in RFC -> non-RFC: * Added kerneldoc * Added Signed-off-by net/batman-adv/distributed-arp-table.c | 61 ++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index fa76465..66114af 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -948,6 +948,41 @@ static unsigned short batadv_dat_get_vid(struct sk_buff *skb, int *hdr_size) } /** + * batadv_dat_arp_create_reply - create an ARP Reply + * @bat_priv: the bat priv with all the soft interface information + * @ip_src: ARP sender IP + * @ip_dst: ARP target IP + * @hw_src: Ethernet source and ARP sender MAC + * @hw_dst: Ethernet destination and ARP target MAC + * @vid: VLAN identifier (optional, set to zero otherwise) + * + * Creates an ARP Reply from the given values, optionally encapsulated in a + * VLAN header. + * + * Return: An skb containing an ARP Reply. + */ +static struct sk_buff * +batadv_dat_arp_create_reply(struct batadv_priv *bat_priv, __be32 ip_src, + __be32 ip_dst, u8 *hw_src, u8 *hw_dst, + unsigned short vid) +{ + struct sk_buff *skb; + + skb = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_dst, bat_priv->soft_iface, + ip_src, hw_dst, hw_src, hw_dst); + if (!skb) + return NULL; + + if (vid & BATADV_VLAN_HAS_TAG) + skb = vlan_insert_tag(skb, htons(ETH_P_8021Q), + vid & VLAN_VID_MASK); + + skb_reset_mac_header(skb); + + return skb; +} + +/** * batadv_dat_snoop_outgoing_arp_request - snoop the ARP request and try to * answer using DAT * @bat_priv: the bat priv with all the soft interface information @@ -1005,17 +1040,12 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, goto out; } - skb_new = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_src, - bat_priv->soft_iface, ip_dst, hw_src, - dat_entry->mac_addr, hw_src); + skb_new = batadv_dat_arp_create_reply(bat_priv, ip_dst, ip_src, + dat_entry->mac_addr, + hw_src, vid); if (!skb_new) goto out; - if (vid & BATADV_VLAN_HAS_TAG) - skb_new = vlan_insert_tag(skb_new, htons(ETH_P_8021Q), - vid & VLAN_VID_MASK); - - skb_reset_mac_header(skb_new); skb_new->protocol = eth_type_trans(skb_new, bat_priv->soft_iface); bat_priv->stats.rx_packets++; @@ -1079,22 +1109,11 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, if (!dat_entry) goto out; - skb_new = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_src, - bat_priv->soft_iface, ip_dst, hw_src, - dat_entry->mac_addr, hw_src); - + skb_new = batadv_dat_arp_create_reply(bat_priv, ip_dst, ip_src, + dat_entry->mac_addr, hw_src, vid); if (!skb_new) goto out; - /* the rest of the TX path assumes that the mac_header offset pointing - * to the inner Ethernet header has been set, therefore reset it now. - */ - skb_reset_mac_header(skb_new); - - if (vid & BATADV_VLAN_HAS_TAG) - skb_new = vlan_insert_tag(skb_new, htons(ETH_P_8021Q), - vid & VLAN_VID_MASK); - /* To preserve backwards compatibility, the node has choose the outgoing * format based on the incoming request packet type. The assumption is * that a node not using the 4addr packet format doesn't support it. -- 2.1.4

2 3

[B.A.T.M.A.N.] pull request for net-next: batman-adv 2016-07-01
by Simon Wunderlich 01 Jul '16

01 Jul '16

Hi David, we are a bit late to submit our feature patches, but I hope we make it in time. Antonio is taking a pause in his upstream work, so I'll be submitting our batman-adv patches for now. It is my first time, so please bear with me. :) Please pull or let me know of any problem! Thank you, Simon The following changes since commit 99860208bc62d8ebd5c57495b84856506fe075bc: sched: remove NET_XMIT_POLICED (2016-06-12 22:02:11 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20160701 for you to fetch changes up to 4e3e823b5a503235630921287f130e1d8d22d200: batman-adv: Add debugfs table for mcast flags (2016-06-30 10:29:43 +0200) ---------------------------------------------------------------- This feature patchset includes the following changes: - two patches with minimal clean up work by Antonio Quartulli and Simon Wunderlich - eight patches of B.A.T.M.A.N. V, API and documentation clean up work, by Antonio Quartulli and Marek Lindner - Andrew Lunn fixed the skb priority adoption when forwarding fragmented packets (two patches) - Multicast optimization support is now enabled for bridges which comes with some protocol updates, by Linus Luessing ---------------------------------------------------------------- Andrew Lunn (2): batman-adv: Set skb priority in fragments batman-adv: Include frame priority in fragment header Antonio Quartulli (4): batman-adv: statically print gateway table header batman-adv: remove ogm_emit and ogm_schedule API calls batman-adv: remove useless inline attribute for sysfs helper function batman-adv: move GW mode and selection class to private data structure Linus Lüssing (4): batman-adv: Always flood IGMP/MLD reports batman-adv: Add multicast optimization support for bridged setups batman-adv: Adding logging of mcast flag changes batman-adv: Add debugfs table for mcast flags Marek Lindner (5): batman-adv: document sysfs files in alphabetical order batman-adv: update elp interval documentation batman-adv: refactor batadv_neigh_node_* functions to follow common style batman-adv: remove unused callback from batadv_algo_ops struct batman-adv: init ELP tweaking options only once Simon Wunderlich (2): batman-adv: Start new development cycle batman-adv: remove unused vid local variable in tt seq print .../ABI/testing/sysfs-class-net-batman-adv | 20 +- net/batman-adv/Kconfig | 2 +- net/batman-adv/bat_algo.h | 7 +- net/batman-adv/bat_iv_ogm.c | 72 ++- net/batman-adv/bat_v.c | 29 +- net/batman-adv/bat_v_elp.c | 4 +- net/batman-adv/bat_v_ogm.c | 4 +- net/batman-adv/debugfs.c | 23 + net/batman-adv/fragmentation.c | 12 +- net/batman-adv/gateway_client.c | 15 +- net/batman-adv/gateway_common.c | 6 +- net/batman-adv/hard-interface.c | 6 +- net/batman-adv/main.c | 2 - net/batman-adv/main.h | 6 +- net/batman-adv/multicast.c | 499 +++++++++++++++++++-- net/batman-adv/multicast.h | 3 + net/batman-adv/originator.c | 40 +- net/batman-adv/originator.h | 6 +- net/batman-adv/packet.h | 7 +- net/batman-adv/routing.c | 2 + net/batman-adv/send.c | 61 +-- net/batman-adv/send.h | 4 +- net/batman-adv/soft-interface.c | 10 +- net/batman-adv/sysfs.c | 22 +- net/batman-adv/translation-table.c | 2 - net/batman-adv/types.h | 32 +- 26 files changed, 704 insertions(+), 192 deletions(-) -- 2.8.1

3 19

[B.A.T.M.A.N.] [RFC 1/2] batman-adv: Fix speedy join in gateway client mode
by Sven Eckelmann 01 Jul '16

01 Jul '16

Speedy join only works when the received packet is either broadcast or an 4addr unicast packet. Thus packets converted from broadcast to unicast via the gateway handling code have to be converted to 4addr packets to allow the receiving gateway server to add the sender address as temporary node to the translation table. Not doing it will make batman-adv drop the DHCP response in many situations because it doesn't yet have the TT entry for the destination of the DHCP response. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- This is completely untested. The RFC was submitted to better explain a problem to Antonio. This problems was noticed in real world setups but these patches were not yet tested in these setups. net/batman-adv/send.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 49836da..0e9445b 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -426,8 +426,8 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb, struct batadv_orig_node *orig_node; orig_node = batadv_gw_get_selected_orig(bat_priv); - return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0, - orig_node, vid); + return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST_4ADDR, + BATADV_P_DATA, orig_node, vid); } void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet) -- 2.8.1

2 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N July 2016