commits January 2016

commits@lists.open-mesh.org

1 participants
274 discussions

[batman-adv] next's head updated: Merge branch 'next' (850a725)
by postmaster＠open-mesh.org 19 Jan '16

19 Jan '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 879ffa2 batman-adv: add kerneldoc for batadv_iv_ogm_aggr_packet 544f94c batman-adv: add seqno maximum age and protection start flag parameters 06b58ea Merge branch 'next' 1a19216 Merge branch 'next' 770d7c1 Merge branch 'next' 5fe476a batman-adv: Switch to HTTPS version of links 5f01697 batman-adv: Add lockdep assert for container_list_lock 03cb7fe Merge branch 'next' 319057e Merge branch 'next' ee0e93f batman-adv: update copyright years for 2016 ab08dfe batman-adv: Fix kernel-doc for batadv_claim_free_ref 839de35 Merge branch 'next' 407e265 Merge branch 'next' c7387df batman-adv: Add compatibility code for kref_get_unless_zero ae315bc batman-adv: Convert batadv_hardif_neigh_node to kref 1faa4d8 batman-adv: Convert batadv_gw_node to kref 395c567 batman-adv: Convert batadv_softif_vlan to kref cda4d54 batman-adv: Convert batadv_bla_backbone_gw to kref b7a53be batman-adv: Convert batadv_bla_claim to kref a3e8d4b batman-adv: Convert batadv_nc_node to kref 2d3c3d3 batman-adv: Convert batadv_nc_path to kref 4952250 batman-adv: Convert batadv_dat_entry to kref dd62ee6 batman-adv: Convert batadv_tvlv_container to kref 88c5eb2 batman-adv: Convert batadv_tvlv_handler to kref d63fa57 batman-adv: Convert batadv_tt_orig_list_entry to kref c12b7f8 batman-adv: Convert batadv_neigh_ifinfo to kref 0d559d4 batman-adv: Convert batadv_orig_ifinfo to kref b4dc027 batman-adv: Convert batadv_neigh_node to kref 9fa8c05 batman-adv: Convert batadv_hard_iface to kref 33b1d7c batman-adv: Convert batadv_orig_node_vlan to kref 090a800 batman-adv: Convert batadv_orig_node to kref b81bdae batman-adv: Convert batadv_tt_common_entry to kref 82b7d70 batman-adv: remove unused BATADV_BONDING_TQ_THRESHOLD constant 0259f43 batman-adv: Rename batadv_orig_node *_free_ref function to *_put 321db7d batman-adv: Rename batadv_hardif *_free_ref function to *_put b68dce4 batman-adv: Rename batadv_neigh_node *_free_ref function to *_put 4c9ec87 batman-adv: Rename batadv_neigh_ifinfo *_free_ref function to *_put ff766a4 batman-adv: Rename batadv_orig_ifinfo *_free_ref function to *_put f645d8a batman-adv: Rename batadv_hardif_neigh *_free_ref function to *_put b66a782 batman-adv: Rename batadv_backbone_gw *_free_ref function to *_put 2980c7d batman-adv: Rename batadv_claim *_free_ref function to *_put 5491a0b batman-adv: Rename batadv_dat_entry *_free_ref function to *_put d581bd3 batman-adv: Rename batadv_gw_node *_free_ref function to *_put f4fa52f batman-adv: Rename batadv_tvlv_handler *_free_ref function to *_put 9823941 batman-adv: Rename batadv_tvlv_container *_free_ref function to *_put 8747283 batman-adv: Rename batadv_softif_vlan *_free_ref function to *_put 71fc703 batman-adv: Rename batadv_nc_node *_free_ref function to *_put 3dcd7b5 batman-adv: Rename batadv_nc_path *_free_ref function to *_put c2ac707 batman-adv: Rename batadv_orig_node_vlan *_free_ref function to *_put 004dddd batman-adv: Rename batadv_tt_local_entry *_free_ref function to *_put 88552f4 batman-adv: Rename batadv_tt_global_entry *_free_ref function to *_put dcd61a7 batman-adv: Rename batadv_tt_orig_list_entry *_free_ref function to *_put ec46535 batman-adv: Add hard_iface specific sysfs wrapper macros for UINT a4b88af batman-adv: ELP - adding basic infrastructure 2c2fe0b batman-adv: ELP - creating neighbor structures 82da7d6 batman-adv: ELP - adding sysfs parameter for elp interval 6328353 batman-adv: OGMv2 - add basic infrastructure 667996e batman-adv: OGMv2 - implement originators logic c513176 batman-adv: add throughput override attribute to hard_ifaces cdc4545 batman-adv: keep track of when unicast packets are sent 5c32451 batman-adv: ELP - compute the metric based on the estimated throughput bedcadf batman-adv: ELP - send unicast ELP packets for throughput sampling fa798e6 batman-adv: Update CHANGELOG for upcoming release 74139f7 batman-adv: Update compatible kernel version number ecdc9bc batman-adv: Start new development cycle 850a725 Merge branch 'next'

