commits October 2011

commits@lists.open-mesh.org

1 participants
35 discussions

batman-adv; branch, master, updated. v2011.3.0-37-g7f1b2a0
by postmaster＠open-mesh.org 24 Oct '11

24 Oct '11

The following commit has been merged in the master branch: commit 7f1b2a091195b47d85576fa72fb97eaa07a4b5b9 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Oct 16 20:32:02 2011 +0200 batman-adv: linearise the tt_response skb only if needed The TT_RESPONSE skb has to be linearised only if the node plans to access the packet payload (so only if the message is directed to that node). In all the other cases the node can avoid this memory operation Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/routing.c b/routing.c index 60ce407..e0e7b7b 100644 --- a/routing.c +++ b/routing.c @@ -616,13 +616,14 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) } break; case TT_RESPONSE: - /* packet needs to be linearized to access the TT changes */ - if (skb_linearize(skb) < 0) - goto out; + if (is_my_mac(tt_query->dst)) { + /* packet needs to be linearized to access the TT + * changes */ + if (skb_linearize(skb) < 0) + goto out; - if (is_my_mac(tt_query->dst)) handle_tt_response(bat_priv, tt_query); - else { + } else { bat_dbg(DBG_TT, bat_priv, "Routing TT_RESPONSE to %pM [%c]\n", tt_query->dst, -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.3.0-36-g52d3db8
by postmaster＠open-mesh.org 24 Oct '11

24 Oct '11

The following commit has been merged in the master branch: commit 52d3db88dfa56527a7ad4ed4f807cd93c3232aa9 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sat Oct 22 18:15:26 2011 +0200 batman-adv: directly write tt entries without buffering When the translation tables (global and local) are written for debugfs, it is not neccesary to allocate a buffer, we can directly use seq_printf() to print them out. This might actually be safer if the table changes between size calculation and traversal, and we can't estimate the required size wrong. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/translation-table.c b/translation-table.c index 5f28a7f..78b9528 100644 --- a/translation-table.c +++ b/translation-table.c @@ -314,8 +314,6 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset) struct hard_iface *primary_if; struct hlist_node *node; struct hlist_head *head; - size_t buf_size, pos; - char *buff; uint32_t i; int ret = 0; @@ -338,34 +336,13 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset) "announced via TT (TTVN: %u):\n", net_dev->name, (uint8_t)atomic_read(&bat_priv->ttvn)); - buf_size = 1; - /* Estimate length for: " * xx:xx:xx:xx:xx:xx\n" */ - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - - rcu_read_lock(); - __hlist_for_each_rcu(node, head) - buf_size += 29; - rcu_read_unlock(); - } - - buff = kmalloc(buf_size, GFP_ATOMIC); - if (!buff) { - ret = -ENOMEM; - goto out; - } - - buff[0] = '\0'; - pos = 0; - for (i = 0; i < hash->size; i++) { head = &hash->table[i]; rcu_read_lock(); hlist_for_each_entry_rcu(tt_local_entry, node, head, hash_entry) { - pos += snprintf(buff + pos, 30, " * %pM " - "[%c%c%c%c%c]\n", + seq_printf(seq, " * %pM [%c%c%c%c%c]\n", tt_local_entry->addr, (tt_local_entry->flags & TT_CLIENT_ROAM ? 'R' : '.'), @@ -380,9 +357,6 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset) } rcu_read_unlock(); } - - seq_printf(seq, "%s", buff); - kfree(buff); out: if (primary_if) hardif_free_ref(primary_if); @@ -591,8 +565,6 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) struct hard_iface *primary_if; struct hlist_node *node; struct hlist_head *head; - size_t buf_size, pos; - char *buff; uint32_t i; int ret = 0; @@ -617,35 +589,13 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) seq_printf(seq, " %-13s %s %-15s %s %s\n", "Client", "(TTVN)", "Originator", "(Curr TTVN)", "Flags"); - buf_size = 1; - /* Estimate length for: " * xx:xx:xx:xx:xx:xx (ttvn) via - * xx:xx:xx:xx:xx:xx (cur_ttvn)\n"*/ - for (i = 0; i < hash->size; i++) { - head = &hash->table[i]; - - rcu_read_lock(); - __hlist_for_each_rcu(node, head) - buf_size += 67; - rcu_read_unlock(); - } - - buff = kmalloc(buf_size, GFP_ATOMIC); - if (!buff) { - ret = -ENOMEM; - goto out; - } - - buff[0] = '\0'; - pos = 0; - for (i = 0; i < hash->size; i++) { head = &hash->table[i]; rcu_read_lock(); hlist_for_each_entry_rcu(tt_global_entry, node, head, hash_entry) { - pos += snprintf(buff + pos, 69, - " * %pM (%3u) via %pM (%3u) " + seq_printf(seq, " * %pM (%3u) via %pM (%3u) " "[%c%c%c]\n", tt_global_entry->addr, tt_global_entry->ttvn, tt_global_entry->orig_node->orig, @@ -661,9 +611,6 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) } rcu_read_unlock(); } - - seq_printf(seq, "%s", buff); - kfree(buff); out: if (primary_if) hardif_free_ref(primary_if); -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.3.0-35-g4c4b4a1
by postmaster＠open-mesh.org 24 Oct '11

24 Oct '11

The following commit has been merged in the master branch: commit 4c4b4a182eeb3bb5e18e5e6853afdc4b015758dd Merge: f8a89f0c03dadc2eb95481062b69c044442fdaa7 474f9178314dc440d3be1df8e1af0f222ad7aff1 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Oct 24 14:40:50 2011 +0200 Merge branch 'next' diff --combined compat.h index 64fbac7,58c3c6a..964c066 --- a/compat.h +++ b/compat.h @@@ -55,13 -55,6 +55,13 @@@ #endif /* < KERNEL_VERSION(2, 6, 36) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) + +#define kstrtoul strict_strtoul +#define kstrtol strict_strtol + +#endif /* < KERNEL_VERSION(2, 6, 39) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) #define kfree_rcu(ptr, rcu_head) call_rcu(&ptr->rcu_head, free_rcu_##ptr) @@@ -70,7 -63,6 +70,6 @@@ void free_rcu_gw_node(struct rcu_head * void free_rcu_neigh_node(struct rcu_head *rcu); void free_rcu_softif_neigh(struct rcu_head *rcu); void free_rcu_tt_local_entry(struct rcu_head *rcu); - void free_rcu_tt_global_entry(struct rcu_head *rcu); #endif /* < KERNEL_VERSION(3, 0, 0) */ diff --combined translation-table.c index c2af2b1,c7aafc7..5f28a7f --- a/translation-table.c +++ b/translation-table.c @@@ -67,7 -67,7 +67,7 @@@ static struct tt_local_entry *tt_local_ struct hlist_head *head; struct hlist_node *node; struct tt_local_entry *tt_local_entry, *tt_local_entry_tmp = NULL; - int index; + uint32_t index; if (!hash) return NULL; @@@ -99,7 -99,7 +99,7 @@@ static struct tt_global_entry *tt_globa struct hlist_node *node; struct tt_global_entry *tt_global_entry; struct tt_global_entry *tt_global_entry_tmp = NULL; - int index; + uint32_t index; if (!hash) return NULL; @@@ -137,10 -137,22 +137,22 @@@ static void tt_local_entry_free_ref(str kfree_rcu(tt_local_entry, rcu); } + static void tt_global_entry_free_rcu(struct rcu_head *rcu) + { + struct tt_global_entry *tt_global_entry; + + tt_global_entry = container_of(rcu, struct tt_global_entry, rcu); + + if (tt_global_entry->orig_node) + orig_node_free_ref(tt_global_entry->orig_node); + + kfree(tt_global_entry); + } + static void tt_global_entry_free_ref(struct tt_global_entry *tt_global_entry) { if (atomic_dec_and_test(&tt_global_entry->refcount)) - kfree_rcu(tt_global_entry, rcu); + call_rcu(&tt_global_entry->rcu, tt_global_entry_free_rcu); } static void tt_local_event(struct bat_priv *bat_priv, const uint8_t *addr, @@@ -304,8 -316,7 +316,8 @@@ int tt_local_seq_print_text(struct seq_ struct hlist_head *head; size_t buf_size, pos; char *buff; - int i, ret = 0; + uint32_t i; + int ret = 0; primary_if = primary_if_get_selected(bat_priv); if (!primary_if) { @@@ -416,7 -427,7 +428,7 @@@ static void tt_local_purge(struct bat_p struct hlist_node *node, *node_tmp; struct hlist_head *head; spinlock_t *list_lock; /* protects write access to the hash lists */ - int i; + uint32_t i; for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@@ -454,7 -465,7 +466,7 @@@ static void tt_local_table_free(struct struct tt_local_entry *tt_local_entry; struct hlist_node *node, *node_tmp; struct hlist_head *head; - int i; + uint32_t i; if (!bat_priv->tt_local_hash) return; @@@ -581,8 -592,7 +593,8 @@@ int tt_global_seq_print_text(struct seq struct hlist_head *head; size_t buf_size, pos; char *buff; - int i, ret = 0; + uint32_t i; + int ret = 0; primary_if = primary_if_get_selected(bat_priv); if (!primary_if) { @@@ -706,12 -716,15 +718,15 @@@ void tt_global_del_orig(struct bat_pri struct orig_node *orig_node, const char *message) { struct tt_global_entry *tt_global_entry; - int i; + uint32_t i; struct hashtable_t *hash = bat_priv->tt_global_hash; struct hlist_node *node, *safe; struct hlist_head *head; spinlock_t *list_lock; /* protects write access to the hash lists */ + if (!hash) + return; + for (i = 0; i < hash->size; i++) { head = &hash->table[i]; list_lock = &hash->list_locks[i]; @@@ -722,10 -735,9 +737,10 @@@ if (tt_global_entry->orig_node == orig_node) { bat_dbg(DBG_TT, bat_priv, "Deleting global tt entry %pM " - "(via %pM): originator time out\n", + "(via %pM): %s\n", tt_global_entry->addr, - tt_global_entry->orig_node->orig); + tt_global_entry->orig_node->orig, + message); hlist_del_rcu(node); tt_global_entry_free_ref(tt_global_entry); } @@@ -742,7 -754,7 +757,7 @@@ static void tt_global_roam_purge(struc struct hlist_node *node, *node_tmp; struct hlist_head *head; spinlock_t *list_lock; /* protects write access to the hash lists */ - int i; + uint32_t i; for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@@ -776,7 -788,7 +791,7 @@@ static void tt_global_table_free(struc struct tt_global_entry *tt_global_entry; struct hlist_node *node, *node_tmp; struct hlist_head *head; - int i; + uint32_t i; if (!bat_priv->tt_global_hash) return; @@@ -862,8 -874,7 +877,8 @@@ uint16_t tt_global_crc(struct bat_priv struct tt_global_entry *tt_global_entry; struct hlist_node *node; struct hlist_head *head; - int i, j; + uint32_t i; + int j; for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@@ -900,8 -911,7 +915,8 @@@ uint16_t tt_local_crc(struct bat_priv * struct tt_local_entry *tt_local_entry; struct hlist_node *node; struct hlist_head *head; - int i, j; + uint32_t i; + int j; for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@@ -1038,7 -1048,7 +1053,7 @@@ static struct sk_buff *tt_response_fill struct sk_buff *skb = NULL; uint16_t tt_tot, tt_count; ssize_t tt_query_size = sizeof(struct tt_query_packet); - int i; + uint32_t i; if (tt_query_size + tt_len > primary_if->soft_iface->mtu) { tt_len = primary_if->soft_iface->mtu - tt_query_size; @@@ -1177,11 -1187,11 +1192,11 @@@ static bool send_other_tt_response(stru (tt_request->flags & TT_FULL_TABLE ? 'F' : '.')); /* Let's get the orig node of the REAL destination */ - req_dst_orig_node = get_orig_node(bat_priv, tt_request->dst); + req_dst_orig_node = orig_hash_find(bat_priv, tt_request->dst); if (!req_dst_orig_node) goto out; - res_dst_orig_node = get_orig_node(bat_priv, tt_request->src); + res_dst_orig_node = orig_hash_find(bat_priv, tt_request->src); if (!res_dst_orig_node) goto out; @@@ -1307,7 -1317,7 +1322,7 @@@ static bool send_my_tt_response(struct my_ttvn = (uint8_t)atomic_read(&bat_priv->ttvn); req_ttvn = tt_request->ttvn; - orig_node = get_orig_node(bat_priv, tt_request->src); + orig_node = orig_hash_find(bat_priv, tt_request->src); if (!orig_node) goto out; @@@ -1715,7 -1725,7 +1730,7 @@@ void tt_free(struct bat_priv *bat_priv * entry */ static void tt_local_reset_flags(struct bat_priv *bat_priv, uint16_t flags) { - int i; + uint32_t i; struct hashtable_t *hash = bat_priv->tt_local_hash; struct hlist_head *head; struct hlist_node *node; @@@ -1748,7 -1758,7 +1763,7 @@@ static void tt_local_purge_pending_clie struct hlist_node *node, *node_tmp; struct hlist_head *head; spinlock_t *list_lock; /* protects write access to the hash lists */ - int i; + uint32_t i; if (!hash) return; -- batman-adv

1 0

batctl; branch, next, updated. v2011.3.0-9-g9031e43
by postmaster＠open-mesh.org 24 Oct '11

24 Oct '11

The following commit has been merged in the next branch: commit 9031e43c3d40a1771d6969c44e06ba4229ee6522 Author: Antonio Quartull <ordex(a)autistici.org> Date: Wed Oct 19 14:34:42 2011 +0200 batctl: correct ttcrc print format in the tcpdump output The OGM ttcrc field is an unsigned short int, therefore it has to be printed using %hu and has to be converted from network to host order using ntohs Signed-off-by: Antonio Quartull <ordex(a)autistici.org> diff --git a/tcpdump.c b/tcpdump.c index 977bedc..7dd289e 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -331,10 +331,10 @@ static void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int re printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_ogm_packet->orig, read_opt)); - printf("OGM via neigh %s, seq %u, tq %3d, ttvn %d, ttcrc %d, ttl %2d, v %d, flags [%c%c%c%c], length %zu\n", + printf("OGM via neigh %s, seq %u, tq %3d, ttvn %d, ttcrc %hu, ttl %2d, v %d, flags [%c%c%c%c], length %zu\n", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), ntohl(batman_ogm_packet->seqno), batman_ogm_packet->tq, batman_ogm_packet->ttvn, - ntohl(batman_ogm_packet->tt_crc), batman_ogm_packet->ttl, batman_ogm_packet->version, + ntohs(batman_ogm_packet->tt_crc), batman_ogm_packet->ttl, batman_ogm_packet->version, (batman_ogm_packet->flags & DIRECTLINK ? 'D' : '.'), (batman_ogm_packet->flags & VIS_SERVER ? 'V' : '.'), (batman_ogm_packet->flags & PRIMARIES_FIRST_HOP ? 'F' : '.'), -- batctl

1 0

batctl; branch, next, updated. v2011.3.0-9-g9031e43
by postmaster＠open-mesh.org 24 Oct '11

24 Oct '11

The following commit has been merged in the next branch: commit b6faa0d4a6024e34d76aa6fdbd03d3fd480f154e Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Aug 19 00:35:55 2011 +0200 batctl: rename all instances of batman_packet to batman_ogm_packet The follow-up routing code changes are going to introduce additional routing packet types which make this distinction necessary. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/packet.h b/packet.h index b76b4be..8a0ce69 100644 --- a/packet.h +++ b/packet.h @@ -25,14 +25,14 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_PACKET = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, + BAT_OGM = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, BAT_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08 }; /* this file is included by batctl which needs these defines */ @@ -89,7 +89,7 @@ enum tt_client_flags { TT_CLIENT_PENDING = 1 << 10 }; -struct batman_packet { +struct batman_ogm_packet { uint8_t packet_type; uint8_t version; /* batman version field */ uint8_t ttl; @@ -104,7 +104,7 @@ struct batman_packet { uint16_t tt_crc; } __packed; -#define BAT_PACKET_LEN sizeof(struct batman_packet) +#define BATMAN_OGM_LEN sizeof(struct batman_ogm_packet) struct icmp_packet { uint8_t packet_type; diff --git a/tcpdump.c b/tcpdump.c index 0e69431..977bedc 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -318,27 +318,27 @@ static void dump_batman_roam(unsigned char *packet_buff, ssize_t buff_len, int r static void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { struct ether_header *ether_header; - struct batman_packet *batman_packet; + struct batman_ogm_packet *batman_ogm_packet; - LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct batman_packet), "BAT OGM"); + LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct batman_ogm_packet), "BAT OGM"); ether_header = (struct ether_header *)packet_buff; - batman_packet = (struct batman_packet *)(packet_buff + sizeof(struct ether_header)); + batman_ogm_packet = (struct batman_ogm_packet *)(packet_buff + sizeof(struct ether_header)); if (!time_printed) print_time(); printf("BAT %s: ", - get_name_by_macaddr((struct ether_addr *)batman_packet->orig, read_opt)); + get_name_by_macaddr((struct ether_addr *)batman_ogm_packet->orig, read_opt)); printf("OGM via neigh %s, seq %u, tq %3d, ttvn %d, ttcrc %d, ttl %2d, v %d, flags [%c%c%c%c], length %zu\n", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), - ntohl(batman_packet->seqno), batman_packet->tq, batman_packet->ttvn, - ntohl(batman_packet->tt_crc), batman_packet->ttl, batman_packet->version, - (batman_packet->flags & DIRECTLINK ? 'D' : '.'), - (batman_packet->flags & VIS_SERVER ? 'V' : '.'), - (batman_packet->flags & PRIMARIES_FIRST_HOP ? 'F' : '.'), - (batman_packet->gw_flags ? 'G' : '.'), + ntohl(batman_ogm_packet->seqno), batman_ogm_packet->tq, batman_ogm_packet->ttvn, + ntohl(batman_ogm_packet->tt_crc), batman_ogm_packet->ttl, batman_ogm_packet->version, + (batman_ogm_packet->flags & DIRECTLINK ? 'D' : '.'), + (batman_ogm_packet->flags & VIS_SERVER ? 'V' : '.'), + (batman_ogm_packet->flags & PRIMARIES_FIRST_HOP ? 'F' : '.'), + (batman_ogm_packet->gw_flags ? 'G' : '.'), (size_t)buff_len - sizeof(struct ether_header)); } @@ -469,7 +469,7 @@ static void dump_batman_frag(unsigned char *packet_buff, ssize_t buff_len, int r static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { - struct batman_packet *batman_packet; + struct batman_ogm_packet *batman_ogm_packet; struct ether_header *eth_hdr; eth_hdr = (struct ether_header *)packet_buff; @@ -488,10 +488,10 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read dump_vlan(packet_buff, buff_len, read_opt, time_printed); break; case ETH_P_BATMAN: - batman_packet = (struct batman_packet *)(packet_buff + ETH_HLEN); + batman_ogm_packet = (struct batman_ogm_packet *)(packet_buff + ETH_HLEN); - switch (batman_packet->packet_type) { - case BAT_PACKET: + switch (batman_ogm_packet->packet_type) { + case BAT_OGM: if (dump_level & DUMP_TYPE_BATOGM) dump_batman_ogm(packet_buff, buff_len, read_opt, time_printed); break; @@ -524,7 +524,7 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read dump_batman_roam(packet_buff, buff_len, read_opt, time_printed); break; default: - printf("Warning - packet contains unknown batman packet type: 0x%02x\n", batman_packet->packet_type); + printf("Warning - packet contains unknown batman packet type: 0x%02x\n", batman_ogm_packet->packet_type); break; } -- batctl

1 0

batctl; branch, next, updated. v2011.3.0-9-g9031e43
by postmaster＠open-mesh.org 24 Oct '11

24 Oct '11

The following commit has been merged in the next branch: commit e4ac9b72dd7a36d587fb91186b6979d94265f234 Merge: b6faa0d4a6024e34d76aa6fdbd03d3fd480f154e 0a284c579e26edc603f46f71684ee66f8bfc0a68 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Oct 24 14:18:29 2011 +0200 Merge branch 'next' of git+ssh://batman-git/batctl into next -- batctl

1 0

batman-adv; branch, next, updated. v2011.3.0-25-g474f917
by postmaster＠open-mesh.org 24 Oct '11

24 Oct '11

The following commit has been merged in the next branch: commit 474f9178314dc440d3be1df8e1af0f222ad7aff1 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat Oct 22 00:55:39 2011 +0200 batman-adv: unify hash_entry field position in tt_local/global_entry Function tt_response_fill_table() actually uses a tt_local_entry pointer to iterate either over the local or the global table entries (it depends on the what hash table is passed as argument). To iterate over such entries the hlist_for_each_entry_rcu() macro has to access their "hash_entry" field which MUST be at the same position in both the tt_global/local_entry structures. Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/types.h b/types.h index 1ae3557..ab8d0fe 100644 --- a/types.h +++ b/types.h @@ -224,22 +224,22 @@ struct socket_packet { struct tt_local_entry { uint8_t addr[ETH_ALEN]; + struct hlist_node hash_entry; unsigned long last_seen; uint16_t flags; atomic_t refcount; struct rcu_head rcu; - struct hlist_node hash_entry; }; struct tt_global_entry { uint8_t addr[ETH_ALEN]; + struct hlist_node hash_entry; /* entry in the global table */ struct orig_node *orig_node; uint8_t ttvn; uint16_t flags; /* only TT_GLOBAL_ROAM is used */ unsigned long roam_at; /* time at which TT_GLOBAL_ROAM was set */ atomic_t refcount; struct rcu_head rcu; - struct hlist_node hash_entry; /* entry in the global table */ }; struct tt_change_node { -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.3.0-24-g4c7d468
by postmaster＠open-mesh.org 24 Oct '11

24 Oct '11

The following commit has been merged in the next branch: commit 4c7d4681fcc55d42488417992064bc213c329664 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Wed Oct 19 10:28:26 2011 +0200 batman-adv: add sanity check when removing global tts After removing the batman-adv module, the hash may be already gone when tt_global_del_orig() tries to clean the hash. This patch adds a sanity check to avoid this. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Tested-by: Alexey Fisher <bug-track(a)fisher-privat.net> diff --git a/translation-table.c b/translation-table.c index abf05cb..c7aafc7 100644 --- a/translation-table.c +++ b/translation-table.c @@ -722,6 +722,9 @@ void tt_global_del_orig(struct bat_priv *bat_priv, struct hlist_head *head; spinlock_t *list_lock; /* protects write access to the hash lists */ + if (!hash) + return; + for (i = 0; i < hash->size; i++) { head = &hash->table[i]; list_lock = &hash->list_locks[i]; -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.3.0-23-g5da9ad7
by postmaster＠open-mesh.org 24 Oct '11

24 Oct '11

The following commit has been merged in the next branch: commit 5da9ad7cd44add597ad345e764669801cdd7d7b1 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Wed Oct 19 11:02:25 2011 +0200 batman-adv: remove references for global tt entries struct tt_global_entry holds a reference to an orig_node which must be decremented before deallocating the structure. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Tested-by: Alexey Fisher <bug-track(a)fisher-privat.net> diff --git a/compat.c b/compat.c index 88ceb40..1793904 100644 --- a/compat.c +++ b/compat.c @@ -36,12 +36,4 @@ void free_rcu_tt_local_entry(struct rcu_head *rcu) kfree(tt_local_entry); } -void free_rcu_tt_global_entry(struct rcu_head *rcu) -{ - struct tt_global_entry *tt_global_entry; - - tt_global_entry = container_of(rcu, struct tt_global_entry, rcu); - kfree(tt_global_entry); -} - #endif /* < KERNEL_VERSION(3, 0, 0) */ diff --git a/compat.h b/compat.h index 43654e8..58c3c6a 100644 --- a/compat.h +++ b/compat.h @@ -63,7 +63,6 @@ void free_rcu_gw_node(struct rcu_head *rcu); void free_rcu_neigh_node(struct rcu_head *rcu); void free_rcu_softif_neigh(struct rcu_head *rcu); void free_rcu_tt_local_entry(struct rcu_head *rcu); -void free_rcu_tt_global_entry(struct rcu_head *rcu); #endif /* < KERNEL_VERSION(3, 0, 0) */ diff --git a/translation-table.c b/translation-table.c index 873fb3d..abf05cb 100644 --- a/translation-table.c +++ b/translation-table.c @@ -137,10 +137,22 @@ static void tt_local_entry_free_ref(struct tt_local_entry *tt_local_entry) kfree_rcu(tt_local_entry, rcu); } +static void tt_global_entry_free_rcu(struct rcu_head *rcu) +{ + struct tt_global_entry *tt_global_entry; + + tt_global_entry = container_of(rcu, struct tt_global_entry, rcu); + + if (tt_global_entry->orig_node) + orig_node_free_ref(tt_global_entry->orig_node); + + kfree(tt_global_entry); +} + static void tt_global_entry_free_ref(struct tt_global_entry *tt_global_entry) { if (atomic_dec_and_test(&tt_global_entry->refcount)) - kfree_rcu(tt_global_entry, rcu); + call_rcu(&tt_global_entry->rcu, tt_global_entry_free_rcu); } static void tt_local_event(struct bat_priv *bat_priv, const uint8_t *addr, -- batman-adv

1 0

linux integration; annotated tag, v3.1-rc10, created. v3.1-rc10
by postmaster＠open-mesh.org 18 Oct '11

18 Oct '11

The annotated tag, v3.1-rc10 has been created at bc9dac81d1d3442713e5b91ed7cda1646df9730e (tag) tagging 899e3ee404961a90b828ad527573aaaac39f0ab1 (commit) replaces v3.1-rc9 tagged by Linus Torvalds on Mon Oct 17 21:06:39 2011 -0700 - Shortlog ------------------------------------------------------------ Linux 3.1-rc10 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJOnPtYAAoJEHm+PkMAQRiGS8sH/0c1GRs0DvppC5oDVIysuOdV LjTpdrA0fUa8/X0cPXTl9RyNiqlYn+F3JCeEaCxdVZJslHCzWRGgd/fQnEEY+JZe B8yg6jLgFZ1R9hx8nqSliQVH63Xv0rpcgGPGwUWFIJCKgsGmx7tZTy0La83Ud7qW MtlHhJdapal23keWxFifw67Q4d3L2u51pwTSJ5Rx70+8Y7waE4+mYmZZS7Hb9UYt Rt4yTiWRlEycu6zoeBn5Gc+uoQV+TOzPUKG8GracbRHW8OH+9qESIRJFkH5rhy/t gdpu+xYvss6H3SBwJRHtpLMYpZsrwx4pVWURJvtxDRgVF+TJxzbQCJURfWMDXs0= =sXHg -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2011