batman-adv: Use printk(%pM) for MAC addresses
PATCH 1/1 batman-adv: Use printk(%pM) for MAC addresses
printk() since kernel version 2.6.29 has supported printing MAC addresses directly, as an extension to the %p processing. This patch makes use of this for printk() and bat_dbg(). This will remove the overhead of using addr_to_string() which is normally never actually output.
For kernels older than 2.6.29 the printk support from 2.6.31 has been imported into batman-adv and will be used for formatting the output before passing it onto the native printk() function.
---
Signed-off-by Andrew Lunn <[email protected]>
Makefile.kbuild +2 -1
@@ -32,4 +32,5 @@ endif obj-m += batman-adv.o -batman-adv-objs := main.o proc.o send.o routing.o soft-interface.o device.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o originator.o +batman-adv-objs := main.o proc.o send.o routing.o soft-interface.o device.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o originator.o bat_printk.o +
translation-table.c +10 -24
@@ -61,7 +61,6 @@struct hna_local_entry *hna_local_entry;struct hna_global_entry *hna_global_entry;struct hashtable_t *swaphash; -char hna_str[ETH_STR_LEN ];unsigned long flags;spin_lock_irqsave (&hna_local_hash_lock, flags);
@@ -74,19 +73,17 @@return ; } -addr_to_string (hna_str, addr); -/* only announce as many hosts as possible in the batman-packet and space in batman_packet->num_hna That also should give a limit to MAC-flooding. */ if ((num_hna +1 > (ETH_DATA_LEN -BAT_PACKET_LEN ) /ETH_ALEN ) || (num_hna +1 >255 )) { -bat_dbg (DBG_ROUTES ,"Can't add new local hna entry (%s): number of local hna entries exceeds packet size \n" , hna_str); +bat_dbg (DBG_ROUTES ,"Can't add new local hna entry (%pM): number of local hna entries exceeds packet size \n" , addr);return ; } -bat_dbg (DBG_ROUTES ,"Creating new local hna entry: %s \n" , - hna_str); +bat_dbg (DBG_ROUTES ,"Creating new local hna entry: %pM \n" , + addr); hna_local_entry =kmalloc (sizeof (struct hna_local_entry ),GFP_ATOMIC );if (!hna_local_entry)
@@ -201,12 +198,9 @@static void hna_local_del (struct hna_local_entry *hna_local_entry,char *message) { -char hna_str[ETH_STR_LEN ]; +bat_dbg (DBG_ROUTES ,"Deleting local hna entry (%pM): %s \n" , + hna_local_entry->addr, message); -addr_to_string (hna_str, hna_local_entry->addr); -bat_dbg (DBG_ROUTES ,"Deleting local hna entry (%s): %s \n" , - hna_str, message); -hash_remove (hna_local_hash, hna_local_entry->addr);_hna_local_del (hna_local_entry); }
@@ -263,13 +257,10 @@struct hna_global_entry *hna_global_entry;struct hna_local_entry *hna_local_entry;struct hashtable_t *swaphash; -char hna_str[ETH_STR_LEN ], orig_str[ETH_STR_LEN ];int hna_buff_count =0 ;unsigned long flags;unsigned char *hna_ptr; -addr_to_string (orig_str, orig_node->orig); -while ((hna_buff_count +1 ) *ETH_ALEN <= hna_buff_len) {spin_lock_irqsave (&hna_global_hash_lock, flags);
@@ -289,10 +280,9 @@memcpy (hna_global_entry->addr, hna_ptr,ETH_ALEN ); -addr_to_string (hna_str, hna_global_entry->addr);bat_dbg (DBG_ROUTES , -"Creating new global hna entry: %s (via %s)\n" , - hna_str, orig_str); +"Creating new global hna entry: %pM (via %pM)\n" , + hna_global_entry->addr, orig_node->orig);spin_lock_irqsave (&hna_global_hash_lock, flags);hash_add (hna_global_hash, hna_global_entry);
@@ -382,14 +372,10 @@void _hna_global_del_orig (struct hna_global_entry *hna_global_entry,char *message) { -char hna_str[ETH_STR_LEN ], orig_str[ETH_STR_LEN ]; +bat_dbg (DBG_ROUTES ,"Deleting global hna entry %pM (via %pM): %s \n" , + hna_global_entry->addr, hna_global_entry->orig_node->orig, + message); -addr_to_string (orig_str, hna_global_entry->orig_node->orig); -addr_to_string (hna_str, hna_global_entry->addr); - -bat_dbg (DBG_ROUTES ,"Deleting global hna entry %s (via %s): %s \n" , - hna_str, orig_str, message); -hash_remove (hna_global_hash, hna_global_entry->addr);kfree (hna_global_entry); }
send.c +4 -9
@@ -113,7 +113,6 @@uint8_t packet_num;int16_t buff_pos;struct batman_packet *batman_packet; -char orig_str[ETH_STR_LEN ];if (batman_if->if_active !=IF_ACTIVE )return ;
@@ -135,15 +134,14 @@else batman_packet->flags &= ~DIRECTLINK ; -addr_to_string (orig_str, batman_packet->orig); fwd_str = (packet_num >0 ?"Forwarding" : (forw_packet->own ?"Sending own" :"Forwarding" )); bat_dbg(DBG_BATMAN, - "%s %spacket (originator %s, seqno %d, TQ %d, TTL %d, IDF %s) on interface %s [%s]\n", + "%s %spacket (originator %pM, seqno %d, TQ %d, TTL %d, IDF %s) on interface %s [%s]\n", fwd_str, (packet_num > 0 ? "aggregated " : ""), - orig_str, ntohs(batman_packet->seqno), + batman_packet->orig, ntohs(batman_packet->seqno), batman_packet->tq, batman_packet->ttl, (batman_packet->flags & DIRECTLINK ? "on" : "off"),
@@ -167,7 +165,6 @@struct batman_if *batman_if;struct batman_packet *batman_packet = (struct batman_packet *)(forw_packet->packet_buff); -char orig_str[ETH_STR_LEN ];unsigned char directlink = (batman_packet->flags &DIRECTLINK ?1 :0 );if (!forw_packet->if_incoming) {
@@ -178,8 +175,6 @@if (forw_packet->if_incoming->if_active !=IF_ACTIVE )return ; -addr_to_string (orig_str, batman_packet->orig); -/* multihomed peer assumed */ /* non-primary OGMs are only broadcasted on their interface */ if ((directlink && (batman_packet->ttl == 1)) ||
@@ -187,9 +182,9 @@/* FIXME: what about aggregated packets ? */ bat_dbg (DBG_BATMAN , -"%s packet (originator %s, seqno %d, TTL %d) on interface %s [%s]\n" , +"%s packet (originator %pM, seqno %d, TTL %d) on interface %s [%s]\n" , (forw_packet->own ?"Sending own" :"Forwarding" ), - orig_str,ntohs (batman_packet->seqno), + batman_packet->orig,ntohs (batman_packet->seqno), batman_packet->ttl, forw_packet->if_incoming->dev, forw_packet->if_incoming->addr_str);
bat_printk.c +1013 -0
1,013 lines not on this page · raw message
hard-interface.c +3 -6
@@ -74,7 +74,6 @@static void check_known_mac_addr (uint8_t *addr) {struct batman_if *batman_if; -char mac_string[ETH_STR_LEN ];rcu_read_lock ();list_for_each_entry_rcu (batman_if, &if_list, list) {
@@ -85,9 +84,8 @@if (!compare_orig (batman_if->net_dev->dev_addr, addr))continue ; -addr_to_string (mac_string, addr); -printk (KERN_WARNING "batman-adv:The newly added mac address (%s) already exists on: %s\n" , - mac_string, batman_if->dev); +printk (KERN_WARNING "batman-adv:The newly added mac address (%pM) already exists on: %s\n" , + addr, batman_if->dev);printk (KERN_WARNING "batman-adv:It is strongly recommended to keep mac addresses unique to avoid problems!\n" ); }rcu_read_unlock ();
@@ -399,8 +397,7 @@return 1 ; out: -if (batman_if->packet_buff) -kfree (batman_if->packet_buff); +kfree (batman_if->packet_buff);kfree (batman_if);kfree (dev);return -1 ;
originator.c +4 -15
@@ -115,7 +115,6 @@ {struct orig_node *orig_node;struct hashtable_t *swaphash; -char orig_str[ETH_STR_LEN ];int size; orig_node = ((struct orig_node *)hash_find (orig_hash, addr));
@@ -123,8 +122,7 @@if (orig_node !=NULL )return orig_node; -addr_to_string (orig_str, addr); -bat_dbg (DBG_BATMAN ,"Creating new originator: %s \n" , orig_str); +bat_dbg (DBG_BATMAN ,"Creating new originator: %pM \n" , addr); orig_node =kmalloc (sizeof (struct orig_node ),GFP_ATOMIC );memset (orig_node,0 ,sizeof (struct orig_node ));
@@ -163,13 +161,11 @@ struct neigh_node **best_neigh_node) {struct list_head *list_pos, *list_pos_tmp; -char neigh_str[ETH_STR_LEN ], orig_str[ETH_STR_LEN ];struct neigh_node *neigh_node;bool neigh_purged = false; *best_neigh_node =NULL ; -/* for all neighbours towards this originator ... */ list_for_each_safe (list_pos, list_pos_tmp, &orig_node->neigh_list) { neigh_node = list_entry(list_pos, struct neigh_node, list);
@@ -178,9 +174,7 @@ (neigh_node->last_valid + ((PURGE_TIMEOUT * HZ) / 1000)))) { -addr_to_string (neigh_str, neigh_node->addr); -addr_to_string (orig_str, orig_node->orig); -bat_dbg (DBG_BATMAN ,"Neighbour timeout: originator %s, neighbour: %s, last_valid %lu\n" , orig_str, neigh_str, (neigh_node->last_valid /HZ )); +bat_dbg (DBG_BATMAN ,"Neighbour timeout: originator %pM, neighbour: %pM, last_valid %lu\n" , orig_node->orig, neigh_node->addr, (neigh_node->last_valid /HZ )); neigh_purged = true;list_del (list_pos);
@@ -198,17 +192,14 @@static bool purge_orig_node (struct orig_node *orig_node) {struct neigh_node *best_neigh_node; -char orig_str[ETH_STR_LEN ]; -addr_to_string (orig_str, orig_node->orig); -if (time_after (jiffies, (orig_node->last_valid + ((2 *PURGE_TIMEOUT *HZ ) /1000 )))) {bat_dbg (DBG_BATMAN , -"Originator timeout: originator %s, last_valid %lu\n" , - orig_str, (orig_node->last_valid /HZ )); +"Originator timeout: originator %pM, last_valid %lu\n" , + orig_node->orig, (orig_node->last_valid /HZ ));return true; }else {if (purge_orig_neigbours (orig_node, &best_neigh_node))
@@ -239,5 +230,3 @@start_purge_timer (); } - -
routing.c +21 -47
167 lines not on this page · raw message
compat.h +5 -0
@@ -73,3 +73,8 @@ ret; \ })#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) */ + +#if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,29 ) +asmlinkage int bat_printk(const char *fmt, ...); +#define printk bat_printk +#endif
main.h +1 -0
@@ -111,6 +111,7 @@#include <linux/workqueue.h> /* workqueue */ #include <net/sock.h> /* struct sock */ #include <linux/jiffies.h> +#include <linux/list.h> #include "types.h" #ifndef REVISION_VERSION
routing.h +6 -6
@@ -27,10 +27,10 @@void slide_own_bcast_window (struct batman_if *batman_if);void batman_data_ready (struct sock *sk,int len);int packet_recv_thread (void *data); -void receive_bat_packet (struct ethhdr *ethhdr, -struct batman_packet *batman_packet, -unsigned char *hna_buff,int hna_buff_len, -struct batman_if *if_incoming); +void receive_bat_packet (struct ethhdr *ethhdr, +struct batman_packet *batman_packet, +unsigned char *hna_buff,int hna_buff_len, +struct batman_if *if_incoming);void update_routes (struct orig_node *orig_node, -struct neigh_node *neigh_node, -unsigned char *hna_buff,int hna_buff_len); +struct neigh_node *neigh_node, +unsigned char *hna_buff,int hna_buff_len);
Quoted 9 lines · Andrew Lunn
printk()since kernel version 2.6.29 has supported printing MAC addresses directly, as an extension to the %p processing. This patch makes use of this forprintk()andbat_dbg(). This will remove the overhead of usingaddr_to_string()which is normally never actually output.For kernels older than 2.6.29 the printk support from 2.6.31 has been imported into batman-adv and will be used for formatting the output before passing it onto the native
printk()function.
[snip]
Quoted 10 lines
Index:
routing.c
===================================================================routing.c +0
-2@@ -79,32 +79,24 @@struct neigh_node *neigh_node, unsigned char *hna_buff, int hna_buff_len) { - char orig_str[ETH_STR_LEN], neigh_str[ETH_STR_LEN]; -char router_str[ETH_STR_LEN ];
routing.c line 86
Quoted 10 lines
routing.c +2
-5- -addr_to_string (orig_str, orig_node->orig); -/* route deleted */ if ((orig_node->router !=NULL )&& (neigh_node ==NULL )) { -bat_dbg (DBG_ROUTES ,"Deleting route towards: %s\n" , - orig_str); +bat_dbg (DBG_ROUTES ,"Deleting route towards: %pMs\n" , + orig_node->orig);
There is an extra "s" after the the replacement %pM.
Gus
Quoted 6 lines
routing.c line 86
Quoted 4 lines
routing.c +2
-2-bat_dbg (DBG_ROUTES ,"Deleting route towards: %s\n" , - orig_str); +bat_dbg (DBG_ROUTES ,"Deleting route towards: %pMs\n" , + orig_node->orig);There is an extra "s" after the the replacement %pM.
Thanks
Andrew