1 0

[batman-adv] next, release-2016.0: batman-adv: Start new development cycle (ecdc9bc)
by postmaster＠open-mesh.org 19 Jan '16

19 Jan '16

Repository : ssh://git@open-mesh.org/batman-adv On branches: next,release-2016.0 >--------------------------------------------------------------- commit ecdc9bc44b25bd1d99b79d5930998a1da2a6195e Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Jan 19 17:08:29 2016 +0100 batman-adv: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- ecdc9bc44b25bd1d99b79d5930998a1da2a6195e net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 34f56ef..d1e11d4 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -24,7 +24,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2016.0" +#define BATADV_SOURCE_VERSION "2016.1" #endif /* B.A.T.M.A.N. parameters */

1 0

[batman-adv] next: Merge branch 'next' (850a725)
by postmaster＠open-mesh.org 19 Jan '16

19 Jan '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 850a725a209fc0830e41a88647130726898f6c41 Merge: bedcadf ecdc9bc Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Jan 19 17:32:24 2016 +0100 Merge branch 'next' >--------------------------------------------------------------- 850a725a209fc0830e41a88647130726898f6c41 CHANGELOG | 16 ++++++++++++++++ README.external | 2 +- net/batman-adv/main.h | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-)

1 0

[batman-adv] maint's head updated: batman-adv: Update compatible kernel version number (74139f7)
by postmaster＠open-mesh.org 19 Jan '16

