B.A.T.M.A.N November 2016

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

19 participants
48 discussions

[B.A.T.M.A.N.] [PATCH net-next 2/2] net: batman-adv: Remove one condition check in batadv_route_unicast_packet
by fgao＠ikuai8.com 21 Nov '16

21 Nov '16

From: Gao Feng <gfree.wind(a)gmail.com> It could decrease one condition check to collect some statements in the first condition block. Signed-off-by: Gao Feng <gfree.wind(a)gmail.com> --- net/batman-adv/routing.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 6b08b26..9d657cf 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -719,20 +719,18 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, len = skb->len; res = batadv_send_skb_to_orig(skb, orig_node, recv_if); - if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) - ret = NET_RX_SUCCESS; - - /* skb was consumed */ - skb = NULL; - /* translate transmit result into receive result */ if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) { + ret = NET_RX_SUCCESS; /* skb was transmitted and consumed */ batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD); batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES, len + ETH_HLEN); } + /* skb was consumed */ + skb = NULL; + put_orig_node: batadv_orig_node_put(orig_node); free_skb: -- 1.9.1

1 0

[B.A.T.M.A.N.] [PATCH net v2 1/1] net: batman-adv: Treat NET_XMIT_CN as transmit successfully
by fgao＠ikuai8.com 21 Nov '16

21 Nov '16

