B.A.T.M.A.N

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

15 participants
4308 discussions

Re: [PATCH] batman-adv: Use wifi rx/tx as fallback throughput
by Marek Lindner 11 Aug '19

11 Aug '19

On Sunday, 11 August 2019 20:54:36 HKT Rene Treffer wrote: > I found a high TX and (very) low RX unrealistic. > > But there was another suggestion to use the "success" rate (1-retransmits > or errors) that sounds like a better idea. I would suggest to disregard RX. Right, retransmission rate or error rate might be helpful to add. A number of questions still need to be answered: * Is this information exported by Wifi drivers like ath9k/ath10k/others ? * How is this information factored into the equation ? * How does the result compare to the actual throughput ? Especially the last point is somewhat crucial simply because in a mesh network with a healthy mix of devices & drivers all these various sources of throughput data need to be comparable. Picture a situation in which batman-adv needs to choose a route involving Ethernet throughput / manual throughput / expected throughput / bitrate throughput. Cheers, Marek

1 0

[PATCH] batman-adv: Use wifi rx/tx as fallback throughput
by René Treffer 11 Aug '19

11 Aug '19

From: rtreffer <treffer(a)measite.de> Some wifi drivers (e.g. ath10k) provide per-station rx/tx values but no estimated throughput. Setting a better estimate than the default 1MBit makes these devices work well with BATMAN V. Signed-off-by: René Treffer <treffer(a)measite.de> --- net/batman-adv/bat_v_elp.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 2614a9ca..ce3b52f1 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -68,7 +68,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) struct ethtool_link_ksettings link_settings; struct net_device *real_netdev; struct station_info sinfo; - u32 throughput; + u32 throughput, rx, tx; int ret; /* if the user specified a customised value for this interface, then @@ -107,10 +107,25 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) } if (ret) goto default_throughput; - if (!(sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT))) - goto default_throughput; - return sinfo.expected_throughput / 100; + if (sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT)) { + return sinfo.expected_throughput / 100; + } + + // try to estimate en expected throughput based on reported rx/tx rates + // 1/3 of tx or 1/3 of the average of rx and tx, whichever is smaller + if (sinfo.filled & BIT(NL80211_STA_INFO_TX_BITRATE)) { + tx = cfg80211_calculate_bitrate(&sinfo.txrate); + if (sinfo.filled & BIT(NL80211_STA_INFO_RX_BITRATE)) { + rx = cfg80211_calculate_bitrate(&sinfo.rxrate); + if (rx < tx) { + return (rx + tx) / 6; + } + } + return tx / 3; + } + + goto default_throughput; } /* if not a wifi interface, check if this device provides data via -- 2.20.1

4 14

[PATCH 0/4] pull request for net-next: batman-adv 2019-08-08
by Simon Wunderlich 08 Aug '19

08 Aug '19

Hi David, here is a small feature/cleanup pull request of batman-adv to go into net-next. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b: Linus 5.3-rc1 (2019-07-21 14:05:38 -0700) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20190808 for you to fetch changes up to 9cb9a17813bf0de1f8ad6deb9538296d5148b5a8: batman-adv: BATMAN_V: aggregate OGMv2 packets (2019-08-04 22:22:00 +0200) ---------------------------------------------------------------- This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Replace usage of strlcpy with strscpy, by Sven Eckelmann - Add OGMv2 per-interface queue and aggregations, by Linus Luessing (2 patches) ---------------------------------------------------------------- Linus Lüssing (2): batman-adv: BATMAN_V: introduce per hard-iface OGMv2 queues batman-adv: BATMAN_V: aggregate OGMv2 packets Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (1): batman-adv: Replace usage of strlcpy with strscpy net/batman-adv/bat_v.c | 7 ++ net/batman-adv/bat_v_ogm.c | 179 +++++++++++++++++++++++++++++++++++++++- net/batman-adv/bat_v_ogm.h | 3 + net/batman-adv/main.h | 2 +- net/batman-adv/soft-interface.c | 8 +- net/batman-adv/sysfs.c | 2 +- net/batman-adv/types.h | 12 +++ 7 files changed, 205 insertions(+), 8 deletions(-)

2 5

[PATCH 0/2] pull request for net: batman-adv 2019-08-08
by Simon Wunderlich 08 Aug '19

08 Aug '19

Hi David, here are some bugfixes 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 5f9e832c137075045d15cd6899ab0505cfb2ca4b: Linus 5.3-rc1 (2019-07-21 14:05:38 -0700) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-net-for-davem-20190808 for you to fetch changes up to f7af86ccf1882084293b11077deec049fd01da63: batman-adv: Fix deletion of RTR(4|6) mcast list entries (2019-07-22 21:34:58 +0200) ---------------------------------------------------------------- Here are some batman-adv bugfixes: - Fix netlink dumping of all mcast_flags buckets, by Sven Eckelmann - Fix deletion of RTR(4|6) mcast list entries, by Sven Eckelmann ---------------------------------------------------------------- Sven Eckelmann (2): batman-adv: Fix netlink dumping of all mcast_flags buckets batman-adv: Fix deletion of RTR(4|6) mcast list entries net/batman-adv/multicast.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

2 3

[PATCH v3 0/2] batman-adv: BATMAN_V: OGMv2 packet aggregation
by Linus Lüssing 04 Aug '19

04 Aug '19

Hi, This small patchset implements the transmission side for the OGMv2 packet aggregation in BATMAN_V. The receiver part was already implemented and seems to work nicely. The first patch implements the necessary queueing mechanism, utilizing skb queues. The second patch then implements the actual OGMv2 packet aggregation for the queued packets. Opportunities for later improvements (left out on purpose, to keep this patchset simple): * Reset queue timer on full queue / if flushing in batadv_v_ogm_queue_on_if(): -> to avoid sending small aggregates in the worker afterwards * Remove BATADV_MAX_AGGREGATION_BYTES (512 bytes) limitation: -> not needed for BATMAN_V, would break compatibility though... (* Increase BATADV_MAX_AGGREGATION_MS (100ms): -> BATMAN_V has less averaging, therefore could use slower OGM intervals and therefore slightly larger aggregtion time window) Regards, Linus Ref./obsolete: Previous, generic aggregation patchset: https://patchwork.open-mesh.org/patch/17013/ == Changelog v3: * PATCH 1/2: * added missing include for linux/lockdep.h * removed inline for batadv_v_ogm_len() * adjusted @aggr_len kerneldoc in types.h * PATCH 2/2: * moved skb_aggr declaration in batadv_v_ogm_aggr_send() to own line Changelog v2: * PATCH 1/2: * added lockdep_assert_held() * fixed aggr_len kerneldoc in types.h * fixed alignment in batadv_v_ogm_queue_left() * added missing includes in bat_v_ogm.{c,h} * fixed @hard_iface kerneldoc for batadv_v_ogm_aggr_list_free() * removed unused bat_priv in batadv_v_ogm_aggr_work() * PATCH 2/2: * unchanged

1 2

[PATCH v2 0/2] batman-adv: BATMAN_V: OGMv2 packet aggregation
by Linus Lüssing 04 Aug '19

04 Aug '19

Hi, This small patchset implements the transmission side for the OGMv2 packet aggregation in BATMAN_V. The receiver part was already implemented and seems to work nicely. The first patch implements the necessary queueing mechanism, utilizing skb queues. The second patch then implements the actual OGMv2 packet aggregation for the queued packets. Opportunities for later improvements (left out on purpose, to keep this patchset simple): * Reset queue timer on full queue / if flushing in batadv_v_ogm_queue_on_if(): -> to avoid sending small aggregates in the worker afterwards * Remove BATADV_MAX_AGGREGATION_BYTES (512 bytes) limitation: -> not needed for BATMAN_V, would break compatibility though... (* Increase BATADV_MAX_AGGREGATION_MS (100ms): -> BATMAN_V has less averaging, therefore could use slower OGM intervals and therefore slightly larger aggregtion time window) Regards, Linus Ref./obsolete: Previous, generic aggregation patchset: https://patchwork.open-mesh.org/patch/17013/ == Changelog v2: * PATCH 1/2: * added lockdep_assert_held() * fixed aggr_len kerneldoc in types.h * fixed alignment in batadv_v_ogm_queue_left() * added missing includes in bat_v_ogm.{c,h} * fixed @hard_iface kerneldoc for batadv_v_ogm_aggr_list_free() * removed unused bat_priv in batadv_v_ogm_aggr_work() * PATCH 2/2: * unchanged

2 6

netlink error with openwrt-19.07 branch
by Moritz Warning 04 Aug '19

04 Aug '19

hi, the OpenWrt branch openwrt-19.07 uses linux-4.14.134 and batman-adv 2019.2 (package release 4). Compiling gives me this error: home/user/openwrt/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/batman-adv-2019.2/net/batman-adv/netlink.c:1346:4: error: 'const struct genl_ops' has no member named 'validate' .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, ^~~~~~~~ /home/user/openwrt/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/batman-adv-2019.2/net/batman-adv/netlink.c:1346:15: error: 'GENL_DONT_VALIDATE_STRICT' undeclared here (not in a function); did you mean 'MACSEC_VALIDATE_STRICT'? .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, ^~~~~~~~~~~~~~~~~~~~~~~~~ MACSEC_VALIDATE_STRICT /home/user/openwrt/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/batman-adv-2019.2/net/batman-adv/netlink.c:1346:43: error: 'GENL_DONT_VALIDATE_DUMP' undeclared here (not in a function); did you mean 'GENL_DONT_VALIDATE_STRICT'? .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, ^~~~~~~~~~~~~~~~~~~~~~~ GENL_DONT_VALIDATE_STRICT /home/user/openwrt/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/batman-adv-2019.2/net/batman-adv/netlink.c:1353:4: error: 'const struct genl_ops' has no member named 'validate' .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, Is this a known error?

2 2

[PATCH 0/2] batman-adv: BATMAN_V: OGMv2 packet aggregation
by Linus Lüssing 04 Aug '19

04 Aug '19

2 4

[PATCH] alfred: vis: Fix ifindex check when registering interface
by Sven Eckelmann 02 Aug '19

02 Aug '19

The return value of if_nametoindex should be checked before the rtnl query is send to the kernel. Otherwise we might try to operate on an ifindex which doesn't exist in the kernel - which will never register any interface. Fixes: a34f044de561 ("alfred: vis: Use rtnl to query list of hardifs of meshif") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- vis/vis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vis/vis.c b/vis/vis.c index 8df3056..cdc5524 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -617,7 +617,7 @@ static int register_interfaces(struct globals *globals) }; register_arg.ifindex = if_nametoindex(globals->interface); - if (!globals->interface) + if (!register_arg.ifindex) return EXIT_FAILURE; -- 2.20.1

1 0

[PATCH] alfred: vis: Add missing include for ifinfomsg
by Sven Eckelmann 01 Aug '19

01 Aug '19

Fixes: 0fc6e6674428 ("alfred: vis: Retrieve hardif status via generic netlink") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- vis/vis.c | 1 + 1 file changed, 1 insertion(+) diff --git a/vis/vis.c b/vis/vis.c index 9474563..8df3056 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -10,6 +10,7 @@ #include <dirent.h> #include <errno.h> #include <getopt.h> +#include <linux/rtnetlink.h> #include <net/if.h> #include <netinet/in.h> #include <signal.h> -- 2.20.1

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