19 Jan '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'maint' now includes: c9bac8f batman-adv: turn batadv_neigh_node_get() into local function fed2826 batman-adv: add list of unique single hop neighbors per hard-interface e46832d batman-adv: add bat_hardif_neigh_init algo ops call 2e11338 batman-adv: export single hop neighbor list via debugfs 6d9f616 batman-adv: update last seen field of single hop originators 817b244 Merge branch 'next' 64382bc Merge branch 'next' a6fff8b Merge branch 'next' 81e457e batman-adv: rename equiv/equal or better to similar or better 0804b62 batman-adv: Add missing include spinlock.h a0f15fc batman-adv: Mark batadv_iv_neigh_print as static e821b76 batman-adv: Mark batadv_hardif_neigh_free_now as static fff4c83 Merge branch 'next' 41e304b Merge branch 'next' 2a938c7 Merge branch 'next' d738025 batman-adv: unify flags access style in tt global add d54f7c8 batman-adv: Use chain pointer when purging fragments e72ce42 batman-adv: Fix typo 'wether' -> 'whether' 8cf7942 Merge branch 'next' af45ff7 batman-adv: Fix kernel-doc parsing of main structs 8643c42 batman-adv: Fix kerneldoc member names in for main structs abdde59 batman-adv: Remove kerneldoc for missing struct members 8c8e792 batman-adv: Add kerneldoc for batadv_neigh_node::refcount 5e5e8fe batman-adv: Fix kerneldoc parsing of structs/enums 54b3211 batman-adv: Remove kerneldoc for missing parameters 1388a2e batman-adv: Fix names in kerneldoc of functions cb6dfb4 batman-adv: Drop invalid kerneldoc for variable batadv_vlan_attrs cef7403 batman-adv: Place constant on right side of comparison b615fba batman-adv: Fix kerneldoc parsing of return description f7b3226 batman-adv: remove leftovers of unused BATADV_PRIMARIES_FIRST_HOP flag 425ba69 batman-adv: kernel doc readability updates d7a21c1 batman-adv: Fix kerneldoc of main functions 5d28c44 batman-adv: Fix kerneldoc of network-coding functions eb90dff batman-adv: Update/repair bridge loop avoidance kerneldoc 348a5da batman-adv: Add function to convert string to batadv throughput dd54d61 Merge branch 'next' 41a559a batman-adv: Fix lockdep annotation of batadv_tlv_container_remove f4b76a0 Merge branch 'next' 4c652b9 batman-adv: Change ifconfig examples to iproute2 c881441 Merge branch 'next' 53aa898 batman-adv: fix kerneldoc for DAT functions dbc613c batman-adv: fix kerneldoc for TT functions 6b9ec9f batman-adv: add kernel doc for AP isolation attributes in bat_priv 743df46 batman-adv: only call post function if something changed 07ed3c3 batman-adv: purge bridge loop avoidance when its disabled c57af3a batman-adv: increase BLA wait periods to 6 77d84a6 batman-adv: Delete unnecessary checks before the function call "kfree_skb" 5a878b8 batman-adv: Less checks in batadv_tvlv_unicast_send() bbcbe0f batman-adv: Delete an unnecessary check before the function call "batadv_softif_vlan_free_ref" b1199c6 batman-adv: Split a condition check 5b0b10e batman-adv: Add missing forward declaration for net_device 1e73793 batman-adv: Start new development cycle bce19ab Merge branch 'next' d794c1c batman-adv: propagate upper priv via netdev_master_upper_dev_link e19f387 batman-adv: add possibility to pass information about upper device via notifier 399bf29 batman-adv: Act on NETDEV_*_TYPE_CHANGE events 84e11be batman-adv: Fix build with linux < 3.9.0 0e92483 batman-adv: update email address 57f7452 Merge branch 'maint' into next 025b743 batman-adv: fix lockdep splat when doing mcast_free 6219a1b batman-adv: Fix list removal of batadv_hardif_neigh_node 2783bc2 batman-adv: Avoid recursive call_rcu for batadv_bla_claim 7fb1c89 batman-adv: Avoid recursive call_rcu for batadv_nc_node 648d2a9 batman-adv: Drop immediate orig_node free function cc18487 batman-adv: Drop immediate batadv_orig_ifinfo free function b28b201 batman-adv: Drop immediate batadv_neigh_node free function b964cfb batman-adv: Drop immediate batadv_hardif_neigh_node free function 26f0de2 batman-adv: Drop immediate neigh_ifinfo free function 88a7a4e batman-adv: Drop immediate batadv_hard_iface free function 0ebccb4 batman-adv: Drop reference to netdevice on last reference fa798e6 batman-adv: Update CHANGELOG for upcoming release 74139f7 batman-adv: Update compatible kernel version number

1 0

[batman-adv] maint, release-2016.0: batman-adv: Update compatible kernel version number (74139f7)
by postmaster＠open-mesh.org 19 Jan '16

19 Jan '16

Repository : ssh://git@open-mesh.org/batman-adv On branches: maint,release-2016.0 >--------------------------------------------------------------- commit 74139f7bd8d7b7abcf602179d6a9f48b8752b6a3 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Jan 19 17:05:09 2016 +0100 batman-adv: Update compatible kernel version number Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 74139f7bd8d7b7abcf602179d6a9f48b8752b6a3 README.external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.external b/README.external index 9793c11..03825ab 100644 --- a/README.external +++ b/README.external @@ -6,7 +6,7 @@ and as external module. The external module allows to get new features without upgrading to a newer kernel version and to get batman-adv specific bugfixes for kernels that are not supported anymore. It compiles against and should work -with Linux 2.6.29 - 4.4. Supporting older versions is not +with Linux 2.6.29 - 4.5. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-)

1 0

[batman-adv] maint, release-2016.0: batman-adv: Update CHANGELOG for upcoming release (fa798e6)
by postmaster＠open-mesh.org 19 Jan '16

19 Jan '16

