B.A.T.M.A.N

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

15 participants
4308 discussions

[B.A.T.M.A.N.] [PATCH 01/18] batman-adv: Prefix bat_debugfs local static functions with batadv_
by Sven Eckelmann 16 May '12

16 May '12

All non-static symbols of batman-adv were prefixed with batadv_ to avoid collisions with other symbols of the kernel. Other symbols of batman-adv should use the same prefix to keep the naming scheme consistent. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- bat_debugfs.c | 143 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 72 insertions(+), 71 deletions(-) diff --git a/bat_debugfs.c b/bat_debugfs.c index cd636db..004d94f 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -32,25 +32,25 @@ #include "icmp_socket.h" #include "bridge_loop_avoidance.h" -static struct dentry *bat_debugfs; +static struct dentry *batadv_debugfs; #ifdef CONFIG_BATMAN_ADV_DEBUG -#define LOG_BUFF_MASK (log_buff_len-1) +#define LOG_BUFF_MASK (batadv_log_buff_len - 1) #define LOG_BUFF(idx) (debug_log->log_buff[(idx) & LOG_BUFF_MASK]) -static int log_buff_len = LOG_BUF_LEN; +static int batadv_log_buff_len = LOG_BUF_LEN; -static void emit_log_char(struct debug_log *debug_log, char c) +static void batadv_emit_log_char(struct debug_log *debug_log, char c) { LOG_BUFF(debug_log->log_end) = c; debug_log->log_end++; - if (debug_log->log_end - debug_log->log_start > log_buff_len) - debug_log->log_start = debug_log->log_end - log_buff_len; + if (debug_log->log_end - debug_log->log_start > batadv_log_buff_len) + debug_log->log_start = debug_log->log_end - batadv_log_buff_len; } __printf(2, 3) -static int fdebug_log(struct debug_log *debug_log, const char *fmt, ...) +static int batadv_fdebug_log(struct debug_log *debug_log, const char *fmt, ...) { va_list args; static char debug_log_buf[256]; @@ -65,7 +65,7 @@ static int fdebug_log(struct debug_log *debug_log, const char *fmt, ...) va_end(args); for (p = debug_log_buf; *p != 0; p++) - emit_log_char(debug_log, *p); + batadv_emit_log_char(debug_log, *p); spin_unlock_bh(&debug_log->lock); @@ -81,14 +81,14 @@ int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, ...) va_start(args, fmt); vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args); - fdebug_log(bat_priv->debug_log, "[%10u] %s", - jiffies_to_msecs(jiffies), tmp_log_buf); + batadv_fdebug_log(bat_priv->debug_log, "[%10u] %s", + jiffies_to_msecs(jiffies), tmp_log_buf); va_end(args); return 0; } -static int log_open(struct inode *inode, struct file *file) +static int batadv_log_open(struct inode *inode, struct file *file) { nonseekable_open(inode, file); file->private_data = inode->i_private; @@ -96,14 +96,14 @@ static int log_open(struct inode *inode, struct file *file) return 0; } -static int log_release(struct inode *inode, struct file *file) +static int batadv_log_release(struct inode *inode, struct file *file) { batadv_dec_module_count(); return 0; } -static ssize_t log_read(struct file *file, char __user *buf, - size_t count, loff_t *ppos) +static ssize_t batadv_log_read(struct file *file, char __user *buf, + size_t count, loff_t *ppos) { struct bat_priv *bat_priv = file->private_data; struct debug_log *debug_log = bat_priv->debug_log; @@ -156,7 +156,7 @@ static ssize_t log_read(struct file *file, char __user *buf, return error; } -static unsigned int log_poll(struct file *file, poll_table *wait) +static unsigned int batadv_log_poll(struct file *file, poll_table *wait) { struct bat_priv *bat_priv = file->private_data; struct debug_log *debug_log = bat_priv->debug_log; @@ -169,15 +169,15 @@ static unsigned int log_poll(struct file *file, poll_table *wait) return 0; } -static const struct file_operations log_fops = { - .open = log_open, - .release = log_release, - .read = log_read, - .poll = log_poll, +static const struct file_operations batadv_log_fops = { + .open = batadv_log_open, + .release = batadv_log_release, + .read = batadv_log_read, + .poll = batadv_log_poll, .llseek = no_llseek, }; -static int debug_log_setup(struct bat_priv *bat_priv) +static int batadv_debug_log_setup(struct bat_priv *bat_priv) { struct dentry *d; @@ -192,7 +192,8 @@ static int debug_log_setup(struct bat_priv *bat_priv) init_waitqueue_head(&bat_priv->debug_log->queue_wait); d = debugfs_create_file("log", S_IFREG | S_IRUSR, - bat_priv->debug_dir, bat_priv, &log_fops); + bat_priv->debug_dir, bat_priv, + &batadv_log_fops); if (d) goto err; @@ -202,49 +203,49 @@ err: return 1; } -static void debug_log_cleanup(struct bat_priv *bat_priv) +static void batadv_debug_log_cleanup(struct bat_priv *bat_priv) { kfree(bat_priv->debug_log); bat_priv->debug_log = NULL; } #else /* CONFIG_BATMAN_ADV_DEBUG */ -static int debug_log_setup(struct bat_priv *bat_priv) +static int batadv_debug_log_setup(struct bat_priv *bat_priv) { bat_priv->debug_log = NULL; return 0; } -static void debug_log_cleanup(struct bat_priv *bat_priv) +static void batadv_debug_log_cleanup(struct bat_priv *bat_priv) { return; } #endif -static int bat_algorithms_open(struct inode *inode, struct file *file) +static int batadv_algorithms_open(struct inode *inode, struct file *file) { return single_open(file, batadv_algo_seq_print_text, NULL); } -static int originators_open(struct inode *inode, struct file *file) +static int batadv_originators_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; return single_open(file, batadv_orig_seq_print_text, net_dev); } -static int gateways_open(struct inode *inode, struct file *file) +static int batadv_gateways_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; return single_open(file, batadv_gw_client_seq_print_text, net_dev); } -static int transtable_global_open(struct inode *inode, struct file *file) +static int batadv_transtable_global_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; return single_open(file, batadv_tt_global_seq_print_text, net_dev); } #ifdef CONFIG_BATMAN_ADV_BLA -static int bla_claim_table_open(struct inode *inode, struct file *file) +static int batadv_bla_claim_table_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; return single_open(file, batadv_bla_claim_table_seq_print_text, @@ -252,13 +253,13 @@ static int bla_claim_table_open(struct inode *inode, struct file *file) } #endif -static int transtable_local_open(struct inode *inode, struct file *file) +static int batadv_transtable_local_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; return single_open(file, batadv_tt_local_seq_print_text, net_dev); } -static int vis_data_open(struct inode *inode, struct file *file) +static int batadv_vis_data_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; return single_open(file, batadv_vis_seq_print_text, net_dev); @@ -269,37 +270,37 @@ struct bat_debuginfo { const struct file_operations fops; }; -#define BAT_DEBUGINFO(_name, _mode, _open) \ -struct bat_debuginfo bat_debuginfo_##_name = { \ - .attr = { .name = __stringify(_name), \ - .mode = _mode, }, \ - .fops = { .owner = THIS_MODULE, \ - .open = _open, \ - .read = seq_read, \ - .llseek = seq_lseek, \ - .release = single_release, \ - } \ +#define BAT_DEBUGINFO(_name, _mode, _open) \ +struct bat_debuginfo batadv_debuginfo_##_name = { \ + .attr = { .name = __stringify(_name), \ + .mode = _mode, }, \ + .fops = { .owner = THIS_MODULE, \ + .open = _open, \ + .read = seq_read, \ + .llseek = seq_lseek, \ + .release = single_release, \ + } \ }; -static BAT_DEBUGINFO(routing_algos, S_IRUGO, bat_algorithms_open); -static BAT_DEBUGINFO(originators, S_IRUGO, originators_open); -static BAT_DEBUGINFO(gateways, S_IRUGO, gateways_open); -static BAT_DEBUGINFO(transtable_global, S_IRUGO, transtable_global_open); +static BAT_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open); +static BAT_DEBUGINFO(originators, S_IRUGO, batadv_originators_open); +static BAT_DEBUGINFO(gateways, S_IRUGO, batadv_gateways_open); +static BAT_DEBUGINFO(transtable_global, S_IRUGO, batadv_transtable_global_open); #ifdef CONFIG_BATMAN_ADV_BLA -static BAT_DEBUGINFO(bla_claim_table, S_IRUGO, bla_claim_table_open); +static BAT_DEBUGINFO(bla_claim_table, S_IRUGO, batadv_bla_claim_table_open); #endif -static BAT_DEBUGINFO(transtable_local, S_IRUGO, transtable_local_open); -static BAT_DEBUGINFO(vis_data, S_IRUGO, vis_data_open); +static BAT_DEBUGINFO(transtable_local, S_IRUGO, batadv_transtable_local_open); +static BAT_DEBUGINFO(vis_data, S_IRUGO, batadv_vis_data_open); -static struct bat_debuginfo *mesh_debuginfos[] = { - &bat_debuginfo_originators, - &bat_debuginfo_gateways, - &bat_debuginfo_transtable_global, +static struct bat_debuginfo *batadv_mesh_debuginfos[] = { + &batadv_debuginfo_originators, + &batadv_debuginfo_gateways, + &batadv_debuginfo_transtable_global, #ifdef CONFIG_BATMAN_ADV_BLA - &bat_debuginfo_bla_claim_table, + &batadv_debuginfo_bla_claim_table, #endif - &bat_debuginfo_transtable_local, - &bat_debuginfo_vis_data, + &batadv_debuginfo_transtable_local, + &batadv_debuginfo_vis_data, NULL, }; @@ -308,17 +309,17 @@ void batadv_debugfs_init(void) struct bat_debuginfo *bat_debug; struct dentry *file; - bat_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL); - if (bat_debugfs == ERR_PTR(-ENODEV)) - bat_debugfs = NULL; + batadv_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL); + if (batadv_debugfs == ERR_PTR(-ENODEV)) + batadv_debugfs = NULL; - if (!bat_debugfs) + if (!batadv_debugfs) goto out; - bat_debug = &bat_debuginfo_routing_algos; + bat_debug = &batadv_debuginfo_routing_algos; file = debugfs_create_file(bat_debug->attr.name, S_IFREG | bat_debug->attr.mode, - bat_debugfs, NULL, &bat_debug->fops); + batadv_debugfs, NULL, &bat_debug->fops); if (!file) pr_err("Can't add debugfs file: %s\n", bat_debug->attr.name); @@ -328,9 +329,9 @@ out: void batadv_debugfs_destroy(void) { - if (bat_debugfs) { - debugfs_remove_recursive(bat_debugfs); - bat_debugfs = NULL; + if (batadv_debugfs) { + debugfs_remove_recursive(batadv_debugfs); + batadv_debugfs = NULL; } } @@ -340,17 +341,17 @@ int batadv_debugfs_add_meshif(struct net_device *dev) struct bat_debuginfo **bat_debug; struct dentry *file; - if (!bat_debugfs) + if (!batadv_debugfs) goto out; - bat_priv->debug_dir = debugfs_create_dir(dev->name, bat_debugfs); + bat_priv->debug_dir = debugfs_create_dir(dev->name, batadv_debugfs); if (!bat_priv->debug_dir) goto out; batadv_socket_setup(bat_priv); - debug_log_setup(bat_priv); + batadv_debug_log_setup(bat_priv); - for (bat_debug = mesh_debuginfos; *bat_debug; ++bat_debug) { + for (bat_debug = batadv_mesh_debuginfos; *bat_debug; ++bat_debug) { file = debugfs_create_file(((*bat_debug)->attr).name, S_IFREG | ((*bat_debug)->attr).mode, bat_priv->debug_dir, @@ -378,9 +379,9 @@ void batadv_debugfs_del_meshif(struct net_device *dev) { struct bat_priv *bat_priv = netdev_priv(dev); - debug_log_cleanup(bat_priv); + batadv_debug_log_cleanup(bat_priv); - if (bat_debugfs) { + if (batadv_debugfs) { debugfs_remove_recursive(bat_priv->debug_dir); bat_priv->debug_dir = NULL; } -- 1.7.10

