B.A.T.M.A.N March 2015

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

10 participants
40 discussions

[B.A.T.M.A.N.] TVLV infrastructure (v2)
by Marek Lindner 10 Jun '15

10 Jun '15

Hi, at the battlemesh we had plenty of time to discuss and test the tvlv patchset. Therefore, a number of changes/fixes found their way into v2 touching the tvlv API, network coding, unicast sending and gateway announcements. This looks like the final version which is going to be merged unless objections are raised soon-ish. Cheers, Marek

2 15

[B.A.T.M.A.N.] [PATCHv14 0/6] Basic Multicast Optimizations
by Linus Lüssing 10 Jun '15

10 Jun '15

This is the fourteenth revision of the basic multicast optimization patches. Changes in v14 include: * fixed compilation for CONFIG_BATMAN_ADV_MCAST=n (issue was introduced by v13) * fixed potential null pointer exception (moved ethhdr assignment in batadv_mcast_forw_mode() to after the check methods / pskb_may_pull()s) * removed flag-list-"helper" functions * removed methods which were performing both counting and orig_node retrieval in batadv_mcast_forw_mode(), instead doing that in two logical, seperate sections in batadv_mcast_forw_mode() Cheers, Linus

3 13

[B.A.T.M.A.N.] [PATCH] alfred: Make sure only link-local EUI64 is used as source
by Sven Eckelmann 05 May '15

05 May '15

