B.A.T.M.A.N January 2014

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

21 participants
62 discussions

[B.A.T.M.A.N.] [PATCHv3] batman-adv: use eth_hdr() instead of skb->data in interface_tx path
by Linus Lüssing 18 Jan '14

18 Jan '14

Using eth_hdr() instead of skb->data avoids some ugly type casts. I wasn't able to reproduce the skb ether header pointer mismatch mentioned in batadv_bla_tx() on a 3.11 kernel with a vlan on top of bat0 and therefore removed the according skb_reset_mac_header() call, too. In fact, it looks like it became obsolete with the following commit, included since 3.9: "net: reset mac header in dev_start_xmit()" (6d1ccff627) Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- This unfortunately didn't work: #define BATADV_SET_ETHTOOL_OPS(netdev, ops) SET_ETHTOOL_OPS(netdev, ops) If anyone has an idea how to achieve that, just let me know. So had to do a copy and paste of that dusty macro. Changes for v3: removed skb_reset_mac_header() entirely in the general code, but added it again for kernels < 3.9 via compat.h bridge_loop_avoidance.c | 3 --- compat.h | 35 +++++++++++++++++++++++++++++++++++ soft-interface.c | 7 ++++--- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 5c0eda4..26ec489 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1535,9 +1535,6 @@ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, if (!atomic_read(&bat_priv->bridge_loop_avoidance)) goto allow; - /* in VLAN case, the mac header might not be set. */ - skb_reset_mac_header(skb); - if (batadv_bla_process_claim(bat_priv, primary_if, skb)) goto handled; diff --git a/compat.h b/compat.h index 57c9d96..8a0ccc5 100644 --- a/compat.h +++ b/compat.h @@ -332,6 +332,41 @@ static int __batadv_interface_set_mac_addr(x, y) pos && ({ n = pos->member.next; 1; }); \ pos = hlist_entry_safe(n, typeof(*pos), member)) +#define BATADV_SET_ETHTOOL_OPS(netdev, ops) \ + ((netdev)->ethtool_ops = (ops)) + +#define __batadv_interface_tx \ + ({ \ + int func(struct sk_buff *skb, struct net_device *soft_iface) \ + { \ + skb_reset_mac_header(skb); \ + return batadv_interface_tx(skb, soft_iface); \ + } \ + &func; \ + }) + +#undef SET_ETHTOOL_OPS +#define SET_ETHTOOL_OPS(dev, batadv_ethtool_ops) \ + ({ \ + const struct net_device_ops my_net_device_ops = { \ + .ndo_init = batadv_softif_init_late, \ + .ndo_open = batadv_interface_open, \ + .ndo_stop = batadv_interface_release, \ + .ndo_get_stats = batadv_interface_stats, \ + .ndo_vlan_rx_add_vid = batadv_interface_add_vid, \ + .ndo_vlan_rx_kill_vid = batadv_interface_kill_vid, \ + .ndo_set_mac_address = batadv_interface_set_mac_addr, \ + .ndo_change_mtu = batadv_interface_change_mtu, \ + .ndo_set_rx_mode = batadv_interface_set_rx_mode, \ + .ndo_start_xmit = __batadv_interface_tx, \ + .ndo_validate_addr = eth_validate_addr, \ + .ndo_add_slave = batadv_softif_slave_add, \ + .ndo_del_slave = batadv_softif_slave_del, \ + }; \ + dev->netdev_ops = &my_net_device_ops; \ + BATADV_SET_ETHTOOL_OPS(dev, batadv_ethtool_ops); \ + }) + #endif /* < KERNEL_VERSION(3, 9, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) diff --git a/soft-interface.c b/soft-interface.c index f82c267..795224d 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -176,7 +176,8 @@ static int batadv_interface_tx(struct sk_buff *skb, soft_iface->trans_start = jiffies; vid = batadv_get_vid(skb, 0); - ethhdr = (struct ethhdr *)skb->data; + + ethhdr = eth_hdr(skb); switch (ntohs(ethhdr->h_proto)) { case ETH_P_8021Q: @@ -194,7 +195,7 @@ static int batadv_interface_tx(struct sk_buff *skb, goto dropped; /* skb->data might have been reallocated by batadv_bla_tx() */ - ethhdr = (struct ethhdr *)skb->data; + ethhdr = eth_hdr(skb); /* Register the client MAC in the transtable */ if (!is_multicast_ether_addr(ethhdr->h_source)) { @@ -230,7 +231,7 @@ static int batadv_interface_tx(struct sk_buff *skb, /* skb->data may have been modified by * batadv_gw_dhcp_recipient_get() */ - ethhdr = (struct ethhdr *)skb->data; + ethhdr = eth_hdr(skb); /* if gw_mode is on, broadcast any non-DHCP message. * All the DHCP packets are going to be sent as unicast */ -- 1.7.10.4