Repository : ssh://git@open-mesh.org/batman-adv On branches: maint,release-2016.0 >--------------------------------------------------------------- commit fa798e6baf3ece6842c6a942481d619c591cd598 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Jan 19 17:04:35 2016 +0100 batman-adv: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- fa798e6baf3ece6842c6a942481d619c591cd598 CHANGELOG | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index ddbc18f..daf0407 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,19 @@ +batman-adv 2016.0 + + * support latest kernels (2.6.29 - 4.5) + * add list of unique single hop neighbors and export it via debugfs + * massive kernel doc updates and coding style cleanups + * redesign/fix RCU handling when cleaning up to avoid bad memory access + * increase bridge loop avoidance wait time to 60 seconds + * remove bridge loop avoidance state when it gets disabled + * support for interfaces which switch from non-ethernet to ethernet mode + * bugs squashed: + - fix lockdep splat when doing mcast_free or batadv_tlv_container_remove + - fix invalid memory access when shrinking buffer for the OGM-return-rate + measurement on interface removal + + -- Tue, 19 Jan 2016 17:02:46 +0100 + batman-adv 2015.2 * support latest kernels (2.6.29 - 4.4)

1 0

[batman-adv] master: batman-adv: B.A.T.M.A.N. V - implement bat_neigh_print API (342f7f3)
by postmaster＠open-mesh.org 19 Jan '16

19 Jan '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 342f7f3acda95f70f25a58e31044c5f6e1a59407 Author: Linus Luessing <linus.luessing(a)web.de> Date: Sat Jan 16 16:40:19 2016 +0800 batman-adv: B.A.T.M.A.N. V - implement bat_neigh_print API Lists all neighbours detected by the Echo Locating Protocol (ELP) and their throughput metric. Initially Developed by Linus during a 6 months trainee study period in Ascom (Switzerland) AG. Signed-off-by: Linus Luessing <linus.luessing(a)web.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> >--------------------------------------------------------------- 342f7f3acda95f70f25a58e31044c5f6e1a59407 net/batman-adv/bat_v.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index a90117c..3315b9a 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -118,6 +118,60 @@ batadv_v_orig_print_neigh(struct batadv_orig_node *orig_node, } /** + * batadv_v_hardif_neigh_print - print a single ELP neighbour node + * @seq: neighbour table seq_file struct + * @hardif_neigh: hardif neighbour information + */ +static void +batadv_v_hardif_neigh_print(struct seq_file *seq, + struct batadv_hardif_neigh_node *hardif_neigh) +{ + int last_secs, last_msecs; + u32 throughput; + + last_secs = jiffies_to_msecs(jiffies - hardif_neigh->last_seen) / 1000; + last_msecs = jiffies_to_msecs(jiffies - hardif_neigh->last_seen) % 1000; + throughput = ewma_throughput_read(&hardif_neigh->bat_v.throughput); + + seq_printf(seq, "%pM %4i.%03is (%9u.%1u) [%10s]\n", + hardif_neigh->addr, last_secs, last_msecs, throughput / 10, + throughput % 10, hardif_neigh->if_incoming->net_dev->name); +} + +/** + * batadv_v_neigh_print - print the single hop neighbour list + * @bat_priv: the bat priv with all the soft interface information + * @seq: neighbour table seq_file struct + */ +static void batadv_v_neigh_print(struct batadv_priv *bat_priv, + struct seq_file *seq) +{ + struct net_device *net_dev = (struct net_device *)seq->private; + struct batadv_hardif_neigh_node *hardif_neigh; + struct batadv_hard_iface *hard_iface; + int batman_count = 0; + + seq_printf(seq, " %-15s %s (%11s) [%10s]\n", "Neighbor", + "last-seen", "throughput", "IF"); + + rcu_read_lock(); + list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { + if (hard_iface->soft_iface != net_dev) + continue; + + hlist_for_each_entry_rcu(hardif_neigh, + &hard_iface->neigh_list, list) { + batadv_v_hardif_neigh_print(seq, hardif_neigh); + batman_count++; + } + } + rcu_read_unlock(); + + if (batman_count == 0) + seq_puts(seq, "No batman nodes in range ...\n"); +} + +/** * batadv_v_orig_print - print the originator table * @bat_priv: the bat priv with all the soft interface information * @seq: debugfs table seq_file struct @@ -230,6 +284,7 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { .bat_orig_print = batadv_v_orig_print, .bat_neigh_cmp = batadv_v_neigh_cmp, .bat_neigh_is_similar_or_better = batadv_v_neigh_is_sob, + .bat_neigh_print = batadv_v_neigh_print, }; /**

