B.A.T.M.A.N

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

15 participants
4309 discussions

[B.A.T.M.A.N.] [PATCHv2] batman-adv: don't use call_rcu if not needed
by Antonio Quartulli 12 May '13

12 May '13

batadv_tt_global_entry_free_ref uses call_rcu to schedule a function which will only free the global entry itself. For this reason call_rcu is useless and kfree_rcu can be used to simplify the code. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - removed one useless container_of in compat.c compat.c | 9 +++++++++ translation-table.c | 20 ++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/compat.c b/compat.c index 1f3a39d..da556a4 100644 --- a/compat.c +++ b/compat.c @@ -27,6 +27,15 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) +void batadv_free_rcu_tt_global_entry(struct rcu_head *rcu) +{ + struct batadv_tt_global_entry *global; + + global = container_of(rcu, struct batadv_tt_global_entry, common.rcu); + + kfree(global); +} + void batadv_free_rcu_gw_node(struct rcu_head *rcu) { struct batadv_gw_node *gw_node; diff --git a/translation-table.c b/translation-table.c index df6b5cd..44e7789 100644 --- a/translation-table.c +++ b/translation-table.c @@ -117,25 +117,17 @@ batadv_tt_local_entry_free_ref(struct batadv_tt_local_entry *tt_local_entry) kfree_rcu(tt_local_entry, common.rcu); } -static void batadv_tt_global_entry_free_rcu(struct rcu_head *rcu) -{ - struct batadv_tt_common_entry *tt_common_entry; - struct batadv_tt_global_entry *tt_global_entry; - - tt_common_entry = container_of(rcu, struct batadv_tt_common_entry, rcu); - tt_global_entry = container_of(tt_common_entry, - struct batadv_tt_global_entry, common); - - kfree(tt_global_entry); -} - +/** + * batadv_tt_global_entry_free_ref - decrement the refcounter for a + * tt_global_entry and possibly free it + * @tt_global_entry: the object to free + */ static void batadv_tt_global_entry_free_ref(struct batadv_tt_global_entry *tt_global_entry) { if (atomic_dec_and_test(&tt_global_entry->common.refcount)) { batadv_tt_global_del_orig_list(tt_global_entry); - call_rcu(&tt_global_entry->common.rcu, - batadv_tt_global_entry_free_rcu); + kfree_rcu(tt_global_entry, common.rcu); } } -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: access h_vlan_encapsulated_proto properly
by Antonio Quartulli 12 May '13

12 May '13