The linux kernel automatically chooses the source address. This can make problems when the metric prefers an address which is not the link-local EUI64 address. For example an user can add an additional address which also can be used for link-local communication but has a higher value in the metric. This can cause alfred to send UDP link-local packets with an address which cannot be decoded by the receiver to get the MAC address of the device. The communication with this device would then fail. It is possible to define the source address when we directly bind to it. This has the problem that this address cannot receive packets with a multicast address as destination. The workaround is to create two sockets for one netsock structure. One is the socket which can send all data and receives unicast packets. The second one is receiving the multicast traffic like the announcements from master alfred server processes. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- alfred.h | 4 ++- netsock.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- recv.c | 5 +-- send.c | 2 ++ server.c | 2 ++ 5 files changed, 103 insertions(+), 16 deletions(-) diff --git a/alfred.h b/alfred.h index 621805d..adf788c 100644 --- a/alfred.h +++ b/alfred.h @@ -102,6 +102,7 @@ struct interface { uint32_t scope_id; char *interface; int netsock; + int netsock_mcast; struct hashtable_t *server_hash; @@ -151,7 +152,8 @@ int alfred_client_set_data(struct globals *globals); int alfred_client_modeswitch(struct globals *globals); int alfred_client_change_interface(struct globals *globals); /* recv.c */ -int recv_alfred_packet(struct globals *globals, struct interface *interface); +int recv_alfred_packet(struct globals *globals, struct interface *interface, + int recv_sock); struct transaction_head * transaction_add(struct globals *globals, struct ether_addr mac, uint16_t id); struct transaction_head * diff --git a/netsock.c b/netsock.c index 592f3e3..6bf6016 100644 --- a/netsock.c +++ b/netsock.c @@ -84,6 +84,8 @@ void netsock_close_all(struct globals *globals) list_for_each_entry_safe(interface, is, &globals->interfaces, list) { if (interface->netsock >= 0) close(interface->netsock); + if (interface->netsock_mcast >= 0) + close(interface->netsock_mcast); list_del(&interface->list); hash_delete(interface->server_hash, free); free(interface->interface); @@ -144,6 +146,7 @@ int netsock_set_interfaces(struct globals *globals, char *interfaces) interface->scope_id = 0; interface->interface = NULL; interface->netsock = -1; + interface->netsock_mcast = -1; interface->server_hash = NULL; interface->interface = strdup(token); @@ -210,11 +213,14 @@ out: static int netsock_open(struct interface *interface) { int sock; - struct sockaddr_in6 sin6; + int sock_mc; + struct sockaddr_in6 sin6, sin6_mc; + struct ipv6_mreq mreq; struct ifreq ifr; int ret; interface->netsock = -1; + interface->netsock_mcast = -1; sock = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP); if (sock < 0) { @@ -222,6 +228,13 @@ static int netsock_open(struct interface *interface) return -1; } + sock_mc = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP); + if (sock_mc < 0) { + close(sock); + perror("can't open socket"); + return -1; + } + memset(&ifr, 0, sizeof(ifr)); strncpy(ifr.ifr_name, interface->interface, IFNAMSIZ); ifr.ifr_name[IFNAMSIZ - 1] = '\0'; @@ -232,12 +245,6 @@ static int netsock_open(struct interface *interface) interface->scope_id = ifr.ifr_ifindex; - memset(&sin6, 0, sizeof(sin6)); - sin6.sin6_port = htons(ALFRED_PORT); - sin6.sin6_family = AF_INET6; - sin6.sin6_addr = in6addr_any; - sin6.sin6_scope_id = ifr.ifr_ifindex; - if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { perror("can't get MAC address"); goto err; @@ -246,12 +253,32 @@ static int netsock_open(struct interface *interface) memcpy(&interface->hwaddr, &ifr.ifr_hwaddr.sa_data, 6); mac_to_ipv6(&interface->hwaddr, &interface->address); + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_port = htons(ALFRED_PORT); + sin6.sin6_family = AF_INET6; + memcpy(&sin6.sin6_addr, &interface->address, sizeof(sin6.sin6_addr)); + sin6.sin6_scope_id = interface->scope_id; + + memset(&sin6_mc, 0, sizeof(sin6_mc)); + sin6_mc.sin6_port = htons(ALFRED_PORT); + sin6_mc.sin6_family = AF_INET6; + memcpy(&sin6_mc.sin6_addr, &in6addr_localmcast, + sizeof(sin6_mc.sin6_addr)); + sin6_mc.sin6_scope_id = interface->scope_id; + enable_raw_bind_capability(1); if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, interface->interface, strlen(interface->interface) + 1)) { perror("can't bind to device"); goto err; } + + if (setsockopt(sock_mc, SOL_SOCKET, SO_BINDTODEVICE, + interface->interface, + strlen(interface->interface) + 1)) { + perror("can't bind to device"); + goto err; + } enable_raw_bind_capability(0); if (bind(sock, (struct sockaddr *)&sin6, sizeof(sin6)) < 0) { @@ -259,6 +286,21 @@ static int netsock_open(struct interface *interface) goto err; } + if (bind(sock_mc, (struct sockaddr *)&sin6_mc, sizeof(sin6_mc)) < 0) { + perror("can't bind"); + goto err; + } + + memcpy(&mreq.ipv6mr_multiaddr, &in6addr_localmcast, + sizeof(mreq.ipv6mr_multiaddr)); + mreq.ipv6mr_interface = interface->scope_id; + + if (setsockopt(sock_mc, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, + &mreq, sizeof(mreq))) { + perror("can't add multicast membership"); + goto err; + } + ret = fcntl(sock, F_GETFL, 0); if (ret < 0) { perror("failed to get file status flags"); @@ -271,11 +313,25 @@ static int netsock_open(struct interface *interface) goto err; } + ret = fcntl(sock_mc, F_GETFL, 0); + if (ret < 0) { + perror("failed to get file status flags"); + goto err; + } + + ret = fcntl(sock_mc, F_SETFL, ret | O_NONBLOCK); + if (ret < 0) { + perror("failed to set file status flags"); + goto err; + } + interface->netsock = sock; + interface->netsock_mcast = sock_mc; return 0; err: close(sock); + close(sock_mc); return -1; } @@ -314,6 +370,12 @@ int netsock_prepare_select(struct globals *globals, fd_set *fds, int maxsock) if (maxsock < interface->netsock) maxsock = interface->netsock; } + + if (interface->netsock_mcast >= 0) { + FD_SET(interface->netsock_mcast, fds); + if (maxsock < interface->netsock_mcast) + maxsock = interface->netsock_mcast; + } } return maxsock; @@ -324,12 +386,22 @@ void netsock_check_error(struct globals *globals, fd_set *errfds) struct interface *interface; list_for_each_entry(interface, &globals->interfaces, list) { - if (interface->netsock >= 0 && - FD_ISSET(interface->netsock, errfds)) { - fprintf(stderr, "Error on netsock detected\n"); + if ((interface->netsock < 0 || + !FD_ISSET(interface->netsock, errfds)) && + (interface->netsock_mcast < 0 || + !FD_ISSET(interface->netsock_mcast, errfds))) + continue; + + fprintf(stderr, "Error on netsock detected\n"); + + if (interface->netsock >= 0) close(interface->netsock); - interface->netsock = -1; - } + + if (interface->netsock_mcast >= 0) + close(interface->netsock_mcast); + + interface->netsock = -1; + interface->netsock_mcast = -1; } } @@ -341,7 +413,15 @@ int netsock_receive_packet(struct globals *globals, fd_set *fds) list_for_each_entry(interface, &globals->interfaces, list) { if (interface->netsock >= 0 && FD_ISSET(interface->netsock, fds)) { - recv_alfred_packet(globals, interface); + recv_alfred_packet(globals, interface, + interface->netsock); + recvs++; + } + + if (interface->netsock_mcast >= 0 && + FD_ISSET(interface->netsock_mcast, fds)) { + recv_alfred_packet(globals, interface, + interface->netsock_mcast); recvs++; } } diff --git a/recv.c b/recv.c index 59c69b4..16242bc 100644 --- a/recv.c +++ b/recv.c @@ -379,7 +379,8 @@ static int process_alfred_status_txend(struct globals *globals, return 0; } -int recv_alfred_packet(struct globals *globals, struct interface *interface) +int recv_alfred_packet(struct globals *globals, struct interface *interface, + int recv_sock) { uint8_t buf[MAX_PAYLOAD]; ssize_t length; @@ -391,7 +392,7 @@ int recv_alfred_packet(struct globals *globals, struct interface *interface) return -1; sourcelen = sizeof(source); - length = recvfrom(interface->netsock, buf, sizeof(buf), 0, + length = recvfrom(recv_sock, buf, sizeof(buf), 0, (struct sockaddr *)&source, &sourcelen); if (length <= 0) { perror("read from network socket failed"); diff --git a/send.c b/send.c index cc55489..8853970 100644 --- a/send.c +++ b/send.c @@ -182,7 +182,9 @@ ssize_t send_alfred_packet(struct interface *interface, if (ret == -EPERM) { perror("Error during sent"); close(interface->netsock); + close(interface->netsock_mcast); interface->netsock = -1; + interface->netsock_mcast = -1; } return ret; diff --git a/server.c b/server.c index c9c77b9..ac253a9 100644 --- a/server.c +++ b/server.c @@ -262,7 +262,9 @@ static void check_if_socket(struct interface *interface) close: close(interface->netsock); + close(interface->netsock_mcast); interface->netsock = -1; + interface->netsock_mcast = -1; close(sock); } -- 2.1.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: bugfix for kernel crash in batadv_tt_local_table_free
by Andreas Pape 22 Apr '15

22 Apr '15

This missing check lead to a kernel crash when a hard_if is removed on a node forwarding untagged and tagged traffic (VLANID 0) to and from the mesh network. Signed-off-by: Andreas Pape <apape(a)phoenixcontact.com> --- translation-table.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/translation-table.c b/translation-table.c index b20812b..4d3ab8d 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1143,8 +1143,10 @@ static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) /* decrease the reference held for this vlan */ vlan = batadv_softif_vlan_get(bat_priv, tt_common_entry->vid); - batadv_softif_vlan_free_ref(vlan); - batadv_softif_vlan_free_ref(vlan); + if (vlan) { + batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_free_ref(vlan); + } batadv_tt_local_entry_free_ref(tt_local); } -- 1.7.0.4 .................................................................. 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: Roland Bent, Dr. Martin Heubeck ___________________________________________________________________ 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 3

[B.A.T.M.A.N.] [PATCH 1/2] alfred: Update copyright years for 2015
by Sven Eckelmann 22 Apr '15

22 Apr '15

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 2 +- alfred.h | 2 +- batadv_query.c | 2 +- batadv_query.h | 2 +- client.c | 2 +- gpsd/Makefile | 2 +- gpsd/alfred-gpsd.c | 2 +- gpsd/alfred-gpsd.h | 2 +- hash.c | 2 +- hash.h | 2 +- main.c | 2 +- netsock.c | 2 +- packet.h | 2 +- recv.c | 2 +- send.c | 2 +- server.c | 2 +- unix_sock.c | 2 +- util.c | 2 +- vis/Makefile | 2 +- vis/vis.c | 2 +- vis/vis.h | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 531339a..8e944c9 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2012-2014 B.A.T.M.A.N. contributors +# Copyright (C) 2012-2015 B.A.T.M.A.N. contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public diff --git a/alfred.h b/alfred.h index f758fc9..ef00551 100644 --- a/alfred.h +++ b/alfred.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.c b/batadv_query.c index cf90554..473ab40 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.h b/batadv_query.h index 463c8e1..6b938ea 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/client.c b/client.c index cff5270..32fdd54 100644 --- a/client.c +++ b/client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/gpsd/Makefile b/gpsd/Makefile index 7ac6288..5055987 100644 --- a/gpsd/Makefile +++ b/gpsd/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2013-2014 B.A.T.M.A.N. contributors +# Copyright (C) 2013-2015 B.A.T.M.A.N. contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index d736ad1..86414cf 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index e287110..297f4e4 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/hash.c b/hash.c index fd85a0f..87e8484 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index c9c8fb1..aa27f25 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/main.c b/main.c index 7eb8baa..d298d65 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/netsock.c b/netsock.c index 45c03e9..cc2e9a5 100644 --- a/netsock.c +++ b/netsock.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/packet.h b/packet.h index 87ad263..27ee6e5 100644 --- a/packet.h +++ b/packet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Sven Eckelmann * diff --git a/recv.c b/recv.c index 870485f..34a16fc 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/send.c b/send.c index 19cc867..f1843fe 100644 --- a/send.c +++ b/send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/server.c b/server.c index 66809d9..1a3d876 100644 --- a/server.c +++ b/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/unix_sock.c b/unix_sock.c index 8a99327..d203c50 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/util.c b/util.c index 9f357cd..84d4b2d 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/Makefile b/vis/Makefile index 9421ae2..32a578e 100644 --- a/vis/Makefile +++ b/vis/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2013-2014 B.A.T.M.A.N. contributors +# Copyright (C) 2013-2015 B.A.T.M.A.N. contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public diff --git a/vis/vis.c b/vis/vis.c index 3dd5c8c..038d89d 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/vis.h b/vis/vis.h index ac2afb5..a23dc83 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * -- 2.1.4

3 3

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Remove dynamically allocated hashtables
by Sven Eckelmann 21 Apr '15

21 Apr '15

It is unnecessary to allocate an extra memory region for hashtables and the corresponding locks. This brings the hashes used in batman-adv slightly in the direction of the common statically sized hash table implementation. More common hashtable functionality cannot be used batman-adv wide because the simple hashtable and rhashtable implementations don't provide bucket based locking. A side-effect of this change is the initialization of each array of locks for each hashtable with a different lock_class. This allows to correct nesting of write access to two different hashtables without triggering a lockdep warning. This also fixes the problem of unprotected access to the pointer to the hashtables. These were dynamically allocated/freed and the pointers were stored in batadv_priv*. Access to these pointers were never protected by any lock and using them could always lead to problems when the batman-adv device was removed. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v5: Rebased on top of patches: * batman-adv: Remove explicit compat.h include and split compat.h * batman-adv: Add required to includes to all files * batman-adv: Remove unused IFF_BRIDGE_PORT live patching hack * batman-adv: Automatically create nested kfree_rcu helper functions Makefile.kbuild | 1 - bat_iv_ogm.c | 13 ++-- bridge_loop_avoidance.c | 131 ++++++++++++------------------------- distributed-arp-table.c | 49 ++++---------- hash.c | 80 ----------------------- hash.h | 108 +++++++++++++----------------- network-coding.c | 146 ++++++++++++++++++++--------------------- originator.c | 56 +++++----------- originator.h | 12 ++-- translation-table.c | 170 ++++++++++++++++++++---------------------------- types.h | 27 +++++--- 11 files changed, 288 insertions(+), 505 deletions(-) delete mode 100644 hash.c diff --git a/Makefile.kbuild b/Makefile.kbuild index 6903703..6ee8b04 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -26,7 +26,6 @@ batman-adv-y += fragmentation.o batman-adv-y += gateway_client.o batman-adv-y += gateway_common.o batman-adv-y += hard-interface.o -batman-adv-y += hash.o batman-adv-y += icmp_socket.o batman-adv-y += main.o batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += multicast.o diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index f3214ed..f2df840 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/kernel.h> #include <linux/bitmap.h> #include <linux/bitops.h> #include <linux/bug.h> @@ -892,7 +893,7 @@ static void batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - struct batadv_hashtable *hash = bat_priv->orig_hash; + struct batadv_hashbucket *hash = bat_priv->orig_hash; struct hlist_head *head; struct batadv_orig_node *orig_node; unsigned long *word; @@ -901,8 +902,8 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface) uint8_t *w; int if_num; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->orig_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { @@ -1828,7 +1829,7 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv, struct batadv_hard_iface *if_outgoing) { struct batadv_neigh_node *neigh_node; - struct batadv_hashtable *hash = bat_priv->orig_hash; + struct batadv_hashbucket *hash = bat_priv->orig_hash; int last_seen_msecs, last_seen_secs; struct batadv_orig_node *orig_node; struct batadv_neigh_ifinfo *n_ifinfo; @@ -1841,8 +1842,8 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv, "Originator", "last-seen", "#", BATADV_TQ_MAX_VALUE, "Nexthop", "outgoingIF", "Potential nexthops"); - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->orig_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 1882b91..540392b 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -22,7 +22,6 @@ #include <linux/byteorder/generic.h> #include <linux/compiler.h> #include <linux/crc16.h> -#include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/fs.h> #include <linux/if_arp.h> @@ -32,7 +31,6 @@ #include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/list.h> -#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/rculist.h> #include <linux/rcupdate.h> @@ -155,17 +153,14 @@ static struct batadv_bla_claim *batadv_claim_hash_find(struct batadv_priv *bat_priv, struct batadv_bla_claim *data) { - struct batadv_hashtable *hash = bat_priv->bla.claim_hash; + struct batadv_hashbucket *hash = bat_priv->bla.claim_hash; struct hlist_head *head; struct batadv_bla_claim *claim; struct batadv_bla_claim *claim_tmp = NULL; int index; - if (!hash) - return NULL; - - index = batadv_choose_claim(data, hash->size); - head = &hash->table[index]; + index = batadv_choose_claim(data, ARRAY_SIZE(bat_priv->bla.claim_hash)); + head = &hash[index].head; rcu_read_lock(); hlist_for_each_entry_rcu(claim, head, hash_entry) { @@ -195,20 +190,18 @@ static struct batadv_bla_backbone_gw * batadv_backbone_hash_find(struct batadv_priv *bat_priv, uint8_t *addr, unsigned short vid) { - struct batadv_hashtable *hash = bat_priv->bla.backbone_hash; + struct batadv_hashbucket *hash = bat_priv->bla.backbone_hash; struct hlist_head *head; struct batadv_bla_backbone_gw search_entry, *backbone_gw; struct batadv_bla_backbone_gw *backbone_gw_tmp = NULL; int index; - - if (!hash) - return NULL; + uint32_t hash_size = ARRAY_SIZE(bat_priv->bla.backbone_hash); ether_addr_copy(search_entry.orig, addr); search_entry.vid = vid; - index = batadv_choose_backbone_gw(&search_entry, hash->size); - head = &hash->table[index]; + index = batadv_choose_backbone_gw(&search_entry, hash_size); + head = &hash[index].head; rcu_read_lock(); hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) { @@ -231,20 +224,19 @@ batadv_backbone_hash_find(struct batadv_priv *bat_priv, static void batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw) { - struct batadv_hashtable *hash; + struct batadv_priv *bat_priv = backbone_gw->bat_priv; + struct batadv_hashbucket *hash; struct hlist_node *node_tmp; struct hlist_head *head; struct batadv_bla_claim *claim; int i; spinlock_t *list_lock; /* protects write access to the hash lists */ - hash = backbone_gw->bat_priv->bla.claim_hash; - if (!hash) - return; + hash = bat_priv->bla.claim_hash; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - list_lock = &hash->list_locks[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->bla.claim_hash); i++) { + head = &hash[i].head; + list_lock = &hash[i].lock; spin_lock_bh(list_lock); hlist_for_each_entry_safe(claim, node_tmp, @@ -479,7 +471,7 @@ static void batadv_bla_answer_request(struct batadv_priv *bat_priv, unsigned short vid) { struct hlist_head *head; - struct batadv_hashtable *hash; + struct batadv_hashbucket *hash; struct batadv_bla_claim *claim; struct batadv_bla_backbone_gw *backbone_gw; int i; @@ -494,8 +486,8 @@ static void batadv_bla_answer_request(struct batadv_priv *bat_priv, return; hash = bat_priv->bla.claim_hash; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->bla.claim_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(claim, head, hash_entry) { @@ -1008,17 +1000,15 @@ static void batadv_bla_purge_backbone_gw(struct batadv_priv *bat_priv, int now) struct batadv_bla_backbone_gw *backbone_gw; struct hlist_node *node_tmp; struct hlist_head *head; - struct batadv_hashtable *hash; + struct batadv_hashbucket *hash; spinlock_t *list_lock; /* protects write access to the hash lists */ int i; hash = bat_priv->bla.backbone_hash; - if (!hash) - return; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - list_lock = &hash->list_locks[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->bla.backbone_hash); i++) { + head = &hash[i].head; + list_lock = &hash[i].lock; spin_lock_bh(list_lock); hlist_for_each_entry_safe(backbone_gw, node_tmp, @@ -1062,15 +1052,13 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv, { struct batadv_bla_claim *claim; struct hlist_head *head; - struct batadv_hashtable *hash; + struct batadv_hashbucket *hash; int i; hash = bat_priv->bla.claim_hash; - if (!hash) - return; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->bla.claim_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(claim, head, hash_entry) { @@ -1110,7 +1098,7 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, { struct batadv_bla_backbone_gw *backbone_gw; struct hlist_head *head; - struct batadv_hashtable *hash; + struct batadv_hashbucket *hash; __be16 group; int i; @@ -1129,11 +1117,9 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, } hash = bat_priv->bla.backbone_hash; - if (!hash) - return; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->bla.backbone_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) { @@ -1164,7 +1150,7 @@ static void batadv_bla_periodic_work(struct work_struct *work) struct batadv_priv_bla *priv_bla; struct hlist_head *head; struct batadv_bla_backbone_gw *backbone_gw; - struct batadv_hashtable *hash; + struct batadv_hashbucket *hash; struct batadv_hard_iface *primary_if; int i; @@ -1182,11 +1168,9 @@ static void batadv_bla_periodic_work(struct work_struct *work) goto out; hash = bat_priv->bla.backbone_hash; - if (!hash) - goto out; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->bla.backbone_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) { @@ -1226,14 +1210,6 @@ out: msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH)); } -/* The hash for claim and backbone hash receive the same key because they - * are getting initialized by hash_new with the same key. Reinitializing - * them with to different keys to allow nested locking without generating - * lockdep warnings - */ -static struct lock_class_key batadv_claim_hash_lock_class_key; -static struct lock_class_key batadv_backbone_hash_lock_class_key; - /* initialize all bla structures */ int batadv_bla_init(struct batadv_priv *bat_priv) { @@ -1265,19 +1241,8 @@ int batadv_bla_init(struct batadv_priv *bat_priv) bat_priv->bla.bcast_duplist[i].entrytime = entrytime; bat_priv->bla.bcast_duplist_curr = 0; - if (bat_priv->bla.claim_hash) - return 0; - - bat_priv->bla.claim_hash = batadv_hash_new(128); - bat_priv->bla.backbone_hash = batadv_hash_new(32); - - if (!bat_priv->bla.claim_hash || !bat_priv->bla.backbone_hash) - return -ENOMEM; - - batadv_hash_set_lock_class(bat_priv->bla.claim_hash, - &batadv_claim_hash_lock_class_key); - batadv_hash_set_lock_class(bat_priv->bla.backbone_hash, - &batadv_backbone_hash_lock_class_key); + batadv_hash_init(bat_priv->bla.claim_hash); + batadv_hash_init(bat_priv->bla.backbone_hash); batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla hashes initialized\n"); @@ -1371,7 +1336,7 @@ out: bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig, unsigned short vid) { - struct batadv_hashtable *hash = bat_priv->bla.backbone_hash; + struct batadv_hashbucket *hash = bat_priv->bla.backbone_hash; struct hlist_head *head; struct batadv_bla_backbone_gw *backbone_gw; int i; @@ -1379,11 +1344,8 @@ bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig, if (!atomic_read(&bat_priv->bridge_loop_avoidance)) return false; - if (!hash) - return false; - - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->bla.backbone_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) { @@ -1442,16 +1404,9 @@ void batadv_bla_free(struct batadv_priv *bat_priv) cancel_delayed_work_sync(&bat_priv->bla.work); primary_if = batadv_primary_if_get_selected(bat_priv); - if (bat_priv->bla.claim_hash) { - batadv_bla_purge_claims(bat_priv, primary_if, 1); - batadv_hash_destroy(bat_priv->bla.claim_hash); - bat_priv->bla.claim_hash = NULL; - } - if (bat_priv->bla.backbone_hash) { - batadv_bla_purge_backbone_gw(bat_priv, 1); - batadv_hash_destroy(bat_priv->bla.backbone_hash); - bat_priv->bla.backbone_hash = NULL; - } + batadv_bla_purge_claims(bat_priv, primary_if, 1); + batadv_bla_purge_backbone_gw(bat_priv, 1); + if (primary_if) batadv_hardif_free_ref(primary_if); } @@ -1643,7 +1598,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) { struct net_device *net_dev = (struct net_device *)seq->private; struct batadv_priv *bat_priv = netdev_priv(net_dev); - struct batadv_hashtable *hash = bat_priv->bla.claim_hash; + struct batadv_hashbucket *hash = bat_priv->bla.claim_hash; struct batadv_bla_claim *claim; struct batadv_hard_iface *primary_if; struct hlist_head *head; @@ -1662,8 +1617,8 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) ntohs(bat_priv->bla.claim_dest.group)); seq_printf(seq, " %-17s %-5s %-17s [o] (%-6s)\n", "Client", "VID", "Originator", "CRC"); - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->bla.claim_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(claim, head, hash_entry) { @@ -1687,7 +1642,7 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) { struct net_device *net_dev = (struct net_device *)seq->private; struct batadv_priv *bat_priv = netdev_priv(net_dev); - struct batadv_hashtable *hash = bat_priv->bla.backbone_hash; + struct batadv_hashbucket *hash = bat_priv->bla.backbone_hash; struct batadv_bla_backbone_gw *backbone_gw; struct batadv_hard_iface *primary_if; struct hlist_head *head; @@ -1707,8 +1662,8 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) ntohs(bat_priv->bla.claim_dest.group)); seq_printf(seq, " %-17s %-5s %-9s (%-6s)\n", "Originator", "VID", "last seen", "CRC"); - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->bla.backbone_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) { diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 0b3d13d..b9025c3 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -20,7 +20,6 @@ #include <linux/atomic.h> #include <linux/byteorder/generic.h> -#include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/fs.h> #include <linux/if_arp.h> @@ -103,12 +102,9 @@ static void __batadv_dat_purge(struct batadv_priv *bat_priv, struct hlist_head *head; uint32_t i; - if (!bat_priv->dat.hash) - return; - - for (i = 0; i < bat_priv->dat.hash->size; i++) { - head = &bat_priv->dat.hash->table[i]; - list_lock = &bat_priv->dat.hash->list_locks[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->dat.hash); i++) { + head = &bat_priv->dat.hash[i].head; + list_lock = &bat_priv->dat.hash[i].lock; spin_lock_bh(list_lock); hlist_for_each_entry_safe(dat_entry, node_tmp, head, @@ -263,17 +259,14 @@ batadv_dat_entry_hash_find(struct batadv_priv *bat_priv, __be32 ip, { struct hlist_head *head; struct batadv_dat_entry to_find, *dat_entry, *dat_entry_tmp = NULL; - struct batadv_hashtable *hash = bat_priv->dat.hash; + struct batadv_hashbucket *hash = bat_priv->dat.hash; uint32_t index; - if (!hash) - return NULL; - to_find.ip = ip; to_find.vid = vid; - index = batadv_hash_dat(&to_find, hash->size); - head = &hash->table[index]; + index = batadv_hash_dat(&to_find, ARRAY_SIZE(bat_priv->dat.hash)); + head = &hash[index].head; rcu_read_lock(); hlist_for_each_entry_rcu(dat_entry, head, hash_entry) { @@ -498,7 +491,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, { batadv_dat_addr_t max = 0, tmp_max = 0; struct batadv_orig_node *orig_node, *max_orig_node = NULL; - struct batadv_hashtable *hash = bat_priv->orig_hash; + struct batadv_hashbucket *hash = bat_priv->orig_hash; struct hlist_head *head; int i; @@ -510,8 +503,8 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, /* iterate over the originator list and find the node with the closest * dat_address which has not been selected yet */ - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->orig_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { @@ -565,9 +558,6 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) batadv_dat_addr_t last_max = BATADV_DAT_ADDR_MAX, ip_key; struct batadv_dat_candidate *res; - if (!bat_priv->orig_hash) - return NULL; - res = kmalloc_array(BATADV_DAT_CANDIDATES_NUM, sizeof(*res), GFP_ATOMIC); if (!res) @@ -724,14 +714,7 @@ static void batadv_dat_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv, */ static void batadv_dat_hash_free(struct batadv_priv *bat_priv) { - if (!bat_priv->dat.hash) - return; - __batadv_dat_purge(bat_priv, NULL); - - batadv_hash_destroy(bat_priv->dat.hash); - - bat_priv->dat.hash = NULL; } /** @@ -740,13 +723,7 @@ static void batadv_dat_hash_free(struct batadv_priv *bat_priv) */ int batadv_dat_init(struct batadv_priv *bat_priv) { - if (bat_priv->dat.hash) - return 0; - - bat_priv->dat.hash = batadv_hash_new(1024); - - if (!bat_priv->dat.hash) - return -ENOMEM; + batadv_hash_init(bat_priv->dat.hash); batadv_dat_start_timer(bat_priv); @@ -780,7 +757,7 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset) { struct net_device *net_dev = (struct net_device *)seq->private; struct batadv_priv *bat_priv = netdev_priv(net_dev); - struct batadv_hashtable *hash = bat_priv->dat.hash; + struct batadv_hashbucket *hash = bat_priv->dat.hash; struct batadv_dat_entry *dat_entry; struct batadv_hard_iface *primary_if; struct hlist_head *head; @@ -796,8 +773,8 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset) seq_printf(seq, " %-7s %-9s %4s %11s\n", "IPv4", "MAC", "VID", "last-seen"); - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->dat.hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(dat_entry, head, hash_entry) { diff --git a/hash.c b/hash.c deleted file mode 100644 index 0532dc9..0000000 --- a/hash.c +++ /dev/null @@ -1,80 +0,0 @@ -/* Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: - * - * Simon Wunderlich, Marek Lindner - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - */ - -#include "hash.h" -#include "main.h" - -#include <linux/fs.h> -#include <linux/lockdep.h> -#include <linux/slab.h> - -/* clears the hash */ -static void batadv_hash_init(struct batadv_hashtable *hash) -{ - uint32_t i; - - for (i = 0; i < hash->size; i++) { - INIT_HLIST_HEAD(&hash->table[i]); - spin_lock_init(&hash->list_locks[i]); - } -} - -/* free only the hashtable and the hash itself. */ -void batadv_hash_destroy(struct batadv_hashtable *hash) -{ - kfree(hash->list_locks); - kfree(hash->table); - kfree(hash); -} - -/* allocates and clears the hash */ -struct batadv_hashtable *batadv_hash_new(uint32_t size) -{ - struct batadv_hashtable *hash; - - hash = kmalloc(sizeof(*hash), GFP_ATOMIC); - if (!hash) - return NULL; - - hash->table = kmalloc_array(size, sizeof(*hash->table), GFP_ATOMIC); - if (!hash->table) - goto free_hash; - - hash->list_locks = kmalloc_array(size, sizeof(*hash->list_locks), - GFP_ATOMIC); - if (!hash->list_locks) - goto free_table; - - hash->size = size; - batadv_hash_init(hash); - return hash; - -free_table: - kfree(hash->table); -free_hash: - kfree(hash); - return NULL; -} - -void batadv_hash_set_lock_class(struct batadv_hashtable *hash, - struct lock_class_key *key) -{ - uint32_t i; - - for (i = 0; i < hash->size; i++) - lockdep_set_class(&hash->list_locks[i], key); -} diff --git a/hash.h b/hash.h index b7cc418..6c69be5 100644 --- a/hash.h +++ b/hash.h @@ -29,6 +29,15 @@ struct lock_class_key; +#define batadv_hash_init(hashtable) \ + do { \ + uint32_t _it; \ + for (_it = 0; _it < ARRAY_SIZE(hashtable); _it++) { \ + INIT_HLIST_HEAD(&hashtable[_it].head); \ + spin_lock_init(&hashtable[_it].lock); \ + } \ + } while (0) + /* callback to a compare function. should compare 2 element datas for their * keys, return 0 if same and not 0 if not same */ @@ -42,52 +51,6 @@ typedef int (*batadv_hashdata_compare_cb)(const struct hlist_node *, typedef uint32_t (*batadv_hashdata_choose_cb)(const void *, uint32_t); typedef void (*batadv_hashdata_free_cb)(struct hlist_node *, void *); -struct batadv_hashtable { - struct hlist_head *table; /* the hashtable itself with the buckets */ - spinlock_t *list_locks; /* spinlock for each hash list entry */ - uint32_t size; /* size of hashtable */ -}; - -/* allocates and clears the hash */ -struct batadv_hashtable *batadv_hash_new(uint32_t size); - -/* set class key for all locks */ -void batadv_hash_set_lock_class(struct batadv_hashtable *hash, - struct lock_class_key *key); - -/* free only the hashtable and the hash itself. */ -void batadv_hash_destroy(struct batadv_hashtable *hash); - -/* remove the hash structure. if hashdata_free_cb != NULL, this function will be - * called to remove the elements inside of the hash. if you don't remove the - * elements, memory might be leaked. - */ -static inline void batadv_hash_delete(struct batadv_hashtable *hash, - batadv_hashdata_free_cb free_cb, - void *arg) -{ - struct hlist_head *head; - struct hlist_node *node, *node_tmp; - spinlock_t *list_lock; /* spinlock to protect write access */ - uint32_t i; - - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - list_lock = &hash->list_locks[i]; - - spin_lock_bh(list_lock); - hlist_for_each_safe(node, node_tmp, head) { - hlist_del_rcu(node); - - if (free_cb) - free_cb(node, arg); - } - spin_unlock_bh(list_lock); - } - - batadv_hash_destroy(hash); -} - /** * batadv_hash_add - adds data to the hashtable * @hash: storage hash table @@ -99,11 +62,28 @@ static inline void batadv_hash_delete(struct batadv_hashtable *hash, * Returns 0 on success, 1 if the element already is in the hash * and -1 on error. */ -static inline int batadv_hash_add(struct batadv_hashtable *hash, - batadv_hashdata_compare_cb compare, - batadv_hashdata_choose_cb choose, - const void *data, - struct hlist_node *data_node) +#define batadv_hash_add(hash, compare, choose, data, data_node) \ + _batadv_hash_add(hash, ARRAY_SIZE(hash), compare, choose, data, \ + data_node) + +/** + * _batadv_hash_add - adds data to the hashtable of a given size + * @hash: storage hash table + * @hash_size: number of buckets in the hashtable @hash + * @compare: callback to determine if 2 hash elements are identical + * @choose: callback calculating the hash index + * @data: data passed to the aforementioned callbacks as argument + * @data_node: to be added element + * + * Returns 0 on success, 1 if the element already is in the hash + * and -1 on error. + */ +static inline int _batadv_hash_add(struct batadv_hashbucket *hash, + uint32_t hash_size, + batadv_hashdata_compare_cb compare, + batadv_hashdata_choose_cb choose, + const void *data, + struct hlist_node *data_node) { uint32_t index; int ret = -1; @@ -114,9 +94,9 @@ static inline int batadv_hash_add(struct batadv_hashtable *hash, if (!hash) goto out; - index = choose(data, hash->size); - head = &hash->table[index]; - list_lock = &hash->list_locks[index]; + index = choose(data, hash_size); + head = &hash[index].head; + list_lock = &hash[index].lock; spin_lock_bh(list_lock); @@ -144,20 +124,24 @@ out: * structure you use with just the key filled, we just need the key for * comparing. */ -static inline void *batadv_hash_remove(struct batadv_hashtable *hash, - batadv_hashdata_compare_cb compare, - batadv_hashdata_choose_cb choose, - void *data) +#define batadv_hash_remove(hash, compare, choose, data) \ + _batadv_hash_remove(hash, ARRAY_SIZE(hash), compare, choose, data) + +static inline void *_batadv_hash_remove(struct batadv_hashbucket *hash, + uint32_t hash_size, + batadv_hashdata_compare_cb compare, + batadv_hashdata_choose_cb choose, + void *data) { uint32_t index; struct hlist_node *node; struct hlist_head *head; void *data_save = NULL; - index = choose(data, hash->size); - head = &hash->table[index]; + index = choose(data, hash_size); + head = &hash[index].head; - spin_lock_bh(&hash->list_locks[index]); + spin_lock_bh(&hash[index].lock); hlist_for_each(node, head) { if (!compare(node, data)) continue; @@ -166,7 +150,7 @@ static inline void *batadv_hash_remove(struct batadv_hashtable *hash, hlist_del_rcu(node); break; } - spin_unlock_bh(&hash->list_locks[index]); + spin_unlock_bh(&hash[index].lock); return data_save; } diff --git a/network-coding.c b/network-coding.c index b3b3c4e..79e49ca 100644 --- a/network-coding.c +++ b/network-coding.c @@ -32,7 +32,6 @@ #include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/list.h> -#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/printk.h> #include <linux/random.h> @@ -54,9 +53,6 @@ #include "routing.h" #include "send.h" -static struct lock_class_key batadv_nc_coding_hash_lock_class_key; -static struct lock_class_key batadv_nc_decoding_hash_lock_class_key; - static void batadv_nc_worker(struct work_struct *work); static int batadv_nc_recv_coded_packet(struct sk_buff *skb, struct batadv_hard_iface *recv_if); @@ -148,22 +144,8 @@ int batadv_nc_mesh_init(struct batadv_priv *bat_priv) bat_priv->nc.timestamp_fwd_flush = jiffies; bat_priv->nc.timestamp_sniffed_purge = jiffies; - if (bat_priv->nc.coding_hash || bat_priv->nc.decoding_hash) - return 0; - - bat_priv->nc.coding_hash = batadv_hash_new(128); - if (!bat_priv->nc.coding_hash) - goto err; - - batadv_hash_set_lock_class(bat_priv->nc.coding_hash, - &batadv_nc_coding_hash_lock_class_key); - - bat_priv->nc.decoding_hash = batadv_hash_new(128); - if (!bat_priv->nc.decoding_hash) - goto err; - - batadv_hash_set_lock_class(bat_priv->nc.decoding_hash, - &batadv_nc_decoding_hash_lock_class_key); + batadv_hash_init(bat_priv->nc.coding_hash); + batadv_hash_init(bat_priv->nc.decoding_hash); INIT_DELAYED_WORK(&bat_priv->nc.work, batadv_nc_worker); batadv_nc_start_timer(bat_priv); @@ -173,9 +155,6 @@ int batadv_nc_mesh_init(struct batadv_priv *bat_priv) BATADV_TVLV_HANDLER_OGM_CIFNOTFND); batadv_nc_tvlv_container_update(bat_priv); return 0; - -err: - return -ENOMEM; } /** @@ -378,17 +357,14 @@ void batadv_nc_purge_orig(struct batadv_priv *bat_priv, */ static void batadv_nc_purge_orig_hash(struct batadv_priv *bat_priv) { - struct batadv_hashtable *hash = bat_priv->orig_hash; + struct batadv_hashbucket *hash = bat_priv->orig_hash; struct hlist_head *head; struct batadv_orig_node *orig_node; uint32_t i; - if (!hash) - return; - /* For each orig_node */ - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->orig_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) @@ -408,10 +384,25 @@ static void batadv_nc_purge_orig_hash(struct batadv_priv *bat_priv) * a boolean value: true is the entry has to be deleted, false * otherwise */ -static void batadv_nc_purge_paths(struct batadv_priv *bat_priv, - struct batadv_hashtable *hash, - bool (*to_purge)(struct batadv_priv *, - struct batadv_nc_path *)) +#define batadv_nc_purge_paths(bat_priv, hash, to_purge) \ + _batadv_nc_purge_paths(bat_priv, hash, ARRAY_SIZE(hash), to_purge) + +/** + * _batadv_nc_purge_paths - traverse all nc paths part of the hash and remove + * unused ones + * @bat_priv: the bat priv with all the soft interface information + * @hash: hash table containing the nc paths to check + * @hash_size: number of buckets in the hashtable + * @to_purge: function in charge to decide whether an entry has to be purged or + * not. This function takes the nc node as argument and has to return + * a boolean value: true is the entry has to be deleted, false + * otherwise + */ +static void _batadv_nc_purge_paths(struct batadv_priv *bat_priv, + struct batadv_hashbucket *hash, + uint32_t hash_size, + bool (*to_purge)(struct batadv_priv *, + struct batadv_nc_path *)) { struct hlist_head *head; struct hlist_node *node_tmp; @@ -419,9 +410,9 @@ static void batadv_nc_purge_paths(struct batadv_priv *bat_priv, spinlock_t *lock; /* Protects lists in hash */ uint32_t i; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - lock = &hash->list_locks[i]; + for (i = 0; i < hash_size; i++) { + head = &hash[i].head; + lock = &hash[i].lock; /* For each nc_path in this bin */ spin_lock_bh(lock); @@ -519,23 +510,21 @@ static int batadv_nc_hash_compare(const struct hlist_node *node, /** * batadv_nc_hash_find - search for an existing nc path and return it * @hash: hash table containing the nc path + * @hash_size: number of buckets in the hashtable * @data: search key * * Returns the nc_path if found, NULL otherwise. */ static struct batadv_nc_path * -batadv_nc_hash_find(struct batadv_hashtable *hash, +batadv_nc_hash_find(struct batadv_hashbucket *hash, uint32_t hash_size, void *data) { struct hlist_head *head; struct batadv_nc_path *nc_path, *nc_path_tmp = NULL; int index; - if (!hash) - return NULL; - - index = batadv_nc_hash_choose(data, hash->size); - head = &hash->table[index]; + index = batadv_nc_hash_choose(data, hash_size); + head = &hash[index].head; rcu_read_lock(); hlist_for_each_entry_rcu(nc_path, head, hash_entry) { @@ -648,12 +637,26 @@ static bool batadv_nc_fwd_flush(struct batadv_priv *bat_priv, * to encourage this function to proceed with the next packet. * Otherwise the rest of the current queue is skipped. */ +#define batadv_nc_process_nc_paths(bat_priv, hash, process_fn) \ + _batadv_nc_process_nc_paths(bat_priv, hash, ARRAY_SIZE(hash), \ + process_fn) + +/** + * _batadv_nc_process_nc_paths - traverse given nc packet pool and free timed + * out nc packets + * @bat_priv: the bat priv with all the soft interface information + * @hash: to be processed hash table + * @hash_size: number of buckets in the hashtable + * @process_fn: Function called to process given nc packet. Should return true + * to encourage this function to proceed with the next packet. + * Otherwise the rest of the current queue is skipped. + */ static void -batadv_nc_process_nc_paths(struct batadv_priv *bat_priv, - struct batadv_hashtable *hash, - bool (*process_fn)(struct batadv_priv *, - struct batadv_nc_path *, - struct batadv_nc_packet *)) +_batadv_nc_process_nc_paths(struct batadv_priv *bat_priv, + struct batadv_hashbucket *hash, uint32_t hash_size, + bool (*process_fn)(struct batadv_priv *, + struct batadv_nc_path *, + struct batadv_nc_packet *)) { struct hlist_head *head; struct batadv_nc_packet *nc_packet, *nc_packet_tmp; @@ -661,12 +664,9 @@ batadv_nc_process_nc_paths(struct batadv_priv *bat_priv, bool ret; int i; - if (!hash) - return; - /* Loop hash table bins */ - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < hash_size; i++) { + head = &hash[i].head; /* Loop coding paths */ rcu_read_lock(); @@ -929,6 +929,7 @@ out: * batadv_nc_get_path - get existing nc_path or allocate a new one * @bat_priv: the bat priv with all the soft interface information * @hash: hash table containing the nc path + * @hash_size: number of buckets in the hashtable * @src: ethernet source address - first half of the nc path search key * @dst: ethernet destination address - second half of the nc path search key * @@ -936,7 +937,8 @@ out: * on error. */ static struct batadv_nc_path *batadv_nc_get_path(struct batadv_priv *bat_priv, - struct batadv_hashtable *hash, + struct batadv_hashbucket *hash, + uint32_t hash_size, uint8_t *src, uint8_t *dst) { @@ -946,7 +948,7 @@ static struct batadv_nc_path *batadv_nc_get_path(struct batadv_priv *bat_priv, batadv_nc_hash_key_gen(&nc_path_key, src, dst); /* Search for existing nc_path */ - nc_path = batadv_nc_hash_find(hash, (void *)&nc_path_key); + nc_path = batadv_nc_hash_find(hash, hash_size, (void *)&nc_path_key); if (nc_path) { /* Set timestamp to delay removal of nc_path */ @@ -973,9 +975,9 @@ static struct batadv_nc_path *batadv_nc_get_path(struct batadv_priv *bat_priv, nc_path->next_hop); /* Add nc_path to hash table */ - hash_added = batadv_hash_add(hash, batadv_nc_hash_compare, - batadv_nc_hash_choose, &nc_path_key, - &nc_path->hash_entry); + hash_added = _batadv_hash_add(hash, hash_size, batadv_nc_hash_compare, + batadv_nc_hash_choose, &nc_path_key, + &nc_path->hash_entry); if (hash_added < 0) { kfree(nc_path); @@ -1259,20 +1261,18 @@ batadv_nc_path_search(struct batadv_priv *bat_priv, struct batadv_nc_path *nc_path, nc_path_key; struct batadv_nc_packet *nc_packet_out = NULL; struct batadv_nc_packet *nc_packet, *nc_packet_tmp; - struct batadv_hashtable *hash = bat_priv->nc.coding_hash; + struct batadv_hashbucket *hash = bat_priv->nc.coding_hash; int idx; - if (!hash) - return NULL; - /* Create almost path key */ batadv_nc_hash_key_gen(&nc_path_key, in_nc_node->addr, out_nc_node->addr); - idx = batadv_nc_hash_choose(&nc_path_key, hash->size); + idx = batadv_nc_hash_choose(&nc_path_key, + ARRAY_SIZE(bat_priv->nc.coding_hash)); /* Check for coding opportunities in this nc_path */ rcu_read_lock(); - hlist_for_each_entry_rcu(nc_path, &hash->table[idx], hash_entry) { + hlist_for_each_entry_rcu(nc_path, &hash[idx].head, hash_entry) { if (!batadv_compare_eth(nc_path->prev_hop, in_nc_node->addr)) continue; @@ -1516,6 +1516,7 @@ bool batadv_nc_skb_forward(struct sk_buff *skb, /* Find or create a nc_path for this src-dst pair */ nc_path = batadv_nc_get_path(bat_priv, bat_priv->nc.coding_hash, + ARRAY_SIZE(bat_priv->nc.coding_hash), ethhdr->h_source, neigh_node->addr); @@ -1565,6 +1566,7 @@ void batadv_nc_skb_store_for_decoding(struct batadv_priv *bat_priv, /* Find existing nc_path or create a new */ nc_path = batadv_nc_get_path(bat_priv, bat_priv->nc.decoding_hash, + ARRAY_SIZE(bat_priv->nc.decoding_hash), ethhdr->h_source, ethhdr->h_dest); @@ -1726,16 +1728,13 @@ batadv_nc_find_decoding_packet(struct batadv_priv *bat_priv, struct ethhdr *ethhdr, struct batadv_coded_packet *coded) { - struct batadv_hashtable *hash = bat_priv->nc.decoding_hash; + struct batadv_hashbucket *hash = bat_priv->nc.decoding_hash; struct batadv_nc_packet *tmp_nc_packet, *nc_packet = NULL; struct batadv_nc_path *nc_path, nc_path_key; uint8_t *dest, *source; __be32 packet_id; int index; - if (!hash) - return NULL; - /* Select the correct packet id based on the location of our mac-addr */ dest = ethhdr->h_source; if (!batadv_is_my_mac(bat_priv, coded->second_dest)) { @@ -1747,11 +1746,12 @@ batadv_nc_find_decoding_packet(struct batadv_priv *bat_priv, } batadv_nc_hash_key_gen(&nc_path_key, source, dest); - index = batadv_nc_hash_choose(&nc_path_key, hash->size); + index = batadv_nc_hash_choose(&nc_path_key, + ARRAY_SIZE(bat_priv->nc.decoding_hash)); /* Search for matching coding path */ rcu_read_lock(); - hlist_for_each_entry_rcu(nc_path, &hash->table[index], hash_entry) { + hlist_for_each_entry_rcu(nc_path, &hash[index].head, hash_entry) { /* Find matching nc_packet */ spin_lock_bh(&nc_path->packet_list_lock); list_for_each_entry(tmp_nc_packet, @@ -1857,9 +1857,7 @@ void batadv_nc_mesh_free(struct batadv_priv *bat_priv) cancel_delayed_work_sync(&bat_priv->nc.work); batadv_nc_purge_paths(bat_priv, bat_priv->nc.coding_hash, NULL); - batadv_hash_destroy(bat_priv->nc.coding_hash); batadv_nc_purge_paths(bat_priv, bat_priv->nc.decoding_hash, NULL); - batadv_hash_destroy(bat_priv->nc.decoding_hash); } /** @@ -1871,7 +1869,7 @@ int batadv_nc_nodes_seq_print_text(struct seq_file *seq, void *offset) { struct net_device *net_dev = (struct net_device *)seq->private; struct batadv_priv *bat_priv = netdev_priv(net_dev); - struct batadv_hashtable *hash = bat_priv->orig_hash; + struct batadv_hashbucket *hash = bat_priv->orig_hash; struct batadv_hard_iface *primary_if; struct hlist_head *head; struct batadv_orig_node *orig_node; @@ -1883,8 +1881,8 @@ int batadv_nc_nodes_seq_print_text(struct seq_file *seq, void *offset) goto out; /* Traverse list of originators */ - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->orig_hash); i++) { + head = &hash[i].head; /* For each orig_node in this bin */ rcu_read_lock(); diff --git a/originator.c b/originator.c index 684536e..7ab6be8 100644 --- a/originator.c +++ b/originator.c @@ -24,7 +24,6 @@ #include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/list.h> -#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/seq_file.h> #include <linux/slab.h> @@ -41,9 +40,6 @@ #include "routing.h" #include "translation-table.h" -/* hash class keys */ -static struct lock_class_key batadv_orig_hash_lock_class_key; - static void batadv_purge_orig(struct work_struct *work); /* returns 1 if they are the same originator */ @@ -139,16 +135,7 @@ void batadv_orig_node_vlan_free_ref(struct batadv_orig_node_vlan *orig_vlan) int batadv_originator_init(struct batadv_priv *bat_priv) { - if (bat_priv->orig_hash) - return 0; - - bat_priv->orig_hash = batadv_hash_new(1024); - - if (!bat_priv->orig_hash) - goto err; - - batadv_hash_set_lock_class(bat_priv->orig_hash, - &batadv_orig_hash_lock_class_key); + batadv_hash_init(bat_priv->orig_hash); INIT_DELAYED_WORK(&bat_priv->orig_work, batadv_purge_orig); queue_delayed_work(batadv_event_workqueue, @@ -156,9 +143,6 @@ int batadv_originator_init(struct batadv_priv *bat_priv) msecs_to_jiffies(BATADV_ORIG_WORK_PERIOD)); return 0; - -err: - return -ENOMEM; } /** @@ -619,23 +603,18 @@ void batadv_orig_node_free_ref_now(struct batadv_orig_node *orig_node) void batadv_originator_free(struct batadv_priv *bat_priv) { - struct batadv_hashtable *hash = bat_priv->orig_hash; + struct batadv_hashbucket *hash = bat_priv->orig_hash; struct hlist_node *node_tmp; struct hlist_head *head; spinlock_t *list_lock; /* spinlock to protect write access */ struct batadv_orig_node *orig_node; uint32_t i; - if (!hash) - return; - cancel_delayed_work_sync(&bat_priv->orig_work); - bat_priv->orig_hash = NULL; - - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - list_lock = &hash->list_locks[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->orig_hash); i++) { + head = &hash[i].head; + list_lock = &hash[i].lock; spin_lock_bh(list_lock); hlist_for_each_entry_safe(orig_node, node_tmp, @@ -645,8 +624,6 @@ void batadv_originator_free(struct batadv_priv *bat_priv) } spin_unlock_bh(list_lock); } - - batadv_hash_destroy(hash); } /** @@ -971,20 +948,17 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv, static void _batadv_purge_orig(struct batadv_priv *bat_priv) { - struct batadv_hashtable *hash = bat_priv->orig_hash; + struct batadv_hashbucket *hash = bat_priv->orig_hash; struct hlist_node *node_tmp; struct hlist_head *head; spinlock_t *list_lock; /* spinlock to protect write access */ struct batadv_orig_node *orig_node; uint32_t i; - if (!hash) - return; - /* for all origins... */ - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - list_lock = &hash->list_locks[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->orig_hash); i++) { + head = &hash[i].head; + list_lock = &hash[i].lock; spin_lock_bh(list_lock); hlist_for_each_entry_safe(orig_node, node_tmp, @@ -1107,7 +1081,7 @@ int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface, { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_algo_ops *bao = bat_priv->bat_algo_ops; - struct batadv_hashtable *hash = bat_priv->orig_hash; + struct batadv_hashbucket *hash = bat_priv->orig_hash; struct hlist_head *head; struct batadv_orig_node *orig_node; uint32_t i; @@ -1116,8 +1090,8 @@ int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface, /* resize all orig nodes because orig_node->bcast_own(_sum) depend on * if_num */ - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->orig_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { @@ -1142,7 +1116,7 @@ int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface, int max_if_num) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - struct batadv_hashtable *hash = bat_priv->orig_hash; + struct batadv_hashbucket *hash = bat_priv->orig_hash; struct hlist_head *head; struct batadv_hard_iface *hard_iface_tmp; struct batadv_orig_node *orig_node; @@ -1153,8 +1127,8 @@ int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface, /* resize all orig nodes because orig_node->bcast_own(_sum) depend on * if_num */ - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->orig_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { diff --git a/originator.h b/originator.h index 39085cc..a2e4fe7 100644 --- a/originator.h +++ b/originator.h @@ -21,6 +21,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/kernel.h> #include <linux/compiler.h> #include <linux/if_ether.h> #include <linux/jhash.h> @@ -29,8 +30,6 @@ #include <linux/stddef.h> #include <linux/types.h> -#include "hash.h" - struct seq_file; int batadv_compare_orig(const struct hlist_node *node, const void *data2); @@ -97,16 +96,13 @@ static inline uint32_t batadv_choose_orig(const void *data, uint32_t size) static inline struct batadv_orig_node * batadv_orig_hash_find(struct batadv_priv *bat_priv, const void *data) { - struct batadv_hashtable *hash = bat_priv->orig_hash; + struct batadv_hashbucket *hash = bat_priv->orig_hash; struct hlist_head *head; struct batadv_orig_node *orig_node, *orig_node_tmp = NULL; int index; - if (!hash) - return NULL; - - index = batadv_choose_orig(data, hash->size); - head = &hash->table[index]; + index = batadv_choose_orig(data, ARRAY_SIZE(bat_priv->orig_hash)); + head = &hash[index].head; rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { diff --git a/translation-table.c b/translation-table.c index 5551ecc..18eb9c5 100644 --- a/translation-table.c +++ b/translation-table.c @@ -23,7 +23,6 @@ #include <linux/byteorder/generic.h> #include <linux/compiler.h> #include <linux/crc32c.h> -#include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/fs.h> #include <linux/if_ether.h> @@ -31,7 +30,6 @@ #include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/list.h> -#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/rculist.h> #include <linux/rcupdate.h> @@ -51,10 +49,6 @@ #include "packet.h" #include "soft-interface.h" -/* hash class keys */ -static struct lock_class_key batadv_tt_local_hash_lock_class_key; -static struct lock_class_key batadv_tt_global_hash_lock_class_key; - static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client, unsigned short vid, struct batadv_orig_node *orig_node); @@ -105,22 +99,32 @@ static inline uint32_t batadv_choose_tt(const void *data, uint32_t size) * Returns a pointer to the tt_common struct belonging to the searched client if * found, NULL otherwise. */ +#define batadv_tt_hash_find(hash, addr, vid) \ + _batadv_tt_hash_find(hash, ARRAY_SIZE(hash), addr, vid) + +/** + * _batadv_tt_hash_find - look for a client in the given hash table + * @hash: the hash table to search + * @hash_size: number of buckets in the hashtable + * @addr: the mac address of the client to look for + * @vid: VLAN identifier + * + * Returns a pointer to the tt_common struct belonging to the searched client if + * found, NULL otherwise. + */ static struct batadv_tt_common_entry * -batadv_tt_hash_find(struct batadv_hashtable *hash, const uint8_t *addr, - unsigned short vid) +_batadv_tt_hash_find(struct batadv_hashbucket *hash, uint32_t hash_size, + const uint8_t *addr, unsigned short vid) { struct hlist_head *head; struct batadv_tt_common_entry to_search, *tt, *tt_tmp = NULL; uint32_t index; - if (!hash) - return NULL; - ether_addr_copy(to_search.addr, addr); to_search.vid = vid; - index = batadv_choose_tt(&to_search, hash->size); - head = &hash->table[index]; + index = batadv_choose_tt(&to_search, hash_size); + head = &hash[index].head; rcu_read_lock(); hlist_for_each_entry_rcu(tt, head, hash_entry) { @@ -483,16 +487,7 @@ static int batadv_tt_local_table_transmit_size(struct batadv_priv *bat_priv) static int batadv_tt_local_init(struct batadv_priv *bat_priv) { - if (bat_priv->tt.local_hash) - return 0; - - bat_priv->tt.local_hash = batadv_hash_new(1024); - - if (!bat_priv->tt.local_hash) - return -ENOMEM; - - batadv_hash_set_lock_class(bat_priv->tt.local_hash, - &batadv_tt_local_hash_lock_class_key); + batadv_hash_init(bat_priv->tt.local_hash); return 0; } @@ -620,8 +615,9 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, is_multicast_ether_addr(addr)) tt_local->common.flags |= BATADV_TT_CLIENT_NOPURGE; - hash_added = batadv_hash_add(bat_priv->tt.local_hash, batadv_compare_tt, - batadv_choose_tt, &tt_local->common, + hash_added = batadv_hash_add(bat_priv->tt.local_hash, + batadv_compare_tt, batadv_choose_tt, + &tt_local->common, &tt_local->common.hash_entry); if (unlikely(hash_added != 0)) { @@ -921,7 +917,7 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) { struct net_device *net_dev = (struct net_device *)seq->private; struct batadv_priv *bat_priv = netdev_priv(net_dev); - struct batadv_hashtable *hash = bat_priv->tt.local_hash; + struct batadv_hashbucket *hash = bat_priv->tt.local_hash; struct batadv_tt_common_entry *tt_common_entry; struct batadv_tt_local_entry *tt_local; struct batadv_hard_iface *primary_if; @@ -945,8 +941,8 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) seq_printf(seq, " %-13s %s %-8s %-9s (%-10s)\n", "Client", "VID", "Flags", "Last seen", "CRC"); - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->tt.local_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(tt_common_entry, @@ -1120,14 +1116,14 @@ static void batadv_tt_local_purge_list(struct batadv_priv *bat_priv, static void batadv_tt_local_purge(struct batadv_priv *bat_priv, int timeout) { - struct batadv_hashtable *hash = bat_priv->tt.local_hash; + struct batadv_hashbucket *hash = bat_priv->tt.local_hash; struct hlist_head *head; spinlock_t *list_lock; /* protects write access to the hash lists */ uint32_t i; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - list_lock = &hash->list_locks[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->tt.local_hash); i++) { + head = &hash[i].head; + list_lock = &hash[i].lock; spin_lock_bh(list_lock); batadv_tt_local_purge_list(bat_priv, head, timeout); @@ -1137,7 +1133,7 @@ static void batadv_tt_local_purge(struct batadv_priv *bat_priv, static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) { - struct batadv_hashtable *hash; + struct batadv_hashbucket *hash; spinlock_t *list_lock; /* protects write access to the hash lists */ struct batadv_tt_common_entry *tt_common_entry; struct batadv_tt_local_entry *tt_local; @@ -1146,14 +1142,11 @@ static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) struct hlist_head *head; uint32_t i; - if (!bat_priv->tt.local_hash) - return; - hash = bat_priv->tt.local_hash; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - list_lock = &hash->list_locks[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->tt.local_hash); i++) { + head = &hash[i].head; + list_lock = &hash[i].lock; spin_lock_bh(list_lock); hlist_for_each_entry_safe(tt_common_entry, node_tmp, @@ -1173,24 +1166,11 @@ static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) } spin_unlock_bh(list_lock); } - - batadv_hash_destroy(hash); - - bat_priv->tt.local_hash = NULL; } static int batadv_tt_global_init(struct batadv_priv *bat_priv) { - if (bat_priv->tt.global_hash) - return 0; - - bat_priv->tt.global_hash = batadv_hash_new(1024); - - if (!bat_priv->tt.global_hash) - return -ENOMEM; - - batadv_hash_set_lock_class(bat_priv->tt.global_hash, - &batadv_tt_global_hash_lock_class_key); + batadv_hash_init(bat_priv->tt.global_hash); return 0; } @@ -1592,7 +1572,7 @@ int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset) { struct net_device *net_dev = (struct net_device *)seq->private; struct batadv_priv *bat_priv = netdev_priv(net_dev); - struct batadv_hashtable *hash = bat_priv->tt.global_hash; + struct batadv_hashbucket *hash = bat_priv->tt.global_hash; struct batadv_tt_common_entry *tt_common_entry; struct batadv_tt_global_entry *tt_global; struct batadv_hard_iface *primary_if; @@ -1610,8 +1590,8 @@ int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset) "Client", "VID", "(TTVN)", "Originator", "(Curr TTVN)", "CRC", "Flags"); - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->tt.global_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(tt_common_entry, @@ -1823,18 +1803,15 @@ void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, struct batadv_tt_global_entry *tt_global; struct batadv_tt_common_entry *tt_common_entry; uint32_t i; - struct batadv_hashtable *hash = bat_priv->tt.global_hash; + struct batadv_hashbucket *hash = bat_priv->tt.global_hash; struct hlist_node *safe; struct hlist_head *head; spinlock_t *list_lock; /* protects write access to the hash lists */ unsigned short vid; - if (!hash) - return; - - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - list_lock = &hash->list_locks[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->tt.global_hash); i++) { + head = &hash[i].head; + list_lock = &hash[i].lock; spin_lock_bh(list_lock); hlist_for_each_entry_safe(tt_common_entry, safe, @@ -1889,7 +1866,7 @@ static bool batadv_tt_global_to_purge(struct batadv_tt_global_entry *tt_global, static void batadv_tt_global_purge(struct batadv_priv *bat_priv) { - struct batadv_hashtable *hash = bat_priv->tt.global_hash; + struct batadv_hashbucket *hash = bat_priv->tt.global_hash; struct hlist_head *head; struct hlist_node *node_tmp; spinlock_t *list_lock; /* protects write access to the hash lists */ @@ -1898,9 +1875,9 @@ static void batadv_tt_global_purge(struct batadv_priv *bat_priv) struct batadv_tt_common_entry *tt_common; struct batadv_tt_global_entry *tt_global; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - list_lock = &hash->list_locks[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->tt.global_hash); i++) { + head = &hash[i].head; + list_lock = &hash[i].lock; spin_lock_bh(list_lock); hlist_for_each_entry_safe(tt_common, node_tmp, head, @@ -1928,7 +1905,7 @@ static void batadv_tt_global_purge(struct batadv_priv *bat_priv) static void batadv_tt_global_table_free(struct batadv_priv *bat_priv) { - struct batadv_hashtable *hash; + struct batadv_hashbucket *hash; spinlock_t *list_lock; /* protects write access to the hash lists */ struct batadv_tt_common_entry *tt_common_entry; struct batadv_tt_global_entry *tt_global; @@ -1936,14 +1913,11 @@ static void batadv_tt_global_table_free(struct batadv_priv *bat_priv) struct hlist_head *head; uint32_t i; - if (!bat_priv->tt.global_hash) - return; - hash = bat_priv->tt.global_hash; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - list_lock = &hash->list_locks[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->tt.global_hash); i++) { + head = &hash[i].head; + list_lock = &hash[i].lock; spin_lock_bh(list_lock); hlist_for_each_entry_safe(tt_common_entry, node_tmp, @@ -1956,10 +1930,6 @@ static void batadv_tt_global_table_free(struct batadv_priv *bat_priv) } spin_unlock_bh(list_lock); } - - batadv_hash_destroy(hash); - - bat_priv->tt.global_hash = NULL; } static bool @@ -2068,7 +2038,7 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, unsigned short vid) { - struct batadv_hashtable *hash = bat_priv->tt.global_hash; + struct batadv_hashbucket *hash = bat_priv->tt.global_hash; struct batadv_tt_common_entry *tt_common; struct batadv_tt_global_entry *tt_global; struct hlist_head *head; @@ -2076,8 +2046,8 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv, uint8_t flags; __be16 tmp_vid; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->tt.global_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(tt_common, head, hash_entry) { @@ -2144,15 +2114,15 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv, static uint32_t batadv_tt_local_crc(struct batadv_priv *bat_priv, unsigned short vid) { - struct batadv_hashtable *hash = bat_priv->tt.local_hash; + struct batadv_hashbucket *hash = bat_priv->tt.local_hash; struct batadv_tt_common_entry *tt_common; struct hlist_head *head; uint32_t i, crc_tmp, crc = 0; uint8_t flags; __be16 tmp_vid; - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->tt.local_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(tt_common, head, hash_entry) { @@ -2307,14 +2277,16 @@ static int batadv_tt_global_valid(const void *entry_ptr, * specified tt hash * @bat_priv: the bat priv with all the soft interface information * @hash: hash table containing the tt entries + * @hash_size: number of buckets in the hashtable * @tt_len: expected tvlv tt data buffer length in number of bytes * @tvlv_buff: pointer to the buffer to fill with the TT data * @valid_cb: function to filter tt change entries * @cb_data: data passed to the filter function as argument */ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, - struct batadv_hashtable *hash, - void *tvlv_buff, uint16_t tt_len, + struct batadv_hashbucket *hash, + uint32_t hash_size, void *tvlv_buff, + uint16_t tt_len, int (*valid_cb)(const void *, const void *), void *cb_data) { @@ -2328,8 +2300,8 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, tt_change = (struct batadv_tvlv_tt_change *)tvlv_buff; rcu_read_lock(); - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < hash_size; i++) { + head = &hash[i].head; hlist_for_each_entry_rcu(tt_common_entry, head, hash_entry) { @@ -2608,6 +2580,7 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv, /* fill the rest of the tvlv with the real TT entries */ batadv_tt_tvlv_generate(bat_priv, bat_priv->tt.global_hash, + ARRAY_SIZE(bat_priv->tt.global_hash), tt_change, tt_len, batadv_tt_global_valid, req_dst_orig_node); @@ -2737,6 +2710,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, /* fill the rest of the tvlv with the real TT entries */ batadv_tt_tvlv_generate(bat_priv, bat_priv->tt.local_hash, + ARRAY_SIZE(bat_priv->tt.local_hash), tt_change, tt_len, batadv_tt_local_valid, NULL); } @@ -3133,17 +3107,14 @@ void batadv_tt_free(struct batadv_priv *bat_priv) static void batadv_tt_local_set_flags(struct batadv_priv *bat_priv, uint16_t flags, bool enable, bool count) { - struct batadv_hashtable *hash = bat_priv->tt.local_hash; + struct batadv_hashbucket *hash = bat_priv->tt.local_hash; struct batadv_tt_common_entry *tt_common_entry; uint16_t changed_num = 0; struct hlist_head *head; uint32_t i; - if (!hash) - return; - - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->tt.local_hash); i++) { + head = &hash[i].head; rcu_read_lock(); hlist_for_each_entry_rcu(tt_common_entry, @@ -3172,7 +3143,7 @@ static void batadv_tt_local_set_flags(struct batadv_priv *bat_priv, /* Purge out all the tt local entries marked with BATADV_TT_CLIENT_PENDING */ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv) { - struct batadv_hashtable *hash = bat_priv->tt.local_hash; + struct batadv_hashbucket *hash = bat_priv->tt.local_hash; struct batadv_tt_common_entry *tt_common; struct batadv_tt_local_entry *tt_local; struct batadv_softif_vlan *vlan; @@ -3181,12 +3152,9 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv) spinlock_t *list_lock; /* protects write access to the hash lists */ uint32_t i; - if (!hash) - return; - - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - list_lock = &hash->list_locks[i]; + for (i = 0; i < ARRAY_SIZE(bat_priv->tt.local_hash); i++) { + head = &hash[i].head; + list_lock = &hash[i].lock; spin_lock_bh(list_lock); hlist_for_each_entry_safe(tt_common, node_tmp, head, diff --git a/types.h b/types.h index 1d4781e..3782588 100644 --- a/types.h +++ b/types.h @@ -49,6 +49,16 @@ struct seq_file; #endif /* CONFIG_BATMAN_ADV_DAT */ /** + * struct batadv_hashbucket - bucket for concurrent, list based hashtable + * @head: pointer to the data of this bucket + * @lock: lock protecting writes to this bucket + */ +struct batadv_hashbucket { + struct hlist_head head; + spinlock_t lock; /* Protects head */ +}; + +/** * enum batadv_dhcp_recipient - dhcp destination * @BATADV_DHCP_NO: packet is not a dhcp message * @BATADV_DHCP_TO_SERVER: dhcp message is directed to a server @@ -532,8 +542,8 @@ struct batadv_priv_tt { atomic_t ogm_append_cnt; atomic_t local_changes; struct list_head changes_list; - struct batadv_hashtable *local_hash; - struct batadv_hashtable *global_hash; + struct batadv_hashbucket local_hash[1024]; + struct batadv_hashbucket global_hash[1024]; struct list_head req_list; struct list_head roam_list; spinlock_t changes_list_lock; /* protects changes */ @@ -563,8 +573,8 @@ struct batadv_priv_tt { #ifdef CONFIG_BATMAN_ADV_BLA struct batadv_priv_bla { atomic_t num_requests; - struct batadv_hashtable *claim_hash; - struct batadv_hashtable *backbone_hash; + struct batadv_hashbucket claim_hash[128]; + struct batadv_hashbucket backbone_hash[32]; struct batadv_bcast_duplist_entry bcast_duplist[BATADV_DUPLIST_SIZE]; int bcast_duplist_curr; /* protects bcast_duplist & bcast_duplist_curr */ @@ -628,12 +638,13 @@ struct batadv_priv_tvlv { * struct batadv_priv_dat - per mesh interface DAT private data * @addr: node DAT address * @hash: hashtable representing the local ARP cache + * @hash_lock: locks for each hashtable buckets * @work: work queue callback item for cache purging */ #ifdef CONFIG_BATMAN_ADV_DAT struct batadv_priv_dat { batadv_dat_addr_t addr; - struct batadv_hashtable *hash; + struct batadv_hashbucket hash[1024]; struct delayed_work work; }; #endif @@ -696,8 +707,8 @@ struct batadv_priv_nc { u32 max_buffer_time; unsigned long timestamp_fwd_flush; unsigned long timestamp_sniffed_purge; - struct batadv_hashtable *coding_hash; - struct batadv_hashtable *decoding_hash; + struct batadv_hashbucket coding_hash[128]; + struct batadv_hashbucket decoding_hash[128]; }; /** @@ -810,7 +821,7 @@ struct batadv_priv { struct dentry *debug_dir; struct hlist_head forw_bat_list; struct hlist_head forw_bcast_list; - struct batadv_hashtable *orig_hash; + struct batadv_hashbucket orig_hash[1024]; spinlock_t forw_bat_list_lock; /* protects forw_bat_list */ spinlock_t forw_bcast_list_lock; /* protects forw_bcast_list */ struct delayed_work orig_work; -- 2.1.4