2 29

[B.A.T.M.A.N.] Some problems with batman-adv
by Jochen Jägers 15 May '12

15 May '12

Hello, i try to set up a ad-hoc-mesh network with batman-adv. There are three test-nodes with following configuration: Nvidia Tegra 2 Dual Core ARM-Cortex A9 Processor with Linux 2.6.36.2 USB-Wifi Dongle with Ralink 5370 Chipset Ralink rt5370sta driver kernel module batman-adv 2012.1.0 (also tried with 2012.0.0) I've set up the ad-hoc network with WPA-Encryption. This is working fine. I can access all nodes if i configure the ra0 (ralink wifi) interface with static ip addresses. I've done this for testing purpose only. Normally only the bat0 interface has an ip address. After wireless connection is established I activate the batman-adv interface. Example from first node: modprobe batman-adv batctl if add ra0 ifconfig bat0 up ifconfig bat0 192.168.50.1 netmask 255.255.255.0 ifconfig bat0 mtu 1472 After booting up all nodes "batctl o" returns: # batctl o [B.A.T.M.A.N. adv 2012.1.0, MainIF/MAC: ra0/80:1f:02:38:7a:bf (bat0)] Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ... 00:0f:c9:22:00:17 0.020s (248) 00:0f:c9:22:00:17 [ ra0]: 00:0f:c9:22:11:78 (245) 00:0f:c9:22:00:17 (248) 00:0f:c9:22:11:78 0.560s (255) 00:0f:c9:22:11:78 [ ra0]: 00:0f:c9:22:00:17 (230) 00:0f:c9:22:11:78 (255) So far everything looks fine. But if i try to connect to the other nodes i mostly get no answers. No ping reply, no ssh or http connection. But sometimes it works for a couple of minutes. I also tried to ping with batctl but got unstable results: first time everything looks good: # batctl ping 00:0f:c9:22:00:17 PING 00:0f:c9:22:00:17 (00:0f:c9:22:00:17) 20(48) bytes of data 20 bytes from 00:0f:c9:22:00:17 icmp_seq=1 ttl=50 time=6.37 ms 20 bytes from 00:0f:c9:22:00:17 icmp_seq=2 ttl=50 time=13.22 ms 20 bytes from 00:0f:c9:22:00:17 icmp_seq=3 ttl=50 time=9.08 ms ^C--- 00:0f:c9:22:00:17 ping statistics --- 3 packets transmitted, 3 received, 0% packet loss rtt min/avg/max/mdev = 6.373/9.560/13.225/2.818 ms another try a few moments later did not work: # batctl ping 00:0f:c9:22:00:17 PING 00:0f:c9:22:00:17 (00:0f:c9:22:00:17) 20(48) bytes of data Reply from host 00:0f:c9:22:00:17 timed out Reply from host 00:0f:c9:22:00:17 timed out Reply from host 00:0f:c9:22:00:17 timed out Reply from host 00:0f:c9:22:00:17 timed out ^C--- 00:0f:c9:22:00:17 ping statistics --- 4 packets transmitted, 0 received, 100% packet loss rtt min/avg/max/mdev = 0.000/0.000/0.000/0.000 ms i tried many different things (changing MTU, Wifi channel, encryption SSID, batman-adv version,...) but the result was the same everytime. Some further information: # iwconfig lo no wireless extensions. dummy0 no wireless extensions. usb0 no wireless extensions. eth0 no wireless extensions. ra0 Ralink STA ESSID:"ceR{)|n$v#pp|fJX" Nickname:"RT2870STA" Mode:Ad-Hoc Frequency=2.442 GHz Cell: DE:BB:8C:08:B8:EC Bit Rate=36 Mb/s RTS thr:off Fragment thr:off Encryption key:D83E-521A-8B9F-7C95-3ACE-D477-****-**** Security mode:open Link Quality=52/100 Signal level:-71 dBm Noise level:-71 dBm Rx invalid nwid:0 Rx invalid crypt:0 Rx invalid frag:0 Tx excessive retries:0 Invalid misc:0 Missed beacon:0 bat0 no wireless extensions. #ifconfig ra0 ra0 Link encap:Ethernet HWaddr 80:1F:02:38:7A:BF UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:0 errors:11 dropped:0 overruns:0 frame:0 TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:258771 (252.7 KiB) TX bytes:13544 (13.2 KiB) #ifconfig bat0 bat0 Link encap:Ethernet HWaddr 02:DA:94:22:E1:67 inet addr:192.168.50.60 Bcast:192.168.50.255 Mask:255.255.255.0 UP BROADCAST RUNNING MULTICAST MTU:1472 Metric:1 RX packets:5 errors:0 dropped:0 overruns:0 frame:0 TX packets:11 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:434 (434.0 B) TX bytes:686 (686.0 B) Do you have any ideas what I can try to solve my problem or where to search for a solution? Thanks for any response. Greetings, -- Jochen Jägers Dr. Riedel Automatisierungstechnik GmbH Greifswalder Str. 4 10405 Berlin Tel. 030/428431-48 Fax. 030/428431-99 http://www.riedel-at.de/ Geschäftsführer: Dr. Manfred Riedel Amtsgericht Berlin Charlottenburg, HRB 39094 Umsatzsteuer-Identifikationsnummer DE 137 196 925

