B.A.T.M.A.N January 2016

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

13 participants
50 discussions

[B.A.T.M.A.N.] Question about sliding windows in Batman-adv 2015.0

by Jérôme GRIES

Hello everybody (thx to Marek Lindner for the answer) My name is Jérôme, i'm a French student in informatics and networks, for a project i use BATMAN ( i use it with raspberry Pi in cars). I would like to change the duration of the sliding windows, i understand that the duration of the sliding windows is equals to 128*intervall it (intervall beetween every hello packets) So normally the sliding windows is equals to 128 seconds because the interval is 1s in default mode. I would like to change the code to change this duration but not just with the interval it value but directly with the 128. Because when i use this protocol in a mobile environment like cars this value is to high, and i would like to reduce in something like sliding windows duration = 30*5(=interval it which i can change easily). Could you tell me where i can find something like that in the code : #define _timeslidingwindows 128 Thank you and have a nice day. Jérôme Gries

7 years, 4 months

[B.A.T.M.A.N.] [RFC] batman-adv: Remove recursive bat-on-bat netdevice check

by Sven Eckelmann

batman-adv checks in different situation if a new device is already on top of a different batman-adv device. This is done by getting the iflink of a device and all its parent. It assumes that this iflink is always a parent device in an acyclic graph. But this assumption is broken by devices like veth which are actually a pair of two devices linked to each other. The recursive check would therefore get veth0 when calling dev_get_iflink on veth1. And it gets veth0 when calling dev_get_iflink with veth1. Creating a veth pair and loading batman-adv freezes parts of the system ip link add veth0 type veth peer name veth1 modprobe batman-adv An RCU stall will be detected on the system which cannot be fixed. INFO: rcu_sched self-detected stall on CPU 1: (5264 ticks this GP) idle=3e9/140000000000001/0 softirq=144683/144686 fqs=5249 (t=5250 jiffies g=46 c=45 q=43) Task dump for CPU 1: insmod R running task 0 247 245 0x00000008 ffffffff8151f140 ffffffff8107888e ffff88000fd141c0 ffffffff8151f140 0000000000000000 ffffffff81552df0 ffffffff8107b420 0000000000000001 ffff88000e3fa700 ffffffff81540b00 ffffffff8107d667 0000000000000001 Call Trace: <IRQ> [<ffffffff8107888e>] ? rcu_dump_cpu_stacks+0x7e/0xd0 [<ffffffff8107b420>] ? rcu_check_callbacks+0x3f0/0x6b0 [<ffffffff8107d667>] ? hrtimer_run_queues+0x47/0x180 [<ffffffff8107cf9d>] ? update_process_times+0x2d/0x50 [<ffffffff810873fb>] ? tick_handle_periodic+0x1b/0x60 [<ffffffff810290ae>] ? smp_trace_apic_timer_interrupt+0x5e/0x90 [<ffffffff813bbae2>] ? apic_timer_interrupt+0x82/0x90 <EOI> [<ffffffff812c3fd7>] ? __dev_get_by_index+0x37/0x40 [<ffffffffa0031f3e>] ? batadv_hard_if_event+0xee/0x3a0 [batman_adv] [<ffffffff812c5801>] ? register_netdevice_notifier+0x81/0x1a0 [...] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Cc: Jetmir Gigollai <jetmir_gigollaj(a)web.de> --- compat-include/linux/netdevice.h | 6 ------ net/batman-adv/hard-interface.c | 42 ---------------------------------------- 2 files changed, 48 deletions(-) diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index f19f624..0e4fcc8 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -111,10 +111,4 @@ static inline int batadv_netdev_set_master(struct net_device *slave, #endif /* < KERNEL_VERSION(3, 17, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) - -#define dev_get_iflink(_net_dev) ((_net_dev)->iflink) - -#endif /* < KERNEL_VERSION(3, 19, 0) */ - #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETDEVICE_H_ */ diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index bef9147..0c2643d 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -75,44 +75,6 @@ out: return hard_iface; } -/** - * batadv_is_on_batman_iface - check if a device is a batman iface descendant - * @net_dev: the device to check - * - * If the user creates any virtual device on top of a batman-adv interface, it - * is important to prevent this new interface to be used to create a new mesh - * network (this behaviour would lead to a batman-over-batman configuration). - * This function recursively checks all the fathers of the device passed as - * argument looking for a batman-adv soft interface. - * - * Return: true if the device is descendant of a batman-adv mesh interface (or - * if it is a batman-adv interface itself), false otherwise - */ -static bool batadv_is_on_batman_iface(const struct net_device *net_dev) -{ - struct net_device *parent_dev; - bool ret; - - /* check if this is a batman-adv mesh interface */ - if (batadv_softif_is_valid(net_dev)) - return true; - - /* no more parents..stop recursion */ - if (dev_get_iflink(net_dev) == 0 || - dev_get_iflink(net_dev) == net_dev->ifindex) - return false; - - /* recurse over the parent device */ - parent_dev = __dev_get_by_index(&init_net, dev_get_iflink(net_dev)); - /* if we got a NULL parent_dev there is something broken.. */ - if (WARN(!parent_dev, "Cannot find parent device")) - return false; - - ret = batadv_is_on_batman_iface(parent_dev); - - return ret; -} - static int batadv_is_valid_iface(const struct net_device *net_dev) { if (net_dev->flags & IFF_LOOPBACK) @@ -124,10 +86,6 @@ static int batadv_is_valid_iface(const struct net_device *net_dev) if (net_dev->addr_len != ETH_ALEN) return 0; - /* no batman over batman */ - if (batadv_is_on_batman_iface(net_dev)) - return 0; - return 1; } -- 2.6.2

7 years, 4 months

[B.A.T.M.A.N.] [PATCH v7 01/19] batman-adv: Rename batadv_orig_node *_free_ref function to *_put

by Sven Eckelmann

The batman-adv source code is the only place in the kernel which uses the *_free_ref naming scheme for the *_put functions. Changing it to *_put makes it more consistent and makes it easier to understand the connection to the *_get functions. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v7: - removed patches which are now applied in the branch master - split *_get -> *_put rename patches into smaller patches only renaming single functions v6: - removed patches which are now applied in the branch next - rebased remaining patches on the patch "batman-adv: Avoid recursive call_rcu for batadv_nc_node" which was modified by Marek while he applied the patches (this unfortunately made some of the remaining patches slightly harder to apply) v5: - add hack which allows to compile against stable kernel like 3.2.44 which also added the kref_get_unless_zero function v4: - fix function names in commit messages - fix double whitespace in batadv_tt_orig_list_entry_release kerneldoc - add extra patch for batadv_claim_free_ref kerneldoc fix - change the phrase "free it" in all *_free_ref/*_put functions to "release it" v3: - update copyright year v2: - split patchset into fixes and kref migration to make it easier when the decision is made where each patch will be applied net/batman-adv/bat_iv_ogm.c | 16 ++++++++-------- net/batman-adv/bridge_loop_avoidance.c | 4 ++-- net/batman-adv/distributed-arp-table.c | 4 ++-- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/gateway_client.c | 8 ++++---- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/main.c | 2 +- net/batman-adv/network-coding.c | 4 ++-- net/batman-adv/originator.c | 8 ++++---- net/batman-adv/originator.h | 2 +- net/batman-adv/routing.c | 18 +++++++++--------- net/batman-adv/send.c | 2 +- net/batman-adv/translation-table.c | 14 +++++++------- 13 files changed, 43 insertions(+), 43 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index bf0e7d6..32df38b 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -287,8 +287,8 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr) free_orig_node: /* free twice, as batadv_orig_node_new sets refcount to 2 */ - batadv_orig_node_free_ref(orig_node); - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); + batadv_orig_node_put(orig_node); return NULL; } @@ -1041,7 +1041,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, ethhdr->h_source, orig_node, orig_tmp); - batadv_orig_node_free_ref(orig_tmp); + batadv_orig_node_put(orig_tmp); if (!neigh_node) goto unlock; } else { @@ -1306,7 +1306,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, orig_ifinfo = batadv_orig_ifinfo_new(orig_node, if_outgoing); if (WARN_ON(!orig_ifinfo)) { - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return 0; } @@ -1367,7 +1367,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, out: spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); batadv_orig_ifinfo_free_ref(orig_ifinfo); return ret; } @@ -1563,7 +1563,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, out_neigh: if ((orig_neigh_node) && (!is_single_hop_neigh)) - batadv_orig_node_free_ref(orig_neigh_node); + batadv_orig_node_put(orig_neigh_node); out: if (router_ifinfo) batadv_neigh_ifinfo_free_ref(router_ifinfo); @@ -1697,7 +1697,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Drop packet: originator packet from myself (via neighbor)\n"); - batadv_orig_node_free_ref(orig_neigh_node); + batadv_orig_node_put(orig_neigh_node); return; } @@ -1735,7 +1735,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, } rcu_read_unlock(); - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); } static int batadv_iv_ogm_receive(struct sk_buff *skb, diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 7781f39..49008d9 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -486,7 +486,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, u8 *orig, if (orig_node) { batadv_tt_global_del_orig(bat_priv, orig_node, vid, "became a backbone gateway"); - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); } if (own_backbone) { @@ -965,7 +965,7 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, bla_dst_own->group = bla_dst->group; } - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return 2; } diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index e326111..8f466e7 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -547,7 +547,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, max = tmp_max; if (max_orig_node) - batadv_orig_node_free_ref(max_orig_node); + batadv_orig_node_put(max_orig_node); max_orig_node = orig_node; } rcu_read_unlock(); @@ -676,7 +676,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, free_neigh: batadv_neigh_node_free_ref(neigh_node); free_orig: - batadv_orig_node_free_ref(cand[i].orig_node); + batadv_orig_node_put(cand[i].orig_node); } out: diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 55656e8..67cb224 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -385,7 +385,7 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb, out: if (orig_node_dst) - batadv_orig_node_free_ref(orig_node_dst); + batadv_orig_node_put(orig_node_dst); if (neigh_node) batadv_neigh_node_free_ref(neigh_node); return ret; diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 261866e..a42dd2a 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -71,7 +71,7 @@ static void batadv_gw_node_release(struct kref *ref) gw_node = container_of(ref, struct batadv_gw_node, refcount); - batadv_orig_node_free_ref(gw_node->orig_node); + batadv_orig_node_put(gw_node->orig_node); kfree_rcu(gw_node, rcu); } @@ -415,7 +415,7 @@ reselect: batadv_gw_reselect(bat_priv); out: if (curr_gw_orig) - batadv_orig_node_free_ref(curr_gw_orig); + batadv_orig_node_put(curr_gw_orig); if (router_gw) batadv_neigh_node_free_ref(router_gw); if (router_orig) @@ -446,7 +446,7 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv, gw_node = kzalloc(sizeof(*gw_node), GFP_ATOMIC); if (!gw_node) { - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return; } @@ -878,7 +878,7 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, out: if (orig_dst_node) - batadv_orig_node_free_ref(orig_dst_node); + batadv_orig_node_put(orig_dst_node); if (curr_gw) batadv_gw_node_free_ref(curr_gw); if (gw_node) diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index a69da37..7d944af 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -292,7 +292,7 @@ out: if (neigh_node) batadv_neigh_node_free_ref(neigh_node); if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return len; } diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 568c550..5b573d1 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -1212,7 +1212,7 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, u8 *src, if (batadv_send_skb_to_orig(skb, orig_node, NULL) == NET_XMIT_DROP) kfree_skb(skb); out: - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); } /** diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index a4eb8ee..00f74d4 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -218,7 +218,7 @@ static void batadv_nc_node_release(struct kref *ref) nc_node = container_of(ref, struct batadv_nc_node, refcount); - batadv_orig_node_free_ref(nc_node->orig_node); + batadv_orig_node_put(nc_node->orig_node); kfree_rcu(nc_node, rcu); } @@ -1372,7 +1372,7 @@ batadv_nc_skb_src_search(struct batadv_priv *bat_priv, } rcu_read_unlock(); - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return nc_packet; } diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index eacd0e5..4df9be4 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -810,11 +810,11 @@ static void batadv_orig_node_release(struct kref *ref) } /** - * batadv_orig_node_free_ref - decrement the orig node refcounter and possibly + * batadv_orig_node_put - decrement the orig node refcounter and possibly * release it * @orig_node: the orig node to free */ -void batadv_orig_node_free_ref(struct batadv_orig_node *orig_node) +void batadv_orig_node_put(struct batadv_orig_node *orig_node) { kref_put(&orig_node->refcount, batadv_orig_node_release); } @@ -843,7 +843,7 @@ void batadv_originator_free(struct batadv_priv *bat_priv) hlist_for_each_entry_safe(orig_node, node_tmp, head, hash_entry) { hlist_del_rcu(&orig_node->hash_entry); - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); } spin_unlock_bh(list_lock); } @@ -1204,7 +1204,7 @@ static void _batadv_purge_orig(struct batadv_priv *bat_priv) batadv_tt_global_del_orig(orig_node->bat_priv, orig_node, -1, "originator timed out"); - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); continue; } diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 9950740..c151f6a 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -37,7 +37,7 @@ int batadv_compare_orig(const struct hlist_node *node, const void *data2); int batadv_originator_init(struct batadv_priv *bat_priv); void batadv_originator_free(struct batadv_priv *bat_priv); void batadv_purge_orig_ref(struct batadv_priv *bat_priv); -void batadv_orig_node_free_ref(struct batadv_orig_node *orig_node); +void batadv_orig_node_put(struct batadv_orig_node *orig_node); struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv, const u8 *addr); struct batadv_hardif_neigh_node * diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 205310b..d2c490d 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -271,7 +271,7 @@ out: if (primary_if) batadv_hardif_free_ref(primary_if); if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return ret; } @@ -319,7 +319,7 @@ out: if (primary_if) batadv_hardif_free_ref(primary_if); if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return ret; } @@ -403,7 +403,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, out: if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return ret; } @@ -649,7 +649,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, out: if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return ret; } @@ -704,7 +704,7 @@ out: if (primary_if) batadv_hardif_free_ref(primary_if); if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return ret; } @@ -768,7 +768,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, return 0; curr_ttvn = (u8)atomic_read(&orig_node->last_ttvn); - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); } /* check if the TTVN contained in the packet is fresher than what the @@ -908,7 +908,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, rx_success: if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return NET_RX_SUCCESS; } @@ -1019,7 +1019,7 @@ int batadv_recv_frag_packet(struct sk_buff *skb, out: if (orig_node_src) - batadv_orig_node_free_ref(orig_node_src); + batadv_orig_node_put(orig_node_src); return ret; } @@ -1124,6 +1124,6 @@ spin_unlock: spin_unlock_bh(&orig_node->bcast_seqno_lock); out: if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return ret; } diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index d8b03fd..261309e 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -317,7 +317,7 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv, out: if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); if (ret == NET_XMIT_DROP) kfree_skb(skb); return ret; diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 1188279..4de02ea 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -390,7 +390,7 @@ static void batadv_tt_orig_list_entry_release(struct kref *ref) orig_entry = container_of(ref, struct batadv_tt_orig_list_entry, refcount); - batadv_orig_node_free_ref(orig_entry->orig_node); + batadv_orig_node_put(orig_entry->orig_node); kfree_rcu(orig_entry, rcu); } @@ -2774,9 +2774,9 @@ unlock: out: if (res_dst_orig_node) - batadv_orig_node_free_ref(res_dst_orig_node); + batadv_orig_node_put(res_dst_orig_node); if (req_dst_orig_node) - batadv_orig_node_free_ref(req_dst_orig_node); + batadv_orig_node_put(req_dst_orig_node); kfree(tvlv_tt_data); return ret; } @@ -2891,7 +2891,7 @@ unlock: out: spin_unlock_bh(&bat_priv->tt.commit_lock); if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); if (primary_if) batadv_hardif_free_ref(primary_if); kfree(tvlv_tt_data); @@ -2979,7 +2979,7 @@ static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv, out: if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); } static void batadv_tt_update_changes(struct batadv_priv *bat_priv, @@ -3085,7 +3085,7 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv, spin_unlock_bh(&bat_priv->tt.req_list_lock); out: if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); } static void batadv_tt_roam_list_free(struct batadv_priv *bat_priv) @@ -3800,7 +3800,7 @@ static int batadv_roam_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv, out: if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return NET_RX_SUCCESS; } -- 2.7.0.rc3

