B.A.T.M.A.N May 2011

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

14 participants
59 discussions

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: multi vlan support for bridge loop detection
by Marek Lindner 04 May '11

04 May '11

The bridge loop detection for batman-adv allows the bat0 interface to be bridged into an ethernet segment which other batman-adv nodes are connected to. In order to also allow multiple VLANs on top of the bat0 interface to be bridged into the ethernet segment this patch extends the aforementioned bridge loop detection. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- main.c | 3 +- soft-interface.c | 401 ++++++++++++++++++++++++++++++++++++++--------------- types.h | 19 ++- 3 files changed, 303 insertions(+), 120 deletions(-) diff --git a/main.c b/main.c index 709b33b..705e8be 100644 --- a/main.c +++ b/main.c @@ -87,11 +87,12 @@ int mesh_init(struct net_device *soft_iface) spin_lock_init(&bat_priv->vis_hash_lock); spin_lock_init(&bat_priv->vis_list_lock); spin_lock_init(&bat_priv->softif_neigh_lock); + spin_lock_init(&bat_priv->softif_neigh_vid_lock); INIT_HLIST_HEAD(&bat_priv->forw_bat_list); INIT_HLIST_HEAD(&bat_priv->forw_bcast_list); INIT_HLIST_HEAD(&bat_priv->gw_list); - INIT_HLIST_HEAD(&bat_priv->softif_neigh_list); + INIT_HLIST_HEAD(&bat_priv->softif_neigh_vids); if (originator_init(bat_priv) < 1) goto err; diff --git a/soft-interface.c b/soft-interface.c index 1772e2b..7cd6ab1 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -86,99 +86,91 @@ static void softif_neigh_free_ref(struct softif_neigh *softif_neigh) call_rcu(&softif_neigh->rcu, softif_neigh_free_rcu); } -static struct softif_neigh *softif_neigh_get_selected(struct bat_priv *bat_priv) +static void softif_neigh_vid_free_rcu(struct rcu_head *rcu) { - struct softif_neigh *neigh; - - rcu_read_lock(); - neigh = rcu_dereference(bat_priv->softif_neigh); - - if (neigh && !atomic_inc_not_zero(&neigh->refcount)) - neigh = NULL; - - rcu_read_unlock(); - return neigh; -} - -static void softif_neigh_select(struct bat_priv *bat_priv, - struct softif_neigh *new_neigh) -{ - struct softif_neigh *curr_neigh; - - spin_lock_bh(&bat_priv->softif_neigh_lock); - - if (new_neigh && !atomic_inc_not_zero(&new_neigh->refcount)) - new_neigh = NULL; - - curr_neigh = bat_priv->softif_neigh; - rcu_assign_pointer(bat_priv->softif_neigh, new_neigh); - - if (curr_neigh) - softif_neigh_free_ref(curr_neigh); - - spin_unlock_bh(&bat_priv->softif_neigh_lock); -} - -static void softif_neigh_deselect(struct bat_priv *bat_priv) -{ - softif_neigh_select(bat_priv, NULL); -} - -void softif_neigh_purge(struct bat_priv *bat_priv) -{ - struct softif_neigh *softif_neigh, *curr_softif_neigh; + struct softif_neigh_vid *softif_neigh_vid; + struct softif_neigh *softif_neigh; struct hlist_node *node, *node_tmp; - char do_deselect = 0; + struct bat_priv *bat_priv; - curr_softif_neigh = softif_neigh_get_selected(bat_priv); + softif_neigh_vid = container_of(rcu, struct softif_neigh_vid, rcu); + bat_priv = softif_neigh_vid->bat_priv; spin_lock_bh(&bat_priv->softif_neigh_lock); - hlist_for_each_entry_safe(softif_neigh, node, node_tmp, - &bat_priv->softif_neigh_list, list) { - - if ((!time_after(jiffies, softif_neigh->last_seen + - msecs_to_jiffies(SOFTIF_NEIGH_TIMEOUT))) && - (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE)) - continue; - - if (curr_softif_neigh == softif_neigh) { - bat_dbg(DBG_ROUTES, bat_priv, - "Current mesh exit point '%pM' vanished " - "(vid: %d).\n", - softif_neigh->addr, softif_neigh->vid); - do_deselect = 1; - } - + &softif_neigh_vid->softif_neigh_list, list) { hlist_del_rcu(&softif_neigh->list); softif_neigh_free_ref(softif_neigh); } - spin_unlock_bh(&bat_priv->softif_neigh_lock); - /* soft_neigh_deselect() needs to acquire the softif_neigh_lock */ - if (do_deselect) - softif_neigh_deselect(bat_priv); + kfree(softif_neigh_vid); +} - if (curr_softif_neigh) - softif_neigh_free_ref(curr_softif_neigh); +static void softif_neigh_vid_free_ref(struct softif_neigh_vid *softif_neigh_vid) +{ + if (atomic_dec_and_test(&softif_neigh_vid->refcount)) + call_rcu(&softif_neigh_vid->rcu, softif_neigh_vid_free_rcu); +} + +static struct softif_neigh_vid *softif_neigh_vid_get(struct bat_priv *bat_priv, + short vid) +{ + struct softif_neigh_vid *softif_neigh_vid; + struct hlist_node *node; + + rcu_read_lock(); + hlist_for_each_entry_rcu(softif_neigh_vid, node, + &bat_priv->softif_neigh_vids, list) { + if (softif_neigh_vid->vid != vid) + continue; + + if (!atomic_inc_not_zero(&softif_neigh_vid->refcount)) + continue; + + goto out; + } + + softif_neigh_vid = kzalloc(sizeof(struct softif_neigh_vid), + GFP_ATOMIC); + if (!softif_neigh_vid) + goto out; + + softif_neigh_vid->vid = vid; + softif_neigh_vid->bat_priv = bat_priv; + + /* initialize with 2 - caller decrements counter by one */ + atomic_set(&softif_neigh_vid->refcount, 2); + INIT_HLIST_HEAD(&softif_neigh_vid->softif_neigh_list); + INIT_HLIST_NODE(&softif_neigh_vid->list); + spin_lock_bh(&bat_priv->softif_neigh_vid_lock); + hlist_add_head_rcu(&softif_neigh_vid->list, + &bat_priv->softif_neigh_vids); + spin_unlock_bh(&bat_priv->softif_neigh_vid_lock); + +out: + rcu_read_unlock(); + return softif_neigh_vid; } static struct softif_neigh *softif_neigh_get(struct bat_priv *bat_priv, uint8_t *addr, short vid) { - struct softif_neigh *softif_neigh; + struct softif_neigh_vid *softif_neigh_vid; + struct softif_neigh *softif_neigh = NULL; struct hlist_node *node; + softif_neigh_vid = softif_neigh_vid_get(bat_priv, vid); + if (!softif_neigh_vid) + goto out; + rcu_read_lock(); hlist_for_each_entry_rcu(softif_neigh, node, - &bat_priv->softif_neigh_list, list) { + &softif_neigh_vid->softif_neigh_list, + list) { if (!compare_eth(softif_neigh->addr, addr)) continue; - if (softif_neigh->vid != vid) - continue; - if (!atomic_inc_not_zero(&softif_neigh->refcount)) continue; @@ -191,30 +183,153 @@ static struct softif_neigh *softif_neigh_get(struct bat_priv *bat_priv, goto out; memcpy(softif_neigh->addr, addr, ETH_ALEN); - softif_neigh->vid = vid; softif_neigh->last_seen = jiffies; /* initialize with 2 - caller decrements counter by one */ atomic_set(&softif_neigh->refcount, 2); INIT_HLIST_NODE(&softif_neigh->list); spin_lock_bh(&bat_priv->softif_neigh_lock); - hlist_add_head_rcu(&softif_neigh->list, &bat_priv->softif_neigh_list); + hlist_add_head_rcu(&softif_neigh->list, + &softif_neigh_vid->softif_neigh_list); spin_unlock_bh(&bat_priv->softif_neigh_lock); out: rcu_read_unlock(); + if (softif_neigh_vid) + softif_neigh_vid_free_ref(softif_neigh_vid); return softif_neigh; } +static struct softif_neigh *softif_neigh_get_selected( + struct softif_neigh_vid *softif_neigh_vid) +{ + struct softif_neigh *softif_neigh; + + rcu_read_lock(); + softif_neigh = rcu_dereference(softif_neigh_vid->softif_neigh); + + if (softif_neigh && !atomic_inc_not_zero(&softif_neigh->refcount)) + softif_neigh = NULL; + + rcu_read_unlock(); + return softif_neigh; +} + +static struct softif_neigh *softif_neigh_vid_get_selected( + struct bat_priv *bat_priv, + short vid) +{ + struct softif_neigh_vid *softif_neigh_vid; + struct softif_neigh *softif_neigh = NULL; + + softif_neigh_vid = softif_neigh_vid_get(bat_priv, vid); + if (!softif_neigh_vid) + goto out; + + softif_neigh = softif_neigh_get_selected(softif_neigh_vid); +out: + if (softif_neigh_vid) + softif_neigh_vid_free_ref(softif_neigh_vid); + return softif_neigh; +} + +static void softif_neigh_vid_select(struct bat_priv *bat_priv, + struct softif_neigh *new_neigh, + short vid) +{ + struct softif_neigh_vid *softif_neigh_vid; + struct softif_neigh *curr_neigh; + + softif_neigh_vid = softif_neigh_vid_get(bat_priv, vid); + if (!softif_neigh_vid) + goto out; + + spin_lock_bh(&bat_priv->softif_neigh_lock); + + if (new_neigh && !atomic_inc_not_zero(&new_neigh->refcount)) + new_neigh = NULL; + + curr_neigh = softif_neigh_vid->softif_neigh; + rcu_assign_pointer(softif_neigh_vid->softif_neigh, new_neigh); + + if ((curr_neigh) && (!new_neigh)) + bat_dbg(DBG_ROUTES, bat_priv, + "Removing mesh exit point on vid: %d (prev: %pM).\n", + vid, curr_neigh->addr); + else if ((curr_neigh) && (new_neigh)) + bat_dbg(DBG_ROUTES, bat_priv, + "Changing mesh exit point on vid: %d from %pM " + "to %pM.\n", vid, curr_neigh->addr, new_neigh->addr); + else if ((!curr_neigh) && (new_neigh)) + bat_dbg(DBG_ROUTES, bat_priv, + "Setting mesh exit point on vid: %d to %pM.\n", + vid, new_neigh->addr); + + if (curr_neigh) + softif_neigh_free_ref(curr_neigh); + + spin_unlock_bh(&bat_priv->softif_neigh_lock); + +out: + if (softif_neigh_vid) + softif_neigh_vid_free_ref(softif_neigh_vid); +} + +static void softif_neigh_vid_deselect(struct bat_priv *bat_priv, + struct softif_neigh_vid *softif_neigh_vid) +{ + struct softif_neigh *curr_neigh; + struct softif_neigh *softif_neigh = NULL, *softif_neigh_tmp; + struct hard_iface *primary_if = NULL; + struct hlist_node *node; + + primary_if = primary_if_get_selected(bat_priv); + if (!primary_if) + goto out; + + /* find new softif_neigh immediately to avoid temporary loops */ + rcu_read_lock(); + curr_neigh = rcu_dereference(softif_neigh_vid->softif_neigh); + + hlist_for_each_entry_rcu(softif_neigh_tmp, node, + &softif_neigh_vid->softif_neigh_list, + list) { + if (softif_neigh_tmp == curr_neigh) + continue; + + /* we got a neighbor but its mac is 'bigger' than ours */ + if (memcmp(primary_if->net_dev->dev_addr, + softif_neigh_tmp->addr, ETH_ALEN) < 0) + continue; + + if (!atomic_inc_not_zero(&softif_neigh_tmp->refcount)) + continue; + + softif_neigh = softif_neigh_tmp; + goto out; + } + + rcu_read_unlock(); + +out: + softif_neigh_vid_select(bat_priv, softif_neigh, softif_neigh_vid->vid); + + if (primary_if) + hardif_free_ref(primary_if); + if (softif_neigh) + softif_neigh_free_ref(softif_neigh); +} + int softif_neigh_seq_print_text(struct seq_file *seq, void *offset) { struct net_device *net_dev = (struct net_device *)seq->private; struct bat_priv *bat_priv = netdev_priv(net_dev); + struct softif_neigh_vid *softif_neigh_vid; struct softif_neigh *softif_neigh; struct hard_iface *primary_if; - struct hlist_node *node; + struct hlist_node *node, *node_tmp; struct softif_neigh *curr_softif_neigh; - int ret = 0; + int ret = 0, last_seen_secs, last_seen_msecs; primary_if = primary_if_get_selected(bat_priv); if (!primary_if) { @@ -233,17 +348,33 @@ int softif_neigh_seq_print_text(struct seq_file *seq, void *offset) seq_printf(seq, "Softif neighbor list (%s)\n", net_dev->name); - curr_softif_neigh = softif_neigh_get_selected(bat_priv); rcu_read_lock(); - hlist_for_each_entry_rcu(softif_neigh, node, - &bat_priv->softif_neigh_list, list) - seq_printf(seq, "%s %pM (vid: %d)\n", - curr_softif_neigh == softif_neigh - ? "=>" : " ", softif_neigh->addr, - softif_neigh->vid); + hlist_for_each_entry_rcu(softif_neigh_vid, node, + &bat_priv->softif_neigh_vids, list) { + seq_printf(seq, " %-15s %s on vid: %d\n", + "Originator", "last-seen", softif_neigh_vid->vid); + + curr_softif_neigh = softif_neigh_get_selected(softif_neigh_vid); + + hlist_for_each_entry_rcu(softif_neigh, node_tmp, + &softif_neigh_vid->softif_neigh_list, + list) { + last_seen_secs = jiffies_to_msecs(jiffies - + softif_neigh->last_seen) / 1000; + last_seen_msecs = jiffies_to_msecs(jiffies - + softif_neigh->last_seen) % 1000; + seq_printf(seq, "%s %pM %3i.%03is\n", + curr_softif_neigh == softif_neigh + ? "=>" : " ", softif_neigh->addr, + last_seen_secs, last_seen_msecs); + } + + if (curr_softif_neigh) + softif_neigh_free_ref(curr_softif_neigh); + + seq_printf(seq, "\n"); + } rcu_read_unlock(); - if (curr_softif_neigh) - softif_neigh_free_ref(curr_softif_neigh); out: if (primary_if) @@ -251,6 +382,69 @@ out: return ret; } +void softif_neigh_purge(struct bat_priv *bat_priv) +{ + struct softif_neigh *softif_neigh, *curr_softif_neigh; + struct softif_neigh_vid *softif_neigh_vid; + struct hlist_node *node, *node_tmp, *node_tmp2; + char do_deselect = 0; + + rcu_read_lock(); + hlist_for_each_entry_rcu(softif_neigh_vid, node, + &bat_priv->softif_neigh_vids, list) { + if (!atomic_inc_not_zero(&softif_neigh_vid->refcount)) + continue; + + curr_softif_neigh = softif_neigh_get_selected(softif_neigh_vid); + + spin_lock_bh(&bat_priv->softif_neigh_lock); + hlist_for_each_entry_safe(softif_neigh, node_tmp, node_tmp2, + &softif_neigh_vid->softif_neigh_list, + list) { + if ((!time_after(jiffies, softif_neigh->last_seen + + msecs_to_jiffies(SOFTIF_NEIGH_TIMEOUT))) && + (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE)) + continue; + + if (curr_softif_neigh == softif_neigh) { + bat_dbg(DBG_ROUTES, bat_priv, + "Current mesh exit point on vid: %d " + "'%pM' vanished.\n", + softif_neigh_vid->vid, + softif_neigh->addr); + do_deselect = 1; + } + + hlist_del_rcu(&softif_neigh->list); + softif_neigh_free_ref(softif_neigh); + } + spin_unlock_bh(&bat_priv->softif_neigh_lock); + + /* soft_neigh_vid_deselect() needs to acquire the + * softif_neigh_lock */ + if (do_deselect) + softif_neigh_vid_deselect(bat_priv, softif_neigh_vid); + + if (curr_softif_neigh) + softif_neigh_free_ref(curr_softif_neigh); + + softif_neigh_vid_free_ref(softif_neigh_vid); + } + rcu_read_unlock(); + + spin_lock_bh(&bat_priv->softif_neigh_vid_lock); + hlist_for_each_entry_safe(softif_neigh_vid, node, node_tmp, + &bat_priv->softif_neigh_vids, list) { + if (!hlist_empty(&softif_neigh_vid->softif_neigh_list)) + continue; + + hlist_del_rcu(&softif_neigh_vid->list); + softif_neigh_vid_free_ref(softif_neigh_vid); + } + spin_unlock_bh(&bat_priv->softif_neigh_vid_lock); + +} + static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev, short vid) { @@ -283,10 +477,7 @@ static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev, if (!softif_neigh) goto out; - curr_softif_neigh = softif_neigh_get_selected(bat_priv); - if (!curr_softif_neigh) - goto out; - + curr_softif_neigh = softif_neigh_vid_get_selected(bat_priv, vid); if (curr_softif_neigh == softif_neigh) goto out; @@ -299,33 +490,16 @@ static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev, softif_neigh->addr, ETH_ALEN) < 0) goto out; - /* switch to new 'smallest neighbor' */ - if ((curr_softif_neigh) && - (memcmp(softif_neigh->addr, curr_softif_neigh->addr, - ETH_ALEN) < 0)) { - bat_dbg(DBG_ROUTES, bat_priv, - "Changing mesh exit point from %pM (vid: %d) " - "to %pM (vid: %d).\n", - curr_softif_neigh->addr, - curr_softif_neigh->vid, - softif_neigh->addr, softif_neigh->vid); - - softif_neigh_select(bat_priv, softif_neigh); - goto out; - } - /* close own batX device and use softif_neigh as exit node */ - if ((!curr_softif_neigh) && - (memcmp(softif_neigh->addr, - primary_if->net_dev->dev_addr, ETH_ALEN) < 0)) { - bat_dbg(DBG_ROUTES, bat_priv, - "Setting mesh exit point to %pM (vid: %d).\n", - softif_neigh->addr, softif_neigh->vid); - - softif_neigh_select(bat_priv, softif_neigh); + if (!curr_softif_neigh) { + softif_neigh_vid_select(bat_priv, softif_neigh, vid); goto out; } + /* switch to new 'smallest neighbor' */ + if (memcmp(softif_neigh->addr, curr_softif_neigh->addr, ETH_ALEN) < 0) + softif_neigh_vid_select(bat_priv, softif_neigh, vid); + out: kfree_skb(skb); if (softif_neigh) @@ -420,8 +594,8 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) * if we have a another chosen mesh exit node in range * it will transport the packets to the mesh */ - curr_softif_neigh = softif_neigh_get_selected(bat_priv); - if ((curr_softif_neigh) && (curr_softif_neigh->vid == vid)) + curr_softif_neigh = softif_neigh_vid_get_selected(bat_priv, vid); + if (curr_softif_neigh) goto dropped; /* TODO: check this for locks */ @@ -529,8 +703,8 @@ void interface_rx(struct net_device *soft_iface, * if we have a another chosen mesh exit node in range * it will transport the packets to the non-mesh network */ - curr_softif_neigh = softif_neigh_get_selected(bat_priv); - if (curr_softif_neigh && (curr_softif_neigh->vid == vid)) { + curr_softif_neigh = softif_neigh_vid_get_selected(bat_priv, vid); + if (curr_softif_neigh) { skb_push(skb, hdr_size); unicast_packet = (struct unicast_packet *)skb->data; @@ -667,7 +841,6 @@ struct net_device *softif_create(char *name) bat_priv->primary_if = NULL; bat_priv->num_ifaces = 0; - bat_priv->softif_neigh = NULL; ret = sysfs_add_meshif(soft_iface); if (ret < 0) diff --git a/types.h b/types.h index 947bafc..9ae507a 100644 --- a/types.h +++ b/types.h @@ -146,14 +146,13 @@ struct bat_priv { atomic_t bcast_queue_left; atomic_t batman_queue_left; char num_ifaces; - struct hlist_head softif_neigh_list; - struct softif_neigh __rcu *softif_neigh; struct debug_log *debug_log; struct kobject *mesh_obj; struct dentry *debug_dir; struct hlist_head forw_bat_list; struct hlist_head forw_bcast_list; struct hlist_head gw_list; + struct hlist_head softif_neigh_vids; struct list_head vis_send_list; struct hashtable_t *orig_hash; struct hashtable_t *hna_local_hash; @@ -167,6 +166,7 @@ struct bat_priv { spinlock_t vis_hash_lock; /* protects vis_hash */ spinlock_t vis_list_lock; /* protects vis_info::recv_list */ spinlock_t softif_neigh_lock; /* protects soft-interface neigh list */ + spinlock_t softif_neigh_vid_lock; /* protects soft-interface vid list */ int16_t num_local_hna; atomic_t hna_local_changed; struct delayed_work hna_work; @@ -270,12 +270,21 @@ struct recvlist_node { uint8_t mac[ETH_ALEN]; }; -struct softif_neigh { +struct softif_neigh_vid { struct hlist_node list; - uint8_t addr[ETH_ALEN]; - unsigned long last_seen; + struct bat_priv *bat_priv; short vid; atomic_t refcount; + struct softif_neigh __rcu *softif_neigh; + struct rcu_head rcu; + struct hlist_head softif_neigh_list; +}; + +struct softif_neigh { + struct hlist_node list; + uint8_t addr[ETH_ALEN]; + unsigned long last_seen; + atomic_t refcount; struct rcu_head rcu; }; -- 1.7.2.3

2 4

[B.A.T.M.A.N.] [PATCH] batman-adv: remove misplaced comment
by Marek Lindner 04 May '11

04 May '11

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- originator.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/originator.c b/originator.c index ef4a9be..51af91b 100644 --- a/originator.c +++ b/originator.c @@ -19,8 +19,6 @@ * */ -/* increase the reference counter for this originator */ - #include "main.h" #include "originator.h" #include "hash.h" -- 1.7.2.3

2 2

[B.A.T.M.A.N.] [RFC/PATCH] batman-adv: Add compatibility code for kfree_rcu
by Sven Eckelmann 03 May '11

03 May '11

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- This is pure speculation and only to show how ugly it is... It is currently not used in Linus' tree ~~~~~~~~~~~~~~~~~~~~ DONT APPLY THIS PATCH ~~~~~~~~~~~~~~~~~~~~ Makefile.kbuild | 1 + compat.c | 41 +++++++++++++++++++++++++++++++++++++++++ compat.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 0 deletions(-) create mode 100644 compat.c diff --git a/Makefile.kbuild b/Makefile.kbuild index 0a35006..be0cbd9 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -50,4 +50,5 @@ batman-adv-y += soft-interface.o batman-adv-y += translation-table.o batman-adv-y += unicast.o batman-adv-y += vis.o +batman-adv-y += compat.o batman-adv-y += bat_printk.o diff --git a/compat.c b/compat.c new file mode 100644 index 0000000..0a8075e --- /dev/null +++ b/compat.c @@ -0,0 +1,41 @@ +#include <linux/sysfs.h> +#include <linux/netdevice.h> +#include "compat.h" + +#define RCU_DEFINITION0(n, x) void bat_kfree_rcu_##n(struct rcu_head *head) \ + {\ + unsigned long offset = (unsigned long)(x);\ + kfree((void *)head - offset);\ + } + +#define RCU_DEFINITION1(n,x) RCU_DEFINITION0(z##n,x) RCU_DEFINITION0(o##n,x+1) +#define RCU_DEFINITION2(n,x) RCU_DEFINITION1(z##n,x) RCU_DEFINITION1(o##n,x+2) +#define RCU_DEFINITION3(n,x) RCU_DEFINITION2(z##n,x) RCU_DEFINITION2(o##n,x+4) +#define RCU_DEFINITION4(n,x) RCU_DEFINITION3(z##n,x) RCU_DEFINITION3(o##n,x+8) +#define RCU_DEFINITION5(n,x) RCU_DEFINITION4(z##n,x) RCU_DEFINITION4(o##n,x+16) +#define RCU_DEFINITION6(n,x) RCU_DEFINITION5(z##n,x) RCU_DEFINITION5(o##n,x+32) +#define RCU_DEFINITION7(n,x) RCU_DEFINITION6(z##n,x) RCU_DEFINITION6(o##n,x+64) +#define RCU_DEFINITION8(n,x) RCU_DEFINITION7(z##n,x) RCU_DEFINITION7(o##n,x+128) +#define RCU_DEFINITION9(n,x) RCU_DEFINITION8(z##n,x) RCU_DEFINITION8(o##n,x+256) +#define RCU_DEFINITION10(n,x) RCU_DEFINITION9(z##n,x) RCU_DEFINITION9(o##n,x+512) +#define RCU_DEFINITION11(n,x) RCU_DEFINITION10(z##n,x) RCU_DEFINITION10(o##n,x+1024) +#define RCU_DEFINITION12(n,x) RCU_DEFINITION11(z##n,x) RCU_DEFINITION11(o##n,x+2048) + +RCU_DEFINITION12(s, 0) + +#define RCU_DECLARATION0(n) &bat_kfree_rcu_##n +#define RCU_DECLARATION1(n) RCU_DECLARATION0(z##n), RCU_DECLARATION0(o##n) +#define RCU_DECLARATION2(n) RCU_DECLARATION1(z##n), RCU_DECLARATION1(o##n) +#define RCU_DECLARATION3(n) RCU_DECLARATION2(z##n), RCU_DECLARATION2(o##n) +#define RCU_DECLARATION4(n) RCU_DECLARATION3(z##n), RCU_DECLARATION3(o##n) +#define RCU_DECLARATION5(n) RCU_DECLARATION4(z##n), RCU_DECLARATION4(o##n) +#define RCU_DECLARATION6(n) RCU_DECLARATION5(z##n), RCU_DECLARATION5(o##n) +#define RCU_DECLARATION7(n) RCU_DECLARATION6(z##n), RCU_DECLARATION6(o##n) +#define RCU_DECLARATION8(n) RCU_DECLARATION7(z##n), RCU_DECLARATION7(o##n) +#define RCU_DECLARATION9(n) RCU_DECLARATION8(z##n), RCU_DECLARATION8(o##n) +#define RCU_DECLARATION10(n) RCU_DECLARATION9(z##n), RCU_DECLARATION9(o##n) +#define RCU_DECLARATION11(n) RCU_DECLARATION10(z##n), RCU_DECLARATION10(o##n) +#define RCU_DECLARATION12(n) RCU_DECLARATION11(z##n), RCU_DECLARATION11(o##n) + +bat_rcu_callback bat_kfree_rcu_offset[_BAT_MAX_KFREE_RCU_OFFSET] = {RCU_DECLARATION12(s)}; + diff --git a/compat.h b/compat.h index 0c5ad82..a297b0d 100644 --- a/compat.h +++ b/compat.h @@ -288,4 +288,32 @@ int bat_seq_printf(struct seq_file *m, const char *f, ...); #endif /* < KERNEL_VERSION(2, 6, 36) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 1234) + +#define _BAT_MAX_KFREE_RCU_OFFSET 4096 +typedef void (*bat_rcu_callback)(struct rcu_head *); +extern bat_rcu_callback bat_kfree_rcu_offset[_BAT_MAX_KFREE_RCU_OFFSET]; + +static __always_inline bool __is_kfree_rcu_offset(unsigned long offset) +{ + return offset < _BAT_MAX_KFREE_RCU_OFFSET; +} + +static __always_inline +void __kfree_rcu(struct rcu_head *head, unsigned long offset) +{ + BUILD_BUG_ON(!__builtin_constant_p(offset)); + BUILD_BUG_ON(!__is_kfree_rcu_offset(offset)); + + call_rcu(head, (bat_rcu_callback)bat_kfree_rcu_offset[offset]); +} + +extern void kfree(const void *); + +#define kfree_rcu(ptr, rcu_head) \ + __kfree_rcu(&((ptr)->rcu_head), offsetof(typeof(*(ptr)), rcu_head)) + + +#endif /* < KERNEL_VERSION(2, 6, 1234) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ -- 1.7.4.4

1 0

[B.A.T.M.A.N.] pull request: batman-adv 2011-05-01
by Sven Eckelmann 03 May '11

03 May '11

Hi, I would like to propose following patches for net-next-2.6/2.6.40. Marek Lindner continued to convert different datastructures to use RCU. Antonio Quartulli fixed an important bug introduced in the last patchset related to the update of the current gateway. He also did some minor cleanup work. I've removed the patch "net: batman-adv: remove rx_csum ethtool_ops" again because you already applied it in your branch. thanks, Sven The following changes since commit af20b710479ae662829cf739b521390daa7fcbcb: batman-adv: Set the txqueuelen to zero when creating soft interface (2011-04-17 21:11:02 +0200) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Antonio Quartulli (3): batman-adv: orig_hash_find() manages rcu_lock/unlock internally batman-adv: Move definition of atomic_dec_not_zero() into main.h batman-adv: fix gw_node_update() and gw_election() Marek Lindner (1): batman-adv: Make bat_priv->primary_if an rcu protected pointer net/batman-adv/aggregation.c | 1 - net/batman-adv/gateway_client.c | 45 ++++++++++++-------- net/batman-adv/hard-interface.c | 83 ++++++++++++++++++++++++----------- net/batman-adv/hard-interface.h | 18 ++++++++ net/batman-adv/icmp_socket.c | 19 ++++++-- net/batman-adv/main.h | 2 + net/batman-adv/originator.c | 34 +++++++++------ net/batman-adv/routing.c | 34 ++++++--------- net/batman-adv/send.c | 18 ++++++-- net/batman-adv/soft-interface.c | 64 +++++++++++++++++++-------- net/batman-adv/translation-table.c | 57 ++++++++++++++++++------ net/batman-adv/types.h | 2 +- net/batman-adv/unicast.c | 16 +++++-- net/batman-adv/vis.c | 37 +++++++++++----- 14 files changed, 292 insertions(+), 138 deletions(-)

2 6

[B.A.T.M.A.N.] [RFC/PATCH] atomic: add *_dec_not_zero
by Sven Eckelmann 03 May '11

03 May '11

Introduce an *_dec_not_zero operation. Make this a special case of *_add_unless because batman-adv uses atomic_dec_not_zero in different places like re-broadcast queue or aggregation queue management. There are other non-final patches which may also want to use this macro. Reported-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Please check someone if this looks ok... I have to look through following people to check who would be interested in reviewing this patch: Richard Henderson <rth(a)twiddle.net> (:ALPHA PORT) Ivan Kokshaysky <ink(a)jurassic.park.msu.ru> (:ALPHA PORT) Matt Turner <mattst88(a)gmail.com> (:ALPHA PORT) Russell King <linux(a)arm.linux.org.uk> (maintainer:ARM PORT,commit_signer:2/4=50%) Hans-Christian Egtvedt <hans-christian.egtvedt(a)atmel.com> (supporter:AVR32 ARCHITECTURE) Mike Frysinger <vapier(a)gentoo.org> (supporter:BLACKFIN ARCHITEC...,commit_signer:1/2=50%) Mikael Starvik <starvik(a)axis.com> (maintainer:CRIS PORT) Jesper Nilsson <jesper.nilsson(a)axis.com> (maintainer:CRIS PORT) David Howells <dhowells(a)redhat.com> (maintainer:FUJITSU FR-V (FRV...,commit_signer:1/3=33%,commit_signer:3/5=60%) Yoshinori Sato <ysato(a)users.sourceforge.jp> (supporter:UCLINUX FOR RENES...) Tony Luck <tony.luck(a)intel.com> (maintainer:IA64 (Itanium) PL...,commit_signer:1/3=33%) Fenghua Yu <fenghua.yu(a)intel.com> (maintainer:IA64 (Itanium) PL...) Hirokazu Takata <takata(a)linux-m32r.org> (maintainer:M32R ARCHITECTURE) Geert Uytterhoeven <geert(a)linux-m68k.org> (maintainer:M68K ARCHITECTURE,commit_signer:2/3=67%) Roman Zippel <zippel(a)linux-m68k.org> (maintainer:M68K ARCHITECTURE) Ralf Baechle <ralf(a)linux-mips.org> (supporter:MIPS,commit_signer:3/5=60%,commit_signer:1/2=50%) Koichi Yasutake <yasutake.koichi(a)jp.panasonic.com> (maintainer:PANASONIC MN10300...) Kyle McMartin <kyle(a)mcmartin.ca> (maintainer:PARISC ARCHITECTURE) Helge Deller <deller(a)gmx.de> (maintainer:PARISC ARCHITECTURE) "James E.J. Bottomley" <jejb(a)parisc-linux.org> (maintainer:PARISC ARCHITECTURE) Benjamin Herrenschmidt <benh(a)kernel.crashing.org> (supporter:LINUX FOR POWERPC...) Paul Mackerras <paulus(a)samba.org> (supporter:LINUX FOR POWERPC...) Martin Schwidefsky <schwidefsky(a)de.ibm.com> (supporter:S390,commit_signer:3/5=60%) Heiko Carstens <heiko.carstens(a)de.ibm.com> (supporter:S390,commit_signer:3/5=60%) linux390(a)de.ibm.com (supporter:S390) Paul Mundt <lethal(a)linux-sh.org> (supporter:SUPERH,commit_signer:1/3=33%,commit_signer:1/4=25%) "David S. Miller" <davem(a)davemloft.net> (maintainer:SPARC + UltraSPAR...,commit_signer:2/4=50%) Chris Metcalf <cmetcalf(a)tilera.com> (supporter:TILE ARCHITECTURE,commit_signer:2/3=67%,commit_signer:3/4=75%) Thomas Gleixner <tglx(a)linutronix.de> (maintainer:X86 ARCHITECTURE...) Ingo Molnar <mingo(a)redhat.com> (maintainer:X86 ARCHITECTURE...) "H. Peter Anvin" <hpa(a)zytor.com> (maintainer:X86 ARCHITECTURE...) x86(a)kernel.org (maintainer:X86 ARCHITECTURE...) Chris Zankel <chris(a)zankel.net> (maintainer:TENSILICA XTENSA...) Arnd Bergmann <arnd(a)arndb.de> (maintainer:GENERIC INCLUDE/A...,commit_signer:1/3=33%,commit_signer:2/4=50%) Sven Eckelmann <sven(a)narfation.org> (commit_signer:1/2=50%,commit_signer:1/1=100%,commit_signer:1/4=25%,commit_signer:1/3=33%,commit_signer:1/5=20%) Anton Blanchard <anton(a)samba.org> (commit_signer:1/2=50%,commit_signer:1/4=25%,commit_signer:1/3=33%,commit_signer:1/5=20%) Nicolas Pitre <nicolas.pitre(a)linaro.org> (commit_signer:2/4=50%) Will Deacon <will.deacon(a)arm.com> (commit_signer:2/4=50%) Greg Ungerer <gerg(a)uclinux.org> (commit_signer:1/3=33%) David Daney <ddaney(a)caviumnetworks.com> (commit_signer:2/5=40%) Deng-Cheng Zhu <dengcheng.zhu(a)gmail.com> (commit_signer:1/5=20%,commit_signer:1/2=50%) Andrew Morton <akpm(a)linux-foundation.org> (commit_signer:1/5=20%) Peter Fritzsche <peter.fritzsche(a)gmx.de> (commit_signer:1/5=20%) Lucas De Marchi <lucas.demarchi(a)profusion.mobi> (commit_signer:1/5=20%) FUJITA Tomonori <fujita.tomonori(a)lab.ntt.co.jp> (commit_signer:1/3=33%,commit_signer:1/4=25%) linux-alpha(a)vger.kernel.org (open list:ALPHA PORT) linux-kernel(a)vger.kernel.org (open list) linux-arm-kernel(a)lists.infradead.org (open list:ARM PORT) uclinux-dist-devel(a)blackfin.uclinux.org (open list:BLACKFIN ARCHITEC...) linux-cris-kernel(a)axis.com (open list:CRIS PORT) linux-ia64(a)vger.kernel.org (open list:IA64 (Itanium) PL...) linux-m32r(a)ml.linux-m32r.org (open list:M32R ARCHITECTURE) linux-m32r-ja(a)ml.linux-m32r.org (open list:M32R ARCHITECTURE) linux-m68k(a)lists.linux-m68k.org (open list:M68K ARCHITECTURE) linux-mips(a)linux-mips.org (open list:MIPS) linux-am33-list(a)redhat.com (open list:PANASONIC MN10300...) linux-parisc(a)vger.kernel.org (open list:PARISC ARCHITECTURE) linuxppc-dev(a)lists.ozlabs.org (open list:LINUX FOR POWERPC...) linux-s390(a)vger.kernel.org (open list:S390) linux-sh(a)vger.kernel.org (open list:SUPERH) sparclinux(a)vger.kernel.org (open list:SPARC + UltraSPAR...) linux-arch(a)vger.kernel.org (open list:GENERIC INCLUDE/A...) arch/alpha/include/asm/atomic.h | 2 ++ arch/alpha/include/asm/local.h | 1 + arch/arm/include/asm/atomic.h | 2 ++ arch/avr32/include/asm/atomic.h | 1 + arch/blackfin/include/asm/atomic.h | 1 + arch/cris/include/asm/atomic.h | 1 + arch/frv/include/asm/atomic.h | 1 + arch/h8300/include/asm/atomic.h | 1 + arch/ia64/include/asm/atomic.h | 2 ++ arch/m32r/include/asm/atomic.h | 1 + arch/m32r/include/asm/local.h | 1 + arch/m68k/include/asm/atomic.h | 1 + arch/mips/include/asm/atomic.h | 2 ++ arch/mips/include/asm/local.h | 1 + arch/mn10300/include/asm/atomic.h | 1 + arch/parisc/include/asm/atomic.h | 2 ++ arch/powerpc/include/asm/atomic.h | 2 ++ arch/powerpc/include/asm/local.h | 1 + arch/s390/include/asm/atomic.h | 2 ++ arch/sh/include/asm/atomic.h | 1 + arch/sparc/include/asm/atomic_32.h | 1 + arch/sparc/include/asm/atomic_64.h | 2 ++ arch/tile/include/asm/atomic.h | 9 +++++++++ arch/tile/include/asm/atomic_32.h | 1 + arch/x86/include/asm/atomic.h | 1 + arch/x86/include/asm/atomic64_64.h | 1 + arch/xtensa/include/asm/atomic.h | 1 + include/asm-generic/atomic-long.h | 2 ++ include/asm-generic/atomic.h | 1 + include/asm-generic/atomic64.h | 1 + include/asm-generic/local.h | 1 + include/asm-generic/local64.h | 2 ++ 32 files changed, 50 insertions(+), 0 deletions(-) diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h index e756d04..7e9434e 100644 --- a/arch/alpha/include/asm/atomic.h +++ b/arch/alpha/include/asm/atomic.h @@ -200,6 +200,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) /** * atomic64_add_unless - add unless the number is a given value @@ -226,6 +227,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) +#define atomic64_dec_not_zero(v) atomic64_add_unless((v), -1, 0) #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0) #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0) diff --git a/arch/alpha/include/asm/local.h b/arch/alpha/include/asm/local.h index b9e3e33..09fb327 100644 --- a/arch/alpha/include/asm/local.h +++ b/arch/alpha/include/asm/local.h @@ -79,6 +79,7 @@ static __inline__ long local_sub_return(long i, local_t * l) c != (u); \ }) #define local_inc_not_zero(l) local_add_unless((l), 1, 0) +#define local_dec_not_zero(l) local_add_unless((l), -1, 0) #define local_add_negative(a, l) (local_add_return((a), (l)) < 0) diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h index 7e79503..a005265 100644 --- a/arch/arm/include/asm/atomic.h +++ b/arch/arm/include/asm/atomic.h @@ -218,6 +218,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) return c != u; } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) #define atomic_inc(v) atomic_add(1, v) #define atomic_dec(v) atomic_sub(1, v) @@ -459,6 +460,7 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u) #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v)) #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0) #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL) +#define atomic64_dec_not_zero(v) atomic64_add_unless((v), -1LL, 0LL) #else /* !CONFIG_GENERIC_ATOMIC64 */ #include <asm-generic/atomic64.h> diff --git a/arch/avr32/include/asm/atomic.h b/arch/avr32/include/asm/atomic.h index bbce6a1..e6f39c1 100644 --- a/arch/avr32/include/asm/atomic.h +++ b/arch/avr32/include/asm/atomic.h @@ -189,6 +189,7 @@ static inline int atomic_sub_if_positive(int i, atomic_t *v) #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0) #define atomic_inc_not_zero(v) atomic_add_unless(v, 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) #define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v) #define smp_mb__before_atomic_dec() barrier() diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h index e485089..900682e 100644 --- a/arch/blackfin/include/asm/atomic.h +++ b/arch/blackfin/include/asm/atomic.h @@ -103,6 +103,7 @@ static inline int atomic_test_mask(int mask, atomic_t *v) c != (u); \ }) #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) /* * atomic_inc_and_test - increment and test diff --git a/arch/cris/include/asm/atomic.h b/arch/cris/include/asm/atomic.h index 88dc9b9..9db2767 100644 --- a/arch/cris/include/asm/atomic.h +++ b/arch/cris/include/asm/atomic.h @@ -151,6 +151,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) return ret != u; } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) /* Atomic operations are already serializing */ #define smp_mb__before_atomic_dec() barrier() diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h index fae32c7..90f12a8 100644 --- a/arch/frv/include/asm/atomic.h +++ b/arch/frv/include/asm/atomic.h @@ -257,6 +257,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) #include <asm-generic/atomic-long.h> #endif /* _ASM_ATOMIC_H */ diff --git a/arch/h8300/include/asm/atomic.h b/arch/h8300/include/asm/atomic.h index 984221a..eda4c8a 100644 --- a/arch/h8300/include/asm/atomic.h +++ b/arch/h8300/include/asm/atomic.h @@ -117,6 +117,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) return ret != u; } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *v) { diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h index 4468814..e2777a9 100644 --- a/arch/ia64/include/asm/atomic.h +++ b/arch/ia64/include/asm/atomic.h @@ -106,6 +106,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) static __inline__ long atomic64_add_unless(atomic64_t *v, long a, long u) { @@ -123,6 +124,7 @@ static __inline__ long atomic64_add_unless(atomic64_t *v, long a, long u) } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) +#define atomic64_dec_not_zero(v) atomic64_add_unless((v), -1, 0) #define atomic_add_return(i,v) \ ({ \ diff --git a/arch/m32r/include/asm/atomic.h b/arch/m32r/include/asm/atomic.h index d44a51e..4e0b4ec 100644 --- a/arch/m32r/include/asm/atomic.h +++ b/arch/m32r/include/asm/atomic.h @@ -263,6 +263,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) static __inline__ void atomic_clear_mask(unsigned long mask, atomic_t *addr) { diff --git a/arch/m32r/include/asm/local.h b/arch/m32r/include/asm/local.h index 734bca8..d536082 100644 --- a/arch/m32r/include/asm/local.h +++ b/arch/m32r/include/asm/local.h @@ -272,6 +272,7 @@ static inline int local_add_unless(local_t *l, long a, long u) } #define local_inc_not_zero(l) local_add_unless((l), 1, 0) +#define local_dec_not_zero(l) local_add_unless((l), -1, 0) static inline void local_clear_mask(unsigned long mask, local_t *addr) { diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h index 03ae3d1..187a33f 100644 --- a/arch/m68k/include/asm/atomic.h +++ b/arch/m68k/include/asm/atomic.h @@ -199,6 +199,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) /* Atomic operations are already serializing */ #define smp_mb__before_atomic_dec() barrier() diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h index 4a02fe8..8c4109e 100644 --- a/arch/mips/include/asm/atomic.h +++ b/arch/mips/include/asm/atomic.h @@ -326,6 +326,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) return c != (u); } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) #define atomic_dec_return(v) atomic_sub_return(1, (v)) #define atomic_inc_return(v) atomic_add_return(1, (v)) @@ -698,6 +699,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) +#define atomic64_dec_not_zero(v) atomic64_add_unless((v), -1, 0) #define atomic64_dec_return(v) atomic64_sub_return(1, (v)) #define atomic64_inc_return(v) atomic64_add_return(1, (v)) diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h index fffc830..c34d3ca 100644 --- a/arch/mips/include/asm/local.h +++ b/arch/mips/include/asm/local.h @@ -137,6 +137,7 @@ static __inline__ long local_sub_return(long i, local_t * l) c != (u); \ }) #define local_inc_not_zero(l) local_add_unless((l), 1, 0) +#define local_dec_not_zero(l) local_add_unless((l), -1, 0) #define local_dec_return(l) local_sub_return(1, (l)) #define local_inc_return(l) local_add_return(1, (l)) diff --git a/arch/mn10300/include/asm/atomic.h b/arch/mn10300/include/asm/atomic.h index 9d773a6..bcad5d1 100644 --- a/arch/mn10300/include/asm/atomic.h +++ b/arch/mn10300/include/asm/atomic.h @@ -270,6 +270,7 @@ static inline void atomic_dec(atomic_t *v) }) #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) /** * atomic_clear_mask - Atomically clear bits in memory diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h index f819559..c2353cf 100644 --- a/arch/parisc/include/asm/atomic.h +++ b/arch/parisc/include/asm/atomic.h @@ -221,6 +221,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) #define atomic_add(i,v) ((void)(__atomic_add_return( (i),(v)))) #define atomic_sub(i,v) ((void)(__atomic_add_return(-(i),(v)))) @@ -335,6 +336,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) +#define atomic64_dec_not_zero(v) atomic64_add_unless((v), -1, 0) #else /* CONFIG_64BIT */ diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h index b8f152e..906f49a 100644 --- a/arch/powerpc/include/asm/atomic.h +++ b/arch/powerpc/include/asm/atomic.h @@ -213,6 +213,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) #define atomic_sub_and_test(a, v) (atomic_sub_return((a), (v)) == 0) #define atomic_dec_and_test(v) (atomic_dec_return((v)) == 0) @@ -469,6 +470,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) +#define atomic64_dec_not_zero(v) atomic64_add_unless((v), -1, 0) #else /* __powerpc64__ */ #include <asm-generic/atomic64.h> diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h index c2410af..3d4c58a 100644 --- a/arch/powerpc/include/asm/local.h +++ b/arch/powerpc/include/asm/local.h @@ -134,6 +134,7 @@ static __inline__ int local_add_unless(local_t *l, long a, long u) } #define local_inc_not_zero(l) local_add_unless((l), 1, 0) +#define local_dec_not_zero(l) local_add_unless((l), -1, 0) #define local_sub_and_test(a, l) (local_sub_return((a), (l)) == 0) #define local_dec_and_test(l) (local_dec_return((l)) == 0) diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h index d9db138..09972c3 100644 --- a/arch/s390/include/asm/atomic.h +++ b/arch/s390/include/asm/atomic.h @@ -109,6 +109,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) #undef __CS_LOOP @@ -326,6 +327,7 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v) #define atomic64_dec_return(_v) atomic64_sub_return(1, _v) #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0) #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) +#define atomic64_dec_not_zero(v) atomic64_add_unless((v), -1, 0) #define smp_mb__before_atomic_dec() smp_mb() #define smp_mb__after_atomic_dec() smp_mb() diff --git a/arch/sh/include/asm/atomic.h b/arch/sh/include/asm/atomic.h index c798312..848849e 100644 --- a/arch/sh/include/asm/atomic.h +++ b/arch/sh/include/asm/atomic.h @@ -31,6 +31,7 @@ #define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0) #define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0) #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) #define atomic_inc(v) atomic_add(1, (v)) #define atomic_dec(v) atomic_sub(1, (v)) diff --git a/arch/sparc/include/asm/atomic_32.h b/arch/sparc/include/asm/atomic_32.h index 7ae128b..c7da1e5 100644 --- a/arch/sparc/include/asm/atomic_32.h +++ b/arch/sparc/include/asm/atomic_32.h @@ -53,6 +53,7 @@ extern void atomic_set(atomic_t *, int); #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0) #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) /* This is the old 24-bit implementation. It's still used internally * by some sparc-specific code, notably the semaphore implementation. diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h index bdb2ff8..23ad7cf 100644 --- a/arch/sparc/include/asm/atomic_64.h +++ b/arch/sparc/include/asm/atomic_64.h @@ -86,6 +86,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) #define atomic64_cmpxchg(v, o, n) \ ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n))) @@ -107,6 +108,7 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u) } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) +#define atomic64_dec_not_zero(v) atomic64_add_unless((v), -1, 0) /* Atomic operations are already serializing */ #define smp_mb__before_atomic_dec() barrier() diff --git a/arch/tile/include/asm/atomic.h b/arch/tile/include/asm/atomic.h index 75a1602..7fd7be2 100644 --- a/arch/tile/include/asm/atomic.h +++ b/arch/tile/include/asm/atomic.h @@ -130,6 +130,15 @@ static inline int atomic_read(const atomic_t *v) */ #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +/** + * atomic_dec_not_zero - decrement unless the number is zero + * @v: pointer of type atomic_t + * + * Atomically decrement @v by 1, so long as @v is non-zero. + * Returns non-zero if @v was non-zero, and zero otherwise. + */ +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) + /* * We define xchg() and cmpxchg() in the included headers. diff --git a/arch/tile/include/asm/atomic_32.h b/arch/tile/include/asm/atomic_32.h index ed359aee..43137bd 100644 --- a/arch/tile/include/asm/atomic_32.h +++ b/arch/tile/include/asm/atomic_32.h @@ -243,6 +243,7 @@ static inline void atomic64_set(atomic64_t *v, u64 n) #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v)) #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0) #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL) +#define atomic64_dec_not_zero(v) atomic64_add_unless((v), -1LL, 0LL) /* * We need to barrier before modifying the word, since the _atomic_xxx() diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h index 952a826..7102a0b 100644 --- a/arch/x86/include/asm/atomic.h +++ b/arch/x86/include/asm/atomic.h @@ -245,6 +245,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) /* * atomic_dec_if_positive - decrement by 1 if old value positive diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h index 49fd1ea..2cb37f4 100644 --- a/arch/x86/include/asm/atomic64_64.h +++ b/arch/x86/include/asm/atomic64_64.h @@ -220,6 +220,7 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u) } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) +#define atomic64_dec_not_zero(v) atomic64_add_unless((v), -1, 0) /* * atomic64_dec_if_positive - decrement by 1 if old value positive diff --git a/arch/xtensa/include/asm/atomic.h b/arch/xtensa/include/asm/atomic.h index a96a061..3b2a7b3 100644 --- a/arch/xtensa/include/asm/atomic.h +++ b/arch/xtensa/include/asm/atomic.h @@ -249,6 +249,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) static inline void atomic_clear_mask(unsigned int mask, atomic_t *v) { diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h index b7babf0..0fe75ab 100644 --- a/include/asm-generic/atomic-long.h +++ b/include/asm-generic/atomic-long.h @@ -130,6 +130,7 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u) } #define atomic_long_inc_not_zero(l) atomic64_inc_not_zero((atomic64_t *)(l)) +#define atomic_long_dec_not_zero(l) atomic64_dec_not_zero((atomic64_t *)(l)) #define atomic_long_cmpxchg(l, old, new) \ (atomic64_cmpxchg((atomic64_t *)(l), (old), (new))) @@ -247,6 +248,7 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u) } #define atomic_long_inc_not_zero(l) atomic_inc_not_zero((atomic_t *)(l)) +#define atomic_long_dec_not_zero(l) atomic_dec_not_zero((atomic_t *)(l)) #define atomic_long_cmpxchg(l, old, new) \ (atomic_cmpxchg((atomic_t *)(l), (old), (new))) diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h index e994197..4e1d3ef 100644 --- a/include/asm-generic/atomic.h +++ b/include/asm-generic/atomic.h @@ -139,6 +139,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) { diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h index b18ce4f..f301c46 100644 --- a/include/asm-generic/atomic64.h +++ b/include/asm-generic/atomic64.h @@ -38,5 +38,6 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u); #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v)) #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0) #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL) +#define atomic64_dec_not_zero(v) atomic64_add_unless((v), -1LL, 0LL) #endif /* _ASM_GENERIC_ATOMIC64_H */ diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h index c8a5d68..82ef01f 100644 --- a/include/asm-generic/local.h +++ b/include/asm-generic/local.h @@ -44,6 +44,7 @@ typedef struct #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n)) #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u)) #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a) +#define local_dec_not_zero(l) atomic_long_dec_not_zero(&(l)->a) /* Non-atomic variants, ie. preemption disabled and won't be touched * in interrupt, etc. Some archs can optimize this case well. */ diff --git a/include/asm-generic/local64.h b/include/asm-generic/local64.h index 02ac760..aa3a841 100644 --- a/include/asm-generic/local64.h +++ b/include/asm-generic/local64.h @@ -45,6 +45,7 @@ typedef struct { #define local64_xchg(l, n) local_xchg((&(l)->a), (n)) #define local64_add_unless(l, _a, u) local_add_unless((&(l)->a), (_a), (u)) #define local64_inc_not_zero(l) local_inc_not_zero(&(l)->a) +#define local64_dec_not_zero(l) local_dec_not_zero(&(l)->a) /* Non-atomic variants, ie. preemption disabled and won't be touched * in interrupt, etc. Some archs can optimize this case well. */ @@ -83,6 +84,7 @@ typedef struct { #define local64_xchg(l, n) atomic64_xchg((&(l)->a), (n)) #define local64_add_unless(l, _a, u) atomic64_add_unless((&(l)->a), (_a), (u)) #define local64_inc_not_zero(l) atomic64_inc_not_zero(&(l)->a) +#define local64_dec_not_zero(l) atomic64_dec_not_zero(&(l)->a) /* Non-atomic variants, ie. preemption disabled and won't be touched * in interrupt, etc. Some archs can optimize this case well. */ -- 1.7.4.4

1 0

[B.A.T.M.A.N.] B.A.T.M.A.N. Developer Meeting
by Linus Lüssing 02 May '11

02 May '11

Hi everyone, During the last Wireless Battlemesh a lot of conceptual protocol discussions as well as batman-adv kernel-hacking took place. Therefore also the question came up where and when would be the best place and time to meet next. The first idea was to meet at the Wireless Community Weekend in Berlin, 3.-5. June 2011, or at the Chaos Communication Camp near Berlin, 11.-14. August 2011. However these dates did not seem to suite everybody (though still some batman developers will probably be there on these dates). Therefore the second idea was to have a dedicated B.A.T.M.A.N. developer meeting between these two dates. Place: Lübeck (near Hamburg, at the Baltic Sea) Date: 30th of June to 3rd of July 2011 or: 7th to 10th of July 2011 Please let me know if you are going to attend, which day you would prefer and if you would like to join the holiday appartement I am offering to organize. Cheers, Linus

4 4

[B.A.T.M.A.N.] [PATCHv2 1/3] batman-adv: Fix crash on module shutdown with multiple ifaces
by Sven Eckelmann 02 May '11

02 May '11

From: Linus Lüssing <linus.luessing(a)web.de> hardif_remove_interfaces() removes all hard interfaces from the hardif_list before freeing and cleaning up any device. However the clean up procedures in orig_hash_del_if() (hardif_remove_interface()->hardif_disable_interface()-> orig_hash_del_if()) need the other interfaces still to be present in the hardif_list. Otherwise it won't renumber any preceding interfaces, which leads to an unhandled kernel paging request in orig_node_del_if()'s "/* copy second part */" due to wrong hard_if->if_num's. With this commit the interface removal on module shutdown will be down in the same way as removing single interfaces from batman only: One interface will be removed and cleaned at a time. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> [sven(a)narfation.org: Keep locking around list_for_each_entry_safe] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Splitted the first patch to keep Linus' fame. There should be no difference (after all patches are applied) between the first and the second version. hard-interface.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index b3058e4..c6edf0a 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -490,22 +490,15 @@ static void hardif_remove_interface(struct hard_iface *hard_iface) void hardif_remove_interfaces(void) { struct hard_iface *hard_iface, *hard_iface_tmp; - struct list_head if_queue; - - INIT_LIST_HEAD(&if_queue); + rtnl_lock(); spin_lock(&hardif_list_lock); list_for_each_entry_safe(hard_iface, hard_iface_tmp, &hardif_list, list) { list_del_rcu(&hard_iface->list); - list_add_tail(&hard_iface->list, &if_queue); - } - spin_unlock(&hardif_list_lock); - - rtnl_lock(); - list_for_each_entry_safe(hard_iface, hard_iface_tmp, &if_queue, list) { hardif_remove_interface(hard_iface); } + spin_unlock(&hardif_list_lock); rtnl_unlock(); } -- 1.7.4.4

2 7

Re: [B.A.T.M.A.N.] [PATCHv2 1/3] batman-adv: Fix crash on module shutdown with multiple ifaces
by Linus Lüssing 02 May '11

02 May '11

On Sat, Apr 30, 2011 at 06:56:58PM +0200, Sven Eckelmann wrote: > From: Linus Lüssing <linus.luessing(a)web.de> > > hardif_remove_interfaces() removes all hard interfaces from the > hardif_list before freeing and cleaning up any device. However the clean > up procedures in orig_hash_del_if() > (hardif_remove_interface()->hardif_disable_interface()-> > orig_hash_del_if()) need the other interfaces still to be present in the > hardif_list. Otherwise it won't renumber any preceding interfaces, which > leads to an unhandled kernel paging request in orig_node_del_if()'s > "/* copy second part */" due to wrong hard_if->if_num's. > > With this commit the interface removal on module shutdown will be down > in the same way as removing single interfaces from batman only: One > interface will be removed and cleaned at a time. > > Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> > [sven(a)narfation.org: Keep locking around list_for_each_entry_safe] Hmm, though that does not seem to work for me like that anyway: ---- [61975.933652] BUG: sleeping function called from invalid context at kernel/mutex.c:278 [61975.938166] in_atomic(): 1, irqs_disabled(): 0, pid: 9199, name: rmmod [61975.941408] INFO: lockdep is turned off. [61975.943655] Pid: 9199, comm: rmmod Not tainted 2.6.38+ #4 [61975.946518] Call Trace: [61975.948360] [<c105888a>] __might_sleep+0xd9/0xe0 [61975.951975] [<c151ea00>] mutex_lock_nested+0x1a/0x33 [61975.954679] [<c1148cfb>] sysfs_addrm_start+0x24/0x29 [61975.957446] [<c11493f1>] sysfs_remove_dir+0x39/0x6c [61975.960000] [<c11e141c>] kobject_del+0xf/0x2c [61975.962872] [<c11e146b>] kobject_release+0x32/0x50 [61975.966295] [<c11e1439>] ? kobject_del+0x2c/0x2c [61975.969065] [<c11e2181>] kref_put+0x39/0x44 [61975.971416] [<c11e13b5>] kobject_put+0x37/0x3c [61975.973921] [<f9e06591>] sysfs_del_hardif+0xd/0x16 [batman_adv] [61975.976845] [<f9e0848c>] hardif_remove_interface+0x23/0x2d [batman_adv] [61975.979936] [<f9e086d7>] hardif_remove_interfaces+0x35/0x53 [batman_adv] [61975.984400] [<f9e10945>] batman_exit+0x17/0x3c [batman_adv] [61975.987189] [<c1094242>] sys_delete_module+0x184/0x1dc [61975.989893] [<c10eb988>] ? remove_vma+0x52/0x58 [61975.992387] [<c10ec6c2>] ? do_munmap+0x245/0x261 [61975.994849] [<c151fd9d>] syscall_call+0x7/0xb [61975.997361] batman_adv: bat0: Interface deactivated: eth1 [61976.000117] batman_adv: bat0: Removing interface: eth1 ---- So looks like we may not hold a spin_lock() during the hardif_remove_interface(). Of course, that issue is not present with your next patch anymore. Thanks for good intention to keep my fame++, but, hmm, maybe it actually only makes sense to have the two patches merged. > Signed-off-by: Sven Eckelmann <sven(a)narfation.org> > --- > Splitted the first patch to keep Linus' fame. There should be no difference > (after all patches are applied) between the first and the second version. > > hard-interface.c | 11 ++--------- > 1 files changed, 2 insertions(+), 9 deletions(-) > > diff --git a/hard-interface.c b/hard-interface.c > index b3058e4..c6edf0a 100644 > --- a/hard-interface.c > +++ b/hard-interface.c > @@ -490,22 +490,15 @@ static void hardif_remove_interface(struct hard_iface *hard_iface) > void hardif_remove_interfaces(void) > { > struct hard_iface *hard_iface, *hard_iface_tmp; > - struct list_head if_queue; > - > - INIT_LIST_HEAD(&if_queue); > > + rtnl_lock(); > spin_lock(&hardif_list_lock); > list_for_each_entry_safe(hard_iface, hard_iface_tmp, > &hardif_list, list) { > list_del_rcu(&hard_iface->list); > - list_add_tail(&hard_iface->list, &if_queue); > - } > - spin_unlock(&hardif_list_lock); > - > - rtnl_lock(); > - list_for_each_entry_safe(hard_iface, hard_iface_tmp, &if_queue, list) { > hardif_remove_interface(hard_iface); > } > + spin_unlock(&hardif_list_lock); > rtnl_unlock(); > } > > -- > 1.7.4.4 >

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: purge unnecessary include
by Marek Lindner 02 May '11

02 May '11

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- compat.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/compat.h b/compat.h index 0c5ad82..bddf7e2 100644 --- a/compat.h +++ b/compat.h @@ -26,7 +26,6 @@ #define _NET_BATMAN_ADV_COMPAT_H_ #include <linux/version.h> /* LINUX_VERSION_CODE */ -#include "bat_sysfs.h" /* struct bat_attribute */ #ifndef IPPROTO_UDP #define IPPROTO_UDP 17 -- 1.7.2.3

3 5

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N May 2011