B.A.T.M.A.N January 2013

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

25 participants
52 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: postpone sysfs removal when unregistering
by Simon Wunderlich 10 Jan '13

10 Jan '13

When processing the unregister notify for a hard interface, removing the sysfs files may lead to a circular deadlock (rtnl mutex <-> s_active). To overcome this problem, postpone the sysfs removal in a worker. Reported-by: Sasha Levin <sasha.levin(a)oracle.com> Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- Changes from RFCv1: * use work_struct properly, instead of delayed_work * postpone for softifs as well as for hardifs Postponing the sysfs removal for the hardif unregister is easier than other alternatives involving deferring. This should bring us to the same level to the bridge code, which also messes with sysfs in the notifier processing function, and uses rtnl_trylock when called from within sysfs. As far as I could understand the net/core code, only the unregister case is the critical one, so the original bug should hopefully be fixed. --- hard-interface.c | 16 ++++++++++++++-- soft-interface.c | 26 +++++++++++++++++++++++--- types.h | 3 +++ 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index f1d37cd..eb3a12d 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -506,6 +506,17 @@ out: return NULL; } +static void batadv_hardif_remove_interface_finish(struct work_struct *work) +{ + struct batadv_hard_iface *hard_iface; + + hard_iface = container_of(work, struct batadv_hard_iface, + cleanup_work); + + batadv_sysfs_del_hardif(&hard_iface->hardif_obj); + batadv_hardif_free_ref(hard_iface); +} + static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface) { ASSERT_RTNL(); @@ -518,8 +529,9 @@ static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface) return; hard_iface->if_status = BATADV_IF_TO_BE_REMOVED; - batadv_sysfs_del_hardif(&hard_iface->hardif_obj); - batadv_hardif_free_ref(hard_iface); + INIT_WORK(&hard_iface->cleanup_work, + batadv_hardif_remove_interface_finish); + queue_work(batadv_event_workqueue, &hard_iface->cleanup_work); } void batadv_hardif_remove_interfaces(void) diff --git a/soft-interface.c b/soft-interface.c index a8eb963..b8a307b 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -464,6 +464,7 @@ struct net_device *batadv_softif_create(const char *name) goto out; bat_priv = netdev_priv(soft_iface); + bat_priv->soft_iface = soft_iface; /* batadv_interface_stats() needs to be available as soon as * register_netdevice() has been called @@ -550,12 +551,31 @@ out: return NULL; } +static void batadv_softif_destroy_finish(struct work_struct *work) +{ + struct batadv_priv *bat_priv; + struct net_device *soft_iface; + + bat_priv = container_of(work, struct batadv_priv, + cleanup_work); + soft_iface = bat_priv->soft_iface; + + batadv_debugfs_del_meshif(soft_iface); + batadv_sysfs_del_meshif(soft_iface); + + rtnl_lock(); + unregister_netdevice(soft_iface); + rtnl_unlock(); +} + void batadv_softif_destroy(struct net_device *soft_iface) { - batadv_debugfs_del_meshif(soft_iface); - batadv_sysfs_del_meshif(soft_iface); + struct batadv_priv *bat_priv = netdev_priv(soft_iface); + batadv_mesh_free(soft_iface); - unregister_netdevice(soft_iface); + + INIT_WORK(&bat_priv->cleanup_work, batadv_softif_destroy_finish); + queue_work(batadv_event_workqueue, &bat_priv->cleanup_work); } int batadv_softif_is_valid(const struct net_device *net_dev) diff --git a/types.h b/types.h index d8061ac..a9800ee 100644 --- a/types.h +++ b/types.h @@ -63,6 +63,7 @@ struct batadv_hard_iface { struct net_device *soft_iface; struct rcu_head rcu; struct batadv_hard_iface_bat_iv bat_iv; + struct work_struct cleanup_work; }; /** @@ -266,6 +267,7 @@ struct batadv_priv_dat { struct batadv_priv { atomic_t mesh_state; + struct net_device *soft_iface; struct net_device_stats stats; uint64_t __percpu *bat_counters; /* Per cpu counters */ atomic_t aggregated_ogms; /* boolean */ @@ -302,6 +304,7 @@ struct batadv_priv { spinlock_t forw_bat_list_lock; /* protects forw_bat_list */ spinlock_t forw_bcast_list_lock; /* protects forw_bcast_list */ struct delayed_work orig_work; + struct work_struct cleanup_work; struct batadv_hard_iface __rcu *primary_if; /* rcu protected pointer */ struct batadv_algo_ops *bat_algo_ops; #ifdef CONFIG_BATMAN_ADV_BLA -- 1.7.10.4

2 2

[B.A.T.M.A.N.] [ 57/80] batman-adv: fix random jitter calculation
by Greg Kroah-Hartman 09 Jan '13

09 Jan '13

3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Akinobu Mita <akinobu.mita(a)gmail.com> [ Upstream commit 143cdd8f33909ff5a153e3f02048738c5964ba26 ] batadv_iv_ogm_emit_send_time() attempts to calculates a random integer in the range of 'orig_interval +- BATADV_JITTER' by the below lines. msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; msecs += (random32() % 2 * BATADV_JITTER); But it actually gets 'orig_interval' or 'orig_interval - BATADV_JITTER' because '%' and '*' have same precedence and associativity is left-to-right. This adds the parentheses at the appropriate position so that it matches original intension. Signed-off-by: Akinobu Mita <akinobu.mita(a)gmail.com> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Cc: Marek Lindner <lindner_marek(a)yahoo.de> Cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Cc: Antonio Quartulli <ordex(a)autistici.org> Cc: b.a.t.m.a.n(a)lists.open-mesh.org Cc: "David S. Miller" <davem(a)davemloft.net> Cc: netdev(a)vger.kernel.org Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- net/batman-adv/bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -72,7 +72,7 @@ static unsigned long bat_iv_ogm_emit_sen { return jiffies + msecs_to_jiffies( atomic_read(&bat_priv->orig_interval) - - JITTER + (random32() % 2*JITTER)); + JITTER + (random32() % (2*JITTER))); } /* when do we schedule a ogm packet to be sent */