7 years, 4 months

[B.A.T.M.A.N.] pull request [net]: batman-adv 20160117

by Antonio Quartulli

Hello David, here you have a bunch of patches intended for net. This patchset is provided by Sven Eckelmann and it is basically fixing 2 major issues that exist in several parts of the code - that is why we have 8 patches. The first bugfix (patch 1 and 2) is preventing call_rcu from being invoked recursively. This would deceive any user waiting on rcu_barrier() because the latter won't be able to wait for the nested invocation thus triggering any sort of undefined behaviours. The second bugfix (patches from 3 to 8) prevents the code from freeing rcu protected objects without waiting for the proper grace period. This issue can potentially lead to wrong memory access and thus kernel crashes. Unfortunately this bogus code pattern was copy/pasted all around the place when developing new features, therefore Sven diligently created several patches to address each component independently. Given that such bugs were introduced quite some time ago, all the patches except patch 5 should be considered for submission to stable. Please pull or let me know of any issue! Thanks a lot, Antonio The following changes since commit 6c3f5aef1159a278b54642ebc0bbb5cdab7630cf: bna: fix Rx data corruption with VLAN stripping enabled and MTU > 4096 (2016-01-15 21:49:25 -0500) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to 42eff6a617e23b691f8e4467f4687ed7245a92db: batman-adv: Drop immediate orig_node free function (2016-01-16 22:50:00 +0800) ---------------------------------------------------------------- Included changes: - avoid recursive invocations of call_rcu() which would fool users waiting on rcu_barrier() - prevent immediate kfree of objects used in rcu protected contexts ---------------------------------------------------------------- Sven Eckelmann (8): batman-adv: Avoid recursive call_rcu for batadv_bla_claim batman-adv: Avoid recursive call_rcu for batadv_nc_node batman-adv: Drop immediate batadv_orig_ifinfo free function batman-adv: Drop immediate batadv_neigh_node free function batman-adv: Drop immediate batadv_hardif_neigh_node free function batman-adv: Drop immediate neigh_ifinfo free function batman-adv: Drop immediate batadv_hard_iface free function batman-adv: Drop immediate orig_node free function net/batman-adv/bridge_loop_avoidance.c | 10 +- net/batman-adv/hard-interface.h | 12 -- net/batman-adv/network-coding.c | 19 ++-- net/batman-adv/originator.c | 196 ++++++++++++--------------------- net/batman-adv/originator.h | 1 - net/batman-adv/translation-table.c | 28 +++-- 6 files changed, 94 insertions(+), 172 deletions(-)