1 0

[batman-adv] master: batman-adv: B.A.T.M.A.N. V - implement bat_orig_print API (662b7c1)
by postmaster＠open-mesh.org 19 Jan '16

19 Jan '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 662b7c111cd57ae56f5a6816b7e7c99348efa50b Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Sat Jan 16 16:40:18 2016 +0800 batman-adv: B.A.T.M.A.N. V - implement bat_orig_print API Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 662b7c111cd57ae56f5a6816b7e7c99348efa50b net/batman-adv/bat_v.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 953c0d1..a90117c 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -22,11 +22,17 @@ #include <linux/bug.h> #include <linux/cache.h> #include <linux/init.h> +#include <linux/jiffies.h> +#include <linux/netdevice.h> +#include <linux/rculist.h> +#include <linux/rcupdate.h> +#include <linux/seq_file.h> #include <linux/types.h> #include <linux/workqueue.h> #include "bat_v_elp.h" #include "bat_v_ogm.h" +#include "hash.h" #include "originator.h" #include "packet.h" @@ -81,6 +87,104 @@ static void batadv_v_ogm_emit(struct batadv_forw_packet *forw_packet) { } +/** + * batadv_v_orig_print_neigh - print neighbors for the originator table + * @orig_node: the orig_node for which the neighbors are printed + * @if_outgoing: outgoing interface for these entries + * @seq: debugfs table seq_file struct + * + * Must be called while holding an rcu lock. + */ +static void +batadv_v_orig_print_neigh(struct batadv_orig_node *orig_node, + struct batadv_hard_iface *if_outgoing, + struct seq_file *seq) +{ + struct batadv_neigh_node *neigh_node; + struct batadv_neigh_ifinfo *n_ifinfo; + + hlist_for_each_entry_rcu(neigh_node, &orig_node->neigh_list, list) { + n_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing); + if (!n_ifinfo) + continue; + + seq_printf(seq, " %pM (%9u.%1u)", + neigh_node->addr, + n_ifinfo->bat_v.throughput / 10, + n_ifinfo->bat_v.throughput % 10); + + batadv_neigh_ifinfo_put(n_ifinfo); + } +} + +/** + * batadv_v_orig_print - print the originator table + * @bat_priv: the bat priv with all the soft interface information + * @seq: debugfs table seq_file struct + * @if_outgoing: the outgoing interface for which this should be printed + */ +static void batadv_v_orig_print(struct batadv_priv *bat_priv, + struct seq_file *seq, + struct batadv_hard_iface *if_outgoing) +{ + struct batadv_neigh_node *neigh_node; + struct batadv_hashtable *hash = bat_priv->orig_hash; + int last_seen_msecs, last_seen_secs; + struct batadv_orig_node *orig_node; + struct batadv_neigh_ifinfo *n_ifinfo; + unsigned long last_seen_jiffies; + struct hlist_head *head; + int batman_count = 0; + u32 i; + + seq_printf(seq, " %-15s %s (%11s) %17s [%10s]: %20s ...\n", + "Originator", "last-seen", "throughput", "Nexthop", + "outgoingIF", "Potential nexthops"); + + for (i = 0; i < hash->size; i++) { + head = &hash->table[i]; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_node, head, hash_entry) { + neigh_node = batadv_orig_router_get(orig_node, + if_outgoing); + if (!neigh_node) + continue; + + n_ifinfo = batadv_neigh_ifinfo_get(neigh_node, + if_outgoing); + if (!n_ifinfo) + goto next; + + last_seen_jiffies = jiffies - orig_node->last_seen; + last_seen_msecs = jiffies_to_msecs(last_seen_jiffies); + last_seen_secs = last_seen_msecs / 1000; + last_seen_msecs = last_seen_msecs % 1000; + + seq_printf(seq, "%pM %4i.%03is (%9u.%1u) %pM [%10s]:", + orig_node->orig, last_seen_secs, + last_seen_msecs, + n_ifinfo->bat_v.throughput / 10, + n_ifinfo->bat_v.throughput % 10, + neigh_node->addr, + neigh_node->if_incoming->net_dev->name); + + batadv_v_orig_print_neigh(orig_node, if_outgoing, seq); + seq_puts(seq, "\n"); + batman_count++; + +next: + batadv_neigh_node_put(neigh_node); + if (n_ifinfo) + batadv_neigh_ifinfo_put(n_ifinfo); + } + rcu_read_unlock(); + } + + if (batman_count == 0) + seq_puts(seq, "No batman nodes in range ...\n"); +} + static int batadv_v_neigh_cmp(struct batadv_neigh_node *neigh1, struct batadv_hard_iface *if_outgoing1, struct batadv_neigh_node *neigh2, @@ -123,6 +227,7 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { .bat_hardif_neigh_init = batadv_v_hardif_neigh_init, .bat_ogm_emit = batadv_v_ogm_emit, .bat_ogm_schedule = batadv_v_ogm_schedule, + .bat_orig_print = batadv_v_orig_print, .bat_neigh_cmp = batadv_v_neigh_cmp, .bat_neigh_is_similar_or_better = batadv_v_neigh_is_sob, };