From: Gao Feng <fgao(a)ikuai8.com> The tc could return NET_XMIT_CN as one congestion notification, but it does not mean the packet is lost. Other modules like ipvlan, macvlan, and others treat NET_XMIT_CN as success too. So batman-adv should add the NET_XMIT_CN check. Signed-off-by: Gao Feng <fgao(a)ikuai8.com> --- v2: Correct two typo "packe" and "ret" v1: Initial version net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/routing.c | 2 +- net/batman-adv/tp_meter.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index e257efd..4bf0622 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -660,7 +660,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, } send_status = batadv_send_unicast_skb(tmp_skb, neigh_node); - if (send_status == NET_XMIT_SUCCESS) { + if (send_status == NET_XMIT_SUCCESS || send_status == NET_XMIT_CN) { /* count the sent packet */ switch (packet_subtype) { case BATADV_P_DAT_DHT_GET: diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 0934730..4714b8f 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -495,7 +495,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES, skb_fragment->len + ETH_HLEN); ret = batadv_send_unicast_skb(skb_fragment, neigh_node); - if (ret != NET_XMIT_SUCCESS) { + if (ret != NET_XMIT_SUCCESS && ret != NET_XMIT_CN) { /* return -1 so that the caller can free the original * skb */ diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 7e8dc64..f44fb07 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -706,7 +706,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, goto out; /* translate transmit result into receive result */ - if (res == NET_XMIT_SUCCESS) { + if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) { /* skb was transmitted and consumed */ batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD); batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES, diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 8af1611..461dbad 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -618,7 +618,7 @@ static int batadv_tp_send_msg(struct batadv_tp_vars *tp_vars, const u8 *src, if (r == -1) kfree_skb(skb); - if (r == NET_XMIT_SUCCESS) + if (r == NET_XMIT_SUCCESS || r == NET_XMIT_CN) return 0; return BATADV_TP_REASON_CANT_SEND; -- 1.9.1

3 3

[B.A.T.M.A.N.] [PATCH net 1/1] net: batman-adv: Treat NET_XMIT_CN as transmit successfully
by fgao＠ikuai8.com 21 Nov '16

21 Nov '16

From: Gao Feng <fgao(a)ikuai8.com> The tc could return NET_XMIT_CN as one congestion notification, but it does not mean the packe is lost. Other modules like ipvlan, macvlan, and others treat NET_XMIT_CN as success too. So batman-adv should add the NET_XMIT_CN check. Signed-off-by: Gao Feng <fgao(a)ikuai8.com> --- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/routing.c | 2 +- net/batman-adv/tp_meter.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index e257efd..4bf0622 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -660,7 +660,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, } send_status = batadv_send_unicast_skb(tmp_skb, neigh_node); - if (send_status == NET_XMIT_SUCCESS) { + if (send_status == NET_XMIT_SUCCESS || send_status == NET_XMIT_CN) { /* count the sent packet */ switch (packet_subtype) { case BATADV_P_DAT_DHT_GET: diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 0934730..4714b8f 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -495,7 +495,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES, skb_fragment->len + ETH_HLEN); ret = batadv_send_unicast_skb(skb_fragment, neigh_node); - if (ret != NET_XMIT_SUCCESS) { + if (ret != NET_XMIT_SUCCESS && ret != NET_XMIT_CN) { /* return -1 so that the caller can free the original * skb */ diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 7e8dc64..8edd324 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -706,7 +706,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, goto out; /* translate transmit result into receive result */ - if (res == NET_XMIT_SUCCESS) { + if (res == NET_XMIT_SUCCESS || ret == NET_XMIT_CN) { /* skb was transmitted and consumed */ batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD); batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES, diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 8af1611..461dbad 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -618,7 +618,7 @@ static int batadv_tp_send_msg(struct batadv_tp_vars *tp_vars, const u8 *src, if (r == -1) kfree_skb(skb); - if (r == NET_XMIT_SUCCESS) + if (r == NET_XMIT_SUCCESS || r == NET_XMIT_CN) return 0; return BATADV_TP_REASON_CANT_SEND; -- 1.9.1

4 6

[B.A.T.M.A.N.] [PATCH 0/8] pull request for net-next: batman-adv 2016-11-19
by Simon Wunderlich 19 Nov '16

19 Nov '16

Hi David, this should be our last feature pull request for batman-adv in this round. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 93bbaab455f30fd43911e0881a02107a17150a62: batman-adv: Reject unicast packet with zero/mcast dst address (2016-11-08 19:02:36 +0100) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20161119 for you to fetch changes up to 9b4aec647a92a2464337db10507348aecf0f0fd7: batman-adv: fix rare race conditions on interface removal (2016-11-08 19:02:39 +0100) ---------------------------------------------------------------- This feature patchset includes the following changes: - 6 patches adding functionality to detect a WiFi interface under other virtual interfaces, like VLANs. They introduce a cache for the detected the WiFi configuration to avoid RTNL locking in critical sections. Patches have been prepared by Marek Lindner and Sven Eckelmann - Enable automatic module loading for genl requests, by Sven Eckelmann - Fix a potential race condition on interface removal. This is not happening very often in practice, but requires bigger changes to fix, so we are sending this to net-next. By Linus Luessing ---------------------------------------------------------------- Linus Lüssing (1): batman-adv: fix rare race conditions on interface removal Marek Lindner (3): batman-adv: refactor wifi interface detection batman-adv: additional checks for virtual interfaces on top of WiFi batman-adv: retrieve B.A.T.M.A.N. V WiFi neighbor stats from real interface Sven Eckelmann (4): batman-adv: Return non-const ptr in batadv_getlink_net batman-adv: Cache the type of wifi device for each hardif batman-adv: Update wifi flags on upper link change batman-adv: Add module alias for batadv netlink family net/batman-adv/bat_iv_ogm.c | 21 +-- net/batman-adv/bat_v_elp.c | 41 +++--- net/batman-adv/hard-interface.c | 173 +++++++++++++++++++++-- net/batman-adv/hard-interface.h | 5 +- net/batman-adv/main.c | 3 + net/batman-adv/send.c | 283 ++++++++++++++++++++++++++++--------- net/batman-adv/send.h | 5 + net/batman-adv/translation-table.c | 10 +- net/batman-adv/types.h | 19 +++ 9 files changed, 445 insertions(+), 115 deletions(-)

2 9

[B.A.T.M.A.N.] [PATCH 0/2] pull request for net: batman-adv 2016-11-19
by Simon Wunderlich 19 Nov '16

19 Nov '16

Hi David, here are some bugfix patches which we would like to have integrated into net. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 9799c50372b23ed774791bdb87d700f1286ee8a9: batman-adv: fix splat on disabling an interface (2016-10-21 14:47:02 +0200) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-net-for-davem-20161119 for you to fetch changes up to e13258f38e927b61cdb5f4ad25309450d3b127d1: batman-adv: Detect missing primaryif during tp_send as error (2016-11-04 12:27:39 +0100) ---------------------------------------------------------------- Here are two batman-adv bugfix patches: - Revert a splat on disabling interface which created another problem, by Sven Eckelmann - Fix error handling when the primary interface disappears during a throughput meter test, by Sven Eckelmann ---------------------------------------------------------------- Sven Eckelmann (2): batman-adv: Revert "fix splat on disabling an interface" batman-adv: Detect missing primaryif during tp_send as error net/batman-adv/hard-interface.c | 1 + net/batman-adv/tp_meter.c | 1 + 2 files changed, 2 insertions(+)

2 3

Re: [B.A.T.M.A.N.] Patch "batman-adv: fix splat on disabling an interface" has been added to the 4.8-stable tree
by Linus Lüssing 18 Nov '16

18 Nov '16

On Thu, Nov 17, 2016 at 10:04:53AM +0100, gregkh(a)linuxfoundation.org wrote: > > This is a note to let you know that I've just added the patch titled > > batman-adv: fix splat on disabling an interface > > to the 4.8-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… > > The filename of the patch is: > batman-adv-fix-splat-on-disabling-an-interface.patch > and it can be found in the queue-4.8 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable(a)vger.kernel.org> know about it. > > > From 9799c50372b23ed774791bdb87d700f1286ee8a9 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing(a)c0d3.blue> > Date: Thu, 6 Oct 2016 01:43:08 +0200 > Subject: batman-adv: fix splat on disabling an interface > [...] Does anyone know whether I should mail Greg, asking him not to apply it? Or is the revert of this commit supposed to trickle through soon anyways?

2 2

[B.A.T.M.A.N.] [PATCH 0/7] alfred: Allow out-of-order TXEND
by Sven Eckelmann 17 Nov '16

17 Nov '16

Hi, alfred allows to have out-of-order push data packet delivery. But these push data packets are only accepted when they finish with an TXEND that has as its seqno the amount of packets alfred received for this transaction. A TXEND packet which is received before the last push data frame was received would therefore cause the complete transaction to be canceled on the receiver side. It was observed on a TP-Link TL-WR841N/ND v8 [1] that after the upgrade to Gluon 2016.2 many (if not the most) transaction were out of order. The TXEND was received before the actual push data was submitted. The master server reacted to this by: 1. TXEND packet received to unknown transaction with seqno != 0 -> TXEND packet was dropped 2. PUSH_DATA packet received with seqno 0 received -> new transaction was created 3. transaction timeout happened -> transaction was dropped This patchset now changes the behavior to automatically create transactions when TXEND packets are received. The routines to decode TXEND and PUSH_DATA packets will check if all frames of a transaction were received and commit the data when the check was successful. This stabilized the statistics [2] for the previously mentioned node. Kind regards, Sven [1] https://stats.freifunk-vogtland.net/dashboard/db/node?var-node=10feedb73eb2… [2] https://stats.freifunk-vogtland.net/dashboard/db/node?var-node=10feedb73eb2… Sven Eckelmann (7): alfred: Avoid hash search for transaction cleanup alfred: Move tx finish functionality in extra function alfred: Remove checks for committed/dropped transaction alfred: Don't force cleanup of transaction on TXEND alfred: Use expected packet count to finished transactions alfred: Allow PUSH_DATA to finish transactions alfred: Allow TXEND to start new transaction alfred.h | 11 +++++--- recv.c | 84 +++++++++++++++++++++++++++++++------------------------------ unix_sock.c | 2 +- 3 files changed, 51 insertions(+), 46 deletions(-)

2 8

[B.A.T.M.A.N.] MTU for batman-adv w/ vlans?
by dan 12 Nov '16

12 Nov '16

I'm not 100% clear on how batman-adv works with vlans, so excuse me if I've taken a wrong path. I have a small 2 radio mesh node with 1 ethernet port for non-mesh access. wlan0 and wlan1 in bat0, bat0 and eth0 in mesh-bridge. MTU is 1532 on WLAN0. If I want a VLAN to pass through the eth0 interface as if it were trunk, what needs to be done? my thought was, increase WLAN0 MTU to 1536 and eth0 to 1504.... will that work? or do I need to create a vlan bat0.1 and eth0.1 and bridge them? Thanks

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Consume dropped packets with kfree_skb
by Sven Eckelmann 10 Nov '16

10 Nov '16

The dropped skbs were previously free'd using kfree_skb in batadv_batman_skb_recv with kfree_skb. This has to be done again directly in the functions which also consume the skb on success. Reported-by: Eric Dumazet <eric.dumazet(a)gmail.com> Fixes: 83fef820ecdb ("batman-adv: Consume skb in receive handlers") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bat_iv_ogm.c | 5 ++++- net/batman-adv/bat_v_elp.c | 7 +++++-- net/batman-adv/bat_v_ogm.c | 5 ++++- net/batman-adv/routing.c | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 36a1b3d..f00f666 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1851,7 +1851,10 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, ret = NET_RX_SUCCESS; free_skb: - consume_skb(skb); + if (ret == NET_RX_SUCCESS) + consume_skb(skb); + else + kfree_skb(skb); return ret; } diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 6376240..f2fb2f0 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -498,7 +498,7 @@ int batadv_v_elp_packet_recv(struct sk_buff *skb, struct batadv_hard_iface *primary_if; struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb); bool res; - int ret; + int ret = NET_RX_DROP; res = batadv_check_management_packet(skb, if_incoming, BATADV_ELP_HLEN); if (!res) @@ -531,7 +531,10 @@ int batadv_v_elp_packet_recv(struct sk_buff *skb, batadv_hardif_put(primary_if); free_skb: - consume_skb(skb); + if (ret == NET_RX_SUCCESS) + consume_skb(skb); + else + kfree_skb(skb); return ret; } diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index ef3a88d..38b9aab 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -844,7 +844,10 @@ int batadv_v_ogm_packet_recv(struct sk_buff *skb, ret = NET_RX_SUCCESS; free_skb: - consume_skb(skb); + if (ret == NET_RX_SUCCESS) + consume_skb(skb); + else + kfree_skb(skb); return ret; } diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 7d9ae4b..6713bdf 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -1066,7 +1066,7 @@ int batadv_recv_unicast_tvlv(struct sk_buff *skb, } free_skb: - consume_skb(skb); + kfree_skb(skb); return ret; } -- 2.10.2

1 1

[B.A.T.M.A.N.] [PATCH 00/17] pull request for net-next: batman-adv 2016-11-08 v2
by Simon Wunderlich 10 Nov '16

10 Nov '16

Hi David, this is an updated version from yesterdays pull request. Sven did changes according to Eric Dumazets comments in Patch 13, everything else staid the same. Please pull or let me know of any problem! Thank you, Simon The following changes since commit a283ad5066cd63f595224c7476001cfc367fdf2e: Merge tag 'batadv-next-for-davem-20161027' of git://git.open-mesh.org/linux-merge (2016-10-29 16:26:50 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20161108-v2 for you to fetch changes up to 93bbaab455f30fd43911e0881a02107a17150a62: batman-adv: Reject unicast packet with zero/mcast dst address (2016-11-08 19:02:36 +0100) ---------------------------------------------------------------- This feature and cleanup patchset includes the following changes: - netlink and code cleanups by Sven Eckelmann (3 patches) - Cleanup and minor fixes by Linus Luessing (3 patches) - Speed up multicast update intervals, by Linus Luessing - Avoid (re)broadcast in meshes for some easy cases, by Linus Luessing - Clean up tx return state handling, by Sven Eckelmann (6 patches) - Fix some special mac address handling cases, by Sven Eckelmann (3 patches) ---------------------------------------------------------------- Linus Lüssing (5): batman-adv: Add wrapper for ARP reply creation batman-adv: Remove unnecessary lockdep in batadv_mcast_mla_list_free batman-adv: Remove unused skb_reset_mac_header() batman-adv: Use own timer for multicast TT and TVLV updates batman-adv: Simple (re)broadcast avoidance Sven Eckelmann (12): batman-adv: Introduce missing headers for genetlink restructure batman-adv: Mark batadv_netlink_ops as const batman-adv: Close two alignment holes in batadv_hard_iface batman-adv: use consume_skb for non-dropped packets batman-adv: Count all non-success TX packets as dropped batman-adv: Consume skb in batadv_frag_send_packet batman-adv: Consume skb in batadv_send_skb_to_orig batman-adv: Consume skb in receive handlers batman-adv: Remove dev_queue_xmit return code exception batman-adv: Disallow mcast src address for data frames batman-adv: Disallow zero and mcast src address for mgmt frames batman-adv: Reject unicast packet with zero/mcast dst address net/batman-adv/bat_iv_ogm.c | 33 ++++-- net/batman-adv/bat_v_elp.c | 30 +++--- net/batman-adv/bat_v_ogm.c | 71 ++++++++++++- net/batman-adv/distributed-arp-table.c | 67 +++++++----- net/batman-adv/fragmentation.c | 70 ++++++++----- net/batman-adv/hard-interface.c | 52 ++++++++++ net/batman-adv/hard-interface.h | 16 +++ net/batman-adv/main.c | 11 +- net/batman-adv/main.h | 1 + net/batman-adv/multicast.c | 70 ++++++++++--- net/batman-adv/multicast.h | 6 -- net/batman-adv/netlink.c | 5 +- net/batman-adv/network-coding.c | 35 ++++--- net/batman-adv/originator.c | 13 ++- net/batman-adv/routing.c | 180 ++++++++++++++++++++------------- net/batman-adv/send.c | 140 ++++++++++++++++++------- net/batman-adv/send.h | 6 +- net/batman-adv/soft-interface.c | 6 +- net/batman-adv/tp_meter.c | 6 -- net/batman-adv/translation-table.c | 4 - net/batman-adv/tvlv.c | 5 +- net/batman-adv/types.h | 10 +- 22 files changed, 582 insertions(+), 255 deletions(-)

2 18

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N November 2016