4 5

[B.A.T.M.A.N.] [PATCH 1/8] batman-adv: Move hash_ipv4 to distributed-arp-table.c
by Sven Eckelmann 15 May '12

15 May '12

hash_ipv4 is only used in distributed-arp-table.c and therefore can be placed inside this file instead of the header. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- distributed-arp-table.c | 24 +++++++++++++++++++++++- distributed-arp-table.h | 22 ---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index e678ec4..4894a85 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -32,6 +32,28 @@ #include "translation-table.h" #include "unicast.h" +/* hash function to choose an entry in a hash table of given size. + * hash algorithm from http://en.wikipedia.org/wiki/Hash_table + */ +static uint32_t batadv_hash_ipv4(const void *data, uint32_t size) +{ + const unsigned char *key = data; + uint32_t hash = 0; + size_t i; + + for (i = 0; i < 4; i++) { + hash += key[i]; + hash += (hash << 10); + hash ^= (hash >> 6); + } + + hash += (hash << 3); + hash ^= (hash >> 11); + hash += (hash << 15); + + return hash % size; +} + #ifdef CONFIG_BATMAN_ADV_DEBUG static void bat_dbg_arp(struct bat_priv *bat_priv, struct sk_buff *skb, @@ -214,7 +236,7 @@ static struct dht_candidate *dht_select_candidates(struct bat_priv *bat_priv, if (!res) return NULL; - ip_key = (dat_addr_t)hash_ipv4(&ip_dst, DAT_ADDR_MAX); + ip_key = (dat_addr_t)batadv_hash_ipv4(&ip_dst, DAT_ADDR_MAX); bat_dbg(DBG_DAT, bat_priv, "dht_select_candidates(): IP=%pI4 hash(IP)=%u\n", &ip_dst, diff --git a/distributed-arp-table.h b/distributed-arp-table.h index 1ba7f01..ee5200a 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -49,28 +49,6 @@ bool batadv_dat_drop_broadcast_packet(struct bat_priv *bat_priv, struct forw_packet *forw_packet); void batadv_arp_change_timeout(struct net_device *soft_iface, const char *name); -/* hash function to choose an entry in a hash table of given size. - * hash algorithm from http://en.wikipedia.org/wiki/Hash_table - */ -static inline uint32_t hash_ipv4(const void *data, uint32_t size) -{ - const unsigned char *key = data; - uint32_t hash = 0; - size_t i; - - for (i = 0; i < 4; i++) { - hash += key[i]; - hash += (hash << 10); - hash ^= (hash >> 6); - } - - hash += (hash << 3); - hash ^= (hash >> 11); - hash += (hash << 15); - - return hash % size; -} - static inline void batadv_dat_init_orig_node_dht_addr(struct orig_node *orig_node) { -- 1.7.10

