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] batman-adv: Remove variable deprecated by skb_put_data
by Sven Eckelmann 05 Jul '17

05 Jul '17

skb_put_data makes it unnecessary to store the skb_put return value to copy some data to the packet. The returned pointer of skb_put_data should therefore not stored by functions which previously only used it to copy some data. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- This patch belongs to the series https://patchwork.open-mesh.org/project/b.a.t.m.a.n./list/?series=11 It must not be squashed in the "batman-adv: introduce and use skb_put_data()" because it is already part of net-next and we must port the change in our patch in a separate pull request. net/batman-adv/bat_iv_ogm.c | 4 +--- net/batman-adv/bat_v_ogm.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index a3501173..8769fa1b 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -729,11 +729,9 @@ static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr, const unsigned char *packet_buff, int packet_len, bool direct_link) { - unsigned char *skb_buff; unsigned long new_direct_link_flag; - skb_buff = skb_put_data(forw_packet_aggr->skb, packet_buff, - packet_len); + skb_put_data(forw_packet_aggr->skb, packet_buff, packet_len); forw_packet_aggr->packet_len += packet_len; forw_packet_aggr->num_packets++; diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 1e3dc374..894c9637 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -137,7 +137,7 @@ static void batadv_v_ogm_send(struct work_struct *work) struct batadv_priv *bat_priv; struct batadv_ogm2_packet *ogm_packet; struct sk_buff *skb, *skb_tmp; - unsigned char *ogm_buff, *pkt_buff; + unsigned char *ogm_buff; int ogm_buff_len; u16 tvlv_len = 0; int ret; @@ -166,7 +166,7 @@ static void batadv_v_ogm_send(struct work_struct *work) goto reschedule; skb_reserve(skb, ETH_HLEN); - pkt_buff = skb_put_data(skb, ogm_buff, ogm_buff_len); + skb_put_data(skb, ogm_buff, ogm_buff_len); ogm_packet = (struct batadv_ogm2_packet *)skb->data; ogm_packet->seqno = htonl(atomic_read(&bat_priv->bat_v.ogm_seqno)); -- 2.11.0

1 1

[B.A.T.M.A.N.] [PATCH 1/3] batman-adv: convert many more places to skb_put_zero()
by Sven Eckelmann 04 Jul '17

04 Jul '17

From: Johannes Berg <johannes.berg(a)intel.com> There were many places that my previous spatch didn't find, as pointed out by yuan linyu in various patches. The following spatch found many more and also removes the now unnecessary casts: @@ identifier p, p2; expression len; expression skb; type t, t2; @@ ( -p = skb_put(skb, len); +p = skb_put_zero(skb, len); | -p = (t)skb_put(skb, len); +p = skb_put_zero(skb, len); ) ... when != p ( p2 = (t2)p; -memset(p2, 0, len); | -memset(p, 0, len); ) @@ type t, t2; identifier p, p2; expression skb; @@ t *p; ... ( -p = skb_put(skb, sizeof(t)); +p = skb_put_zero(skb, sizeof(t)); | -p = (t *)skb_put(skb, sizeof(t)); +p = skb_put_zero(skb, sizeof(t)); ) ... when != p ( p2 = (t2)p; -memset(p2, 0, sizeof(*p)); | -memset(p, 0, sizeof(*p)); ) @@ expression skb, len; @@ -memset(skb_put(skb, len), 0, len); +skb_put_zero(skb, len); Apply it to the tree (with one manual fixup to keep the comment in vxlan.c, which spatch removed.) Signed-off-by: Johannes Berg <johannes.berg(a)intel.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> [sven(a)narfation.org: Add compat code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- This patch is already part of net-next. Only the compat code is new. compat-include/linux/skbuff.h | 13 +++++++++++++ net/batman-adv/bat_v_elp.c | 3 +-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h index 95f645ad..02bc11de 100644 --- a/compat-include/linux/skbuff.h +++ b/compat-include/linux/skbuff.h @@ -76,4 +76,17 @@ struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb, #endif /* < KERNEL_VERSION(4, 2, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) + +static inline void *skb_put_zero(struct sk_buff *skb, unsigned int len) +{ + void *tmp = skb_put(skb, len); + + memset(tmp, 0, len); + + return tmp; +} + +#endif /* < KERNEL_VERSION(4, 13, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SKBUFF_H_ */ diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index b58007b7..bd1064d9 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -346,9 +346,8 @@ int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface) goto out; skb_reserve(hard_iface->bat_v.elp_skb, ETH_HLEN + NET_IP_ALIGN); - elp_buff = skb_put(hard_iface->bat_v.elp_skb, BATADV_ELP_HLEN); + elp_buff = skb_put_zero(hard_iface->bat_v.elp_skb, BATADV_ELP_HLEN); elp_packet = (struct batadv_elp_packet *)elp_buff; - memset(elp_packet, 0, BATADV_ELP_HLEN); elp_packet->packet_type = BATADV_ELP; elp_packet->version = BATADV_COMPAT_VERSION; -- 2.11.0

