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

Commit 10b1bbb4 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

batman-adv: Cache the type of wifi device for each hardif 



batman-adv is requiring the type of wifi device in different contexts. Some
of them can take the rtnl semaphore and some of them already have the
semaphore taken. But even others don't allow that the semaphore will be
taken.

The data has to be retrieved when the hardif is added to batman-adv because
some of the wifi information for an hardif will only be available with rtnl
lock. It can then be cached in the batadv_hard_iface and the functions
is_wifi_netdev and is_cfg80211_netdev can just compare the correct bits
without imposing extra locking requirements.

Signed-off-by: default avatarSven Eckelmann <sven.eckelmann@open-mesh.com>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent f44a3ae9

net/batman-adv/bat_iv_ogm.c

+1 −1
Original line number Diff line number Diff line
@@ -1272,7 +1272,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, 
	 */

	tq_iface_penalty = BATADV_TQ_MAX_VALUE;

	if (if_outgoing && (if_incoming == if_outgoing) &&

	    batadv_is_wifi_netdev(if_outgoing->net_dev))

	    batadv_is_wifi_hardif(if_outgoing))

		tq_iface_penalty = batadv_hop_penalty(BATADV_TQ_MAX_VALUE,

						      bat_priv);

net/batman-adv/bat_v_elp.c

