commits August 2010

commits@lists.open-mesh.org

2 participants
39 discussions

r1759 - trunk/batman-adv
by postmaster＠open-mesh.org 08 Aug '10

08 Aug '10

Author: marek Date: 2010-08-08 15:00:50 +0200 (Sun, 08 Aug 2010) New Revision: 1759 Modified: trunk/batman-adv/aggregation.c trunk/batman-adv/send.c trunk/batman-adv/types.h Log: batman-adv: Aggregate batman packets directly in skb All originator messages are send through aggregation buffers. Those buffers can directly be allocated as skb to reduce the cost of allocation an extra buffer and copying them to a new allocated skb directly before it gets send. Now only the skb must be cloned in case of send_packet_to_if as it gets called by send_packet for each interface. Non-primary ogms must not cloned at all because they will only send once and the forward_packet structure is freed by send_outstanding_bat_packet afterwards. Reported-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv/aggregation.c =================================================================== --- trunk/batman-adv/aggregation.c 2010-08-08 13:00:46 UTC (rev 1758) +++ trunk/batman-adv/aggregation.c 2010-08-08 13:00:50 UTC (rev 1759) @@ -39,7 +39,7 @@ struct forw_packet *forw_packet) { struct batman_packet *batman_packet = - (struct batman_packet *)forw_packet->packet_buff; + (struct batman_packet *)forw_packet->skb->data; int aggregated_bytes = forw_packet->packet_len + packet_len; /** @@ -106,6 +106,7 @@ { struct forw_packet *forw_packet_aggr; unsigned long flags; + unsigned char *skb_buff; /* FIXME: each batman_if will be attached to a softif */ struct bat_priv *bat_priv = netdev_priv(soft_device); @@ -125,23 +126,22 @@ return; } - forw_packet_aggr->packet_buff = kmalloc(MAX_AGGREGATION_BYTES, - GFP_ATOMIC); - if (!forw_packet_aggr->packet_buff) { + forw_packet_aggr->skb = dev_alloc_skb(MAX_AGGREGATION_BYTES + + sizeof(struct ethhdr)); + if (!forw_packet_aggr->skb) { if (!own_packet) atomic_inc(&bat_priv->batman_queue_left); kfree(forw_packet_aggr); return; } + skb_reserve(forw_packet_aggr->skb, sizeof(struct ethhdr)); INIT_HLIST_NODE(&forw_packet_aggr->list); + skb_buff = skb_put(forw_packet_aggr->skb, packet_len); forw_packet_aggr->packet_len = packet_len; - memcpy(forw_packet_aggr->packet_buff, - packet_buff, - forw_packet_aggr->packet_len); + memcpy(skb_buff, packet_buff, packet_len); - forw_packet_aggr->skb = NULL; forw_packet_aggr->own = own_packet; forw_packet_aggr->if_incoming = if_incoming; forw_packet_aggr->num_packets = 0; @@ -171,8 +171,10 @@ int packet_len, bool direct_link) { - memcpy((forw_packet_aggr->packet_buff + forw_packet_aggr->packet_len), - packet_buff, packet_len); + unsigned char *skb_buff; + + skb_buff = skb_put(forw_packet_aggr->skb, packet_len); + memcpy(skb_buff, packet_buff, packet_len); forw_packet_aggr->packet_len += packet_len; forw_packet_aggr->num_packets++; Modified: trunk/batman-adv/send.c =================================================================== --- trunk/batman-adv/send.c 2010-08-08 13:00:46 UTC (rev 1758) +++ trunk/batman-adv/send.c 2010-08-08 13:00:50 UTC (rev 1759) @@ -132,14 +132,14 @@ uint8_t packet_num; int16_t buff_pos; struct batman_packet *batman_packet; + struct sk_buff *skb; if (batman_if->if_status != IF_ACTIVE) return; packet_num = 0; buff_pos = 0; - batman_packet = (struct batman_packet *) - (forw_packet->packet_buff); + batman_packet = (struct batman_packet *)forw_packet->skb->data; /* adjust all flags and log packets */ while (aggregated_packet(buff_pos, @@ -171,12 +171,13 @@ (batman_packet->num_hna * ETH_ALEN); packet_num++; batman_packet = (struct batman_packet *) - (forw_packet->packet_buff + buff_pos); + (forw_packet->skb->data + buff_pos); } - send_raw_packet(forw_packet->packet_buff, - forw_packet->packet_len, - batman_if, broadcast_addr); + /* create clone because function is called more than once */ + skb = skb_clone(forw_packet->skb, GFP_ATOMIC); + if (skb) + send_skb_packet(skb, batman_if, broadcast_addr); } /* send a batman packet */ @@ -186,7 +187,7 @@ struct bat_priv *bat_priv = netdev_priv(soft_device); struct batman_if *batman_if; struct batman_packet *batman_packet = - (struct batman_packet *)(forw_packet->packet_buff); + (struct batman_packet *)(forw_packet->skb->data); unsigned char directlink = (batman_packet->flags & DIRECTLINK ? 1 : 0); if (!forw_packet->if_incoming) { @@ -212,10 +213,11 @@ batman_packet->ttl, forw_packet->if_incoming->dev, forw_packet->if_incoming->addr_str); - send_raw_packet(forw_packet->packet_buff, - forw_packet->packet_len, - forw_packet->if_incoming, + /* skb is only used once and than forw_packet is free'd */ + send_skb_packet(forw_packet->skb, forw_packet->if_incoming, broadcast_addr); + forw_packet->skb = NULL; + return; } @@ -379,7 +381,6 @@ { if (forw_packet->skb) kfree_skb(forw_packet->skb); - kfree(forw_packet->packet_buff); kfree(forw_packet); } @@ -438,7 +439,6 @@ skb_reset_mac_header(skb); forw_packet->skb = skb; - forw_packet->packet_buff = NULL; /* how often did we send the bcast packet ? */ forw_packet->num_packets = 0; Modified: trunk/batman-adv/types.h =================================================================== --- trunk/batman-adv/types.h 2010-08-08 13:00:46 UTC (rev 1758) +++ trunk/batman-adv/types.h 2010-08-08 13:00:50 UTC (rev 1759) @@ -172,7 +172,6 @@ unsigned long send_time; uint8_t own; struct sk_buff *skb; - unsigned char *packet_buff; uint16_t packet_len; uint32_t direct_link_flags; uint8_t num_packets;

1 0

r1758 - trunk/batman-adv
by postmaster＠open-mesh.org 08 Aug '10

08 Aug '10

Author: marek Date: 2010-08-08 15:00:46 +0200 (Sun, 08 Aug 2010) New Revision: 1758 Modified: trunk/batman-adv/send.c Log: batman-adv: Only clone skb data for multiple broadcasts batman-adv tries to resend broadcasts on all interfaces up to three times. For each round and each interface it must provide a skb which gets consumed by the sending function. It is unnecessary to copy the data of each broadcast because the actual data is either not shared or already copied by add_bcast_packet_to_list. So it is enough to just copy the skb control data Reported-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv/send.c =================================================================== --- trunk/batman-adv/send.c 2010-08-08 13:00:41 UTC (rev 1757) +++ trunk/batman-adv/send.c 2010-08-08 13:00:46 UTC (rev 1758) @@ -477,7 +477,7 @@ rcu_read_lock(); list_for_each_entry_rcu(batman_if, &if_list, list) { /* send a copy of the saved skb */ - skb1 = skb_copy(forw_packet->skb, GFP_ATOMIC); + skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC); if (skb1) send_skb_packet(skb1, batman_if, broadcast_addr);

1 0

r1757 - trunk/batman-adv
by postmaster＠open-mesh.org 08 Aug '10

08 Aug '10

Author: marek Date: 2010-08-08 15:00:41 +0200 (Sun, 08 Aug 2010) New Revision: 1757 Modified: trunk/batman-adv/send.c trunk/batman-adv/soft-interface.c trunk/batman-adv/soft-interface.h trunk/batman-adv/unicast.c Log: batman-adv: Keep header writable and unshared my_skb_push provided an easy way to allocate enough headroom in situation were we don't have enough space left and move the data pointer to the new position, but we didn't checked wether we are allowed to write to the new pushed header. This is for example a problem when the skb was cloned and thus doesn't have a private data part. my_skb_head_push now replaces my_skb_push by using skb_cow_head to provide only a large enough, writable header without testing for the rest of the (maybe shared) data. It will also move the data pointer using skb_push when skb_cow_head doesn't fail. This should give us enough flexibility in situation were skbs will be queued by underlying layers and still doesn't unnecessarily copy the data in situations when the skb was consumed right away during dev_queue_xmit. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv/send.c =================================================================== --- trunk/batman-adv/send.c 2010-08-03 19:02:27 UTC (rev 1756) +++ trunk/batman-adv/send.c 2010-08-08 13:00:41 UTC (rev 1757) @@ -76,7 +76,7 @@ } /* push to the ethernet header. */ - if (my_skb_push(skb, sizeof(struct ethhdr)) < 0) + if (my_skb_head_push(skb, sizeof(struct ethhdr)) < 0) goto send_skb_err; skb_reset_mac_header(skb); Modified: trunk/batman-adv/soft-interface.c =================================================================== --- trunk/batman-adv/soft-interface.c 2010-08-03 19:02:27 UTC (rev 1756) +++ trunk/batman-adv/soft-interface.c 2010-08-08 13:00:41 UTC (rev 1757) @@ -33,8 +33,6 @@ static uint32_t bcast_seqno = 1; /* give own bcast messages seq numbers to avoid * broadcast storms */ -static int32_t skb_packets; -static int32_t skb_bad_packets; unsigned char main_if_addr[ETH_ALEN]; static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); @@ -61,18 +59,22 @@ memcpy(main_if_addr, addr, ETH_ALEN); } -int my_skb_push(struct sk_buff *skb, unsigned int len) +int my_skb_head_push(struct sk_buff *skb, unsigned int len) { - int result = 0; + int result; - skb_packets++; - if (skb_headroom(skb) < len) { - skb_bad_packets++; - result = pskb_expand_head(skb, len, 0, GFP_ATOMIC); + /** + * TODO: We must check if we can release all references to non-payload + * data using skb_header_release in our skbs to allow skb_cow_header to + * work optimally. This means that those skbs are not allowed to read + * or write any data which is before the current position of skb->data + * after that call and thus allow other skbs with the same data buffer + * to write freely in that area. + */ + result = skb_cow_head(skb, len); - if (result < 0) - return result; - } + if (result < 0) + return result; skb_push(skb, len); return 0; @@ -148,7 +150,7 @@ /* ethernet packet should be broadcasted */ if (bcast_dst && do_bcast) { - if (my_skb_push(skb, sizeof(struct bcast_packet)) < 0) + if (my_skb_head_push(skb, sizeof(struct bcast_packet)) < 0) goto dropped; bcast_packet = (struct bcast_packet *)skb->data; Modified: trunk/batman-adv/soft-interface.h =================================================================== --- trunk/batman-adv/soft-interface.h 2010-08-03 19:02:27 UTC (rev 1756) +++ trunk/batman-adv/soft-interface.h 2010-08-08 13:00:41 UTC (rev 1757) @@ -26,7 +26,7 @@ void interface_setup(struct net_device *dev); int interface_tx(struct sk_buff *skb, struct net_device *dev); void interface_rx(struct sk_buff *skb, int hdr_size); -int my_skb_push(struct sk_buff *skb, unsigned int len); +int my_skb_head_push(struct sk_buff *skb, unsigned int len); extern unsigned char main_if_addr[]; Modified: trunk/batman-adv/unicast.c =================================================================== --- trunk/batman-adv/unicast.c 2010-08-03 19:02:27 UTC (rev 1756) +++ trunk/batman-adv/unicast.c 2010-08-08 13:00:41 UTC (rev 1757) @@ -164,8 +164,8 @@ frag_skb = dev_alloc_skb(data_len - (data_len / 2) + hdr_len); skb_split(skb, frag_skb, data_len / 2); - if (my_skb_push(frag_skb, hdr_len) < 0 || - my_skb_push(skb, hdr_len) < 0) + if (my_skb_head_push(frag_skb, hdr_len) < 0 || + my_skb_head_push(skb, hdr_len) < 0) goto drop_frag; ucast_frag1 = (struct unicast_frag_packet *)skb->data; @@ -245,7 +245,7 @@ return unicast_send_frag_skb(skb, bat_priv, batman_if, dstaddr, orig_node); - if (my_skb_push(skb, sizeof(struct unicast_packet)) < 0) + if (my_skb_head_push(skb, sizeof(struct unicast_packet)) < 0) goto dropped; unicast_packet = (struct unicast_packet *)skb->data;

1 0

r1756 - trunk/batman-adv
by postmaster＠open-mesh.org 03 Aug '10

03 Aug '10

Author: marek Date: 2010-08-03 21:02:27 +0200 (Tue, 03 Aug 2010) New Revision: 1756 Modified: trunk/batman-adv/compat.h Log: batman-adv: eth_type_trans() in older kernels does not set the outgoing device Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv/compat.h =================================================================== --- trunk/batman-adv/compat.h 2010-08-01 18:31:29 UTC (rev 1755) +++ trunk/batman-adv/compat.h 2010-08-03 19:02:27 UTC (rev 1756) @@ -49,6 +49,17 @@ #define skb_mac_header(_skb) \ ((_skb)->mac.raw) +#include <linux/etherdevice.h> +static inline __be16 bat_eth_type_trans(struct sk_buff *skb, + struct net_device *dev) +{ + skb->dev = dev; + return eth_type_trans(skb, dev); +} + +#define eth_type_trans(_skb, _dev) \ + bat_eth_type_trans(_skb, _dev); + #endif /* < KERNEL_VERSION(2,6,22) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)

1 0

[git] linux integration annotated tag, v2.6.35, created. v2.6.35
by postmaster＠open-mesh.net 02 Aug '10

02 Aug '10

The annotated tag, v2.6.35 has been created at d786bf1b8352facdde8cc28725e1e6e067e1854d (tag) tagging 9fe6206f400646a2322096b56c59891d530e8d51 (commit) replaces v2.6.35-rc6 tagged by Linus Torvalds on Sun Aug 1 15:11:23 2010 -0700 - Shortlog ------------------------------------------------------------ Linux 2.6.35 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEABECAAYFAkxV8RAACgkQF3YsRnbiHLuQ7QCglaaNqg3Tj/MlBBqOS/yCT2AO W6YAnighAAS+a9w66UhMInbElrhO8/IN =WX7J -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

r1755 - trunk/batman-adv
by postmaster＠open-mesh.org 01 Aug '10

01 Aug '10

Author: marek Date: 2010-08-01 20:31:29 +0200 (Sun, 01 Aug 2010) New Revision: 1755 Modified: trunk/batman-adv/hard-interface.c trunk/batman-adv/main.c trunk/batman-adv/types.h Log: batman-adv: register the batman-adv packet type per interface Batman-adv globally registered the batman-adv packet type and installed a hook to batman_skb_recv(). Each interface receiving a packet with that type would end up in this function which then had to loop through all batman-adv internal interface structures to find the its meta data. The more interfaces a system had the longer the loops might take. Each and every packet goes through this function making it a performance critical loop. This patch installs the hook for each activated interface. The called batman_skb_recv() can distinguish these calls, therefore avoiding the loop through the interface structures. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv/hard-interface.c =================================================================== --- trunk/batman-adv/hard-interface.c 2010-08-01 15:22:38 UTC (rev 1754) +++ trunk/batman-adv/hard-interface.c 2010-08-01 18:31:29 UTC (rev 1755) @@ -269,6 +269,11 @@ batman_if->if_status = IF_INACTIVE; orig_hash_add_if(batman_if, bat_priv->num_ifaces); + batman_if->batman_adv_ptype.type = __constant_htons(ETH_P_BATMAN); + batman_if->batman_adv_ptype.func = batman_skb_recv; + batman_if->batman_adv_ptype.dev = batman_if->net_dev; + dev_add_pack(&batman_if->batman_adv_ptype); + atomic_set(&batman_if->seqno, 1); atomic_set(&batman_if->frag_seqno, 1); bat_info(soft_device, "Adding interface: %s\n", batman_if->dev); @@ -323,6 +328,8 @@ return; bat_info(soft_device, "Removing interface: %s\n", batman_if->dev); + dev_remove_pack(&batman_if->batman_adv_ptype); + bat_priv->num_ifaces--; orig_hash_del_if(batman_if, bat_priv->num_ifaces); @@ -473,6 +480,7 @@ struct batman_if *batman_if; int ret; + batman_if = container_of(ptype, struct batman_if, batman_adv_ptype); skb = skb_share_check(skb, GFP_ATOMIC); /* skb was released by skb_share_check() */ @@ -498,10 +506,6 @@ || !skb_mac_header(skb))) goto err_free; - batman_if = get_batman_if_by_netdev(skb->dev); - if (!batman_if) - goto err_free; - /* discard frames on not active interfaces */ if (batman_if->if_status != IF_ACTIVE) goto err_free; Modified: trunk/batman-adv/main.c =================================================================== --- trunk/batman-adv/main.c 2010-08-01 15:22:38 UTC (rev 1754) +++ trunk/batman-adv/main.c 2010-08-01 18:31:29 UTC (rev 1755) @@ -51,11 +51,6 @@ unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; atomic_t module_state; -static struct packet_type batman_adv_packet_type __read_mostly = { - .type = __constant_htons(ETH_P_BATMAN), - .func = batman_skb_recv, -}; - struct workqueue_struct *bat_event_workqueue; static int __init batman_init(void) @@ -105,7 +100,6 @@ goto unreg_sysfs; register_netdevice_notifier(&hard_if_notifier); - dev_add_pack(&batman_adv_packet_type); pr_info("B.A.T.M.A.N. advanced %s%s (compatibility version %i) " "loaded\n", SOURCE_VERSION, REVISION_VERSION_STR, @@ -142,8 +136,6 @@ soft_device = NULL; } - dev_remove_pack(&batman_adv_packet_type); - destroy_workqueue(bat_event_workqueue); bat_event_workqueue = NULL; } @@ -187,8 +179,6 @@ vis_quit(); - /* TODO: unregister BATMAN pack */ - gw_node_list_free(); originator_free(); Modified: trunk/batman-adv/types.h =================================================================== --- trunk/batman-adv/types.h 2010-08-01 15:22:38 UTC (rev 1754) +++ trunk/batman-adv/types.h 2010-08-01 18:31:29 UTC (rev 1755) @@ -46,6 +46,7 @@ int packet_len; struct kobject *hardif_obj; struct rcu_head rcu; + struct packet_type batman_adv_ptype; }; /**

1 0

r1754 - trunk/batctl
by postmaster＠open-mesh.org 01 Aug '10

01 Aug '10

Author: marek Date: 2010-08-01 17:22:38 +0200 (Sun, 01 Aug 2010) New Revision: 1754 Modified: trunk/batctl/tcpdump.c Log: batctl: tcpdump - show ogm gateway flags Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batctl/tcpdump.c =================================================================== --- trunk/batctl/tcpdump.c 2010-08-01 14:31:56 UTC (rev 1753) +++ trunk/batctl/tcpdump.c 2010-08-01 15:22:38 UTC (rev 1754) @@ -262,13 +262,14 @@ printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_packet->orig, read_opt)); - printf("OGM via neigh %s, seq %u, tq %3d, ttl %2d, v %d, flags [%c%c%c], length %zu\n", + printf("OGM via neigh %s, seq %u, tq %3d, 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->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' : '.'), (size_t)buff_len - sizeof(struct ether_header)); }

1 0

r1753 - trunk/batman-adv
by postmaster＠open-mesh.org 01 Aug '10

01 Aug '10

Author: marek Date: 2010-08-01 16:31:56 +0200 (Sun, 01 Aug 2010) New Revision: 1753 Modified: trunk/batman-adv/send.c Log: batman-adv: propagate gateway flags via the main OGM only If the gateway flags are progatated via all OGMs a node sends out nearby nodes will believe to 'see' several gateways although it is the same node. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv/send.c =================================================================== --- trunk/batman-adv/send.c 2010-08-01 14:31:54 UTC (rev 1752) +++ trunk/batman-adv/send.c 2010-08-01 14:31:56 UTC (rev 1753) @@ -295,7 +295,8 @@ else batman_packet->flags &= ~VIS_SERVER; - if (atomic_read(&bat_priv->gw_mode) == GW_MODE_SERVER) + if ((batman_if == bat_priv->primary_if) && + (atomic_read(&bat_priv->gw_mode) == GW_MODE_SERVER)) batman_packet->gw_flags = (uint8_t)atomic_read(&bat_priv->gw_class); else

1 0

r1752 - trunk/batman-adv
by postmaster＠open-mesh.org 01 Aug '10

01 Aug '10

Author: marek Date: 2010-08-01 16:31:54 +0200 (Sun, 01 Aug 2010) New Revision: 1752 Modified: trunk/batman-adv/main.c Log: batman-adv: fix own mac address detection Earlier batman-adv versions would only create a batman_if struct after a corresponding interface had been activated by a user. Now each existing system interface has a batman_if struct and has to be checked by verifying the IF_ACTIVE flag. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv/main.c =================================================================== --- trunk/batman-adv/main.c 2010-07-31 17:21:13 UTC (rev 1751) +++ trunk/batman-adv/main.c 2010-08-01 14:31:54 UTC (rev 1752) @@ -247,10 +247,13 @@ int is_my_mac(uint8_t *addr) { struct batman_if *batman_if; + rcu_read_lock(); list_for_each_entry_rcu(batman_if, &if_list, list) { - if ((batman_if->net_dev) && - (compare_orig(batman_if->net_dev->dev_addr, addr))) { + if (batman_if->if_status != IF_ACTIVE) + continue; + + if (compare_orig(batman_if->net_dev->dev_addr, addr)) { rcu_read_unlock(); return 1; }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2010