1 2

[B.A.T.M.A.N.] [PATCH] batctl: Remove manual \0 terminator after snprintf
by Sven Eckelmann 20 Apr '15

20 Apr '15

snprintf already guarantees \0 terminated strings for size arguments is > 0. Reported-by: Anatoliy Lapitskiy <anatoliy.lapitskiy(a)gmail.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- bisect_iv.c | 4 ---- debugfs.c | 1 - sys.c | 14 +------------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/bisect_iv.c b/bisect_iv.c index b748813..fea6358 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -644,7 +644,6 @@ static int print_rt_path_at_seqno(struct bat_node *src_node, struct bat_node *ds snprintf(curr_loop_magic, sizeof(curr_loop_magic), "%s%s%lli%lli", src_node->name, dst_node->name, seqno, seqno_rand); - curr_loop_magic[sizeof(curr_loop_magic) - 1] = '\0'; printf("Path towards %s (seqno %lli ", get_name_by_macstr(dst_node->name, read_opt), seqno); @@ -725,7 +724,6 @@ static int find_rt_table_change(struct bat_node *src_node, struct bat_node *dst_ snprintf(curr_loop_magic, sizeof(curr_loop_magic), "%s%s%lli%lli", src_node->name, dst_node->name, seqno_min_tmp, seqno_rand); - curr_loop_magic[sizeof(curr_loop_magic) - 1] = '\0'; orig_event = orig_event_get_by_ptr(curr_node, dst_node); if (!orig_event) @@ -982,7 +980,6 @@ static void seqno_trace_print_neigh(struct seqno_trace_neigh *seqno_trace_neigh, (strlen(head) > 1 ? head : num_sisters == 0 ? " " : head), (strlen(head) == 1 ? " " : num_sisters == 0 ? " " : "| ")); - new_head[sizeof(new_head) - 1] = '\0'; seqno_trace_print_neigh(seqno_trace_neigh->seqno_trace_neigh[i], seqno_trace_neigh->seqno_event, seqno_trace_neigh->num_neighbors - i - 1, new_head, read_opt); @@ -1028,7 +1025,6 @@ static void seqno_trace_print(struct list_head_first *trace_list, char *trace_or snprintf(head, sizeof(head), "%c", (seqno_trace->seqno_trace_neigh.num_neighbors == i + 1 ? '\\' : '|')); - head[sizeof(head) - 1] = '\0'; seqno_trace_print_neigh(seqno_trace->seqno_trace_neigh.seqno_trace_neigh[i], NULL, diff --git a/debugfs.c b/debugfs.c index 7b3a4b2..04e47e9 100644 --- a/debugfs.c +++ b/debugfs.c @@ -54,7 +54,6 @@ int debugfs_make_path(const char *fmt, char *mesh_iface, char *buffer, int size) return len+1; snprintf(buffer, size-1, fmt, debugfs_mountpoint, mesh_iface); - buffer[size - 1] = '\0'; return 0; } diff --git a/sys.c b/sys.c index 676bef1..0d7f55f 100644 --- a/sys.c +++ b/sys.c @@ -146,7 +146,6 @@ static int print_interfaces(char *mesh_iface) while ((iface_dir = readdir(iface_base_dir)) != NULL) { snprintf(path_buff, PATH_BUFF_LEN, SYS_MESH_IFACE_FMT, iface_dir->d_name); - path_buff[PATH_BUFF_LEN - 1] = '\0'; res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if (res != EXIT_SUCCESS) continue; @@ -164,7 +163,6 @@ static int print_interfaces(char *mesh_iface) line_ptr = NULL; snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_STATUS_FMT, iface_dir->d_name); - path_buff[PATH_BUFF_LEN - 1] = '\0'; res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if (res != EXIT_SUCCESS) { fprintf(stderr, "<error reading status>\n"); @@ -228,11 +226,9 @@ int interface(char *mesh_iface, int argc, char **argv) for (i = 2; i < argc; i++) { snprintf(path_buff, PATH_BUFF_LEN, SYS_MESH_IFACE_FMT, argv[i]); - path_buff[PATH_BUFF_LEN - 1] = '\0'; if (!file_exists(path_buff)) { snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_DIR, argv[i]); - path_buff[PATH_BUFF_LEN - 1] = '\0'; if (!file_exists(path_buff)) { fprintf(stderr, "Error - interface does not exist: %s\n", argv[i]); @@ -303,7 +299,6 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); - path_buff[PATH_BUFF_LEN - 1] = '\0'; if (argc != 1) { for (i = 1; i < argc; i++) { @@ -332,7 +327,6 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) } snprintf(str, sizeof(str), "%i", log_level); - str[sizeof(str) - 1] = '\0'; res = write_file(path_buff, SYS_LOG_LEVEL, str, NULL); goto out; } @@ -401,16 +395,13 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) /* prepare the classic path */ path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); - path_buff[PATH_BUFF_LEN - 1] = '\0'; /* if the specified interface is a VLAN then change the path to point * to the proper "vlan%{vid}" subfolder in the sysfs tree. */ vid = vlan_get_link(mesh_iface, &base_dev); - if (vid >= 0) { + if (vid >= 0) snprintf(path_buff, PATH_BUFF_LEN, SYS_VLAN_PATH, base_dev, vid); - path_buff[PATH_BUFF_LEN - 1] = '\0'; - } if (argc == 1) { res = read_file(path_buff, (char *)batctl_settings[setting].sysfs_name, @@ -476,7 +467,6 @@ int handle_gw_setting(char *mesh_iface, int argc, char **argv) path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); - path_buff[PATH_BUFF_LEN - 1] = '\0'; if (argc == 1) { res = read_file(path_buff, SYS_GW_MODE, USE_READ_BUFF, 0, 0, 0); @@ -586,7 +576,6 @@ int check_mesh_iface(char *mesh_iface) snprintf(path_buff, PATH_BUFF_LEN, SYS_VLAN_PATH, base_dev, vid); else snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); - path_buff[PATH_BUFF_LEN - 1] = '\0'; /* try to open the mesh sys directory */ dir = opendir(path_buff); @@ -610,7 +599,6 @@ int check_mesh_iface_ownership(char *mesh_iface, char *hard_iface) /* check if this device actually belongs to the mesh interface */ snprintf(path_buff, sizeof(path_buff), SYS_MESH_IFACE_FMT, hard_iface); - path_buff[sizeof(path_buff) - 1] = '\0'; res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if (res != EXIT_SUCCESS) { fprintf(stderr, "Error - the directory '%s' could not be read: %s\n", -- 2.1.4

2 1

[B.A.T.M.A.N.] batman-adv: increased default hop penalty
by Ruben Wisniewski 19 Apr '15

19 Apr '15

Forwarded private message, on request by Simon. On Friday 27 March 2015 16:52:14 Ruben Wisniewski wrote: > Hello Simon, > > > we just updated our mesh, to the batman-adv-version 2014.4. Now your > patch batman-adv: increase default hop penalty[1] is included. > > Since we got very large mesh-networks, we have some troubles with your > patch, which makes long (needed) pathes unusable, because they TQ drop > to lower zero. > > Else, we got some old and some new batman-adv versions, this change > overloads the old nodes, because their TQ are better, and similiar > links over new nodes got ignored. > > Else I see no improvement overall, because the usual urban link-wide > is about 30-50 meteres, and we got parts of the net where we need 4-5 > hops to reach the last node. Your Patch seem to limit these pathes to > something around 3 hops. So parts of our net are now offline, and the > speed overall doesn't seem to be improved. > > After these experience I like to ask you, if you mind reverting this > patch again. Else we have to work around with resetting to 15 again on > boot, which I think is not the prefered solution. > > > [1] > http://www.open-mesh.org/projects/batman-adv/repository/revisions/7644650bb7 > 66bd4c7b6be5d97e6b1c3ed93a38d7 > > > Best regards, > > > Ruben

3 2

[B.A.T.M.A.N.] [PATCHv2 1/4] batman-adv: Remove explicit compat.h include and split compat.h
by Sven Eckelmann 24 Mar '15

24 Mar '15

The current approach for the compat layer is to include the compat.h file at exactly the right time to provide additional functionality and to live patch the batman-adv sources. This has the problem that the compat.h file becomes harder to read over time. Also live patching and adding of missing functionality partially conflict. This becomes obvious when the include order in some files is different compared to the one the author of an compat.h entry expected. A different approach is to inject intermediate header files which add additional features. This allows to reduce the size of compat.h and only leaves the live patching part in it. The compat.h can then added automatically to each compile run before anything else is included. compat.h has therefore the control which headers must be included before the live patching of the batman-adv source can begin. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: no change Makefile | 4 + compat-include/linux/atomic.h | 29 +++ compat-include/linux/bug.h | 38 ++++ compat-include/linux/compiler.h | 40 ++++ compat-include/linux/etherdevice.h | 45 +++++ compat-include/linux/export.h | 29 +++ compat-include/linux/if_ether.h | 33 ++++ compat-include/linux/if_vlan.h | 44 +++++ compat-include/linux/kconfig.h | 42 +++++ compat-include/linux/kernel.h | 44 +++++ compat-include/linux/list.h | 54 ++++++ compat-include/linux/moduleparam.h | 72 +++++++ compat-include/linux/net.h | 39 ++++ compat-include/linux/netdev_features.h | 35 ++++ compat-include/linux/netdevice.h | 114 +++++++++++ compat-include/linux/percpu.h | 48 +++++ compat-include/linux/printk.h | 39 ++++ compat-include/linux/random.h | 33 ++++ compat-include/linux/rculist.h | 49 +++++ compat-include/linux/rcupdate.h | 39 ++++ compat-include/linux/seq_file.h | 36 ++++ compat-include/linux/skbuff.h | 94 +++++++++ compat-include/linux/slab.h | 33 ++++ compat.h | 336 ++------------------------------- main.h | 2 +- 25 files changed, 1050 insertions(+), 321 deletions(-) create mode 100644 compat-include/linux/atomic.h create mode 100644 compat-include/linux/bug.h create mode 100644 compat-include/linux/compiler.h create mode 100644 compat-include/linux/etherdevice.h create mode 100644 compat-include/linux/export.h create mode 100644 compat-include/linux/if_ether.h create mode 100644 compat-include/linux/if_vlan.h create mode 100644 compat-include/linux/kconfig.h create mode 100644 compat-include/linux/kernel.h create mode 100644 compat-include/linux/list.h create mode 100644 compat-include/linux/moduleparam.h create mode 100644 compat-include/linux/net.h create mode 100644 compat-include/linux/netdev_features.h create mode 100644 compat-include/linux/netdevice.h create mode 100644 compat-include/linux/percpu.h create mode 100644 compat-include/linux/printk.h create mode 100644 compat-include/linux/random.h create mode 100644 compat-include/linux/rculist.h create mode 100644 compat-include/linux/rcupdate.h create mode 100644 compat-include/linux/seq_file.h create mode 100644 compat-include/linux/skbuff.h create mode 100644 compat-include/linux/slab.h diff --git a/Makefile b/Makefile index 4f6c30a..fd7ae8d 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,10 @@ RM ?= rm -f REVISION= $(shell if [ -d "$(PWD)/.git" ]; then \ echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ fi) +NOSTDINC_FLAGS := \ + -I$(PWD)/compat-include/ \ + -include $(PWD)/compat.h \ + $(CFLAGS) CONFIG_BATMAN_ADV=m batman-adv-y += compat.o diff --git a/compat-include/linux/atomic.h b/compat-include/linux/atomic.h new file mode 100644 index 0000000..304af51 --- /dev/null +++ b/compat-include/linux/atomic.h @@ -0,0 +1,29 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_ATOMIC_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_ATOMIC_H_ + +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) +#include_next <linux/atomic.h> +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ATOMIC_H_ */ diff --git a/compat-include/linux/bug.h b/compat-include/linux/bug.h new file mode 100644 index 0000000..66f79f8 --- /dev/null +++ b/compat-include/linux/bug.h @@ -0,0 +1,38 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_BUG_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_BUG_H_ + +#include <linux/version.h> +#include_next <linux/bug.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) + +#undef BUILD_BUG_ON +#ifdef __CHECKER__ +#define BUILD_BUG_ON(condition) (0) +#else /* __CHECKER__ */ +#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2 * !!(condition)])) +#endif /* __CHECKER__ */ + +#endif /* < KERNEL_VERSION(3, 0, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_BUG_H_ */ diff --git a/compat-include/linux/compiler.h b/compat-include/linux/compiler.h new file mode 100644 index 0000000..1717105 --- /dev/null +++ b/compat-include/linux/compiler.h @@ -0,0 +1,40 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ + +#include <linux/version.h> +#include_next <linux/compiler.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) + +#define __always_unused __attribute__((unused)) +#define __percpu + +#endif /* < KERNEL_VERSION(2, 6, 33) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) + +#define __rcu + +#endif /* < KERNEL_VERSION(2, 6, 36) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ */ diff --git a/compat-include/linux/etherdevice.h b/compat-include/linux/etherdevice.h new file mode 100644 index 0000000..c20b43c --- /dev/null +++ b/compat-include/linux/etherdevice.h @@ -0,0 +1,45 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_ETHERDEVICE_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_ETHERDEVICE_H_ + +#include <linux/version.h> +#include_next <linux/etherdevice.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) + +#define eth_hw_addr_random(dev) batadv_eth_hw_addr_random(dev) + +static inline void batadv_eth_hw_addr_random(struct net_device *dev) +{ + random_ether_addr(dev->dev_addr); +} + +#endif /* < KERNEL_VERSION(3, 4, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) + +#define ether_addr_equal_unaligned(_a, _b) (memcmp(_a, _b, ETH_ALEN) == 0) +#define ether_addr_copy(_a, _b) memcpy(_a, _b, ETH_ALEN) + +#endif /* < KERNEL_VERSION(3, 14, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ETHERDEVICE_H_ */ diff --git a/compat-include/linux/export.h b/compat-include/linux/export.h new file mode 100644 index 0000000..3b31a2d --- /dev/null +++ b/compat-include/linux/export.h @@ -0,0 +1,29 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_EXPORT_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_EXPORT_H_ + +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) +#include_next <linux/export.h> +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_EXPORT_H_ */ diff --git a/compat-include/linux/if_ether.h b/compat-include/linux/if_ether.h new file mode 100644 index 0000000..5ea164f --- /dev/null +++ b/compat-include/linux/if_ether.h @@ -0,0 +1,33 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_IF_ETHER_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_IF_ETHER_H_ + +#include <linux/version.h> +#include_next <linux/if_ether.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) + +#define ETH_P_BATMAN 0x4305 + +#endif /* < KERNEL_VERSION(3, 8, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_IF_ETHER_H_ */ diff --git a/compat-include/linux/if_vlan.h b/compat-include/linux/if_vlan.h new file mode 100644 index 0000000..3b146b4 --- /dev/null +++ b/compat-include/linux/if_vlan.h @@ -0,0 +1,44 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_IF_VLAN_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_IF_VLAN_H_ + +#include <linux/version.h> +#include_next <linux/if_vlan.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) + +#define VLAN_PRIO_MASK 0xe000 /* Priority Code Point */ +#define VLAN_PRIO_SHIFT 13 + +#endif /* < KERNEL_VERSION(2, 6, 33) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) + +#define vlan_insert_tag(skb, proto, vid) __vlan_put_tag(skb, vid) + +#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + +#define vlan_insert_tag(skb, proto, vid) vlan_insert_tag(skb, vid) + +#endif /* < KERNEL_VERSION(3, 0, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_IF_VLAN_H_ */ diff --git a/compat-include/linux/kconfig.h b/compat-include/linux/kconfig.h new file mode 100644 index 0000000..be8aa02 --- /dev/null +++ b/compat-include/linux/kconfig.h @@ -0,0 +1,42 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_KCONFIG_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_KCONFIG_H_ + +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) +#include_next <linux/kconfig.h> +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) + +#define __ARG_PLACEHOLDER_1 0, +#define config_enabled(cfg) _config_enabled(cfg) +#define _config_enabled(value) __config_enabled(__ARG_PLACEHOLDER_##value) +#define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0) +#define ___config_enabled(__ignored, val, ...) val + +#define IS_ENABLED(option) \ + (config_enabled(option) || config_enabled(option##_MODULE)) + +#endif /* < KERNEL_VERSION(3, 1, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_KCONFIG_H_ */ diff --git a/compat-include/linux/kernel.h b/compat-include/linux/kernel.h new file mode 100644 index 0000000..81b2862 --- /dev/null +++ b/compat-include/linux/kernel.h @@ -0,0 +1,44 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_KERNEL_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_KERNEL_H_ + +#include <linux/version.h> +#include_next <linux/kernel.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) + +#define kstrtou32(cp, base, v)\ +({\ + unsigned long _v;\ + int _r;\ + _r = strict_strtoul(cp, base, &_v);\ + *(v) = (uint32_t)_v;\ + if ((unsigned long)*(v) != _v)\ + _r = -ERANGE;\ + _r;\ +}) +#define kstrtoul strict_strtoul +#define kstrtol strict_strtol + +#endif /* < KERNEL_VERSION(2, 6, 39) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_KERNEL_H_ */ diff --git a/compat-include/linux/list.h b/compat-include/linux/list.h new file mode 100644 index 0000000..dcd604c --- /dev/null +++ b/compat-include/linux/list.h @@ -0,0 +1,54 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_LIST_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_LIST_H_ + +#include <linux/version.h> +#include_next <linux/list.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) + +#define hlist_entry_safe(ptr, type, member) \ + ({ typeof(ptr) ____ptr = (ptr); \ + ____ptr ? hlist_entry(____ptr, type, member) : NULL; \ + }) + +#undef hlist_for_each_entry +#define hlist_for_each_entry(pos, head, member) \ + for (pos = hlist_entry_safe((head)->first, typeof(*(pos)), member);\ + pos; \ + pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member)) + +#undef hlist_for_each_entry_safe +#define hlist_for_each_entry_safe(pos, n, head, member) \ + for (pos = hlist_entry_safe((head)->first, typeof(*pos), member);\ + pos && ({ n = pos->member.next; 1; }); \ + pos = hlist_entry_safe(n, typeof(*pos), member)) + +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) + +#define hlist_add_behind(n, prev) hlist_add_after(prev, n) + +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_LIST_H_ */ diff --git a/compat-include/linux/moduleparam.h b/compat-include/linux/moduleparam.h new file mode 100644 index 0000000..fd8ac41 --- /dev/null +++ b/compat-include/linux/moduleparam.h @@ -0,0 +1,72 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_MODULEPARAM_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_MODULEPARAM_H_ + +#include <linux/version.h> +#include_next <linux/moduleparam.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) + +#define __compat__module_param_call(p1, p2, p3, p4, p5, p6, p7) \ + __module_param_call(p1, p2, p3, p4, p5, p7) + +#else + +#define __compat__module_param_call(p1, p2, p3, p4, p5, p6, p7) \ + __module_param_call(p1, p2, p3, p4, p5, p6, p7) + +#endif /* < KERNEL_VERSION(2, 6, 31) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) + +struct kernel_param_ops { + /* Returns 0, or -errno. arg is in kp->arg. */ + int (*set)(const char *val, const struct kernel_param *kp); + /* Returns length written or -errno. Buffer is 4k (ie. be short!) */ + int (*get)(char *buffer, struct kernel_param *kp); + /* Optional function to free kp->arg when module unloaded. */ + void (*free)(void *arg); +}; + +#define module_param_cb(name, ops, arg, perm) \ + static int __compat_set_param_##name(const char *val, \ + struct kernel_param *kp) \ + { return (ops)->set(val, kp); } \ + static int __compat_get_param_##name(char *buffer, \ + struct kernel_param *kp) \ + { return (ops)->get(buffer, kp); } \ + __compat__module_param_call(MODULE_PARAM_PREFIX, name, \ + __compat_set_param_##name, \ + __compat_get_param_##name, arg, \ + __same_type((arg), bool *), perm) + +static inline int batadv_param_set_copystring(const char *val, + const struct kernel_param *kp) +{ + return param_set_copystring(val, (struct kernel_param *)kp); +} + +#define param_set_copystring batadv_param_set_copystring + +#endif /* < KERNEL_VERSION(2, 6, 36) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_MODULEPARAM_H_ */ diff --git a/compat-include/linux/net.h b/compat-include/linux/net.h new file mode 100644 index 0000000..fcd7873 --- /dev/null +++ b/compat-include/linux/net.h @@ -0,0 +1,39 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_NET_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_NET_H_ + +#include <linux/version.h> +#include_next <linux/net.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) + +#ifndef net_ratelimited_function +#define net_ratelimited_function(func, ...) \ + do { \ + if (net_ratelimit()) \ + func(__VA_ARGS__); \ + } while (0) +#endif /* ifndef net_ratelimited_function */ + +#endif /* < KERNEL_VERSION(3, 5, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NET_H_ */ diff --git a/compat-include/linux/netdev_features.h b/compat-include/linux/netdev_features.h new file mode 100644 index 0000000..36c9c2f --- /dev/null +++ b/compat-include/linux/netdev_features.h @@ -0,0 +1,35 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_NETDEV_FEATURES_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_NETDEV_FEATURES_H_ + +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) +#include_next <linux/netdev_features.h> +#endif /* >= KERNEL_VERSION(3, 3, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + +#define NETIF_F_HW_VLAN_CTAG_FILTER NETIF_F_HW_VLAN_FILTER + +#endif /* < KERNEL_VERSION(3, 10, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETDEV_FEATURES_H_ */ diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h new file mode 100644 index 0000000..9a2f204 --- /dev/null +++ b/compat-include/linux/netdevice.h @@ -0,0 +1,114 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_NETDEVICE_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_NETDEVICE_H_ + +#include <linux/version.h> +#include_next <linux/netdevice.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) + +#include <linux/netdev_features.h> + +#endif /* < KERNEL_VERSION(3, 3, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) + +#define unregister_netdevice_queue(dev, head) unregister_netdevice(dev) + +#endif /* < KERNEL_VERSION(2, 6, 33) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) + +#include <linux/etherdevice.h> + +#undef netdev_for_each_mc_addr +#define netdev_for_each_mc_addr(mclist, dev) \ + for (mclist = (struct batadv_dev_addr_list *)dev->mc_list; mclist; \ + mclist = (struct batadv_dev_addr_list *)mclist->next) + +/* Note, that this breaks the usage of the normal 'struct netdev_hw_addr' + * for kernels < 2.6.35 in batman-adv! + */ +#define netdev_hw_addr batadv_dev_addr_list +struct batadv_dev_addr_list { + struct dev_addr_list *next; + u8 addr[MAX_ADDR_LEN]; + u8 da_addrlen; + u8 da_synced; + int da_users; + int da_gusers; +}; + +#endif /* < KERNEL_VERSION(2, 6, 35) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) + +#define NET_ADDR_RANDOM 0 + +#endif /* < KERNEL_VERSION(2, 6, 36) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) + +/* On older kernels net_dev->master is reserved for iface bonding. */ +static inline int batadv_netdev_set_master(struct net_device *slave, + struct net_device *master) +{ + return 0; +} + +#define netdev_set_master batadv_netdev_set_master + +#endif /* < KERNEL_VERSION(2, 6, 39) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) + +#define netdev_master_upper_dev_link netdev_set_master +#define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL) +#define netdev_master_upper_dev_get(dev) \ +({\ + ASSERT_RTNL();\ + dev->master;\ +}) + +#endif /* < KERNEL_VERSION(3, 9, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) + +#define netdev_notifier_info_to_dev(ptr) ptr + +#endif /* < KERNEL_VERSION(3, 11, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) + +/* alloc_netdev() was defined differently before 2.6.38 */ +#undef alloc_netdev +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) +#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ + alloc_netdev_mq(sizeof_priv, name, setup, 1) +#else +#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ + alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1) +#endif /* nested < KERNEL_VERSION(2, 6, 38) */ + +#endif /* < KERNEL_VERSION(3, 17, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETDEVICE_H_ */ diff --git a/compat-include/linux/percpu.h b/compat-include/linux/percpu.h new file mode 100644 index 0000000..82355e4 --- /dev/null +++ b/compat-include/linux/percpu.h @@ -0,0 +1,48 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_PERCPU_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_PERCPU_H_ + +#include <linux/version.h> +#include_next <linux/percpu.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) + +#undef __alloc_percpu +#define __alloc_percpu(size, align) \ + percpu_alloc_mask((size), GFP_KERNEL, cpu_possible_map) + +#endif /* < KERNEL_VERSION(2, 6, 30) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) + +#define this_cpu_add(x, c) batadv_this_cpu_add(&(x), c) + +static inline void batadv_this_cpu_add(uint64_t *count_ptr, size_t count) +{ + int cpu = get_cpu(); + *per_cpu_ptr(count_ptr, cpu) += count; + put_cpu(); +} + +#endif /* < KERNEL_VERSION(2, 6, 33) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_PERCPU_H_ */ diff --git a/compat-include/linux/printk.h b/compat-include/linux/printk.h new file mode 100644 index 0000000..c69c406 --- /dev/null +++ b/compat-include/linux/printk.h @@ -0,0 +1,39 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_PRINTK_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_PRINTK_H_ + +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) +#include_next <linux/printk.h> +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) + +#define pr_warn pr_warning + +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_PRINTK_H_ */ + +#ifndef pr_fmt +#define pr_fmt(fmt) fmt +#endif diff --git a/compat-include/linux/random.h b/compat-include/linux/random.h new file mode 100644 index 0000000..ce12f1a --- /dev/null +++ b/compat-include/linux/random.h @@ -0,0 +1,33 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_RANDOM_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_RANDOM_H_ + +#include <linux/version.h> +#include_next <linux/random.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) + +#define prandom_u32() random32() + +#endif /* < KERNEL_VERSION(3, 9, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_RANDOM_H_ */ diff --git a/compat-include/linux/rculist.h b/compat-include/linux/rculist.h new file mode 100644 index 0000000..4736db1 --- /dev/null +++ b/compat-include/linux/rculist.h @@ -0,0 +1,49 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_RCULIST_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_RCULIST_H_ + +#include <linux/version.h> +#include_next <linux/rculist.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) + +#define hlist_first_rcu(head) \ + (*((struct hlist_node __rcu **)(&(head)->first))) + +#define hlist_next_rcu(node) \ + (*((struct hlist_node __rcu **)(&(node)->next))) + +#endif /* < KERNEL_VERSION(2, 6, 37) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) + +#undef hlist_for_each_entry_rcu +#define hlist_for_each_entry_rcu(pos, head, member) \ + for (pos = hlist_entry_safe(rcu_dereference_raw(hlist_first_rcu(head)),\ + typeof(*(pos)), member); \ + pos; \ + pos = hlist_entry_safe(rcu_dereference_raw(hlist_next_rcu(\ + &(pos)->member)), typeof(*(pos)), member)) + +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_RCULIST_H_ */ diff --git a/compat-include/linux/rcupdate.h b/compat-include/linux/rcupdate.h new file mode 100644 index 0000000..f3ed948 --- /dev/null +++ b/compat-include/linux/rcupdate.h @@ -0,0 +1,39 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_RCUPDATE_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_RCUPDATE_H_ + +#include <linux/version.h> +#include_next <linux/rcupdate.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) + +#define rcu_dereference_protected(p, c) (p) + +#define rcu_dereference_raw(p) ({ \ + typeof(p) _________p1 = ACCESS_ONCE(p); \ + smp_read_barrier_depends(); \ + (_________p1); \ + }) + +#endif /* < KERNEL_VERSION(2, 6, 34) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_RCUPDATE_H_ */ diff --git a/compat-include/linux/seq_file.h b/compat-include/linux/seq_file.h new file mode 100644 index 0000000..5eaaec8 --- /dev/null +++ b/compat-include/linux/seq_file.h @@ -0,0 +1,36 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_SEQ_FILE_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_SEQ_FILE_H_ + +#include <linux/version.h> +#include_next <linux/seq_file.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) + +static inline bool seq_has_overflowed(struct seq_file *m) +{ + return m->count == m->size; +} + +#endif /* < KERNEL_VERSION(3, 19, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SEQ_FILE_H_ */ diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h new file mode 100644 index 0000000..ed911ef --- /dev/null +++ b/compat-include/linux/skbuff.h @@ -0,0 +1,94 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_SKBUFF_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_SKBUFF_H_ + +#include <linux/version.h> +#include_next <linux/skbuff.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) + +#define consume_skb(_skb) kfree_skb(_skb) + +#endif /* < KERNEL_VERSION(2, 6, 30) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) + +static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, + unsigned int length) +{ + struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN); + + if (NET_IP_ALIGN && skb) + skb_reserve(skb, NET_IP_ALIGN); + return skb; +} + +#endif /* < KERNEL_VERSION(2, 6, 33) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) + +static inline void skb_reset_mac_len(struct sk_buff *skb) +{ + skb->mac_len = skb->network_header - skb->mac_header; +} + +#endif /* < KERNEL_VERSION(3, 0, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) + +/* hack for not correctly set mac_len. This may happen for some special + * configurations like batman-adv on VLANs. + * + * This is pretty dirty, but we only use skb_share_check() in main.c right + * before mac_len is checked, and the recomputation shouldn't hurt too much. + */ +#define skb_share_check(skb, b) \ + ({ \ + struct sk_buff *_t_skb; \ + _t_skb = skb_share_check(skb, b); \ + if (_t_skb) \ + skb_reset_mac_len(_t_skb); \ + _t_skb; \ + }) + +#endif /* < KERNEL_VERSION(3, 8, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) + +/* older kernels still need to call skb_abort_seq_read() */ +#define skb_seq_read(consumed, data, st) \ + ({ \ + int __len = skb_seq_read(consumed, data, st); \ + if (__len == 0) \ + skb_abort_seq_read(st); \ + __len; \ + }) + +#endif /* < KERNEL_VERSION(3, 11, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) + +#define pskb_copy_for_clone pskb_copy + +#endif /* < KERNEL_VERSION(3, 16, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SKBUFF_H_ */ diff --git a/compat-include/linux/slab.h b/compat-include/linux/slab.h new file mode 100644 index 0000000..569c5aa --- /dev/null +++ b/compat-include/linux/slab.h @@ -0,0 +1,33 @@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_SLAB_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_SLAB_H_ + +#include <linux/version.h> +#include_next <linux/slab.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) + +#define kmalloc_array(n, size, flags) kmalloc(n * size, flags) + +#endif /* < KERNEL_VERSION(3, 4, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SLAB_H_ */ diff --git a/compat.h b/compat.h index 3b59e78..ed90e2e 100644 --- a/compat.h +++ b/compat.h @@ -22,30 +22,7 @@ #define _NET_BATMAN_ADV_COMPAT_H_ #include <linux/version.h> /* LINUX_VERSION_CODE */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) - -#define consume_skb(_skb) kfree_skb(_skb) - -#undef __alloc_percpu -#define __alloc_percpu(size, align) \ - percpu_alloc_mask((size), GFP_KERNEL, cpu_possible_map) - -#endif /* < KERNEL_VERSION(2, 6, 30) */ - - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) - -#define __compat__module_param_call(p1, p2, p3, p4, p5, p6, p7) \ - __module_param_call(p1, p2, p3, p4, p5, p7) - -#else - -#define __compat__module_param_call(p1, p2, p3, p4, p5, p6, p7) \ - __module_param_call(p1, p2, p3, p4, p5, p6, p7) - -#endif /* < KERNEL_VERSION(2, 6, 31) */ - +#include <linux/kconfig.h> #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)) #include <linux/autoconf.h> @@ -56,154 +33,47 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -#define __always_unused __attribute__((unused)) -#define __percpu - #define skb_iif iif -#define this_cpu_add(x, c) batadv_this_cpu_add(&(x), c) - -static inline void batadv_this_cpu_add(uint64_t *count_ptr, size_t count) -{ - int cpu = get_cpu(); - *per_cpu_ptr(count_ptr, cpu) += count; - put_cpu(); -} - #define batadv_softif_destroy_netlink(dev, head) batadv_softif_destroy_netlink(dev) -#define unregister_netdevice_queue(dev, head) unregister_netdevice(dev) - -static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, - unsigned int length) -{ - struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN); - - if (NET_IP_ALIGN && skb) - skb_reserve(skb, NET_IP_ALIGN); - return skb; -} - -#define VLAN_PRIO_MASK 0xe000 /* Priority Code Point */ -#define VLAN_PRIO_SHIFT 13 #endif /* < KERNEL_VERSION(2, 6, 33) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) - -#define rcu_dereference_protected(p, c) (p) - -#define rcu_dereference_raw(p) ({ \ - typeof(p) _________p1 = ACCESS_ONCE(p); \ - smp_read_barrier_depends(); \ - (_________p1); \ - }) - -#endif /* < KERNEL_VERSION(2, 6, 34) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) +#include <linux/netdevice.h> -#define pr_warn pr_warning +#define netdev_master_upper_dev_get_rcu(dev) \ + (dev->br_port ? dev : NULL); \ + break; -#undef netdev_for_each_mc_addr -#define netdev_for_each_mc_addr(mclist, dev) \ - for (mclist = (struct batadv_dev_addr_list *)dev->mc_list; mclist; \ - mclist = (struct batadv_dev_addr_list *)mclist->next) +#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) -/* Note, that this breaks the usage of the normal 'struct netdev_hw_addr' - * for kernels < 2.6.35 in batman-adv! - */ -#define netdev_hw_addr batadv_dev_addr_list -struct batadv_dev_addr_list { - struct dev_addr_list *next; - u8 addr[MAX_ADDR_LEN]; - u8 da_addrlen; - u8 da_synced; - int da_users; - int da_gusers; -}; +#include <linux/netdevice.h> -#endif /* < KERNEL_VERSION(2, 6, 35) */ +#define netdev_master_upper_dev_get_rcu(dev) \ + (dev->priv_flags & IFF_BRIDGE_PORT ? dev : NULL); \ + break; +#endif /* < KERNEL_VERSION(2, 6, 36) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) -#define __rcu #define IFF_BRIDGE_PORT 0 || (hard_iface->net_dev->br_port ? 1 : 0) -struct kernel_param_ops { - /* Returns 0, or -errno. arg is in kp->arg. */ - int (*set)(const char *val, const struct kernel_param *kp); - /* Returns length written or -errno. Buffer is 4k (ie. be short!) */ - int (*get)(char *buffer, struct kernel_param *kp); - /* Optional function to free kp->arg when module unloaded. */ - void (*free)(void *arg); -}; - -#define module_param_cb(name, ops, arg, perm) \ - static int __compat_set_param_##name(const char *val, \ - struct kernel_param *kp) \ - { return (ops)->set(val, kp); } \ - static int __compat_get_param_##name(char *buffer, \ - struct kernel_param *kp) \ - { return (ops)->get(buffer, kp); } \ - __compat__module_param_call(MODULE_PARAM_PREFIX, name, \ - __compat_set_param_##name, \ - __compat_get_param_##name, arg, \ - __same_type((arg), bool *), perm) - -static inline int batadv_param_set_copystring(const char *val, - const struct kernel_param *kp) -{ - return param_set_copystring(val, (struct kernel_param *)kp); -} -#define param_set_copystring batadv_param_set_copystring - /* hack for dev->addr_assign_type &= ~NET_ADDR_RANDOM; */ #define addr_assign_type ifindex -#define NET_ADDR_RANDOM 0 - -#define netdev_master_upper_dev_get_rcu(dev) \ - (dev->br_port ? dev : NULL); \ - break; #endif /* < KERNEL_VERSION(2, 6, 36) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) - -#define hlist_first_rcu(head) (*((struct hlist_node __rcu **)(&(head)->first))) -#define hlist_next_rcu(node) (*((struct hlist_node __rcu **)(&(node)->next))) - -#endif /* < KERNEL_VERSION(2, 6, 37) */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) -#define kstrtou32(cp, base, v)\ -({\ - unsigned long _v;\ - int _r;\ - _r = strict_strtoul(cp, base, &_v);\ - *(v) = (uint32_t)_v;\ - if ((unsigned long)*(v) != _v)\ - _r = -ERANGE;\ - _r;\ -}) -#define kstrtoul strict_strtoul -#define kstrtol strict_strtol - -/* On older kernels net_dev->master is reserved for iface bonding. */ -static inline int batadv_netdev_set_master(struct net_device *slave, - struct net_device *master) -{ - return 0; -} - -#define netdev_set_master batadv_netdev_set_master - /* Hack for removing ndo_add/del_slave at the end of net_device_ops. * This is somewhat ugly because it requires that ndo_validate_addr * is at the end of this struct in soft-interface.c. */ +#include <linux/netdevice.h> + #define ndo_validate_addr \ ndo_validate_addr = eth_validate_addr, \ }; \ @@ -223,7 +93,8 @@ static const struct { \ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) #define kfree_rcu(ptr, rcu_head) call_rcu(&ptr->rcu_head, batadv_free_rcu_##ptr) -#define vlan_insert_tag(skb, proto, vid) __vlan_put_tag(skb, vid) + +struct rcu_head; void batadv_free_rcu_orig_vlan(struct rcu_head *rcu); void batadv_free_rcu_softif_vlan(struct rcu_head *rcu); @@ -235,32 +106,8 @@ void batadv_free_rcu_dat_entry(struct rcu_head *rcu); void batadv_free_rcu_nc_path(struct rcu_head *rcu); void batadv_free_rcu_tvlv_handler(struct rcu_head *rcu); -static inline void skb_reset_mac_len(struct sk_buff *skb) -{ - skb->mac_len = skb->network_header - skb->mac_header; -} - -#undef BUILD_BUG_ON -#ifdef __CHECKER__ -#define BUILD_BUG_ON(condition) (0) -#else /* __CHECKER__ */ -#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) -#endif /* __CHECKER__ */ - #endif /* < KERNEL_VERSION(3, 0, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) - -#define __ARG_PLACEHOLDER_1 0, -#define config_enabled(cfg) _config_enabled(cfg) -#define _config_enabled(value) __config_enabled(__ARG_PLACEHOLDER_##value) -#define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0) -#define ___config_enabled(__ignored, val, ...) val - -#define IS_ENABLED(option) \ - (config_enabled(option) || config_enabled(option##_MODULE)) - -#endif /* < KERNEL_VERSION(3, 1, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) @@ -287,56 +134,8 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #endif /* < KERNEL_VERSION(3, 3, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) - -#define eth_hw_addr_random(dev) batadv_eth_hw_addr_random(dev) - -static inline void batadv_eth_hw_addr_random(struct net_device *dev) -{ - random_ether_addr(dev->dev_addr); -} - -#define kmalloc_array(n, size, flags) kmalloc(n * size, flags) - -#endif /* < KERNEL_VERSION(3, 4, 0) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) - -#ifndef net_ratelimited_function -#define net_ratelimited_function(func, ...) \ - do { \ - if (net_ratelimit()) \ - func(__VA_ARGS__); \ - } while (0) -#endif /* ifndef net_ratelimited_function */ - -#endif /* < KERNEL_VERSION(3, 5, 0) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - -#define ETH_P_BATMAN 0x4305 - -/* hack for not correctly set mac_len. This may happen for some special - * configurations like batman-adv on VLANs. - * - * This is pretty dirty, but we only use skb_share_check() in main.c right - * before mac_len is checked, and the recomputation shouldn't hurt too much. - */ -#define skb_share_check(skb, b) \ - ({ \ - struct sk_buff *_t_skb; \ - _t_skb = skb_share_check(skb, b); \ - if (_t_skb) \ - skb_reset_mac_len(_t_skb); \ - _t_skb; \ - }) - -#endif /* < KERNEL_VERSION(3, 8, 0) */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) -#define prandom_u32() random32() - #define batadv_interface_set_mac_addr(x, y) \ __batadv_interface_set_mac_addr(struct net_device *dev, void *p);\ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) \ @@ -361,61 +160,10 @@ static int batadv_interface_tx(struct sk_buff *skb, \ static int __batadv_interface_tx(struct sk_buff *skb, \ struct net_device *soft_iface) -#define netdev_master_upper_dev_link netdev_set_master -#define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL) -#define netdev_master_upper_dev_get(dev) \ -({\ - ASSERT_RTNL();\ - dev->master;\ -}) -#define hlist_entry_safe(ptr, type, member) \ - ({ typeof(ptr) ____ptr = (ptr); \ - ____ptr ? hlist_entry(____ptr, type, member) : NULL; \ - }) - -#undef hlist_for_each_entry -#define hlist_for_each_entry(pos, head, member) \ - for (pos = hlist_entry_safe((head)->first, typeof(*(pos)), member);\ - pos; \ - pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member)) - -#undef hlist_for_each_entry_rcu -#define hlist_for_each_entry_rcu(pos, head, member) \ - for (pos = hlist_entry_safe (rcu_dereference_raw(hlist_first_rcu(head)),\ - typeof(*(pos)), member); \ - pos; \ - pos = hlist_entry_safe(rcu_dereference_raw(hlist_next_rcu(\ - &(pos)->member)), typeof(*(pos)), member)) - -#undef hlist_for_each_entry_safe -#define hlist_for_each_entry_safe(pos, n, head, member) \ - for (pos = hlist_entry_safe((head)->first, typeof(*pos), member);\ - pos && ({ n = pos->member.next; 1; }); \ - pos = hlist_entry_safe(n, typeof(*pos), member)) - -#ifndef netdev_master_upper_dev_get_rcu -#define netdev_master_upper_dev_get_rcu(dev) \ - (dev->priv_flags & IFF_BRIDGE_PORT ? dev : NULL); \ - break; - -#endif /* netdev_master_upper_dev_get_rcu */ - #endif /* < KERNEL_VERSION(3, 9, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) -#ifndef vlan_insert_tag - -/* include this header early to let the following define - * not mess up the original function prototype. - */ -#include <linux/if_vlan.h> -#define vlan_insert_tag(skb, proto, vid) vlan_insert_tag(skb, vid) - -#endif /* vlan_insert_tag */ - -#define NETIF_F_HW_VLAN_CTAG_FILTER NETIF_F_HW_VLAN_FILTER - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) #define batadv_interface_add_vid(x, y, z) \ @@ -443,56 +191,4 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #endif /* < KERNEL_VERSION(3, 10, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) - -#define netdev_notifier_info_to_dev(ptr) ptr - -/* older kernels still need to call skb_abort_seq_read() */ -#define skb_seq_read(consumed, data, st) \ - ({ \ - int __len = skb_seq_read(consumed, data, st); \ - if (__len == 0) \ - skb_abort_seq_read(st); \ - __len; \ - }) -#endif /* < KERNEL_VERSION(3, 11, 0) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) - -#define ether_addr_equal_unaligned(_a, _b) (memcmp(_a, _b, ETH_ALEN) == 0) -#define ether_addr_copy(_a, _b) memcpy(_a, _b, ETH_ALEN) - -#endif /* < KERNEL_VERSION(3, 14, 0) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) - -#define pskb_copy_for_clone pskb_copy - -#endif /* < KERNEL_VERSION(3, 16, 0) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) - -#define hlist_add_behind(n, prev) hlist_add_after(prev, n) - -/* alloc_netdev() was defined differently before 2.6.38 */ -#undef alloc_netdev -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) -#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ - alloc_netdev_mq(sizeof_priv, name, setup, 1) -#else -#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ - alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1) -#endif /* nested < KERNEL_VERSION(2, 6, 38) */ - -#endif /* < KERNEL_VERSION(3, 17, 0) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) - -static inline bool seq_has_overflowed(struct seq_file *m) -{ - return m->count == m->size; -} - -#endif /* < KERNEL_VERSION(3, 19, 0) */ - #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/main.h b/main.h index 569846b..1d5340c 100644 --- a/main.h +++ b/main.h @@ -182,7 +182,7 @@ enum batadv_uev_type { #include <linux/jiffies.h> #include <linux/seq_file.h> #include <linux/if_vlan.h> -#include "compat.h" +#include <linux/printk.h> #include "types.h" -- 2.1.4

1 3

[B.A.T.M.A.N.] Fwd: [Battlemesh] Announcing Battlemesh V8 Maribor, Slovenia
by Simon Wunderlich 24 Mar '15

24 Mar '15

I'm sure there are some on this list who will be interested in joining! Please spread the word. :) ---------- Forwarded Message ---------- Subject: [Battlemesh] Announcing Battlemesh V8 Maribor, Slovenia Date: Monday 23 March 2015, 17:13:18 From: Musti <musti(a)wlan-si.net> To: Battle of the Mesh Mailing List <battlemesh(a)ml.ninux.org> ========================================================== Announcing the Wireless Battle Mesh v8 (3rd - 9th of August 2015, Maribor, Slovenia) ========================================================== The next 'Wireless Battle of the Mesh' will take place from Mon 3rd till Sun 9th of August at Dom Obrambe Pekre, Maribor, Slovenia. The event aims to bring together people from across the globe to test the performance of different routing protocols for ad-hoc networks, like Babel, B.A.T.M.A.N., BMX, OLSR, and 802.11s. Of course, new protocols (working on OpenWrt) are always welcome! It is not required to be active within the mentioned protocols, so if you are a mesh networking enthusiast, community networking activist, or have an interest in mesh networks in general, you have to check this out! Information about the event is gathered at: http://battlemesh.org/BattleMeshV8 Location ======== The event takes place at the Dom Obrambe Pekre, Maribor, Slovenia. It features one large dining hall with an attached smaller hall for talks, a large lecture theater, several smaller classrooms and an outdoor auditorium. Expect to find nice community WiFi internet connection (open.wlan-si.net), video projectors, beverage and snack supplies and some curious hackers. Participant Registration and Fee ================================ The event itself is free of charge and open for all, so to register without hotel and food supply, simply add your name to the participant table. http://battlemesh.org/BattleMeshV8/Participants If you wish low cost accommodation, a special group booking has been arranged. Payment in advance is required to get the full benefit of the discount. Therefore, like for the previous event, this year's edition features an "early bird low cost" registration program with two accomodation options: Hotel Milena: ------------- Hotel Milena is a family run hotel under mountain Pohorje for which the accommodation is offered in a package. Rooms are for 2-4 people, some rooms have a double bed only. In the case of a large number of participants some accommodation will be in the neighbouring hotels as well. Breakfast is included. There is a 15min walk to the conference venue. Early bird booking is available for 6 nights (August 3rd to 9th) for 150 EUR if payment is received before 18th April. The price goes up to EUR 175,00 for all later payments. These late arrangements are subject to availability. Camping: -------- Camping Kekec is a camping place in the vicinity of Hotel Milena, all the usual camping amnesties available. No breakfast included. There are shops nearby, walking to the conference venue takes 18 minutes. Early bird booking is available for 6 nights (August 3rd to 9th) for 45 EUR if payment is received before 18th April The price goes up to EUR 55,00 for all later payments. These late arrangements are subject to availability. General: -------- For any additional information, requests and inquiries get in touch with the local organization team: battlemeshv8 at wlan-si.net Of course, this package is not compulsory. You can also find your own bed and food supply yourself during the event if you wish to do so. Payment information can be found be found here on the Battlemesh Wiki: http://battlemesh.org/BattleMeshV8#Participant_Registration_and_Fee Spread the Word =============== Feel free to spread the word by forwarding this mail to all lists / people that might be interested in it. Blogging about the event is more than welcome, and if you do so, please add a ping-back to the wiki page: http://battlemesh.org/BattleMeshV8 Contact ======= * Web: http://battlemesh.org/BattleMeshV8 * Email: http://ml.ninux.org/mailman/listinfo/battlemesh * IRC: irc.freenode.net #battlemesh Kind regards, Musti _______________________________________________ Battlemesh mailing list Battlemesh(a)ml.ninux.org http://ml.ninux.org/mailman/listinfo/battlemesh -----------------------------------------

1 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N March 2015