2 1

[B.A.T.M.A.N.] pull request: batman-adv 2014-01-16
by Antonio Quartulli 17 Jan '14

17 Jan '14

Hello David, here you have one more change by Simon Wunderlich intended for net-next/linux-3.14. This patch is properly formatting some kerneldoc that we already had but which has not been written down in a proper way. Please pull or let me know if something is wrong! Thanks a lot, Antonio The following changes since commit b93819854d6e79999a01ae73f90d3a4b06816cf7: stmmac: Add vlan rx for better GRO performance. (2014-01-15 15:13:08 -0800) 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 1b371d13071d6b6b9dc7a00fe1bc5a6babd68a5b: batman-adv: use consistent kerneldoc style (2014-01-16 00:16:00 +0100) ---------------------------------------------------------------- Included change: - properly format already existing kerneldoc ---------------------------------------------------------------- Simon Wunderlich (1): batman-adv: use consistent kerneldoc style net/batman-adv/bat_iv_ogm.c | 6 ++++-- net/batman-adv/bridge_loop_avoidance.c | 24 ++++++++++++++++++------ net/batman-adv/translation-table.c | 8 +++++--- net/batman-adv/types.h | 6 ++++-- 4 files changed, 31 insertions(+), 13 deletions(-)

2 2

[B.A.T.M.A.N.] pull request [net]: batman-adv 2014-01-16
by Antonio Quartulli 17 Jan '14

17 Jan '14

Hello David, here you have a very small fix intended for net/linux-3.13. This patch is fixing the batman-adv overhead computation (by Marek Lindner). The result of such operation is used to initialize the hard_header_len member of the soft-interface netdev object. Please pull or let me know of any problem! Thanks a lot, Antonio The following changes since commit 51bb352f15595f2dee42b599680809de3d08999d: qlge: Fix vlan netdev features. (2014-01-14 19:02:35 -0800) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to 1df0cbd509bc21b0c331358c1f9d9a6fc94bada8: batman-adv: fix batman-adv header overhead calculation (2014-01-15 23:54:20 +0100) ---------------------------------------------------------------- Included change: - properly compute the batman-adv header overhead. Such result is later used to initialize the hard_header_len member of the soft-interface netdev object ---------------------------------------------------------------- Marek Lindner (1): batman-adv: fix batman-adv header overhead calculation net/batman-adv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 2

[B.A.T.M.A.N.] [PATCHv2] batman-adv: use eth_hdr() instead of skb->data in interface_tx path
by Linus Lüssing 16 Jan '14

16 Jan '14

3 2

[B.A.T.M.A.N.] [PATCH] batman-adv: fix coccinelle warnings
by Martin Hundebøll 16 Jan '14

16 Jan '14