1 0

[B.A.T.M.A.N.] [ 084/123] batman-adv: fix random jitter calculation
by Greg Kroah-Hartman 09 Jan '13

09 Jan '13

3.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Akinobu Mita <akinobu.mita(a)gmail.com> [ Upstream commit 143cdd8f33909ff5a153e3f02048738c5964ba26 ] batadv_iv_ogm_emit_send_time() attempts to calculates a random integer in the range of 'orig_interval +- BATADV_JITTER' by the below lines. msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; msecs += (random32() % 2 * BATADV_JITTER); But it actually gets 'orig_interval' or 'orig_interval - BATADV_JITTER' because '%' and '*' have same precedence and associativity is left-to-right. This adds the parentheses at the appropriate position so that it matches original intension. Signed-off-by: Akinobu Mita <akinobu.mita(a)gmail.com> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Cc: Marek Lindner <lindner_marek(a)yahoo.de> Cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Cc: Antonio Quartulli <ordex(a)autistici.org> Cc: b.a.t.m.a.n(a)lists.open-mesh.org Cc: "David S. Miller" <davem(a)davemloft.net> Cc: netdev(a)vger.kernel.org Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- net/batman-adv/bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -119,7 +119,7 @@ batadv_iv_ogm_emit_send_time(const struc unsigned int msecs; msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; - msecs += (random32() % 2 * BATADV_JITTER); + msecs += random32() % (2 * BATADV_JITTER); return jiffies + msecs_to_jiffies(msecs); }

1 0

[B.A.T.M.A.N.] [PATCHv2] batctl: man page - fix undefined macro warning
by Marek Lindner 09 Jan '13

09 Jan '13