7 years, 4 months

[B.A.T.M.A.N.] [PATCH] batman-adv: remove unused BATADV_BONDING_TQ_THRESHOLD constant

by Antonio Quartulli

BATADV_BONDING_TQ_THRESHOLD is not used anymore since the implementation of the bat_neigh_is_similar_or_better() API function. Such function uses the more generic BATADV_TQ_SIMILARITY_THRESHOLD constant. Therefore, remove definition of the unused BATADV_BONDING_TQ_THRESHOLD constant. Signed-off-by: Antonio Quartulli <a(a)unstable.cc> --- net/batman-adv/main.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 32dfc9e..8c01f54 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -100,11 +100,6 @@ */ #define BATADV_TQ_SIMILARITY_THRESHOLD 50 -/* how much worse secondary interfaces may be to be considered as bonding - * candidates - */ -#define BATADV_BONDING_TQ_THRESHOLD 50 - /* should not be bigger than 512 bytes or change the size of * forw_packet->direct_link_flags */ -- 2.7.0

7 years, 4 months

[B.A.T.M.A.N.] [PATCH v6 01/20] batman-adv: Add compatibility code for kref_get_unless_zero

by Sven Eckelmann

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v6: - removed patches which are now applied in the branch next - rebased remaining patches on the patch "batman-adv: Avoid recursive call_rcu for batadv_nc_node" which was modified by Marek while he applied the patches (this unfortunately made some of the remaining patches "hard" to apply) v5: - add hack which allows to compile against stable kernel like 3.2.44 which also added the kref_get_unless_zero function v4: - fix function names in commit messages - fix double whitespace in batadv_tt_orig_list_entry_release kerneldoc - add extra patch for batadv_claim_free_ref kerneldoc fix - change the phrase "free it" in all *_free_ref/*_put functions to "release it" v3: - update copyright year v2: - split patchset into fixes and kref migration to make it easier when the decision is made where each patch will be applied compat-include/linux/kref.h | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 compat-include/linux/kref.h diff --git a/compat-include/linux/kref.h b/compat-include/linux/kref.h new file mode 100644 index 0000000..bb3442c --- /dev/null +++ b/compat-include/linux/kref.h @@ -0,0 +1,46 @@ +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * 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. + * + * 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/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_KREF_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_KREF_H_ + +#include <linux/version.h> +#include_next <linux/kref.h> + +#include <linux/atomic.h> +#include <linux/kernel.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) + +/* some stable versions like Linux 3.2.44 also introduced this function + * and would therefore break the build because they trigger a redefinition + * of this function. Instead rename this function to be in the batadv_* + * namespace + */ +#define kref_get_unless_zero(__kref) batadv_kref_get_unless_zero(__kref) + +static inline int __must_check batadv_kref_get_unless_zero(struct kref *kref) +{ + return atomic_add_unless(&kref->refcount, 1, 0); +} + +#endif /* < KERNEL_VERSION(3, 8, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_KREF_H_ */ -- 2.7.0.rc3