From: Fengguang Wu <fengguang.wu(a)intel.com> net/batman-adv/network-coding.c:1535:1-7: Replace memcpy with struct assignment Generated by: coccinelle/misc/memcpy-assign.cocci Signed-off-by: Fengguang Wu <fengguang.wu(a)intel.com> Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> --- network-coding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network-coding.c b/network-coding.c index f1b604d..801ece6 100644 --- a/network-coding.c +++ b/network-coding.c @@ -1636,7 +1636,7 @@ batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb, /* Reconstruct original mac header */ ethhdr = eth_hdr(skb); - memcpy(ethhdr, &ethhdr_tmp, sizeof(*ethhdr)); + *ethhdr = ethhdr_tmp; /* Select the correct unicast header information based on the location * of our mac address in the coded_packet header -- 1.8.5.2

2 1

[B.A.T.M.A.N.] pull request: batman-adv 2014-01-13
by Antonio Quartulli 16 Jan '14

16 Jan '14

Hello David, here you have another pull request intended for net-next/linux-3.14. Patches from 1 to 8 implement an optimization for multi-interface setups. It allows batman-adv nodes to take advantage of all the interfaces they have in a smarter way than what the protocol was doing before. In a few words this feature allows a single node to make routing decision by using a sort of "network-wide knowledge". For more details please read [1]. Along with this feature you also have some specific debug facilities that should make the netadmin life easier in case of troubles. Patch 11 is adding some compile time checks against the size of the packets we send over the wire. This should ensure us that no future member reordering messes up with the padding of those structures. The remaining patches are minor changes and cleanups. In particular: - drop the CRC16 dependency from Kbuild - remove "returns" at the end of void functions - update release version - update copyright years to 2014 - add missing sysfs attributes in batman-adv.txt document Please pull or let me know of any problem! Thanks a lot, Antonio [1] http://www.open-mesh.org/projects/batman-adv/wiki/Network-wide-multi-link-o… The following changes since commit f9577a376e28d7b8367319e103d6511d41c1c5fa: Merge branch 'alx_stats' (2014-01-11 20:53:03 -0800) 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 12afc36e38b3b6a0ec9bda71632c2285e7fdbab2: batman-adv: drop dependency against CRC16 (2014-01-12 14:41:21 +0100) ---------------------------------------------------------------- Included changes: - drop dependency against CRC16 - move to new release version - add size check at compile time for packet structs - update copyright years in every file - implement new bonding/interface alternation feature ---------------------------------------------------------------- Antonio Quartulli (3): batman-adv: remove returns at the end of void functions batman-adv: add missing sysfs attributes to README batman-adv: drop dependency against CRC16 Simon Wunderlich (11): batman-adv: remove bonding and interface alternating batman-adv: split tq information in neigh_node struct batman-adv: split out router from orig_node batman-adv: add WiFi penalty batman-adv: consider outgoing interface in OGM sending batman-adv: add bonding again batman-adv: add debugfs structure for information per interface batman-adv: add debugfs support to view multiif tables batman-adv: add build checks for packet sizes batman-adv: update copyright years for 2014 batman-adv: Start new development cycle Documentation/networking/batman-adv.txt | 9 +- net/batman-adv/Kconfig | 1 - net/batman-adv/Makefile | 2 +- net/batman-adv/bat_algo.h | 2 +- net/batman-adv/bat_iv_ogm.c | 882 +++++++++++++++++++++----------- net/batman-adv/bitarray.c | 2 +- net/batman-adv/bitarray.h | 2 +- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/bridge_loop_avoidance.h | 2 +- net/batman-adv/debugfs.c | 91 +++- net/batman-adv/debugfs.h | 4 +- net/batman-adv/distributed-arp-table.c | 5 +- net/batman-adv/distributed-arp-table.h | 2 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/fragmentation.h | 2 +- net/batman-adv/gateway_client.c | 88 +++- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/gateway_common.h | 2 +- net/batman-adv/hard-interface.c | 11 +- net/batman-adv/hard-interface.h | 20 +- net/batman-adv/hash.c | 2 +- net/batman-adv/hash.h | 2 +- net/batman-adv/icmp_socket.c | 5 +- net/batman-adv/icmp_socket.h | 2 +- net/batman-adv/main.c | 26 +- net/batman-adv/main.h | 10 +- net/batman-adv/network-coding.c | 51 +- net/batman-adv/network-coding.h | 9 +- net/batman-adv/originator.c | 536 +++++++++++++++++-- net/batman-adv/originator.h | 22 +- net/batman-adv/packet.h | 2 +- net/batman-adv/routing.c | 429 ++++++---------- net/batman-adv/routing.h | 14 +- net/batman-adv/send.c | 21 +- net/batman-adv/send.h | 2 +- net/batman-adv/soft-interface.c | 4 +- net/batman-adv/soft-interface.h | 2 +- net/batman-adv/sysfs.c | 2 +- net/batman-adv/sysfs.h | 2 +- net/batman-adv/translation-table.c | 8 +- net/batman-adv/translation-table.h | 2 +- net/batman-adv/types.h | 132 +++-- 43 files changed, 1652 insertions(+), 768 deletions(-)

2 17

[B.A.T.M.A.N.] [PATCH v2 OpenWrt] [batman-adv: Makefile: add depends for 'crc16' which is still needed but removed accidentally
by Bastian Bittorf 15 Jan '14

15 Jan '14

batman-adv: Makefile: add depends for 'crc16' which is still needed/used in BLA-framework (Bridge Loop Avoidance) in bridge_loop_avoidance.c. Thanks to Antonio 'ordex' Quartulli for confirmation. The problem was introduced with 1ee5b17e4f7b2c145524edfb51617c911fad7cc4 ("upgrade package to latest release 2014.0.0"). Signed-off-by: Bastian Bittorf <bittorf(a)bluebottle.com> --- batman-adv/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 0e0945b..2504682 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -29,7 +29,7 @@ define KernelPackage/batman-adv URL:=http://www.open-mesh.org/ MAINTAINER:=Marek Lindner <lindner_marek(a)yahoo.de> SUBMENU:=Network Support - DEPENDS:=+kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc + DEPENDS:=+kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc TITLE:=B.A.T.M.A.N. Adv FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) -- 1.8.1.2

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: use eth_hdr() instead of skb->data in interface_tx path
by Linus Lüssing 15 Jan '14

15 Jan '14

1 0

[B.A.T.M.A.N.] [PATCH-next] batman-adv: use consistent kerneldoc style
by Simon Wunderlich 15 Jan '14

15 Jan '14

Reported-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> --- bat_iv_ogm.c | 6 ++++-- bridge_loop_avoidance.c | 24 ++++++++++++++++++------ translation-table.c | 8 +++++--- types.h | 6 ++++-- 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 921ac20..512159b 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -598,7 +598,8 @@ out: return res; } -/* batadv_iv_ogm_aggregate_new - create a new aggregated packet and add this +/** + * batadv_iv_ogm_aggregate_new - create a new aggregated packet and add this * packet to it. * @packet_buff: pointer to the OGM * @packet_len: (total) length of the OGM @@ -1745,7 +1746,8 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, return NET_RX_SUCCESS; } -/* batadv_iv_ogm_orig_print_neigh - print neighbors for the originator table +/** + * batadv_iv_ogm_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 diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 5c0eda4..05f0712 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -130,7 +130,9 @@ static void batadv_claim_free_ref(struct batadv_bla_claim *claim) call_rcu(&claim->rcu, batadv_claim_free_rcu); } -/* @bat_priv: the bat priv with all the soft interface information +/** + * batadv_claim_hash_find + * @bat_priv: the bat priv with all the soft interface information * @data: search data (may be local/static data) * * looks for a claim in the hash, and returns it if found @@ -449,7 +451,9 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv, batadv_backbone_gw_free_ref(backbone_gw); } -/* @bat_priv: the bat priv with all the soft interface information +/** + * batadv_bla_answer_request - answer a bla request by sending own claims + * @bat_priv: the bat priv with all the soft interface information * @vid: the vid where the request came on * * Repeat all of our own claims, and finally send an ANNOUNCE frame @@ -495,7 +499,9 @@ static void batadv_bla_answer_request(struct batadv_priv *bat_priv, batadv_backbone_gw_free_ref(backbone_gw); } -/* @backbone_gw: the backbone gateway from whom we are out of sync +/** + * batadv_bla_send_request - send a request to repeat claims + * @backbone_gw: the backbone gateway from whom we are out of sync * * When the crc is wrong, ask the backbone gateway for a full table update. * After the request, it will repeat all of his own claims and finally @@ -520,7 +526,9 @@ static void batadv_bla_send_request(struct batadv_bla_backbone_gw *backbone_gw) } } -/* @bat_priv: the bat priv with all the soft interface information +/** + * batadv_bla_send_announce + * @bat_priv: the bat priv with all the soft interface information * @backbone_gw: our backbone gateway which should be announced * * This function sends an announcement. It is called from multiple @@ -844,7 +852,9 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, } -/* @bat_priv: the bat priv with all the soft interface information +/** + * batadv_bla_process_claim + * @bat_priv: the bat priv with all the soft interface information * @skb: the frame to be checked * * Check if this is a claim frame, and process it accordingly. @@ -1311,7 +1321,9 @@ out: -/* @bat_priv: the bat priv with all the soft interface information +/** + * batadv_bla_is_backbone_gw_orig + * @bat_priv: the bat priv with all the soft interface information * @orig: originator mac address * @vid: VLAN identifier * diff --git a/translation-table.c b/translation-table.c index a6fb1ff..b6071f6 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1382,7 +1382,8 @@ out: return ret; } -/* batadv_transtable_best_orig - Get best originator list entry from tt entry +/** + * batadv_transtable_best_orig - Get best originator list entry from tt entry * @bat_priv: the bat priv with all the soft interface information * @tt_global_entry: global translation table entry to be analyzed * @@ -1426,8 +1427,9 @@ batadv_transtable_best_orig(struct batadv_priv *bat_priv, return best_entry; } -/* batadv_tt_global_print_entry - print all orig nodes who announce the address - * for this global entry +/** + * batadv_tt_global_print_entry - print all orig nodes who announce the address + * for this global entry * @bat_priv: the bat priv with all the soft interface information * @tt_global_entry: global translation table entry to be printed * @seq: debugfs table seq_file struct diff --git a/types.h b/types.h index b53f90d..78370ab 100644 --- a/types.h +++ b/types.h @@ -333,7 +333,8 @@ struct batadv_neigh_node { struct rcu_head rcu; }; -/* struct batadv_neigh_node_bat_iv - neighbor information per outgoing +/** + * struct batadv_neigh_node_bat_iv - neighbor information per outgoing * interface for BATMAN IV * @tq_recv: ring buffer of received TQ values from this neigh node * @tq_index: ring buffer index @@ -350,7 +351,8 @@ struct batadv_neigh_ifinfo_bat_iv { uint8_t real_packet_count; }; -/* struct batadv_neigh_ifinfo - neighbor information per outgoing interface +/** + * struct batadv_neigh_ifinfo - neighbor information per outgoing interface * @list: list node for batadv_neigh_node::ifinfo_list * @if_outgoing: pointer to outgoing hard interface * @bat_iv: B.A.T.M.A.N. IV private structure -- 1.7.10.4

2 1

[B.A.T.M.A.N.] [PATCH-next] batman-adv: fix batman-adv header overhead calculation
by Marek Lindner 15 Jan '14

15 Jan '14

Batman-adv prepends a full ethernet header in addition to its own header. This has to be reflected in the MTU calculation. Introduced by f1f310d5c261f0214f85afea95d5cd11d49d64c6 ("batman-adv: consider network coding overhead when calculating required mtu") Reported-by: cmsv <cmsv(a)wirelesspt.net> Reported-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index 4547bf0..fd85205 100644 --- a/main.c +++ b/main.c @@ -277,7 +277,7 @@ int batadv_max_header_len(void) sizeof(struct batadv_coded_packet)); #endif - return header_len; + return header_len + ETH_HLEN; } /** -- 1.8.4.4

1 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N January 2014