1 0

[batman-adv] master: batman-adv: B.A.T.M.A.N. V - implement neighbor comparison API calls (b05bbab)
by postmaster＠open-mesh.org 19 Jan '16

19 Jan '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit b05bbab5e1fc12aef199e4aeb034508f22a02759 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Sat Jan 16 16:40:17 2016 +0800 batman-adv: B.A.T.M.A.N. V - implement neighbor comparison API calls Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- b05bbab5e1fc12aef199e4aeb034508f22a02759 net/batman-adv/bat_v.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index ff31f2a..953c0d1 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -19,12 +19,15 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bug.h> #include <linux/cache.h> #include <linux/init.h> +#include <linux/types.h> #include <linux/workqueue.h> #include "bat_v_elp.h" #include "bat_v_ogm.h" +#include "originator.h" #include "packet.h" static int batadv_v_iface_enable(struct batadv_hard_iface *hard_iface) @@ -78,6 +81,39 @@ static void batadv_v_ogm_emit(struct batadv_forw_packet *forw_packet) { } +static int batadv_v_neigh_cmp(struct batadv_neigh_node *neigh1, + struct batadv_hard_iface *if_outgoing1, + struct batadv_neigh_node *neigh2, + struct batadv_hard_iface *if_outgoing2) +{ + struct batadv_neigh_ifinfo *ifinfo1, *ifinfo2; + + ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1); + ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2); + + if (WARN_ON(!ifinfo1 || !ifinfo2)) + return 0; + + return ifinfo1->bat_v.throughput - ifinfo2->bat_v.throughput; +} + +static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1, + struct batadv_hard_iface *if_outgoing1, + struct batadv_neigh_node *neigh2, + struct batadv_hard_iface *if_outgoing2) +{ + struct batadv_neigh_ifinfo *ifinfo1, *ifinfo2; + u32 threshold; + + ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1); + ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2); + + threshold = ifinfo1->bat_v.throughput / 4; + threshold = ifinfo1->bat_v.throughput - threshold; + + return ifinfo2->bat_v.throughput > threshold; +} + static struct batadv_algo_ops batadv_batman_v __read_mostly = { .name = "BATMAN_V", .bat_iface_enable = batadv_v_iface_enable, @@ -87,6 +123,8 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { .bat_hardif_neigh_init = batadv_v_hardif_neigh_init, .bat_ogm_emit = batadv_v_ogm_emit, .bat_ogm_schedule = batadv_v_ogm_schedule, + .bat_neigh_cmp = batadv_v_neigh_cmp, + .bat_neigh_is_similar_or_better = batadv_v_neigh_is_sob, }; /**

1 0

[batman-adv] master: batman-adv: ELP - send unicast ELP packets for throughput sampling (bedcadf)
by postmaster＠open-mesh.org 19 Jan '16