+4 −4
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) 
	/* if this is a wireless device, then ask its throughput through

	 * cfg80211 API

	 */

	if (batadv_is_wifi_netdev(hard_iface->net_dev)) {

		if (!batadv_is_cfg80211_netdev(hard_iface->net_dev))

	if (batadv_is_wifi_hardif(hard_iface)) {

		if (!batadv_is_cfg80211_hardif(hard_iface))

			/* unsupported WiFi driver version */

			goto default_throughput;
@@ -186,7 +186,7 @@ batadv_v_elp_wifi_neigh_probe(struct batadv_hardif_neigh_node *neigh) 
	int elp_skb_len;



	/* this probing routine is for Wifi neighbours only */

	if (!batadv_is_wifi_netdev(hard_iface->net_dev))

	if (!batadv_is_wifi_hardif(hard_iface))

		return true;



	/* probe the neighbor only if no unicast packets have been sent
@@ -351,7 +351,7 @@ int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface) 
	/* warn the user (again) if there is no throughput data is available */

	hard_iface->bat_v.flags &= ~BATADV_WARNING_DEFAULT;



	if (batadv_is_wifi_netdev(hard_iface->net_dev))

	if (batadv_is_wifi_hardif(hard_iface))

		hard_iface->bat_v.flags &= ~BATADV_FULL_DUPLEX;



	INIT_DELAYED_WORK(&hard_iface->bat_v.elp_wq,

net/batman-adv/hard-interface.c

+67 −15
Original line number Diff line number Diff line
@@ -201,6 +201,30 @@ static bool batadv_is_valid_iface(const struct net_device *net_dev) 
	return true;

}



/**

 * batadv_is_wext_netdev - check if the given net_device struct is a

 *  wext wifi interface

 * @net_device: the device to check

 *

 * Return: true if the net device is a wext wireless device, false

 *  otherwise.

 */

static bool batadv_is_wext_netdev(struct net_device *net_device)

{

	if (!net_device)

		return false;



#ifdef CONFIG_WIRELESS_EXT

	/* pre-cfg80211 drivers have to implement WEXT, so it is possible to

	 * check for wireless_handlers != NULL

	 */

	if (net_device->wireless_handlers)

		return true;

#endif



	return false;

}



/**

 * batadv_is_cfg80211_netdev - check if the given net_device struct is a

 *  cfg80211 wifi interface
@@ -209,7 +233,7 @@ static bool batadv_is_valid_iface(const struct net_device *net_dev) 
 * Return: true if the net device is a cfg80211 wireless device, false

 *  otherwise.

 */

bool batadv_is_cfg80211_netdev(struct net_device *net_device)

static bool batadv_is_cfg80211_netdev(struct net_device *net_device)

{

	if (!net_device)

		return false;
@@ -222,26 +246,53 @@ bool batadv_is_cfg80211_netdev(struct net_device *net_device) 
}



/**

 * batadv_is_wifi_netdev - check if the given net_device struct is a wifi

 *  interface

 * batadv_wifi_flags_evaluate - calculate wifi flags for net_device

 * @net_device: the device to check

 *

 * Return: true if the net device is a 802.11 wireless device, false otherwise.

 * Return: batadv_hard_iface_wifi_flags flags of the device

 */

bool batadv_is_wifi_netdev(struct net_device *net_device)

static u32 batadv_wifi_flags_evaluate(struct net_device *net_device)

{

	if (!net_device)

		return false;

	u32 wifi_flags = 0;



#ifdef CONFIG_WIRELESS_EXT

	/* pre-cfg80211 drivers have to implement WEXT, so it is possible to

	 * check for wireless_handlers != NULL

	if (batadv_is_wext_netdev(net_device))

		wifi_flags |= BATADV_HARDIF_WIFI_WEXT_DIRECT;



	if (batadv_is_cfg80211_netdev(net_device))

		wifi_flags |= BATADV_HARDIF_WIFI_CFG80211_DIRECT;



	return wifi_flags;

}



/**

 * batadv_is_cfg80211_hardif - check if the given hardif is a cfg80211 wifi

 *  interface

 * @hard_iface: the device to check

 *

 * Return: true if the net device is a cfg80211 wireless device, false

 *  otherwise.

 */

	if (net_device->wireless_handlers)

		return true;

#endif

bool batadv_is_cfg80211_hardif(struct batadv_hard_iface *hard_iface)

{

	u32 allowed_flags = 0;



	allowed_flags |= BATADV_HARDIF_WIFI_CFG80211_DIRECT;



	return !!(hard_iface->wifi_flags & allowed_flags);

}



/**

 * batadv_is_wifi_hardif - check if the given hardif is a wifi interface

 * @hard_iface: the device to check

 *

 * Return: true if the net device is a 802.11 wireless device, false otherwise.

 */

bool batadv_is_wifi_hardif(struct batadv_hard_iface *hard_iface)

{

	if (!hard_iface)

		return false;



	return batadv_is_cfg80211_netdev(net_device);

	return hard_iface->wifi_flags != 0;

}



/**
@@ -765,7 +816,8 @@ batadv_hardif_add_interface(struct net_device *net_dev) 
	kref_init(&hard_iface->refcount);



	hard_iface->num_bcasts = BATADV_NUM_BCASTS_DEFAULT;

	if (batadv_is_wifi_netdev(net_dev))

	hard_iface->wifi_flags = batadv_wifi_flags_evaluate(net_dev);

	if (batadv_is_wifi_hardif(hard_iface))

		hard_iface->num_bcasts = BATADV_NUM_BCASTS_WIRELESS;



	batadv_v_hardif_init(hard_iface);

net/batman-adv/hard-interface.h

+2 −3
Original line number Diff line number Diff line
@@ -65,9 +65,8 @@ enum batadv_hard_if_cleanup { 


extern struct notifier_block batadv_hard_if_notifier;



bool batadv_is_cfg80211_netdev(struct net_device *net_device);

bool batadv_is_wifi_netdev(struct net_device *net_device);

bool batadv_is_wifi_iface(int ifindex);

bool batadv_is_cfg80211_hardif(struct batadv_hard_iface *hard_iface);

bool batadv_is_wifi_hardif(struct batadv_hard_iface *hard_iface);

struct batadv_hard_iface*

batadv_hardif_get_by_netdev(const struct net_device *net_dev);

int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,

net/batman-adv/translation-table.c

+8 −2
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, 
	struct net *net = dev_net(soft_iface);

	struct batadv_softif_vlan *vlan;

	struct net_device *in_dev = NULL;

	struct batadv_hard_iface *in_hardif = NULL;

	struct hlist_head *head;

	struct batadv_tt_orig_list_entry *orig_entry;

	int hash_added, table_size, packet_size_max;
@@ -657,6 +658,9 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, 
	if (ifindex != BATADV_NULL_IFINDEX)

		in_dev = dev_get_by_index(net, ifindex);



	if (in_dev)

		in_hardif = batadv_hardif_get_by_netdev(in_dev);



	tt_local = batadv_tt_local_hash_find(bat_priv, addr, vid);



	if (!is_multicast_ether_addr(addr))
@@ -730,7 +734,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, 
	 */

	tt_local->common.flags = BATADV_TT_CLIENT_NEW;

	tt_local->common.vid = vid;

	if (batadv_is_wifi_netdev(in_dev))

	if (batadv_is_wifi_hardif(in_hardif))

		tt_local->common.flags |= BATADV_TT_CLIENT_WIFI;

	kref_init(&tt_local->common.refcount);

	tt_local->last_seen = jiffies;
@@ -790,7 +794,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, 
	 */

	remote_flags = tt_local->common.flags & BATADV_TT_REMOTE_MASK;



	if (batadv_is_wifi_netdev(in_dev))

	if (batadv_is_wifi_hardif(in_hardif))

		tt_local->common.flags |= BATADV_TT_CLIENT_WIFI;

	else

		tt_local->common.flags &= ~BATADV_TT_CLIENT_WIFI;
@@ -814,6 +818,8 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, 


	ret = true;

out:

	if (in_hardif)

		batadv_hardif_put(in_hardif);

	if (in_dev)

		dev_put(in_dev);

	if (tt_local)