7 years, 4 months

[B.A.T.M.A.N.] [PATCH v4 01/31] batman-adv: Fix kernel-doc for batadv_claim_free_ref

by Sven Eckelmann

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v4: - fix function names in commit messages - fix double whitespace in batadv_tt_orig_list_entry_release kerneldoc - add extra patch for batadv_claim_free_ref kerneldoc fix - change the phrase "free it" in all *_free_ref/*_put functions to "release it" v3: - update copyright year v2: - split patchset into fixes and kref migration to make it easier when the decision is made where each patch will be applied net/batman-adv/bridge_loop_avoidance.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index d9b034a..fc1b898 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -168,7 +168,8 @@ static void batadv_claim_free_rcu(struct rcu_head *rcu) } /** - * batadv_claim_free_rcu - free a claim + * batadv_claim_free_ref - decrement the claim refcounter and possibly + * release it * @claim: claim to be free'd */ static void batadv_claim_free_ref(struct batadv_bla_claim *claim) -- 2.6.4

7 years, 4 months

[B.A.T.M.A.N.] B.A.T.M.A.N. V leaves the nest

by Marek Lindner

Hi, for those following the mailing list and other events around the B.A.T.M.A.N. team the term 'B.A.T.M.A.N. V' probably sounds all too familiar. It has been more than 5 years since the first ideas for improving the routing protocol were exchanged. In the following years we had several GSoC projects dedicated to pull this topic forward, countless hack & brainstorming sessions (including sleepless nights at each battlemesh). Turns out, replacing a mature protocol like B.A.T.M.A.N. IV takes more effort than you might think. Another hurdle we kept running into was the missing separation between routing logic and feature code preventing any developer and/or tester to quickly switch from one protocol to the other. Now we have finally completed hiding all routing logic behind an internal API allowing to change the routing protocol while still benefiting from all the layer2 features. With this mail the B.A.T.M.A.N. team announces the availability of the latest protocol revision: B.A.T.M.A.N. V. Major features are its throughput based path metric and packet type separation. For a high level overview about the differences to B.A.T.M.A.N. IV feel invited to continue reading[1]. Technical protocol specs also are available [2][3]. The code has already undergone stability and performance testing[4], thus is considered ready for a wider audience testing. In the coming weeks said patches will be included in the main source tree and sent upstream to the kernel maintainers. Comments and feedback are welcome! Next steps involve finishing the throughout meter[5] to enrich B.A.T.M.A.N. V with an automatic link throughput detection when other mechanisms fail. Happy routing, The B.A.T.M.A.N. team [1] https://www.open-mesh.org/projects/batman-adv/wiki/BATMAN_V [2] https://www.open-mesh.org/projects/batman-adv/wiki/ELP [3] https://www.open-mesh.org/projects/batman-adv/wiki/Ogmv2 [4] https://www.open-mesh.org/projects/batman-adv/wiki/BATMAN_V_Tests [5] https://www.open-mesh.org/projects/open-mesh/wiki/2012-10-06-GSoC-2012-Edo-…