In the gateway code in case of VLAN tagged frame the ethhdr pointer is moved forward by 4 bytes so that the offset of h_proto in struct ethhdr matches the real h_vlan_encapsulated_proto address in the skb. This trick is correct but the code is not easy to understand and may lead to bugs in case of re-use of ethhdr for other purposes. Use a standalone protocol variable and assign it accordingly to the header type Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- gateway_client.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gateway_client.c b/gateway_client.c index 973f02d..8ea13e1 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -626,23 +626,29 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) struct iphdr *iphdr; struct ipv6hdr *ipv6hdr; struct udphdr *udphdr; + uint16_t proto; /* check for ethernet header */ if (!pskb_may_pull(skb, *header_len + ETH_HLEN)) return false; ethhdr = (struct ethhdr *)skb->data; + proto = ntohs(ethhdr->h_proto); *header_len += ETH_HLEN; /* check for initial vlan header */ - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { + if (proto == ETH_P_8021Q) { + struct vlan_ethhdr *vhdr; + if (!pskb_may_pull(skb, *header_len + VLAN_HLEN)) return false; - ethhdr = (struct ethhdr *)(skb->data + VLAN_HLEN); + + vhdr = (struct vlan_ethhdr *)skb->data; + proto = ntohs(vhdr->h_vlan_encapsulated_proto); *header_len += VLAN_HLEN; } /* check for ip header */ - switch (ntohs(ethhdr->h_proto)) { + switch (proto) { case ETH_P_IP: if (!pskb_may_pull(skb, *header_len + sizeof(*iphdr))) return false; @@ -675,11 +681,11 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) *header_len += sizeof(*udphdr); /* check for bootp port */ - if ((ntohs(ethhdr->h_proto) == ETH_P_IP) && + if ((proto == ETH_P_IP) && (ntohs(udphdr->dest) != 67)) return false; - if ((ntohs(ethhdr->h_proto) == ETH_P_IPV6) && + if ((proto == ETH_P_IPV6) && (ntohs(udphdr->dest) != 547)) return false; -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCHv2 next 1/2] batman-adv: use VLAN_VID_MASK when printing the vid
by Antonio Quartulli 12 May '13

12 May '13

Introduced in 454b849c7de18a7b44eecebe889f5f3149d24780 ("batman-adv: print the VID properly") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index d575436..8bcffa5 100644 --- a/main.h +++ b/main.h @@ -175,7 +175,7 @@ enum batadv_vlan_flags { /* mask needed to extract the vlan ID (12bits) from a 16bits variable */ #define BATADV_VID_MASK 0x0FFF #define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \ - (int)(vid & BATADV_VID_MASK) : -1) + (int)(vid & VLAN_VID_MASK) : -1) extern char batadv_routing_algo[]; extern struct list_head batadv_hardif_list; -- 1.8.1.5

2 3

Re: [B.A.T.M.A.N.] Performance Comparison (Batman-adv. vs. 802.11s)
by ajeet singh 12 May '13

12 May '13

Hello All, Thanks a lot for reply. After applying patch http://www.spinics.net/lists/linux-wireless/msg107080.html , I am able to run batman-adv and 802.11s on top of the same wireless chipset (One after another). I am using Atheros-AR9271 chipsets (ath9k_htc) for my tests. I am getting good ping latency in both cases IBSS (Batman-adv) and mesh mode (802.11s), but latency fluctuation is there in the case of mesh mode. 802.11s gives around 15 mbps between two nodes but there is unexpected throughput result in the case of batman-adv. It’s coming in kbps sometimes. As I have tested batman-adv with different chipsets and got pretty good throughput around 30 mbps. I suspect there may be something with ath9k_htc driver and batman-adv compatibility. I will be investigating the problem in details. Please let me know if you people have any information related to this problem. Thanks for providing the paper URL (http://wwwtlc.iet.unipi.it/research/ggt-iswpc10.pdf), but this paper is a quite old and within 2 years, both protocols have evolved a lot. Thanks Ajeet On Sat, May 11, 2013 at 3:30 PM, <b.a.t.m.a.n-request(a)lists.open-mesh.org> wrote: > Send B.A.T.M.A.N mailing list submissions to > b.a.t.m.a.n(a)lists.open-mesh.org > > To subscribe or unsubscribe via the World Wide Web, visit > https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n > or, via email, send a message with subject or body 'help' to > b.a.t.m.a.n-request(a)lists.open-mesh.org > > You can reach the person managing the list at > b.a.t.m.a.n-owner(a)lists.open-mesh.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of B.A.T.M.A.N digest..." > > > Today's Topics: > > 1. Re: Performance Comparison (Batman-adv. vs. 802.11s) > (Linus L?ssing) > 2. Re: Performance Comparison (Batman-adv. vs. 802.11s) > (Thomas Pedersen) > 3. Re: Performance Comparison (Batman-adv. vs. 802.11s) > (Yeoh Chun-Yeow) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Fri, 10 May 2013 15:07:06 +0200 > From: Linus L?ssing <linus.luessing(a)web.de> > To: The list for a Better Approach To Mobile Ad-hoc Networking > <b.a.t.m.a.n(a)lists.open-mesh.org> > Subject: Re: [B.A.T.M.A.N.] Performance Comparison (Batman-adv. vs. > 802.11s) > Message-ID: <20130510130706.GA11726@Linus-Debian> > Content-Type: text/plain; charset=utf-8 > > Hi Ajeet, > > As far as I know it is not possible to have a virtual 802.11s mesh > and an IBSS interface at the same time with the ath5k/ath9k (at least > I think that was the case during the Wireless BattleMesh v6). You > might need to run tests one after the other or you could try to make > the ath5k/9k VAP patches [1],[2],[3] to not only work for IBSS but > also mesh mode. > > Cheers, Linus > > [1]: openwrt/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch > [2]: openwrt/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch > [3]: openwrt/package/mac80211/patches/412-mac80211_allow_adhoc_and_ap.patch > > > On Fri, May 10, 2013 at 08:56:27AM +0530, ajeet singh wrote: >> Dear all, >> >> I have done the set-up of Batman-adv. and 802.11s in my lab. >> I am comparing their working functionalities and performance >> measurements (throughput etc.). >> >> Have anyone tested batman-adv. and 802.11s with same test setup (I >> mean with same wireless chipsets)? >> >> Please provide me any related URLs. >> >> Thanks in advance. >> >> Thanks >> Ajeet > > > ------------------------------ > > Message: 2 > Date: Fri, 10 May 2013 16:40:44 -0700 > From: Thomas Pedersen <thomas(a)cozybit.com> > To: The list for a Better Approach To Mobile Ad-hoc Networking > <b.a.t.m.a.n(a)lists.open-mesh.org> > Subject: Re: [B.A.T.M.A.N.] Performance Comparison (Batman-adv. vs. > 802.11s) > Message-ID: > <CAG6hwVNYGxnO4rJoxBS387U0wuMEOnxLram4ZNq5rW4Ybx2SeQ(a)mail.gmail.com> > Content-Type: text/plain; charset=ISO-8859-1 > > Hi Ajeet, > > This should be possible with the patches Linus posted, but you'll > probably need the one at > http://www.spinics.net/lists/linux-wireless/msg107080.html as well. > > On Fri, May 10, 2013 at 6:07 AM, Linus L?ssing <linus.luessing(a)web.de> wrote: >> Hi Ajeet, >> >> As far as I know it is not possible to have a virtual 802.11s mesh >> and an IBSS interface at the same time with the ath5k/ath9k (at least >> I think that was the case during the Wireless BattleMesh v6). You >> might need to run tests one after the other or you could try to make >> the ath5k/9k VAP patches [1],[2],[3] to not only work for IBSS but >> also mesh mode. >> >> Cheers, Linus >> >> [1]: openwrt/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch >> [2]: openwrt/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch >> [3]: openwrt/package/mac80211/patches/412-mac80211_allow_adhoc_and_ap.patch >> >> >> On Fri, May 10, 2013 at 08:56:27AM +0530, ajeet singh wrote: >>> Dear all, >>> >>> I have done the set-up of Batman-adv. and 802.11s in my lab. >>> I am comparing their working functionalities and performance >>> measurements (throughput etc.). >>> >>> Have anyone tested batman-adv. and 802.11s with same test setup (I >>> mean with same wireless chipsets)? >>> >>> Please provide me any related URLs. >>> >>> Thanks in advance. >>> >>> Thanks >>> Ajeet > > > > -- > Thomas > > > ------------------------------ > > Message: 3 > Date: Sat, 11 May 2013 11:59:21 +0800 > From: Yeoh Chun-Yeow <yeohchunyeow(a)gmail.com> > To: The list for a Better Approach To Mobile Ad-hoc Networking > <b.a.t.m.a.n(a)lists.open-mesh.org> > Subject: Re: [B.A.T.M.A.N.] Performance Comparison (Batman-adv. vs. > 802.11s) > Message-ID: > <CAEFj985diyOZstxbb5chNPXxQz4mswsaWPhD5_LqBfATuic4fQ(a)mail.gmail.com> > Content-Type: text/plain; charset=ISO-8859-1 > > Hi, Ajeet > > You can take a look on this paper [1] published in year 2010. > > [1] http://wwwtlc.iet.unipi.it/research/ggt-iswpc10.pdf > > ---- > Chun-Yeow > > > ------------------------------ > > Subject: Digest Footer > > _______________________________________________ > B.A.T.M.A.N mailing list > B.A.T.M.A.N(a)lists.open-mesh.org > https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n > > > ------------------------------ > > End of B.A.T.M.A.N Digest, Vol 77, Issue 12 > ******************************************* -- Thanks Ajeet

2 1

[B.A.T.M.A.N.] pull request net: batman-adv 2013-05-09
by Antonio Quartulli 11 May '13

11 May '13

here you have four fixes intended for net. 1/4 fixes the parsing of a string sent from userspace in order to avoid random memory access in case of string length of 0. 2/4 adds a check for the return value of pskb_trim_rcsum() in order to stop processing the skb in case of failure. 3/4 prevents DAT (the Distributed ARP Table) to send cached ARP replies when both the source and the destination of the snooped ARP request are local clients (meaning: directly connected to the node). This can confuse a bridge where batman-adv is enslaved. 4/4 fix a race condition in the main clean up procedure by reordering sub-components freeing function invocations. Please pull or let me know if there is any problem. Thanks a lot, Antonio The following changes since commit 4f924b2aa4d3cb30f07e57d6b608838edcbc0d88: if_cablemodem.h: Add parenthesis around ioctl macros (2013-05-08 13:13:30 -0700) 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 a4361860351e87876aebd9595906d928ce8572c6: batman-adv: reorder clean up routine in order to avoid race conditions (2013-05-09 12:39:45 +0200) ---------------------------------------------------------------- Included changes: - fix parsing of user typed protocol string to avoid random memory access in some cases - check pskb_trim_rcsum() return value - prevent DAT from sending ARP replies when not needed - reorder the main clean up routine to prevent race conditions ---------------------------------------------------------------- Antonio Quartulli (2): batman-adv: make DAT drop ARP requests targeting local clients batman-adv: reorder clean up routine in order to avoid race conditions Marek Lindner (2): batman-adv: check proto length before accessing proto string buffer batman-adv: check return value of pskb_trim_rcsum() net/batman-adv/distributed-arp-table.c | 13 +++++++++++++ net/batman-adv/main.c | 18 +++++++++++++----- net/batman-adv/network-coding.c | 8 ++++++-- 3 files changed, 32 insertions(+), 7 deletions(-)

2 6

Re: [B.A.T.M.A.N.] Performance Comparison (Batman-adv. vs. 802.11s)
by Yeoh Chun-Yeow 11 May '13

11 May '13

Hi, Ajeet You can take a look on this paper [1] published in year 2010. [1] http://wwwtlc.iet.unipi.it/research/ggt-iswpc10.pdf ---- Chun-Yeow

1 0

[B.A.T.M.A.N.] Performance Comparison (Batman-adv. vs. 802.11s)
by ajeet singh 10 May '13

10 May '13

Dear all, I have done the set-up of Batman-adv. and 802.11s in my lab. I am comparing their working functionalities and performance measurements (throughput etc.). Have anyone tested batman-adv. and 802.11s with same test setup (I mean with same wireless chipsets)? Please provide me any related URLs. Thanks in advance. Thanks Ajeet

3 2

[B.A.T.M.A.N.] [PATCHv2 maint] batman-adv: fix VLAN Ethernet header access
by Antonio Quartulli 10 May '13

10 May '13

From: Antonio Quartulli <antonio(a)open-mesh.com> In interface_rx() skb->data cannot be directly used to access the Ethernet header because it point to the batman one. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- v2: - use vlan_eth_hdr() soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soft-interface.c b/soft-interface.c index 6f20d33..114d10d 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -320,7 +320,7 @@ void batadv_interface_rx(struct net_device *soft_iface, switch (ntohs(ethhdr->h_proto)) { case ETH_P_8021Q: - vhdr = (struct vlan_ethhdr *)skb->data; + vhdr = vlan_eth_hdr(skb); vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK; if (vhdr->h_vlan_encapsulated_proto != ethertype) -- 1.8.1.5

2 4

[B.A.T.M.A.N.] [PATCH next 1/2] batman-adv: use VLAN_VID_MASK instead of BATADV_VID_MASK
by Antonio Quartulli 09 May '13

09 May '13

VLAN_VID_MASK is already diefined in linux/if_vlan.h and therefore does not need to be privately re-defined Introduced in 0b1da1765fdb00ca5d53bc95c9abc70dfc9aae5b ("batman-adv: change VID semantic in the BLA code") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- bridge_loop_avoidance.c | 2 +- main.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index e95cf4b..e9d8e0b 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -344,7 +344,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, if (vid & BATADV_VLAN_HAS_TAG) skb = vlan_insert_tag(skb, htons(ETH_P_8021Q), - vid & BATADV_VID_MASK); + vid & VLAN_VID_MASK); skb_reset_mac_header(skb); skb->protocol = eth_type_trans(skb, soft_iface); diff --git a/main.h b/main.h index d575436..68c7ee0 100644 --- a/main.h +++ b/main.h @@ -172,8 +172,6 @@ enum batadv_vlan_flags { BATADV_VLAN_HAS_TAG = BIT(15), }; -/* mask needed to extract the vlan ID (12bits) from a 16bits variable */ -#define BATADV_VID_MASK 0x0FFF #define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \ (int)(vid & BATADV_VID_MASK) : -1) -- 1.8.1.5

2 3

[B.A.T.M.A.N.] [PATCH maint] batman-adv: fix VLAN Ethernet header access
by Antonio Quartulli 09 May '13

09 May '13

From: Antonio Quartulli <antonio(a)open-mesh.com> In interface_rx() skb->data cannot be directly used to access the Ethernet header because it point to the batman one. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soft-interface.c b/soft-interface.c index 6f20d33..c8e1f8f 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -320,7 +320,7 @@ void batadv_interface_rx(struct net_device *soft_iface, switch (ntohs(ethhdr->h_proto)) { case ETH_P_8021Q: - vhdr = (struct vlan_ethhdr *)skb->data; + vhdr = (struct vlan_ethhdr *)ethhdr; vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK; if (vhdr->h_vlan_encapsulated_proto != ethertype) -- 1.8.1.5

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