1 3

[B.A.T.M.A.N.] [PATCH] batman-adv: fix spelling mistake "ourselve" -> "ourself"
by Colin King 26 Jun '17

26 Jun '17

From: Colin Ian King <colin.king(a)canonical.com> Trivial fix to spelling mistake in batadv_dbg debug message Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- net/batman-adv/bat_v_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 1e3dc374bfde..d6dbf67acbb5 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -200,7 +200,7 @@ static void batadv_v_ogm_send(struct work_struct *work) type = "unknown"; } - batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "OGM2 from ourselve on %s surpressed: %s\n", + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "OGM2 from ourself on %s surpressed: %s\n", hard_iface->net_dev->name, type); batadv_hardif_put(hard_iface); -- 2.11.0

3 3

[B.A.T.M.A.N.] batman-adv: is it possible to increase mtu size for batman-adv interfaces?
by Andreas Pape 20 Jun '17

20 Jun '17

Hi, currently the mtu size of batman-adv soft-interfaces is limited to ETH_DATA_LEN (1500 bytes) in function batadv_hardif_min_mtu as far as I understand. A comment in this function states that batman-adv "does not support MTUs bigger than ETH_DATA_LEN". Is there a specific reason for this or would it be possible to increase the MTU size to something like 1518 by simply replacing all limitations to ETH_DATA_LEN with a higher value? Kind regards, Andreas .................................................................. PHOENIX CONTACT ELECTRONICS GmbH Sitz der Gesellschaft / registered office of the company: 31812 Bad Pyrmont USt-Id-Nr.: DE811742156 Amtsgericht Hannover HRB 100528 / district court Hannover HRB 100528 Geschäftsführer / Executive Board: Ulrich Leidecker, Christoph Leifer __________________________________________________________________ Diese E-Mail enthält vertrauliche und/oder rechtlich geschützte Informationen. Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtümlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten Sie diese Mail. Das unerlaubte Kopieren, jegliche anderweitige Verwendung sowie die unbefugte Weitergabe dieser Mail ist nicht gestattet. ---------------------------------------------------------------------------------------------------- This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure, distribution or other use of the material or parts thereof is strictly forbidden. ___________________________________________________________________

2 1

[B.A.T.M.A.N.] Odd use of %14pM in net/batman-adv/distributed-arp-table.c
by Joe Perches 14 Jun '17

14 Jun '17