7 years, 4 months

[B.A.T.M.A.N.] Need help bridging Regular AP to Batman

by André Pouliot

Hi, I'm trying to do a mesh network using the RaspberryPi and Batman. My problem is I'm using 2 wifi card on one raspberrypi one for batman and the other one for connecting to my wireless access point. I already made my mesh network I can ping on layer 2 or 3 between 2 raspberrypi. When connecting the Ethernet cable(on the raspberry with 2 wifi dongle) I can use the bridge to ping toward the internet. But when I disconnect the cable I can't ping internet anymore. I already verified my batman interface and my bridge both seem to work The AP is connected on wlan1, wlan1 doesn't have an IP address assigned to it. The AP is configured with WPA2. When trying to assign a address using dhclient to the bridge interface the system can't seem to find a way and the command is waiting. If I want to connected my batman network to a standard wifi AP do I need to use a bridge or the functionality exist with batman? If it's with the bridge how can it work? I'm putting the output of a few command at the end of the email. If you want anything else It will be my pleasure to send it. André Pouliot ----- root@raspberrypi:/home/pi# ifconfig bat0 Link encap:Ethernet HWaddr 72:4c:12:42:f2:d4 inet6 addr: fe80::704c:12ff:fe42:f2d4/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:354 errors:0 dropped:0 overruns:0 frame:0 TX packets:5857 errors:0 dropped:791 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:19536 (19.0 KiB) TX bytes:821562 (802.3 KiB) eth0 Link encap:Ethernet HWaddr b8:27:eb:06:21:f3 inet addr:172.17.94.48 Bcast:172.17.95.255 Mask:255.255.240.0 inet6 addr: fe80::ba27:ebff:fe06:21f3/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:9628 errors:0 dropped:5 overruns:0 frame:0 TX packets:3273 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:1054143 (1.0 MiB) TX bytes:380009 (371.1 KiB) lo Link encap:Local Loopback inet addr:127.0.0.1 Mask:255.0.0.0 inet6 addr: ::1/128 Scope:Host UP LOOPBACK RUNNING MTU:65536 Metric:1 RX packets:216 errors:0 dropped:0 overruns:0 frame:0 TX packets:216 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:22172 (21.6 KiB) TX bytes:22172 (21.6 KiB) mesh-bridge Link encap:Ethernet HWaddr 00:0f:60:04:03:a6 inet addr:172.17.94.29 Bcast:172.17.95.255 Mask:255.255.240.0 inet6 addr: fe80::20f:60ff:fe04:3a6/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:9123 errors:0 dropped:0 overruns:0 frame:0 TX packets:2856 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:963896 (941.3 KiB) TX bytes:316106 (308.6 KiB) wlan0 Link encap:Ethernet HWaddr 40:a5:ef:01:23:c8 inet6 addr: fe80::42a5:efff:fe01:23c8/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1532 Metric:1 RX packets:22070 errors:0 dropped:0 overruns:0 frame:0 TX packets:29900 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:2408956 (2.2 MiB) TX bytes:4165384 (3.9 MiB) wlan1 Link encap:Ethernet HWaddr 00:0f:60:04:03:a6 UP BROADCAST MULTICAST MTU:1500 Metric:1 RX packets:2195 errors:0 dropped:1 overruns:0 frame:0 TX packets:11 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:276922 (270.4 KiB) TX bytes:3110 (3.0 KiB) root@raspberrypi:/home/pi# brctl show bridge name bridge id STP enabled interfaces mesh-bridge 8000.000f600403a6 no bat0 eth0 wlan1 root@raspberrypi:/home/pi# batctl o [B.A.T.M.A.N. adv 2015.0, MainIF/MAC: wlan0/40:a5:ef:01:23:c8 (bat0 BATMAN_IV)] Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ... 40:a5:ef:01:2f:58 0.010s (255) 40:a5:ef:01:2f:58 [ wlan0]: 40:a5:ef:01:2f:58 (255) root@raspberrypi:/home/pi# iw dev wlan1 link Connected to 00:24:01:65:e4:6d (on wlan1) SSID: C2T3-Prod freq: 2437 RX: 16265 bytes (149 packets) TX: 180 bytes (3 packets) signal: -43 dBm tx bitrate: 6.5 MBit/s MCS 0 bss flags: short-preamble short-slot-time dtim period: 1 beacon int: 100