3 18

[B.A.T.M.A.N.] pull request: batman-adv 2012-05-14
by Antonio Quartulli 14 May '12

14 May '12

Hello David, here is our last set of changes intended for net-next/linux-3.5. In this patchset there are: 1) several minor cleanups and fixes 2) an optimisation that avoid to linearise the whole packet when not needed 3) an optimisation for client traffic rerouting after a roaming event. Patches that modify the whole naming schema will be sent later for merging with linux-3.6. Thank you, Antonio The following changes since commit f96a8a0b78548c0ec06b0b4b438db6ee895d67e9: igb: Add Support for new i210/i211 devices. (2012-05-12 13:17:13 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 521251f2f5fa16747cc21e71580e404af855d140: batman-adv: unset the TT_CLIENT_PENDING flag if the new local entry already exists (2012-05-14 09:05:08 +0200) ---------------------------------------------------------------- Included changes: * an improvement to avoid to linearise the whole received packet when not needed * an improvement for client traffic rerouting after roaming * a fix for the local translation table state-machine * minor cleanups and fixes ---------------------------------------------------------------- Antonio Quartulli (3): batman-adv: avoid skb_linearise() if not needed batman-adv: improve unicast packet (re)routing batman-adv: unset the TT_CLIENT_PENDING flag if the new local entry already exists Marek Lindner (2): batman-adv: prepare lq_update_lock to be shared among different protocols batman-adv: refactor window_protected to avoid unnecessary return statement Sven Eckelmann (3): batman-adv: use shorter pr_warn instead of pr_warning batman-adv: Start new development cycle batman-adv: README cleanups Documentation/networking/batman-adv.txt | 11 +++++------ net/batman-adv/bat_iv_ogm.c | 9 ++++----- net/batman-adv/hard-interface.c | 6 +++--- net/batman-adv/main.h | 2 +- net/batman-adv/originator.c | 1 + net/batman-adv/routing.c | 27 ++++++++++++++++----------- net/batman-adv/send.c | 4 ++-- net/batman-adv/translation-table.c | 21 +++++++++++++++++++++ net/batman-adv/translation-table.h | 2 ++ net/batman-adv/types.h | 2 +- net/batman-adv/unicast.c | 8 ++++++++ 11 files changed, 64 insertions(+), 29 deletions(-)

2 9

[B.A.T.M.A.N.] Possible OGM forwarding misbehavior
by Daniele Furlan 14 May '12

14 May '12

Hi all, incidentally I noticed that with the modification that introduced the 'NOT_BEST_NEXT_HOP' flag only OGM coming from best next hop neighbour are forwarded in case of multi-hop originators. The problem is that in the routing code it is forwarded only the first OGM received with a fresh sequence number (that could be received from a sub-optimal router). This means that if the OGM from best next hop neighbour is not received as the first OGM, it is not forwarded and I think this can be a problem. Maybe it can be better to maintain also an index of the last FORWARDED sequence number instead of checking the last RECEIVED sequence number. Regards -- Daniele Furlan

2 1

[B.A.T.M.A.N.] [PATCHv3 01/23] batman-adv: Fix namespace for hash_set_lock_class
by Sven Eckelmann 14 May '12

14 May '12

This function was introduced in 2c9aa3b4c37bd55148f5f25212c89e7bf5f28497 without a proper namespace prefix. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- bridge_loop_avoidance.c | 7 ++++--- hash.c | 3 ++- hash.h | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 89e9721..314e37b 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1172,9 +1172,10 @@ int bla_init(struct bat_priv *bat_priv) if (!bat_priv->claim_hash || !bat_priv->backbone_hash) return -ENOMEM; - hash_set_lock_class(bat_priv->claim_hash, &claim_hash_lock_class_key); - hash_set_lock_class(bat_priv->backbone_hash, - &backbone_hash_lock_class_key); + batadv_hash_set_lock_class(bat_priv->claim_hash, + &claim_hash_lock_class_key); + batadv_hash_set_lock_class(bat_priv->backbone_hash, + &backbone_hash_lock_class_key); bat_dbg(DBG_BLA, bat_priv, "bla hashes initialized\n"); diff --git a/hash.c b/hash.c index 4578c20..a7dcff0 100644 --- a/hash.c +++ b/hash.c @@ -70,7 +70,8 @@ free_hash: return NULL; } -void hash_set_lock_class(struct hashtable_t *hash, struct lock_class_key *key) +void batadv_hash_set_lock_class(struct hashtable_t *hash, + struct lock_class_key *key) { uint32_t i; diff --git a/hash.h b/hash.h index 2e0409a..3d67ce4 100644 --- a/hash.h +++ b/hash.h @@ -46,7 +46,8 @@ struct hashtable_t { struct hashtable_t *hash_new(uint32_t size); /* set class key for all locks */ -void hash_set_lock_class(struct hashtable_t *hash, struct lock_class_key *key); +void batadv_hash_set_lock_class(struct hashtable_t *hash, + struct lock_class_key *key); /* free only the hashtable and the hash itself. */ void hash_destroy(struct hashtable_t *hash); -- 1.7.10

2 47

[B.A.T.M.A.N.] [PATCH] batman-adv: clear ADD+DEL (and viceversa) events in the same orig-interval
by Antonio Quartulli 14 May '12

14 May '12

During an OGM-interval (time between two different OGM sendings) the same client could roam away and then roam back to us. In this case the node would add two events to the events list (that is going to be sent appended to the next OGM). A DEL one and an ADD one. Obviously they will only increase the overhead (either in the air and on the receiver side) and eventually trigger wrong states/events without producing any real effect. For this reason we can safely delete any ADD event with its related DEL one. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- translation-table.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/translation-table.c b/translation-table.c index 2ecf3a2..c134a29 100644 --- a/translation-table.c +++ b/translation-table.c @@ -154,7 +154,9 @@ static void tt_orig_list_entry_free_ref(struct tt_orig_list_entry *orig_entry) static void tt_local_event(struct bat_priv *bat_priv, const uint8_t *addr, uint8_t flags) { - struct tt_change_node *tt_change_node; + struct tt_change_node *tt_change_node, *entry, *safe; + bool event_removed = false; + bool del_op_requested, del_op_entry; tt_change_node = kmalloc(sizeof(*tt_change_node), GFP_ATOMIC); @@ -164,13 +166,46 @@ static void tt_local_event(struct bat_priv *bat_priv, const uint8_t *addr, tt_change_node->change.flags = flags; memcpy(tt_change_node->change.addr, addr, ETH_ALEN); + del_op_requested = flags & TT_CLIENT_DEL; + + /* check for ADD+DEL or DEL+ADD events */ spin_lock_bh(&bat_priv->tt_changes_list_lock); + list_for_each_entry_safe(entry, safe, &bat_priv->tt_changes_list, + list) { + if (!compare_eth(entry->change.addr, addr)) + continue; + + /* DEL+ADD in the same orig interval have no effect and can be + * removed to avoid silly behaviour on the receiver side. The + * other way around (ADD+DEL) can happen in case of roaming of + * a client still in the NEW state. Roaming of NEW clients is + * now possible due to automatically recognition of "temporary" + * clients + */ + del_op_entry = entry->change.flags & TT_CLIENT_DEL; + if (!del_op_requested && del_op_entry) + goto del; + else if (del_op_requested && !del_op_entry) + goto del; + else + continue; +del: + list_del(&entry->list); + kfree(entry); + event_removed = true; + goto unlock; + } + /* track the change in the OGMinterval list */ list_add_tail(&tt_change_node->list, &bat_priv->tt_changes_list); - atomic_inc(&bat_priv->tt_local_changes); + +unlock: spin_unlock_bh(&bat_priv->tt_changes_list_lock); - atomic_set(&bat_priv->tt_ogm_append_cnt, 0); + if (event_removed) + atomic_dec(&bat_priv->tt_local_changes); + else + atomic_inc(&bat_priv->tt_local_changes); } int tt_len(int changes_num) -- 1.7.9.4

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: beautify tt_global_add() argument list
by Antonio Quartulli 14 May '12

14 May '12

Instead of adding a new bool argument each time it is needed, it is better (and simpler) to pass an 8bit flag argument which contains all the needed flags Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- routing.c | 2 +- translation-table.c | 19 +++++++------------ translation-table.h | 3 +-- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/routing.c b/routing.c index e4d13dc..6c50b1d 100644 --- a/routing.c +++ b/routing.c @@ -686,7 +686,7 @@ int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if) roam_adv_packet->src, roam_adv_packet->client); tt_global_add(bat_priv, orig_node, roam_adv_packet->client, - atomic_read(&orig_node->last_ttvn) + 1, true, false); + TT_CLIENT_ROAM, atomic_read(&orig_node->last_ttvn) + 1); /* Roaming phase starts: I have new information but the ttvn has not * been incremented yet. This flag will make me check all the incoming diff --git a/translation-table.c b/translation-table.c index c134a29..e5b6f25 100644 --- a/translation-table.c +++ b/translation-table.c @@ -647,24 +647,22 @@ static void tt_global_add_orig_entry(struct tt_global_entry *tt_global_entry, /* caller must hold orig_node refcount */ int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, - const unsigned char *tt_addr, uint8_t ttvn, bool roaming, - bool wifi) + const unsigned char *tt_addr, uint8_t flags, uint8_t ttvn) { struct tt_global_entry *tt_global_entry = NULL; + struct tt_orig_list_entry *orig_entry; int ret = 0; int hash_added; tt_global_entry = tt_global_hash_find(bat_priv, tt_addr); if (!tt_global_entry) { - tt_global_entry = kzalloc(sizeof(*tt_global_entry), - GFP_ATOMIC); + tt_global_entry = kzalloc(sizeof(*tt_global_entry), GFP_ATOMIC); if (!tt_global_entry) goto out; memcpy(tt_global_entry->common.addr, tt_addr, ETH_ALEN); - - tt_global_entry->common.flags = NO_FLAGS; + tt_global_entry->common.flags = flags; tt_global_entry->roam_at = 0; atomic_set(&tt_global_entry->common.refcount, 2); @@ -703,9 +701,6 @@ int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, ttvn); } - if (wifi) - tt_global_entry->common.flags |= TT_CLIENT_WIFI; - bat_dbg(DBG_TT, bat_priv, "Creating new global tt entry: %pM (via %pM)\n", tt_global_entry->common.addr, orig_node->orig); @@ -713,7 +708,7 @@ int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, out_remove: /* remove address from local hash if present */ tt_local_remove(bat_priv, tt_global_entry->common.addr, - "global tt received", roaming); + "global tt received", flags & TT_CLIENT_ROAM); ret = 1; out: if (tt_global_entry) @@ -1733,9 +1728,9 @@ static void _tt_update_changes(struct bat_priv *bat_priv, (tt_change + i)->flags & TT_CLIENT_ROAM); else if (!tt_global_add(bat_priv, orig_node, - (tt_change + i)->addr, ttvn, false, + (tt_change + i)->addr, (tt_change + i)->flags & - TT_CLIENT_WIFI)) + TT_CLIENT_WIFI, ttvn)) /* In case of problem while storing a * global_entry, we stop the updating * procedure without committing the diff --git a/translation-table.h b/translation-table.h index d6af2ba..d32f975 100644 --- a/translation-table.h +++ b/translation-table.h @@ -32,8 +32,7 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset); void tt_global_add_orig(struct bat_priv *bat_priv, struct orig_node *orig_node, const unsigned char *tt_buff, int tt_buff_len); int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, - const unsigned char *addr, uint8_t ttvn, bool roaming, - bool wifi); + const unsigned char *addr, uint8_t flags, uint8_t ttvn); int tt_global_seq_print_text(struct seq_file *seq, void *offset); void tt_global_del_orig(struct bat_priv *bat_priv, struct orig_node *orig_node, const char *message); -- 1.7.9.4

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: fix comment style and typo
by Antonio Quartulli 13 May '12

13 May '12

Fix to David's style Introduced by b46c60b9e1ee7a1909c542413a85875a750955d6 Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- This patch is for next routing.c | 3 ++- translation-table.c | 3 ++- unicast.c | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/routing.c b/routing.c index 2181a91..4f2059f 100644 --- a/routing.c +++ b/routing.c @@ -922,7 +922,8 @@ static int check_unicast_ttvn(struct bat_priv *bat_priv, sizeof(struct unicast_packet)); /* we don't have an updated route for this client, so we should - * not try to reroute the packet!! */ + * not try to reroute the packet!! + */ if (tt_global_client_is_roaming(bat_priv, ethhdr->h_dest)) return 1; diff --git a/translation-table.c b/translation-table.c index 88e4c8e..a66c2dc 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2122,7 +2122,8 @@ request_table: /* returns true whether we know that the client has moved from its old * originator to another one. This entry is kept is still kept for consistency - * purposes */ + * purposes + */ bool tt_global_client_is_roaming(struct bat_priv *bat_priv, uint8_t *addr) { struct tt_global_entry *tt_global_entry; diff --git a/unicast.c b/unicast.c index 62ea9f1..e5c7999 100644 --- a/unicast.c +++ b/unicast.c @@ -395,10 +395,11 @@ find_router: unicast_packet = (struct unicast_packet *)skb->data; - /* inform the destination ode that we are still missing a correct route + /* inform the destination node that we are still missing a correct route * for this client. The destination will receive this packet and will * try to reroute it because the ttvn contained in the header is less - * than the current one */ + * than the current one + */ if (tt_global_client_is_roaming(bat_priv, ethhdr->h_dest)) unicast_packet->ttvn = unicast_packet->ttvn - 1; -- 1.7.9.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Directly print to seq_file in vis
by Sven Eckelmann 13 May '12

13 May '12

The vis output doesn't need to be buffered in an character buffer before it can be send to the userspace program that reads from the vis debug file. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- vis.c | 228 ++++++++++++++++++++++++----------------------------------------- 1 file changed, 83 insertions(+), 145 deletions(-) diff --git a/vis.c b/vis.c index 6b7a1c0..3095c41 100644 --- a/vis.c +++ b/vis.c @@ -140,72 +140,117 @@ static void batadv_vis_data_insert_interface(const uint8_t *interface, hlist_add_head(&entry->list, if_list); } -static ssize_t batadv_vis_prim_sec(char *buff, const struct hlist_head *if_list) +static void batadv_vis_data_read_prim_sec(struct seq_file *seq, + const struct hlist_head *if_list) { struct if_list_entry *entry; struct hlist_node *pos; - size_t len = 0; hlist_for_each_entry(entry, pos, if_list, list) { if (entry->primary) - len += sprintf(buff + len, "PRIMARY, "); + seq_printf(seq, "PRIMARY, "); else - len += sprintf(buff + len, "SEC %pM, ", entry->addr); + seq_printf(seq, "SEC %pM, ", entry->addr); } - - return len; -} - -static size_t batadv_vis_cnt_prim_sec(struct hlist_head *if_list) -{ - struct if_list_entry *entry; - struct hlist_node *pos; - size_t count = 0; - - hlist_for_each_entry(entry, pos, if_list, list) { - if (entry->primary) - count += 9; - else - count += 23; - } - - return count; } /* read an entry */ -static ssize_t batadv_vis_data_read_entry(char *buff, +static ssize_t batadv_vis_data_read_entry(struct seq_file *seq, const struct vis_info_entry *entry, const uint8_t *src, bool primary) { - /* maximal length: max(4+17+2, 3+17+1+3+2) == 26 */ if (primary && entry->quality == 0) - return sprintf(buff, "TT %pM, ", entry->dest); + return seq_printf(seq, "TT %pM, ", entry->dest); else if (batadv_compare_eth(entry->src, src)) - return sprintf(buff, "TQ %pM %d, ", entry->dest, - entry->quality); + return seq_printf(seq, "TQ %pM %d, ", entry->dest, + entry->quality); return 0; } +static void batadv_vis_data_insert_interfaces(struct hlist_head *list, + struct vis_packet *packet, + struct vis_info_entry *entries) +{ + int i; + + for (i = 0; i < packet->entries; i++) { + if (entries[i].quality == 0) + continue; + + if (batadv_compare_eth(entries[i].src, packet->vis_orig)) + continue; + + batadv_vis_data_insert_interface(entries[i].src, list, false); + } +} + +static void batadv_vis_data_read_entries(struct seq_file *seq, + struct hlist_head *list, + struct vis_packet *packet, + struct vis_info_entry *entries) +{ + int i; + struct if_list_entry *entry; + struct hlist_node *pos; + + hlist_for_each_entry(entry, pos, list, list) { + seq_printf(seq, "%pM,", entry->addr); + + for (i = 0; i < packet->entries; i++) + batadv_vis_data_read_entry(seq, &entries[i], + entry->addr, entry->primary); + + /* add primary/secondary records */ + if (batadv_compare_eth(entry->addr, packet->vis_orig)) + batadv_vis_data_read_prim_sec(seq, list); + + seq_printf(seq, "\n"); + } +} + +static void batadv_vis_seq_print_text_bucket(struct seq_file *seq, + const struct hlist_head *head) +{ + struct hlist_node *node; + struct vis_info *info; + struct vis_packet *packet; + uint8_t *entries_pos; + struct vis_info_entry *entries; + struct if_list_entry *entry; + struct hlist_node *pos, *n; + + HLIST_HEAD(vis_if_list); + + hlist_for_each_entry_rcu(info, node, head, hash_entry) { + packet = (struct vis_packet *)info->skb_packet->data; + entries_pos = (uint8_t *)packet + sizeof(*packet); + entries = (struct vis_info_entry *)entries_pos; + + batadv_vis_data_insert_interface(packet->vis_orig, &vis_if_list, + true); + batadv_vis_data_insert_interfaces(&vis_if_list, packet, + entries); + batadv_vis_data_read_entries(seq, &vis_if_list, packet, + entries); + + hlist_for_each_entry_safe(entry, pos, n, &vis_if_list, list) { + hlist_del(&entry->list); + kfree(entry); + } + } +} + int batadv_vis_seq_print_text(struct seq_file *seq, void *offset) { struct hard_iface *primary_if; - struct hlist_node *node; struct hlist_head *head; - struct vis_info *info; - struct vis_packet *packet; - struct vis_info_entry *entries; struct net_device *net_dev = (struct net_device *)seq->private; struct bat_priv *bat_priv = netdev_priv(net_dev); struct hashtable_t *hash = bat_priv->vis_hash; - HLIST_HEAD(vis_if_list); - struct if_list_entry *entry; - struct hlist_node *pos, *n; uint32_t i; - int j, ret = 0; + int ret = 0; int vis_server = atomic_read(&bat_priv->vis_mode); - size_t buff_pos, buf_size; - char *buff; primary_if = batadv_primary_if_get_selected(bat_priv); if (!primary_if) @@ -214,120 +259,13 @@ int batadv_vis_seq_print_text(struct seq_file *seq, void *offset) if (vis_server == VIS_TYPE_CLIENT_UPDATE) goto out; - buf_size = 1; - /* Estimate length */ spin_lock_bh(&bat_priv->vis_hash_lock); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; - - rcu_read_lock(); - hlist_for_each_entry_rcu(info, node, head, hash_entry) { - packet = (struct vis_packet *)info->skb_packet->data; - entries = (struct vis_info_entry *) - ((char *)packet + sizeof(*packet)); - - batadv_vis_data_insert_interface(packet->vis_orig, - &vis_if_list, true); - - for (j = 0; j < packet->entries; j++) { - if (entries[j].quality == 0) - continue; - if (batadv_compare_eth(entries[j].src, - packet->vis_orig)) - continue; - batadv_vis_data_insert_interface(entries[j].src, - &vis_if_list, - false); - } - - hlist_for_each_entry(entry, pos, &vis_if_list, list) { - buf_size += 18 + 26 * packet->entries; - - /* add primary/secondary records */ - if (batadv_compare_eth(entry->addr, - packet->vis_orig)) - buf_size += - batadv_vis_cnt_prim_sec(&vis_if_list); - - buf_size += 1; - } - - hlist_for_each_entry_safe(entry, pos, n, &vis_if_list, - list) { - hlist_del(&entry->list); - kfree(entry); - } - } - rcu_read_unlock(); + batadv_vis_seq_print_text_bucket(seq, head); } - - buff = kmalloc(buf_size, GFP_ATOMIC); - if (!buff) { - spin_unlock_bh(&bat_priv->vis_hash_lock); - ret = -ENOMEM; - goto out; - } - buff[0] = '\0'; - buff_pos = 0; - - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - - rcu_read_lock(); - hlist_for_each_entry_rcu(info, node, head, hash_entry) { - packet = (struct vis_packet *)info->skb_packet->data; - entries = (struct vis_info_entry *) - ((char *)packet + sizeof(*packet)); - - batadv_vis_data_insert_interface(packet->vis_orig, - &vis_if_list, true); - - for (j = 0; j < packet->entries; j++) { - if (entries[j].quality == 0) - continue; - if (batadv_compare_eth(entries[j].src, - packet->vis_orig)) - continue; - batadv_vis_data_insert_interface(entries[j].src, - &vis_if_list, - false); - } - - hlist_for_each_entry(entry, pos, &vis_if_list, list) { - buff_pos += sprintf(buff + buff_pos, "%pM,", - entry->addr); - - for (j = 0; j < packet->entries; j++) - buff_pos += batadv_vis_data_read_entry( - buff + buff_pos, - &entries[j], - entry->addr, - entry->primary); - - /* add primary/secondary records */ - if (batadv_compare_eth(entry->addr, - packet->vis_orig)) - buff_pos += - batadv_vis_prim_sec(buff + buff_pos, - &vis_if_list); - - buff_pos += sprintf(buff + buff_pos, "\n"); - } - - hlist_for_each_entry_safe(entry, pos, n, &vis_if_list, - list) { - hlist_del(&entry->list); - kfree(entry); - } - } - rcu_read_unlock(); - } - spin_unlock_bh(&bat_priv->vis_hash_lock); - seq_printf(seq, "%s", buff); - kfree(buff); - out: if (primary_if) batadv_hardif_free_ref(primary_if); -- 1.7.10

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N