The following commit has been merged in the merge/master branch: commit 2a89d102d9033ef2d30a8e0dc350afaa36fd36c5 Merge: de6db08fd0a6a0f9a1a213b3e11b6b26acde46a0 2808f92a9e3e3a920ac2c40710a0fedf9f7a4525 Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue Feb 16 17:22:39 2016 +0800

Merge branch 'maint' into next

diff --combined net/batman-adv/hard-interface.c index d6229fb,730cfa8..b22b277 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@@ -1,4 -1,4 +1,4 @@@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * @@@ -18,7 -18,6 +18,7 @@@ #include "hard-interface.h" #include "main.h"

+#include <linux/atomic.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> @@@ -27,7 -26,6 +27,7 @@@ #include <linux/if_ether.h> #include <linux/if.h> #include <linux/kernel.h> +#include <linux/kref.h> #include <linux/list.h> #include <linux/netdevice.h> #include <linux/printk.h> @@@ -52,13 -50,10 +52,13 @@@ /** * batadv_hardif_release - release hard interface from lists and queue for * free after rcu grace period - * @hard_iface: the hard interface to free + * @ref: kref pointer of the hard interface */ -void batadv_hardif_release(struct batadv_hard_iface *hard_iface) +void batadv_hardif_release(struct kref *ref) { + struct batadv_hard_iface *hard_iface; + + hard_iface = container_of(ref, struct batadv_hard_iface, refcount); dev_put(hard_iface->net_dev);

kfree_rcu(hard_iface, rcu); @@@ -72,7 -67,7 +72,7 @@@ batadv_hardif_get_by_netdev(const struc rcu_read_lock(); list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { if (hard_iface->net_dev == net_dev && - atomic_inc_not_zero(&hard_iface->refcount)) + kref_get_unless_zero(&hard_iface->refcount)) goto out; }

@@@ -84,6 -79,28 +84,28 @@@ out }

/** + * batadv_mutual_parents - check if two devices are each others parent + * @dev1: 1st net_device + * @dev2: 2nd net_device + * + * veth devices come in pairs and each is the parent of the other! + * + * Return: true if the devices are each others parent, otherwise false + */ + static bool batadv_mutual_parents(const struct net_device *dev1, + const struct net_device *dev2) + { + int dev1_parent_iflink = dev_get_iflink(dev1); + int dev2_parent_iflink = dev_get_iflink(dev2); + + if (!dev1_parent_iflink || !dev2_parent_iflink) + return false; + + return (dev1_parent_iflink == dev2->ifindex) && + (dev2_parent_iflink == dev1->ifindex); + } + + /** * batadv_is_on_batman_iface - check if a device is a batman iface descendant * @net_dev: the device to check * @@@ -116,6 -133,9 +138,9 @@@ static bool batadv_is_on_batman_iface(c if (WARN(!parent_dev, "Cannot find parent device")) return false;

+ if (batadv_mutual_parents(net_dev, parent_dev)) + return false; + ret = batadv_is_on_batman_iface(parent_dev);

return ret; @@@ -177,7 -197,7 +202,7 @@@ batadv_hardif_get_active(const struct n continue;

if (hard_iface->if_status == BATADV_IF_ACTIVE && - atomic_inc_not_zero(&hard_iface->refcount)) + kref_get_unless_zero(&hard_iface->refcount)) goto out; }

@@@ -201,7 -221,7 +226,7 @@@ static void batadv_primary_if_update_ad batadv_bla_update_orig_address(bat_priv, primary_if, oldif); out: if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); }

static void batadv_primary_if_select(struct batadv_priv *bat_priv, @@@ -211,7 -231,7 +236,7 @@@

ASSERT_RTNL();

- if (new_hard_iface && !atomic_inc_not_zero(&new_hard_iface->refcount)) + if (new_hard_iface && !kref_get_unless_zero(&new_hard_iface->refcount)) new_hard_iface = NULL;

curr_hard_iface = rcu_dereference_protected(bat_priv->primary_if, 1); @@@ -225,7 -245,7 +250,7 @@@

out: if (curr_hard_iface) - batadv_hardif_free_ref(curr_hard_iface); + batadv_hardif_put(curr_hard_iface); }

static bool @@@ -384,7 -404,7 +409,7 @@@ batadv_hardif_activate_interface(struc

out: if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); }

static void @@@ -439,7 -459,7 +464,7 @@@ int batadv_hardif_enable_interface(stru if (hard_iface->if_status != BATADV_IF_NOT_IN_USE) goto out;

- if (!atomic_inc_not_zero(&hard_iface->refcount)) + if (!kref_get_unless_zero(&hard_iface->refcount)) goto out;

soft_iface = dev_get_by_name(&init_net, iface_name); @@@ -537,7 -557,7 +562,7 @@@ err_dev hard_iface->soft_iface = NULL; dev_put(soft_iface); err: - batadv_hardif_free_ref(hard_iface); + batadv_hardif_put(hard_iface); return ret; }

@@@ -568,7 -588,7 +593,7 @@@ void batadv_hardif_disable_interface(st batadv_primary_if_select(bat_priv, new_if);

if (new_if) - batadv_hardif_free_ref(new_if); + batadv_hardif_put(new_if); }

bat_priv->bat_algo_ops->bat_iface_disable(hard_iface); @@@ -591,11 -611,11 +616,11 @@@ }

hard_iface->soft_iface = NULL; - batadv_hardif_free_ref(hard_iface); + batadv_hardif_put(hard_iface);

out: if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); }

/** @@@ -614,7 -634,7 +639,7 @@@ static void batadv_hardif_remove_interf

batadv_debugfs_del_hardif(hard_iface); batadv_sysfs_del_hardif(&hard_iface->hardif_obj); - batadv_hardif_free_ref(hard_iface); + batadv_hardif_put(hard_iface); }

static struct batadv_hard_iface * @@@ -660,8 -680,7 +685,8 @@@ batadv_hardif_add_interface(struct net_ hard_iface->num_bcasts = BATADV_NUM_BCASTS_WIRELESS;

/* extra reference for return */ - atomic_set(&hard_iface->refcount, 2); + kref_init(&hard_iface->refcount); + kref_get(&hard_iface->refcount);

batadv_check_known_mac_addr(hard_iface->net_dev); list_add_tail_rcu(&hard_iface->list, &batadv_hardif_list); @@@ -769,10 -788,10 +794,10 @@@ static int batadv_hard_if_event(struct }

hardif_put: - batadv_hardif_free_ref(hard_iface); + batadv_hardif_put(hard_iface); out: if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); return NOTIFY_DONE; }