7 years, 4 months

by Sven Eckelmann

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 2 +- alfred.h | 2 +- batadv_query.c | 2 +- batadv_query.h | 2 +- client.c | 2 +- gpsd/Makefile | 2 +- gpsd/alfred-gpsd.c | 2 +- gpsd/alfred-gpsd.h | 2 +- hash.c | 2 +- hash.h | 2 +- main.c | 2 +- netsock.c | 2 +- packet.h | 2 +- recv.c | 2 +- send.c | 2 +- server.c | 2 +- unix_sock.c | 2 +- util.c | 2 +- vis/Makefile | 2 +- vis/vis.c | 2 +- vis/vis.h | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 818b1fd..939e9f8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2012-2015 B.A.T.M.A.N. contributors +# Copyright (C) 2012-2016 B.A.T.M.A.N. contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public diff --git a/alfred.h b/alfred.h index b23487f..cf97e78 100644 --- a/alfred.h +++ b/alfred.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.c b/batadv_query.c index c289b80..2604503 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.h b/batadv_query.h index 8991ee9..d9660bc 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/client.c b/client.c index 22b8439..2a5e8a5 100644 --- a/client.c +++ b/client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/gpsd/Makefile b/gpsd/Makefile index 5055987..72e4445 100644 --- a/gpsd/Makefile +++ b/gpsd/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2013-2015 B.A.T.M.A.N. contributors +# Copyright (C) 2013-2016 B.A.T.M.A.N. contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 2516417..88f841c 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 4f87063..ca91f43 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/hash.c b/hash.c index f2c8b9c..7669679 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index 6e027bb..24bddb1 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/main.c b/main.c index 452d9ae..9610398 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/netsock.c b/netsock.c index 6bf6016..d72541e 100644 --- a/netsock.c +++ b/netsock.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/packet.h b/packet.h index 5ecdf39..ebb4274 100644 --- a/packet.h +++ b/packet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Sven Eckelmann * diff --git a/recv.c b/recv.c index f459190..98539cb 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/send.c b/send.c index 43c10f4..70f694c 100644 --- a/send.c +++ b/send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/server.c b/server.c index ac253a9..47aee4f 100644 --- a/server.c +++ b/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/unix_sock.c b/unix_sock.c index 570c62c..3c7e583 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/util.c b/util.c index 84d4b2d..db6ec96 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/Makefile b/vis/Makefile index 32a578e..accd1fa 100644 --- a/vis/Makefile +++ b/vis/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2013-2015 B.A.T.M.A.N. contributors +# Copyright (C) 2013-2016 B.A.T.M.A.N. contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public diff --git a/vis/vis.c b/vis/vis.c index c1f8dad..753cb91 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/vis.h b/vis/vis.h index 969ca33..1b7e210 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * -- 2.6.4

7 years, 4 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N January 2016