commits April 2012

commits@lists.open-mesh.org

1 participants
91 discussions

linux integration; branch, merge/master, updated. v3.4-rc1-1906-g85ab3fc
by postmaster＠open-mesh.org 24 Apr '12

24 Apr '12

The following commit has been merged in the merge/master branch: commit 85ab3fc8ce96d253267ff0ec14b8ccd0c41f3659 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Apr 24 10:13:00 2012 +0200 batman-adv: use fake functions instead of defines for not compiled-in routines Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 3108cd3..6935be9 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -96,7 +96,10 @@ static void bat_dbg_arp(struct bat_priv *bat_priv, struct sk_buff *skb, #else -#define bat_dbg_arp(...) +static void bat_dbg_arp(struct bat_priv *bat_priv, struct sk_buff *skb, + uint16_t type, int hdr_size, char *msg) +{ +} #endif /* CONFIG_BATMAN_ADV_DEBUG */ -- linux integration

1 0

linux integration; branch, merge/master, updated. v3.4-rc1-1906-g85ab3fc
by postmaster＠open-mesh.org 24 Apr '12

24 Apr '12

The following commit has been merged in the merge/master branch: commit 799e90a57330c488fe4d7ef26b84c76333173271 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Apr 24 10:07:11 2012 +0200 batman-adv: opening function bracket must be on a new line Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index db1694d..3108cd3 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -37,7 +37,8 @@ #ifdef CONFIG_BATMAN_ADV_DEBUG static void bat_dbg_arp(struct bat_priv *bat_priv, struct sk_buff *skb, - uint16_t type, int hdr_size, char *msg) { + uint16_t type, int hdr_size, char *msg) +{ struct unicast_4addr_packet *unicast_4addr_packet; if (msg) -- linux integration

1 0

linux integration; branch, merge/master, updated. v3.4-rc1-1906-g85ab3fc
by postmaster＠open-mesh.org 24 Apr '12

24 Apr '12

The following commit has been merged in the merge/master branch: commit b753bccc9092c7bff77905726002de9489718254 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Apr 24 10:05:58 2012 +0200 batman-adv: fix comment style in DAT code Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index b43bece..db1694d 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -51,7 +51,8 @@ static void bat_dbg_arp(struct bat_priv *bat_priv, struct sk_buff *skb, return; /* if the AP packet is encapsulated in a batman packet, let's print some - * debug messages */ + * debug messages + */ unicast_4addr_packet = (struct unicast_4addr_packet *)skb->data; switch (unicast_4addr_packet->u.header.packet_type) { @@ -118,11 +119,13 @@ static bool is_orig_node_eligible(struct dht_candidate *res, int select, if (tmp_max > last_max) goto out; /* check if during this iteration we have already found an originator - * with a closer dht address */ + * with a closer dht address + */ if (tmp_max < max) goto out; /* this is an hash collision with the temporary selected node. Choose - * the one with the lowest address */ + * the one with the lowest address + */ if ((tmp_max == max) && (compare_eth(candidate->orig, max_orig_node->orig) > 0)) goto out; @@ -133,7 +136,8 @@ out: } /* selects the next candidate by populating cands[select] and modifies last_max - * accordingly */ + * accordingly + */ static void choose_next_candidate(struct bat_priv *bat_priv, struct dht_candidate *cands, int select, dat_addr_t ip_key, dat_addr_t *last_max) @@ -146,11 +150,13 @@ static void choose_next_candidate(struct bat_priv *bat_priv, int i; /* if no node is eligible as candidate, we will leave the candidate as - * NOT_FOUND */ + * NOT_FOUND + */ cands[select].type = DHT_CANDIDATE_NOT_FOUND; /* iterate over the originator list and find the node with closest - * dht_address which has not been selected yet */ + * dht_address which has not been selected yet + */ for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -190,7 +196,8 @@ static void choose_next_candidate(struct bat_priv *bat_priv, * closest values (from the LEFT, with wrap around if needed) then the hash * value of the key. ip_dst is the key. * - * return an array of size DHT_CANDIDATES_NUM */ + * return an array of size DHT_CANDIDATES_NUM + */ static struct dht_candidate *dht_select_candidates(struct bat_priv *bat_priv, uint32_t ip_dst) { @@ -222,7 +229,8 @@ static struct dht_candidate *dht_select_candidates(struct bat_priv *bat_priv, * and is sent as unicast packet to each of the selected candidate. * * If the packet is successfully sent to at least one candidate, then this - * function returns true */ + * function returns true + */ static bool dht_send_data(struct bat_priv *bat_priv, struct sk_buff *skb, uint32_t ip, int packet_subtype) { @@ -269,7 +277,8 @@ out: /* Update the neighbour entry corresponding to the IP passed as parameter with * the hw address hw. If the neighbour entry doesn't exists, then it will be - * created */ + * created + */ static void arp_neigh_update(struct bat_priv *bat_priv, uint32_t ip, uint8_t *hw) { @@ -293,7 +302,8 @@ out: } /* Returns arphdr->ar_op if the skb contains a valid ARP packet, otherwise - * returns 0 */ + * returns 0 + */ static uint16_t arp_get_type(struct bat_priv *bat_priv, struct sk_buff *skb, int hdr_size) { @@ -347,7 +357,8 @@ out: /* return true if the message has been sent to the dht candidates, false * otherwise. In case of true the message has to be enqueued to permit the - * fallback */ + * fallback + */ bool dat_snoop_outgoing_arp_request(struct bat_priv *bat_priv, struct sk_buff *skb) { @@ -361,7 +372,8 @@ bool dat_snoop_outgoing_arp_request(struct bat_priv *bat_priv, type = arp_get_type(bat_priv, skb, 0); /* If we get an ARP_REQUEST we have to send the unicast message to the - * selected DHT candidates */ + * selected DHT candidates + */ if (type != ARPOP_REQUEST) goto out; @@ -409,7 +421,8 @@ out: /* This function is meant to be invoked for an ARP request which is coming into * the bat0 interfaces from the mesh network. It will check for the needed data * into the local table. If found, an ARP reply is sent immediately, otherwise - * the caller has to deliver the ARP request to the upper layer */ + * the caller has to deliver the ARP request to the upper layer + */ bool dat_snoop_incoming_arp_request(struct bat_priv *bat_priv, struct sk_buff *skb, int hdr_size) { @@ -465,7 +478,8 @@ out: /* This function is meant to be invoked on an ARP reply packet going into the * soft interface. The related neighbour entry has to be updated and the DHT has - * to be populated as well */ + * to be populated as well + */ bool dat_snoop_outgoing_arp_reply(struct bat_priv *bat_priv, struct sk_buff *skb) { @@ -489,7 +503,8 @@ bool dat_snoop_outgoing_arp_reply(struct bat_priv *bat_priv, arp_neigh_update(bat_priv, ip_dst, hw_dst); /* Send the ARP reply to the candidates for both the IP addresses we - * fetched from the ARP reply */ + * fetched from the ARP reply + */ dht_send_data(bat_priv, skb, ip_src, BAT_P_DAT_DHT_PUT); dht_send_data(bat_priv, skb, ip_dst, BAT_P_DAT_DHT_PUT); ret = true; @@ -498,7 +513,8 @@ out: } /* This function has to be invoked on an ARP reply coming into the soft - * interface from the mesh network. The local table has to be updated */ + * interface from the mesh network. The local table has to be updated + */ bool dat_snoop_incoming_arp_reply(struct bat_priv *bat_priv, struct sk_buff *skb, int hdr_size) { @@ -520,12 +536,14 @@ bool dat_snoop_incoming_arp_reply(struct bat_priv *bat_priv, ip_dst = ARP_IP_DST(skb, hdr_size); /* Update our internal cache with both the IP addresses we fetched from - * the ARP reply */ + * the ARP reply + */ arp_neigh_update(bat_priv, ip_src, hw_src); arp_neigh_update(bat_priv, ip_dst, hw_dst); /* if this REPLY is directed to a client of mine, let's deliver the - * packet to the interface */ + * packet to the interface + */ ret = !is_my_client(bat_priv, hw_dst); out: /* if ret == false packet has to be delivered to the interface */ @@ -538,7 +556,8 @@ bool dat_drop_broadcast_packet(struct bat_priv *bat_priv, struct neighbour *n; /* If this packet is an ARP_REQUEST and we already have the information - * that it is going to ask, we can drop the packet */ + * that it is going to ask, we can drop the packet + */ if (!forw_packet->num_packets && (ARPOP_REQUEST == arp_get_type(bat_priv, forw_packet->skb, sizeof(struct bcast_packet)))) { @@ -572,7 +591,8 @@ void arp_change_timeout(struct net_device *soft_iface, const char *name) } /* Introduce a delay in the ARP state-machine transactions. Entries - * will be kept in the ARP table for the default time multiplied by 4 */ + * will be kept in the ARP table for the default time multiplied by 4 + */ in_dev->arp_parms->base_reachable_time *= ARP_TIMEOUT_FACTOR; in_dev->arp_parms->gc_staletime *= ARP_TIMEOUT_FACTOR; in_dev->arp_parms->reachable_time *= ARP_TIMEOUT_FACTOR; diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h index fcf6c15..5e23577 100644 --- a/net/batman-adv/distributed-arp-table.h +++ b/net/batman-adv/distributed-arp-table.h @@ -51,8 +51,9 @@ bool dat_drop_broadcast_packet(struct bat_priv *bat_priv, struct forw_packet *forw_packet); void arp_change_timeout(struct net_device *soft_iface, const char *name); -/* hash function to choose an entry in a hash table of given size */ -/* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ +/* hash function to choose an entry in a hash table of given size. + * hash algorithm from http://en.wikipedia.org/wiki/Hash_table + */ static inline uint32_t hash_ipv4(const void *data, uint32_t size) { const unsigned char *key = data; diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 0757c2d..9137aa0 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -191,7 +191,8 @@ static int recv_unhandled_packet(struct sk_buff *skb, } /* incoming packets with the batman ethertype received on any active hard - * interface */ + * interface + */ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype, struct net_device *orig_dev) { @@ -238,7 +239,8 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, } /* all receive handlers return whether they received or reused - * the supplied skb. if not, we have to free the skb. */ + * the supplied skb. if not, we have to free the skb. + */ idx = batman_ogm_packet->header.packet_type; ret = (*recv_packet_handler[idx])(skb, hard_iface); @@ -247,7 +249,8 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, /* return NET_RX_SUCCESS in any case as we * most probably dropped the packet for - * routing-logical reasons. */ + * routing-logical reasons. + */ return NET_RX_SUCCESS; err_free: diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 14ff75a..5fced65 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -72,7 +72,8 @@ /* numbers of originator to contact for any PUT/GET DHT operation */ #define DHT_CANDIDATES_NUM 3 /* Factor which default ARP timeout values of the soft_iface table are - * multiplied by */ + * multiplied by + */ #define ARP_TIMEOUT_FACTOR 4 #define LOG_BUF_LEN 8192 /* has to be a power of 2 */ diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c index 63ab35b..62ea9f1 100644 --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c @@ -328,7 +328,8 @@ bool prepare_unicast_4addr_packet(struct bat_priv *bat_priv, /* pull the header space and fill the unicast_packet substructure. * We can do that because the first member of the unicast_4addr_packet - * is of type struct unicast_packet */ + * is of type struct unicast_packet + */ if (!pull_and_fill_unicast(skb, sizeof(*unicast_4addr_packet), orig_node)) goto out; @@ -387,7 +388,8 @@ find_router: break; default: /* this function supports UNICAST and UNICAST_4ADDR only. It - * should never be invoked with any other packet type */ + * should never be invoked with any other packet type + */ goto out; } -- linux integration

1 0

linux integration; annotated tag, batman-adv-for-davem, deleted. v3.4-rc2-618-g1e5cc26
by postmaster＠open-mesh.org 23 Apr '12

23 Apr '12

The annotated tag, batman-adv-for-davem has been deleted was 21d78a97fc4ed3eda415dde2f6483f3b32babd04 ----------------------------------------------------------------------- tag batman-adv-for-davem Included changes: * remove duplicated line in comment * add htons() invocation for tt_crc as suggested by Al Viro * OriGinator Message seqno initial value is now random * some cleanups and fixes -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJPjnVmAAoJEFMQTLzJFOZFqpkH/33gzND7Ukfdax6CPYqb1AVm A63gtnZlNCwPf7dCJkq4yF4RVn/ir1pp+BwX5C9BIN9V/ZSaTsIKsMXAaZzUK3DH PCZEJCn+iys+ZX5KrpLum0wMSQyxt08GsGZLueiu+Rm0zRZLSCy58THNqLt2b6ZK mDH6tdbGxKXxrKeWzVz3PzQv8dPuFqApPiQ+M6ugf4YvjdYYEiGWFn8gad+XObeA oxbFGMt6MKdc+9EsKqd0Br1lqHiQ+RC2xXQiFEBizPe34LiYJ69irkEBki/6KV9Z ujeB0RxlMHXL75vUWoqyGcv/F2lzZd/tXQA6qz7ioCBHqzb1Mk/KGmVJ3KZ5CK8= =9lku -----END PGP SIGNATURE----- 1e5cc266dbc401d11aefb966ad35e651c2f67414 batman-adv: skip the window protection test when the originator has no neighbours ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; annotated tag, for_net-next_20111126, deleted. v3.2-rc1-10-g76e8d7b
by postmaster＠open-mesh.org 22 Apr '12

22 Apr '12

The annotated tag, for_net-next_20111126 has been deleted was a5a8105ab339c59765b7da175640c3225c5cf444 ----------------------------------------------------------------------- tag for_net-next_20111126 batman-adv 2011-11-26 for net-next 76e8d7b0d1b0091929e8cd18551a87b6bb6ef2c1 batman-adv: Fix range check for expected packets ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; annotated tag, for_net-next_20111126, created. for_net-next_20111126
by postmaster＠open-mesh.org 22 Apr '12

22 Apr '12

The annotated tag, for_net-next_20111126 has been created at a5a8105ab339c59765b7da175640c3225c5cf444 (tag) tagging 76e8d7b0d1b0091929e8cd18551a87b6bb6ef2c1 (commit) replaces v3.2-rc1 tagged by Sven Eckelmann on Sat Nov 26 14:09:20 2011 +0100 - Shortlog ------------------------------------------------------------ batman-adv 2011-11-26 for net-next Antonio Quartulli (5): batman-adv: tt_global_del_orig() has to print the correct message batman-adv: use orig_hash_find() instead of get_orig_node() in TT code batman-adv: fixed hash functions type to uint32_t instead of int batman-adv: linearise the tt_response skb only if needed batman-adv: check for tt_reponse packet real length Marek Lindner (1): batman-adv: refactoring gateway handling code Simon Wunderlich (2): batman-adv: directly write tt entries without buffering batman-adv: Fix range check for expected packets Sven Eckelmann (2): batman-adv: update internal version number batman-adv: Replace obsolete strict_strto<foo> with kstrto<foo> ----------------------------------------------------------------------- -- linux integration

1 0

batman-adv; branch, master, updated. v2012.1.0-97-g1aee9b4
by postmaster＠open-mesh.org 22 Apr '12

22 Apr '12

The following commit has been merged in the master branch: commit 1aee9b47eab62668ded02ed09f6f12c0d67e3c8a Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Apr 18 17:16:39 2012 +0800 batman-adv: ignore trailing CR when comparing protocol names Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/main.c b/main.c index 170f65f..25c2e2b 100644 --- a/main.c +++ b/main.c @@ -380,14 +380,19 @@ int bat_algo_seq_print_text(struct seq_file *seq, void *offset) static int param_set_ra(const char *val, const struct kernel_param *kp) { struct bat_algo_ops *bat_algo_ops; + char *algo_name = (char *)val; + size_t name_len = strlen(algo_name); - bat_algo_ops = bat_algo_get((char *)val); + if (algo_name[name_len - 1] == '\n') + algo_name[name_len - 1] = '\0'; + + bat_algo_ops = bat_algo_get(algo_name); if (!bat_algo_ops) { - pr_err("Routing algorithm '%s' is not supported\n", val); + pr_err("Routing algorithm '%s' is not supported\n", algo_name); return -EINVAL; } - return param_set_copystring(val, kp); + return param_set_copystring(algo_name, kp); } static const struct kernel_param_ops param_ops_ra = { -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.1.0-96-gdb01402
by postmaster＠open-mesh.org 22 Apr '12

22 Apr '12

The following commit has been merged in the master branch: commit db014029c8a340a628be7cf47c29dc117a88e857 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Apr 18 17:15:57 2012 +0800 batman-adv: avoid characters requiring shell escapes in protocol names Reported-by: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index f753e58..2b48b82 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1240,7 +1240,7 @@ static int bat_iv_ogm_receive(struct sk_buff *skb, } static struct bat_algo_ops batman_iv __read_mostly = { - .name = "BATMAN IV", + .name = "BATMAN_IV", .bat_iface_enable = bat_iv_ogm_iface_enable, .bat_iface_disable = bat_iv_ogm_iface_disable, .bat_iface_update_mac = bat_iv_ogm_iface_update_mac, diff --git a/main.c b/main.c index 5a193f5..170f65f 100644 --- a/main.c +++ b/main.c @@ -40,7 +40,7 @@ * list traversals just rcu-locked */ struct list_head hardif_list; static int (*recv_packet_handler[256])(struct sk_buff *, struct hard_iface *); -char bat_routing_algo[20] = "BATMAN IV"; +char bat_routing_algo[20] = "BATMAN_IV"; static struct hlist_head bat_algo_list; unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.1.0-95-g560985e
by postmaster＠open-mesh.org 22 Apr '12

22 Apr '12

The following commit has been merged in the master branch: commit 560985e2ee7a665b3e60adf58b4d61c53b8df61e Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Fri Apr 20 17:02:45 2012 +0200 batman-adv: Add get_ethtool_stats() support Added additional counters in a bat_stats structure, which are exported through the ethtool api. The counters are specific to batman-adv and includes: forwarded packets and bytes management packets and bytes (aggregated OGMs at this point) translation table packets distributed arp table packets New counters are added by extending "enum bat_counters" in types.h and adding corresponding descriptive string(s) to bat_counters_strings in soft-iface.c. Counters are increased by calling add_counter() and incremented by one by calling inc_counter(). Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> diff --git a/README b/README index 82c075f..49c03d5 100644 --- a/README +++ b/README @@ -212,6 +212,11 @@ The debug output can be changed at runtime using the file will enable debug messages for when routes change. +Counters for different types of packets entering and leaving the +batman-adv module are available through ethtool: + +# ethtool --statistics bat0 + BATCTL ------ diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 095aa64..f753e58 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -196,8 +196,12 @@ static void bat_iv_ogm_send_to_if(struct forw_packet *forw_packet, /* create clone because function is called more than once */ skb = skb_clone(forw_packet->skb, GFP_ATOMIC); - if (skb) + if (skb) { + inc_counter(bat_priv, BAT_CNT_MGMT_TX); + add_counter(bat_priv, BAT_CNT_MGMT_TX_BYTES, + skb->len + ETH_HLEN); send_skb_packet(skb, hard_iface, broadcast_addr); + } } /* send a batman ogm packet */ @@ -1203,6 +1207,9 @@ static int bat_iv_ogm_receive(struct sk_buff *skb, if (bat_priv->bat_algo_ops->bat_ogm_emit != bat_iv_ogm_emit) return NET_RX_DROP; + inc_counter(bat_priv, BAT_CNT_MGMT_RX); + add_counter(bat_priv, BAT_CNT_MGMT_RX_BYTES, skb->len + ETH_HLEN); + packet_len = skb_headlen(skb); ethhdr = (struct ethhdr *)skb_mac_header(skb); packet_buff = skb->data; diff --git a/distributed-arp-table.c b/distributed-arp-table.c index b43bece..a2d3821 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -395,9 +395,11 @@ bool dat_snoop_outgoing_arp_request(struct bat_priv *bat_priv, netif_rx(skb_new); bat_dbg(DBG_DAT, bat_priv, "ARP request replied locally\n"); - } else + } else { /* Send the request on the DHT */ + inc_counter(bat_priv, BAT_CNT_DAT_REQUEST_TX); ret = dht_send_data(bat_priv, skb, ip_dst, BAT_P_DAT_DHT_GET); + } out: if (n) neigh_release(n); @@ -450,6 +452,8 @@ bool dat_snoop_incoming_arp_request(struct bat_priv *bat_priv, if (!skb_new) goto out; + inc_counter(bat_priv, BAT_CNT_DAT_REPLY_TX); + unicast_4addr_send_skb(skb_new, bat_priv, BAT_P_DAT_CACHE_REPLY); ret = true; @@ -488,6 +492,8 @@ bool dat_snoop_outgoing_arp_reply(struct bat_priv *bat_priv, arp_neigh_update(bat_priv, ip_src, hw_src); arp_neigh_update(bat_priv, ip_dst, hw_dst); + inc_counter(bat_priv, BAT_CNT_DAT_REPLY_TX); + /* Send the ARP reply to the candidates for both the IP addresses we * fetched from the ARP reply */ dht_send_data(bat_priv, skb, ip_src, BAT_P_DAT_DHT_PUT); diff --git a/main.c b/main.c index 0757c2d..5a193f5 100644 --- a/main.c +++ b/main.c @@ -153,6 +153,8 @@ void mesh_free(struct net_device *soft_iface) bla_free(bat_priv); + free_percpu(bat_priv->bat_counters); + atomic_set(&bat_priv->mesh_state, MESH_INACTIVE); } diff --git a/main.h b/main.h index c8bfe28..9dc7971 100644 --- a/main.h +++ b/main.h @@ -150,6 +150,7 @@ enum dbg_level { #include <linux/kthread.h> /* kernel threads */ #include <linux/pkt_sched.h> /* schedule types */ #include <linux/workqueue.h> /* workqueue */ +#include <linux/percpu.h> #include <linux/slab.h> #include <net/sock.h> /* struct sock */ #include <linux/jiffies.h> @@ -259,4 +260,30 @@ static inline bool has_timed_out(unsigned long timestamp, unsigned int timeout) _dummy > smallest_signed_int(_dummy); }) #define seq_after(x, y) seq_before(y, x) +/* Stop preemption on local cpu while incrementing the counter */ +static inline void add_counter(struct bat_priv *bat_priv, size_t idx, + size_t count) +{ + int cpu = get_cpu(); + per_cpu_ptr(bat_priv->bat_counters, cpu)[idx] += count; + put_cpu(); +} + +#define inc_counter(b, i) add_counter(b, i, 1) + +/* Sum and return the cpu-local counters for index 'idx' */ +static inline uint64_t sum_counter(struct bat_priv *bat_priv, size_t idx) +{ + uint64_t *counters; + int cpu; + int sum = 0; + + for_each_possible_cpu(cpu) { + counters = per_cpu_ptr(bat_priv->bat_counters, cpu); + sum += counters[idx]; + } + + return sum; +} + #endif /* _NET_BATMAN_ADV_MAIN_H_ */ diff --git a/routing.c b/routing.c index 2181a91..f7ee5ff 100644 --- a/routing.c +++ b/routing.c @@ -600,6 +600,8 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) switch (tt_query->flags & TT_QUERY_TYPE_MASK) { case TT_REQUEST: + inc_counter(bat_priv, BAT_CNT_TT_REQUEST_RX); + /* If we cannot provide an answer the tt_request is * forwarded */ if (!send_tt_response(bat_priv, tt_query)) { @@ -612,6 +614,8 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) } break; case TT_RESPONSE: + inc_counter(bat_priv, BAT_CNT_TT_RESPONSE_RX); + if (is_my_mac(tt_query->dst)) { /* packet needs to be linearized to access the TT * changes */ @@ -663,6 +667,8 @@ int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if) if (is_broadcast_ether_addr(ethhdr->h_source)) goto out; + inc_counter(bat_priv, BAT_CNT_TT_ROAM_ADV_RX); + roam_adv_packet = (struct roam_adv_packet *)skb->data; if (!is_my_mac(roam_adv_packet->dst)) @@ -870,6 +876,10 @@ static int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if) /* decrement ttl */ unicast_packet->header.ttl--; + /* Update stats counter */ + inc_counter(bat_priv, BAT_CNT_FORWARD); + add_counter(bat_priv, BAT_CNT_FORWARD_BYTES, skb->len + ETH_HLEN); + /* route it */ send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); ret = NET_RX_SUCCESS; diff --git a/soft-interface.c b/soft-interface.c index b56dafd..101253d 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -46,6 +46,10 @@ static void bat_get_drvinfo(struct net_device *dev, static u32 bat_get_msglevel(struct net_device *dev); static void bat_set_msglevel(struct net_device *dev, u32 value); static u32 bat_get_link(struct net_device *dev); +static void bat_get_strings(struct net_device *dev, u32 stringset, u8 *data); +static void bat_get_ethtool_stats(struct net_device *dev, + struct ethtool_stats *stats, u64 *data); +static int bat_get_sset_count(struct net_device *dev, int stringset); static const struct ethtool_ops bat_ethtool_ops = { .get_settings = bat_get_settings, @@ -53,6 +57,9 @@ static const struct ethtool_ops bat_ethtool_ops = { .get_msglevel = bat_get_msglevel, .set_msglevel = bat_set_msglevel, .get_link = bat_get_link, + .get_strings = bat_get_strings, + .get_ethtool_stats = bat_get_ethtool_stats, + .get_sset_count = bat_get_sset_count, }; int my_skb_head_push(struct sk_buff *skb, unsigned int len) @@ -414,13 +421,18 @@ struct net_device *softif_create(const char *name) bat_priv->primary_if = NULL; bat_priv->num_ifaces = 0; + bat_priv->bat_counters = __alloc_percpu(sizeof(uint64_t) * BAT_CNT_NUM, + __alignof__(uint64_t)); + if (!bat_priv->bat_counters) + goto unreg_soft_iface; + ret = bat_algo_select(bat_priv, bat_routing_algo); if (ret < 0) - goto unreg_soft_iface; + goto free_bat_counters; ret = sysfs_add_meshif(soft_iface); if (ret < 0) - goto unreg_soft_iface; + goto free_bat_counters; ret = debugfs_add_meshif(soft_iface); if (ret < 0) @@ -436,6 +448,8 @@ unreg_debugfs: debugfs_del_meshif(soft_iface); unreg_sysfs: sysfs_del_meshif(soft_iface); +free_bat_counters: + free_percpu(bat_priv->bat_counters); unreg_soft_iface: unregister_netdevice(soft_iface); return NULL; @@ -501,3 +515,56 @@ static u32 bat_get_link(struct net_device *dev) { return 1; } + +/* Inspired by drivers/net/ethernet/dlink/sundance.c:1702 + * Declare each description string in struct.name[] to get fixed sized buffer + * and compile time checking for strings longer than ETH_GSTRING_LEN. + */ +static const struct { + const char name[ETH_GSTRING_LEN]; +} bat_counters_strings[] = { + { "forward" }, + { "forward_bytes" }, + { "mgmt_tx" }, + { "mgmt_tx_bytes" }, + { "mgmt_rx" }, + { "mgmt_rx_bytes" }, + { "tt_request_tx" }, + { "tt_request_rx" }, + { "tt_response_tx" }, + { "tt_response_rx" }, + { "tt_roam_adv_tx" }, + { "tt_roam_adv_rx" }, +#ifdef CONFIG_BATMAN_ADV_DAT + { "dat_request_tx" }, + { "dat_request_rx" }, + { "dat_reply_tx" }, + { "dat_reply_rx" }, +#endif +}; + +static void bat_get_strings(struct net_device *dev, uint32_t stringset, + uint8_t *data) +{ + if (stringset == ETH_SS_STATS) + memcpy(data, bat_counters_strings, + sizeof(bat_counters_strings)); +} + +static void bat_get_ethtool_stats(struct net_device *dev, + struct ethtool_stats *stats, uint64_t *data) +{ + struct bat_priv *bat_priv = netdev_priv(dev); + int i; + + for (i = 0; i < BAT_CNT_NUM; i++) + data[i] = sum_counter(bat_priv, i); +} + +static int bat_get_sset_count(struct net_device *dev, int stringset) +{ + if (stringset == ETH_SS_STATS) + return BAT_CNT_NUM; + + return -EOPNOTSUPP; +} diff --git a/translation-table.c b/translation-table.c index 88e4c8e..f8f207a 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1356,6 +1356,8 @@ static int send_tt_request(struct bat_priv *bat_priv, dst_orig_node->orig, neigh_node->addr, (full_table ? 'F' : '.')); + inc_counter(bat_priv, BAT_CNT_TT_REQUEST_TX); + send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); ret = 0; @@ -1480,6 +1482,8 @@ static bool send_other_tt_response(struct bat_priv *bat_priv, res_dst_orig_node->orig, neigh_node->addr, req_dst_orig_node->orig, req_ttvn); + inc_counter(bat_priv, BAT_CNT_TT_RESPONSE_TX); + send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); ret = true; goto out; @@ -1596,6 +1600,8 @@ static bool send_my_tt_response(struct bat_priv *bat_priv, orig_node->orig, neigh_node->addr, (tt_response->flags & TT_FULL_TABLE ? 'F' : '.')); + inc_counter(bat_priv, BAT_CNT_TT_RESPONSE_TX); + send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); ret = true; goto out; @@ -1895,6 +1901,8 @@ static void send_roam_adv(struct bat_priv *bat_priv, uint8_t *client, "Sending ROAMING_ADV to %pM (client %pM) via %pM\n", orig_node->orig, client, neigh_node->addr); + inc_counter(bat_priv, BAT_CNT_TT_ROAM_ADV_TX); + send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); ret = 0; diff --git a/types.h b/types.h index 995e910..2944f77 100644 --- a/types.h +++ b/types.h @@ -162,9 +162,32 @@ struct bcast_duplist_entry { }; #endif +enum bat_counters { + BAT_CNT_FORWARD, + BAT_CNT_FORWARD_BYTES, + BAT_CNT_MGMT_TX, + BAT_CNT_MGMT_TX_BYTES, + BAT_CNT_MGMT_RX, + BAT_CNT_MGMT_RX_BYTES, + BAT_CNT_TT_REQUEST_TX, + BAT_CNT_TT_REQUEST_RX, + BAT_CNT_TT_RESPONSE_TX, + BAT_CNT_TT_RESPONSE_RX, + BAT_CNT_TT_ROAM_ADV_TX, + BAT_CNT_TT_ROAM_ADV_RX, +#ifdef CONFIG_BATMAN_ADV_DAT + BAT_CNT_DAT_REQUEST_TX, + BAT_CNT_DAT_REQUEST_RX, + BAT_CNT_DAT_REPLY_TX, + BAT_CNT_DAT_REPLY_RX, +#endif + BAT_CNT_NUM, +}; + struct bat_priv { atomic_t mesh_state; struct net_device_stats stats; + uint64_t *bat_counters; /* Per cpu counters */ atomic_t aggregated_ogms; /* boolean */ atomic_t bonding; /* boolean */ atomic_t fragmentation; /* boolean */ -- batman-adv

1 0

batctl; branch, master, updated. v2012.1.0-20-g25df17a
by postmaster＠open-mesh.org 22 Apr '12

22 Apr '12

The following commit has been merged in the master branch: commit 25df17aa4da33cb101da7fdc749d7a1b4f05505d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Apr 20 04:36:49 2012 +0800 batctl: fix man page originator entry Reported-by: Jo-Philipp Wich <jow(a)openwrt.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/man/batctl.8 b/man/batctl.8 index 036412b..4f2e1c6 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -59,7 +59,7 @@ protocol. If no parameter is given or the first parameter is neither "add" nor "del" the current interface settings are displayed. In order to add or delete interfaces specify "add" or "del" as first argument and append the interface names you wish to add or delete. .br .IP "\fBoriginators\fP|\fBo\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP][\fB\-t\fP]" -Once started batctl will display the list of announced gateways in the network. Use the "\-w" option to let batctl refresh the list every second or add a number to let it refresh at a custom interval in seconds (with optional decimal places). If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. The "\-t" option filters all originators that have not been seen for the specified amount of seconds (with optional decimal places) from the output. +Once started batctl will display the list of announced originators in the network. Use the "\-w" option to let batctl refresh the list every second or add a number to let it refresh at a custom interval in seconds (with optional decimal places). If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. The "\-t" option filters all originators that have not been seen for the specified amount of seconds (with optional decimal places) from the output. .br .IP "\fBinterval\fP|\fBit\fP [\fBorig_interval\fP]" If no parameter is given the current originator interval setting is displayed otherwise the parameter is used to set the originator interval. The interval is in units of milliseconds. -- batctl

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2012