19 Jan '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit bedcadfaa92b167a4f7c3df21f3682a32e1cfdfd Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Tue Nov 10 18:51:22 2015 +0100 batman-adv: ELP - send unicast ELP packets for throughput sampling In case of an unused wireless link, the mac80211 throughput estimation won't get updated further. Consequently, the reported throughput metric will become obsolete. With this patch unicast sampling is introduced by periodically sending unicast ELP packets to each neighbor on idle WiFi links. These sampling packets will fill an entire frame, so that the measurement is as reliable as possible Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- bedcadfaa92b167a4f7c3df21f3682a32e1cfdfd net/batman-adv/bat_v_elp.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ net/batman-adv/main.h | 3 ++ 2 files changed, 72 insertions(+) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index fa2d60f..f257897 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -163,6 +163,69 @@ void batadv_v_elp_throughput_metric_update(struct work_struct *work) } /** + * batadv_v_elp_wifi_neigh_probe - send link probing packets to a neighbour + * @neigh: the neighbour to probe + * + * Sends a predefined number of unicast wifi packets to a given neighbour in + * order to trigger the throughput estimation on this link by the RC algorithm. + * Packets are sent only if there there is not enough payload unicast traffic + * towards this neighbour.. + * + * Return: True on success and false in case of error during skb preparation. + */ +static bool +batadv_v_elp_wifi_neigh_probe(struct batadv_hardif_neigh_node *neigh) +{ + struct batadv_hard_iface *hard_iface = neigh->if_incoming; + struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); + unsigned long last_tx_diff; + struct sk_buff *skb; + int probe_len, i; + int elp_skb_len; + + /* this probing routine is for Wifi neighbours only */ + if (!batadv_is_wifi_netdev(hard_iface->net_dev)) + return true; + + /* probe the neighbor only if no unicast packets have been sent + * to it in the last 100 milliseconds: this is the rate control + * algorithm sampling interval (minstrel). In this way, if not + * enough traffic has been sent to the neighbor, batman-adv can + * generate 2 probe packets and push the RC algorithm to perform + * the sampling + */ + last_tx_diff = jiffies_to_msecs(jiffies - neigh->bat_v.last_unicast_tx); + if (last_tx_diff <= BATADV_ELP_PROBE_MAX_TX_DIFF) + return true; + + probe_len = max_t(int, sizeof(struct batadv_elp_packet), + BATADV_ELP_MIN_PROBE_SIZE); + + for (i = 0; i < BATADV_ELP_PROBES_PER_NODE; i++) { + elp_skb_len = hard_iface->bat_v.elp_skb->len; + skb = skb_copy_expand(hard_iface->bat_v.elp_skb, 0, + probe_len - elp_skb_len, + GFP_ATOMIC); + if (!skb) + return false; + + /* Tell the skb to get as big as the allocated space (we want + * the packet to be exactly of that size to make the link + * throughput estimation effective. + */ + skb_put(skb, probe_len - hard_iface->bat_v.elp_skb->len); + + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "Sending unicast (probe) ELP packet on interface %s to %pM\n", + hard_iface->net_dev->name, neigh->addr); + + batadv_send_skb_packet(skb, hard_iface, neigh->addr); + } + + return true; +} + +/** * batadv_v_elp_periodic_work - ELP periodic task per interface * @work: work queue item * @@ -225,6 +288,12 @@ static void batadv_v_elp_periodic_work(struct work_struct *work) */ rcu_read_lock(); hlist_for_each_entry_rcu(hardif_neigh, &hard_iface->neigh_list, list) { + if (!batadv_v_elp_wifi_neigh_probe(hardif_neigh)) + /* if something goes wrong while probing, better to stop + * sending packets immediately and reschedule the task + */ + break; + if (!kref_get_unless_zero(&hardif_neigh->refcount)) continue; diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 2f8add6..1ccfb3e 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -63,6 +63,9 @@ /* B.A.T.M.A.N. V */ #define BATADV_THROUGHPUT_DEFAULT_VALUE 10 +#define BATADV_ELP_PROBES_PER_NODE 2 +#define BATADV_ELP_MIN_PROBE_SIZE 200 /* bytes */ +#define BATADV_ELP_PROBE_MAX_TX_DIFF 100 /* milliseconds */ #define BATADV_ELP_MAX_AGE 64 #define BATADV_OGM_MAX_ORIGDIFF 5 #define BATADV_OGM_MAX_AGE 64

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2016