An output mac address is 17 bytes 1 12345678901234567 00:11:22:33:44:55 but in net/batman-adv/distributed-arp-table.c int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset) { [...] seq_printf(seq, " * %15pI4 %14pM %4i %6i:%02i\n", &dat_entry->ip, dat_entry->mac_addr, batadv_print_vid(dat_entry->vid), last_seen_mins, last_seen_secs); %14pM is odd as this should not emit the last byte of the mac address. So given the example above, it would output 00:11:22:33:44 Is that what's really desired? If so, I'd suggest using something more obvious like %5phC

3 5

[B.A.T.M.A.N.] [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13
by Simon Wunderlich 13 Jun '17

13 Jun '17

Hi David, here is our 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 2ea659a9ef488125eb46da6eb571de5eae5c43f6: Linux 4.12-rc1 (2017-05-13 13:19:49 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20170613 for you to fetch changes up to d62890885efbc48acea46964ea3af69b61c8c5eb: batman-adv: Accept only filled wifi station info (2017-06-13 12:25:43 +0200) ---------------------------------------------------------------- This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - decrease maximum fragment size, by Matthias Schiffer - Clean up seqfile writing, by Markus Elfring (2 patches) - use __func__ in debug messages, by Sven Eckelmann - Mark tpmeter initializers with __init, by Antonio Quartulli - ignore loop detection MAC addresses, by Simon Wunderlich - clean up some return handling, by Simon Wunderlich - improve ELP throughput value handling for WiFi neighbors in BATMAN V/ELP, by Sven Eckelmann (2 patches) ---------------------------------------------------------------- Antonio Quartulli (1): batman-adv: tp_meter: mark init function with __init Markus Elfring (2): batman-adv: Replace a seq_puts() call by seq_putc() in two functions batman-adv: Combine two seq_puts() calls into one call in batadv_nc_nodes_seq_print_text() Matthias Schiffer (1): batman-adv: decrease maximum fragment size Simon Wunderlich (3): batman-adv: Start new development cycle batman-adv: do not add loop detection mac addresses to global tt batman-adv: simplify return handling in some TT functions Sven Eckelmann (3): batman-adv: Print correct function names in dbg messages batman-adv: Use default throughput value on cfg80211 error batman-adv: Accept only filled wifi station info net/batman-adv/bat_iv_ogm.c | 5 ++- net/batman-adv/bat_v.c | 2 +- net/batman-adv/bat_v_elp.c | 10 ++++- net/batman-adv/bridge_loop_avoidance.c | 73 ++++++++++++++++++---------------- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/main.h | 4 +- net/batman-adv/network-coding.c | 4 +- net/batman-adv/routing.c | 4 +- net/batman-adv/send.c | 6 +-- net/batman-adv/tp_meter.c | 3 +- net/batman-adv/translation-table.c | 21 +++++----- 11 files changed, 72 insertions(+), 62 deletions(-)

2 11

[B.A.T.M.A.N.] [PATCH 0/2] pull request for net: batman-adv 2017-06-13
by Simon Wunderlich 13 Jun '17

13 Jun '17

Hi David, here are two batman-adv bugfixes for net. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 2ea659a9ef488125eb46da6eb571de5eae5c43f6: Linux 4.12-rc1 (2017-05-13 13:19:49 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-net-for-davem-20170613 for you to fetch changes up to a1a745ef980a1b48299ead4ea7990e62c0516f6e: batman-adv: fix memory leak when dropping packet from other gateway (2017-05-19 12:20:28 +0200) ---------------------------------------------------------------- Here are two batman-adv bugfixes: - fix rx packet counters for local ARP replies, by Sven Eckelmann - fix memory leaks for unicast packetes received from another gateway in bridge loop avoidance, by Andreas Pape ---------------------------------------------------------------- Andreas Pape (1): batman-adv: fix memory leak when dropping packet from other gateway Sven Eckelmann (1): batman-adv: Fix rx packet/bytes stats on local ARP reply net/batman-adv/distributed-arp-table.c | 5 +++-- net/batman-adv/routing.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)

2 3

[B.A.T.M.A.N.] [batctl] compiling with gcc 7.1.0: there are some notes and warnings
by Philipp Psurek 13 Jun '17

13 Jun '17

Hi all, it's nothing to worry about but since 2011 I always noticed a clean compile run of your code. Now with gcc 7.1.0 there are some warnings and notes that might interest you: ~ LANG=C make CC bat-hosts.o CC debugfs.o CC debug.o CC functions.o CC genl.o CC hash.o CC icmp_helper.o CC interface.o CC ioctl.o CC main.o CC netlink.o CC ping.o CC sys.o In file included from sys.c:37:0: sys.c: In function 'handle_ra_setting': sys.h:33:25: warning: '%s' directive output may be truncated writing up to 255 bytes into a region of size 185 [-Wformat-truncation=] #define SYS_IFACE_PATH "/sys/class/net" ^ sys.h:38:30: note: in expansion of macro 'SYS_IFACE_PATH' #define SYS_ROUTING_ALGO_FMT SYS_IFACE_PATH"/%s/mesh/routing_algo" ^~~~~~~~~~~~~~ sys.c:480:38: note: in expansion of macro 'SYS_ROUTING_ALGO_FMT' snprintf(path_buff, PATH_BUFF_LEN, SYS_ROUTING_ALGO_FMT, iface_dir->d_name); ^~~~~~~~~~~~~~~~~~~~ sys.h:38:46: note: format string is defined here #define SYS_ROUTING_ALGO_FMT SYS_IFACE_PATH"/%s/mesh/routing_algo" ^~ sys.c:480:3: note: 'snprintf' output between 34 and 289 bytes into a destination of size 200 snprintf(path_buff, PATH_BUFF_LEN, SYS_ROUTING_ALGO_FMT, iface_dir->d_name); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CC tcpdump.o CC tp_meter.o tp_meter.c: In function 'tp_meter': tp_meter.c:502:3: warning: this statement may fall through [-Wimplicit-fallthrough=] printf("CANCEL received: test aborted\n"); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tp_meter.c:504:2: note: here case BATADV_TP_REASON_COMPLETE: ^~~~ CC traceroute.o CC translate.o LD batctl # batctl -v batctl 2017.1-1-g3069ca8 [batman-adv: 2017.1-4-g2149d80d] It's really nothing bad at all. gcc 7.1.0 is somehow a little bit capricious but with more suggestions to make cleaner code. best regards Philipp

3 20

[B.A.T.M.A.N.] [PATCH v2 0/6] batman-adv: broadcast packet aggregation
by Linus Lüssing 13 Jun '17

13 Jun '17

Hi, Here is a first patchset to reintroduce aggregation support for BATMAN V, too - as well as any other packet type with a broadcast destination. Branch: * https://git.open-mesh.org/batman-adv.git/shortlog/refs/heads/linus/aggregat… Regards, Linus PS: Requires: "batman-adv: Introduce packet type independent TVLV handler API" (40e5c9e798ec, available on patchwork or linus/aggregation branch) --- Changelog: v2: * reset skb->cb on the soft-iface reception path, too [PATCH 5/6] (thanks Sven!) RFC->v1: * removed tvlv (un)pack ctx wrappers * fixed a crash when deaggregating ARP packets * now compile tested down to 3.2, too (no issues found) * now stress tested with multicast traffic of a larger, public mesh setup

2 9

[B.A.T.M.A.N.] [PATCH v3 1/2] batman-adv: Use default throughput value on cfg80211 error
by Sven Eckelmann 12 Jun '17

12 Jun '17

A wifi interface should never be handled like an ethernet devices. The parser of the cfg80211 output must therefore skip the ethtool code when cfg80211_get_station returned an error. Fixes: 01b1fe819ee0 ("batman-adv: refactor wifi interface detection") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: - no changes net/batman-adv/bat_v_elp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index b90c9903..96e73337 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -109,8 +109,10 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) */ return 0; } - if (!ret) - return sinfo.expected_throughput / 100; + if (ret) + goto default_throughput; + + return sinfo.expected_throughput / 100; } /* if not a wifi interface, check if this device provides data via -- 2.11.0

2 2

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