Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c124391 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Convert batadv_orig_node to kref 



batman-adv uses a self-written reference implementation which is just based
on atomic_t. This is less obvious when reading the code than kref and
therefore increases the change that the reference counting will be missed.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <a@unstable.cc>
parent 161a3be9

net/batman-adv/distributed-arp-table.c

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, 
							  max_orig_node))

				continue;



			if (!atomic_inc_not_zero(&orig_node->refcount))

			if (!kref_get_unless_zero(&orig_node->refcount))

				continue;



			max = tmp_max;

net/batman-adv/gateway_client.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ batadv_gw_get_selected_orig(struct batadv_priv *bat_priv) 
	if (!orig_node)

		goto unlock;



	if (!atomic_inc_not_zero(&orig_node->refcount))

	if (!kref_get_unless_zero(&orig_node->refcount))

		orig_node = NULL;



unlock:
@@ -441,7 +441,7 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv, 
	if (gateway->bandwidth_down == 0)

		return;



	if (!atomic_inc_not_zero(&orig_node->refcount))

	if (!kref_get_unless_zero(&orig_node->refcount))

		return;



	gw_node = kzalloc(sizeof(*gw_node), GFP_ATOMIC);

net/batman-adv/multicast.c

+4 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/in.h>

#include <linux/ip.h>

#include <linux/ipv6.h>

#include <linux/kref.h>

#include <linux/list.h>

#include <linux/lockdep.h>

#include <linux/netdevice.h>
@@ -447,7 +448,7 @@ batadv_mcast_forw_ipv4_node_get(struct batadv_priv *bat_priv) 
	hlist_for_each_entry_rcu(tmp_orig_node,

				 &bat_priv->mcast.want_all_ipv4_list,

				 mcast_want_all_ipv4_node) {

		if (!atomic_inc_not_zero(&tmp_orig_node->refcount))

		if (!kref_get_unless_zero(&tmp_orig_node->refcount))

			continue;



		orig_node = tmp_orig_node;
@@ -474,7 +475,7 @@ batadv_mcast_forw_ipv6_node_get(struct batadv_priv *bat_priv) 
	hlist_for_each_entry_rcu(tmp_orig_node,

				 &bat_priv->mcast.want_all_ipv6_list,

				 mcast_want_all_ipv6_node) {

		if (!atomic_inc_not_zero(&tmp_orig_node->refcount))

		if (!kref_get_unless_zero(&tmp_orig_node->refcount))

			continue;



		orig_node = tmp_orig_node;
@@ -525,7 +526,7 @@ batadv_mcast_forw_unsnoop_node_get(struct batadv_priv *bat_priv) 
	hlist_for_each_entry_rcu(tmp_orig_node,

				 &bat_priv->mcast.want_all_unsnoopables_list,

				 mcast_want_all_unsnoopables_node) {

		if (!atomic_inc_not_zero(&tmp_orig_node->refcount))

		if (!kref_get_unless_zero(&tmp_orig_node->refcount))

			continue;



		orig_node = tmp_orig_node;

net/batman-adv/network-coding.c

+1 −1
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ static struct batadv_nc_node 
	if (!nc_node)

		return NULL;



	if (!atomic_inc_not_zero(&orig_neigh_node->refcount))

	if (!kref_get_unless_zero(&orig_neigh_node->refcount))

		goto free;



	/* Initialize nc_node */

net/batman-adv/originator.c

+9 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "originator.h"

#include "main.h"



#include <linux/atomic.h>

#include <linux/errno.h>

#include <linux/etherdevice.h>

#include <linux/fs.h>
@@ -775,14 +776,17 @@ static void batadv_orig_node_free_rcu(struct rcu_head *rcu) 
/**

 * batadv_orig_node_release - release orig_node from lists and queue for

 *  free after rcu grace period

 * @orig_node: the orig node to free

 * @ref: kref pointer of the orig_node

 */

static void batadv_orig_node_release(struct batadv_orig_node *orig_node)

static void batadv_orig_node_release(struct kref *ref)

{

	struct hlist_node *node_tmp;

	struct batadv_neigh_node *neigh_node;

	struct batadv_orig_node *orig_node;

	struct batadv_orig_ifinfo *orig_ifinfo;



	orig_node = container_of(ref, struct batadv_orig_node, refcount);



	spin_lock_bh(&orig_node->neigh_list_lock);



	/* for all neighbors towards this originator ... */
@@ -812,8 +816,7 @@ static void batadv_orig_node_release(struct batadv_orig_node *orig_node) 
 */

void batadv_orig_node_free_ref(struct batadv_orig_node *orig_node)

{

	if (atomic_dec_and_test(&orig_node->refcount))

		batadv_orig_node_release(orig_node);

	kref_put(&orig_node->refcount, batadv_orig_node_release);

}



void batadv_originator_free(struct batadv_priv *bat_priv)
@@ -885,7 +888,8 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv, 
	batadv_nc_init_orig(orig_node);



	/* extra reference for return */

	atomic_set(&orig_node->refcount, 2);

	kref_init(&orig_node->refcount);

	kref_get(&orig_node->refcount);



	orig_node->bat_priv = bat_priv;

	ether_addr_copy(orig_node->orig, addr);