A line beginning with ' or . in a groff file has a special meaning and cannot be used for literal text. Instead the interpreter will try to execute it and fail doing so. A zero-width space or reformatting the paragraph can be used as simple workaround. This problem was detected using: LC_ALL=en_US.UTF-8 MANROFFSEQ='' MANWIDTH=80 man --warnings -E UTF-8 -l -Tutf8 -Z man/batctl.8 >/dev/null Reported-by: Pau Koning <paukoning(a)gmail.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- v2: * Use different approach to solve issue as first attempt was too obscure. man/batctl.8 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/man/batctl.8 b/man/batctl.8 index 62e9de2..7af78e9 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH "BATCTL" "8" "Jan 04, 2010" "Linux" "B.A.T.M.A.N. Advanced Control Tool" +.TH "BATCTL" "8" "Jan 06, 2013" "Linux" "B.A.T.M.A.N. Advanced Control Tool" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -18,6 +18,8 @@ .\" -------------------------------------------------------------------------- .\" Process this file with .\" groff -man batctl.8 -Tutf8 +.\" Retrieve format warnings with +.\" man --warnings batctl.8 > /dev/null .\" -------------------------------------------------------------------------- .ad l .SH NAME @@ -100,8 +102,8 @@ replace the MAC addresses with bat\-host names in the output. .br .IP "\fBgw_mode|gw\fP [\fBoff\fP|\fBclient\fP|\fBserver\fP] [\fBsel_class|bandwidth\fP]\fP" If no parameter is given the current gateway mode is displayed otherwise the parameter is used to set the gateway mode. The -second (optional) argument specifies the selection class (if 'client' was the first argument) or the gateway bandwidth (if -'server' was the first argument). If the node is a server this parameter is used to inform other nodes in the network about +second (optional) argument specifies the selection class (if 'client' was the first argument) or the gateway bandwidth (if 'server' +was the first argument). If the node is a server this parameter is used to inform other nodes in the network about this node's internet connection bandwidth. Just enter any number (optionally followed by "kbit" or "mbit") and the batman-adv module will guess your appropriate gateway class. Use "/" to separate the down\(hy and upload rates. You can omit the upload rate and the module will assume an upload of download / 5. -- 1.7.10.4

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: fix NET_ADDR_RANDOM usage for pre-3.9 kernel
by Simon Wunderlich 09 Jan '13

09 Jan '13

Kernel before 3.9 have the NET_ADDR_RANDOM flag which needs to be set. This patch adds the necessary compat change for older kernel. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- compat.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/compat.h b/compat.h index 3d03a2f..e21b310 100644 --- a/compat.h +++ b/compat.h @@ -198,6 +198,19 @@ static inline void eth_hw_addr_random(struct net_device *dev) #define prandom_u32() random32() +#define batadv_interface_set_mac_addr(x, y) \ +__batadv_interface_set_mac_addr(struct net_device *dev, void *p);\ +static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) \ +{\ + int ret;\ +\ + ret = __batadv_interface_set_mac_addr(dev, p);\ + if (!ret) \ + dev->addr_assign_type &= ~NET_ADDR_RANDOM;\ + return ret;\ +}\ +static int __batadv_interface_set_mac_addr(x, y) + #endif /* < KERNEL_VERSION(3, 9, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ -- 1.7.10.4

2 1

[B.A.T.M.A.N.] pull request: batman-adv 2013-01-07
by Antonio Quartulli 09 Jan '13

09 Jan '13

here are two harmless "fixes" intended for net: one is fixing the versioning number in order to keep it in sync with the year of release and the other simply updates the copyright years in each and every file. Please pull or let me know if you find any problem. Thanks a lot, Antonio The following changes since commit c7e2e1d72ed7707239d20525e0ebcad7e3303659: ipv4: fix NULL checking in devinet_ioctl() (2013-01-06 21:11:18 -0800) 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 d5c184eec815d28d042683f578f6d93224d9dfa9: batman-adv: update copyright years (2013-01-07 11:43:19 +0100) ---------------------------------------------------------------- Included fixes are: - Fix version number to keep consistency with the year of release - Update copyright years to 2013 in each file ---------------------------------------------------------------- Antonio Quartulli (2): batman-adv: Start new development cycle batman-adv: update copyright years net/batman-adv/bat_algo.h | 2 +- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bitarray.c | 2 +- net/batman-adv/bitarray.h | 2 +- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/bridge_loop_avoidance.h | 2 +- net/batman-adv/debugfs.c | 2 +- net/batman-adv/debugfs.h | 2 +- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/distributed-arp-table.h | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/gateway_common.h | 2 +- net/batman-adv/hard-interface.c | 2 +- net/batman-adv/hard-interface.h | 2 +- net/batman-adv/hash.c | 2 +- net/batman-adv/hash.h | 2 +- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/icmp_socket.h | 2 +- net/batman-adv/main.c | 2 +- net/batman-adv/main.h | 4 ++-- net/batman-adv/originator.c | 2 +- net/batman-adv/originator.h | 2 +- net/batman-adv/packet.h | 2 +- net/batman-adv/ring_buffer.c | 2 +- net/batman-adv/ring_buffer.h | 2 +- net/batman-adv/routing.c | 2 +- net/batman-adv/routing.h | 2 +- net/batman-adv/send.c | 2 +- net/batman-adv/send.h | 2 +- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/soft-interface.h | 2 +- net/batman-adv/sysfs.c | 2 +- net/batman-adv/sysfs.h | 2 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/translation-table.h | 2 +- net/batman-adv/types.h | 2 +- net/batman-adv/unicast.c | 2 +- net/batman-adv/unicast.h | 2 +- net/batman-adv/vis.c | 2 +- net/batman-adv/vis.h | 2 +- 42 files changed, 43 insertions(+), 43 deletions(-)

2 4

Re: [B.A.T.M.A.N.] Latency Related Problem
by Marek Lindner 08 Jan '13

08 Jan '13

Hi, you don't like the mailing list ? Why do you keep mailing me privately ? this is the last time I respond to mails you send to me privately concerning batman-adv. Use the mailing list! On Tuesday, January 08, 2013 19:36:45 you wrote: > I am not comparing the ping between two nodes. > > I am just concerned about the ping latency between nodes. > > As per my experiment, I am getting 100ms delay between one hop(SPK3 > –to-SPK2) and 200 ms delay between two hops (SPK3-to-SPK1) and so on. > > Even 100ms delay seems a lot, some applications may not work properly. > > Is there any delay (buffer) involved in local packet delivery from bat0 to > local mesh interfaces (wlan0)? yes, there is standard wifi buffering. Consider this: ping time from node1 to node2: ~100ms ping time from node2 to node3: ~100ms => ping time from node1 to node3: ~200ms The delays simply add up because wifi is a shared medium. The node in the middle can only forward the packet while it does not receive. That is due to how wifi works and has nothing to do with batman-adv. If you wish to mitigate the delay you should not use a shared medium. For example using multiple wifi cards on different channels is a solution. Cheers, Marek

2 1

Re: [B.A.T.M.A.N.] Latency Related Problem
by Marek Lindner 08 Jan '13

08 Jan '13

Hi, > I am using batman-adv for my project. I have configured my network in > following topology, > > > NODE 1 (STA|AP) ------ NODE 2 (STA|AP) ------ NODE 3 (STA|AP) ------ > > I am getting very high latency if I ping NODE 2 or NODE 3 from NODE 1. Ping > latency is approx 100ms. > > I am getting the normal delay ( 1ms) if I ping the Nodes without > batman-adv. > > I have also tested with "batctl ping" and getting the same issue. can you please provide packet dumps (tcpdump or wireshark) of the different traffic types flowing through your network ? Which batman-adv version are you using ? Cheers, Marek

1 0

[B.A.T.M.A.N.] wpa-none through openwrt config
by Ray Gibson 07 Jan '13

07 Jan '13

Hello, I'm trying to get wpa-none happy on my bullet m5's running batman-adv (aa-rc1 with batman-adv 2012.3.0). I can make it work by running wpa_supplicant manually with the correct options but am interested in having it work through the uci config files. Is this possible? The wpa_supplicant.sh script seems to want to force wpa-psk with any options that force wpa_supplicant, which generate a relatively useless supplicant config file for ibss. This also makes wlan0 get the default 1500 MTU. Here's my "semi-working" wpa_supplicant.conf file, after I increase the MTU then batman talks properly and sees the other node. semi-working because even though batctl o sees the other node it can't ping it unless the psk is commented out.. :-\ ctrl_interface=/var/run/wpa_supplicant ctrl_interface_group=0 eapol_version=1 ap_scan=2 fast_reauth=1 #IBSS/ad-hoc mode with WPA2/AES encryption network={ ssid="batmesh" bssid=20:aa:bb:cc:dd:ee mode=1 scan_ssid=1 frequency=5765 fixed_freq=1 mcast_rate=18 htmode=HT20 proto=WPA key_mgmt=WPA-NONE pairwise=NONE group=CCMP psk="xxxxxxxx" } Thanks for any ideas. -- Ray Gibson Future Concepts IS Inc. 909-593-6705 x2096 This communication constitutes an electronic communication within the meaning of the Electronic Communications Privacy Act, 18 USC 2510, and its disclosure is strictly limited to the recipient intended by the sender of this message. This e-mail and any files transmitted with it are proprietary and intended for the sole use of the individual or entity to whom they are addressed. They are not to be viewed, shared, copied or forwarded, regardless to whom, without the expressed permission of Future Concepts I.S., Inc. If you have received this e-mail in error, please notify the sender and immediately delete it from your system. Thank you.

2 2

[B.A.T.M.A.N.] [PATCH 1/3] batctl: man page - improve selection class 1 explanation
by Marek Lindner 06 Jan '13

06 Jan '13

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- man/batctl.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/batctl.8 b/man/batctl.8 index 3c8edce..7e4f391 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -128,7 +128,7 @@ default: 20 \-> late switch (TQ 20) .RS 16 examples: 1 -> fast connection .RS 16 -consider the gateway's advertised throughput as well as the link quality towards the gateway +consider the gateway's advertised throughput as well as the link quality towards the gateway and stick with the selection until the gateway disappears .RE .RE .RS 25 -- 1.7.10.4

1 5

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N January 2013