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

Commit 04ad3783 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge 



Antonio Quartulli says:

====================
Included changes:
- change my email in MAINTAINERS and Doc files
- create and export list of single hop neighs per interface
- protect CRC in the BLA code by means of its own lock
- minor fixes and code cleanups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 897ca373 5a1dd8a4

Documentation/ABI/testing/sysfs-class-net-mesh

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Description: 


What:           /sys/class/net/<mesh_iface>/mesh/<vlan_subdir>/ap_isolation

Date:           May 2011

Contact:        Antonio Quartulli <antonio@meshcoding.com>

Contact:        Antonio Quartulli <a@unstable.cc>

Description:

                Indicates whether the data traffic going from a

                wireless client to another wireless client will be
@@ -70,7 +70,7 @@ Description: 


What:		/sys/class/net/<mesh_iface>/mesh/isolation_mark

Date:		Nov 2013

Contact:	Antonio Quartulli <antonio@meshcoding.com>

Contact:	Antonio Quartulli <a@unstable.cc>

Description:

		Defines the isolation mark (and its bitmask) which

		is used to classify clients as "isolated" by the

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2111,7 +2111,7 @@ F: include/linux/backlight.h 
BATMAN ADVANCED

M:	Marek Lindner <mareklindner@neomailbox.ch>

M:	Simon Wunderlich <sw@simonwunderlich.de>

M:	Antonio Quartulli <antonio@meshcoding.com>

M:	Antonio Quartulli <a@unstable.cc>

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

W:	http://www.open-mesh.org/

S:	Maintained

net/batman-adv/bat_iv_ogm.c

+67 −4
Original line number Diff line number Diff line
@@ -1379,6 +1379,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
				struct batadv_hard_iface *if_outgoing)

{

	struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);

	struct batadv_hardif_neigh_node *hardif_neigh = NULL;

	struct batadv_neigh_node *router = NULL;

	struct batadv_neigh_node *router_router = NULL;

	struct batadv_orig_node *orig_neigh_node;
@@ -1423,6 +1424,13 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
		goto out;

	}



	if (is_single_hop_neigh) {

		hardif_neigh = batadv_hardif_neigh_get(if_incoming,

						       ethhdr->h_source);

		if (hardif_neigh)

			hardif_neigh->last_seen = jiffies;

	}



	router = batadv_orig_router_get(orig_node, if_outgoing);

	if (router) {

		router_router = batadv_orig_router_get(router->orig_node,
@@ -1557,6 +1565,8 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
		batadv_neigh_node_free_ref(router_router);

	if (orig_neigh_router)

		batadv_neigh_node_free_ref(orig_neigh_router);

	if (hardif_neigh)

		batadv_hardif_neigh_free_ref(hardif_neigh);



	kfree_skb(skb_priv);

}
@@ -1861,6 +1871,58 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv, 
		seq_puts(seq, "No batman nodes in range ...\n");

}



/**

 * batadv_iv_hardif_neigh_print - print a single hop neighbour node

 * @seq: neighbour table seq_file struct

 * @hardif_neigh: hardif neighbour information

 */

static void

batadv_iv_hardif_neigh_print(struct seq_file *seq,

			     struct batadv_hardif_neigh_node *hardif_neigh)

{

	int last_secs, last_msecs;



	last_secs = jiffies_to_msecs(jiffies - hardif_neigh->last_seen) / 1000;

	last_msecs = jiffies_to_msecs(jiffies - hardif_neigh->last_seen) % 1000;



	seq_printf(seq, "   %10s   %pM %4i.%03is\n",

		   hardif_neigh->if_incoming->net_dev->name,

		   hardif_neigh->addr, last_secs, last_msecs);

}



/**

 * batadv_iv_ogm_neigh_print - print the single hop neighbour list

 * @bat_priv: the bat priv with all the soft interface information

 * @seq: neighbour table seq_file struct

 */

static void batadv_iv_neigh_print(struct batadv_priv *bat_priv,

				  struct seq_file *seq)

{

	struct net_device *net_dev = (struct net_device *)seq->private;

	struct batadv_hardif_neigh_node *hardif_neigh;

	struct batadv_hard_iface *hard_iface;

	int batman_count = 0;



	seq_printf(seq, "   %10s        %-13s %s\n",

		   "IF", "Neighbor", "last-seen");



	rcu_read_lock();

	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {

		if (hard_iface->soft_iface != net_dev)

			continue;



		hlist_for_each_entry_rcu(hardif_neigh,

					 &hard_iface->neigh_list, list) {

			batadv_iv_hardif_neigh_print(seq, hardif_neigh);

			batman_count++;

		}

	}

	rcu_read_unlock();



	if (batman_count == 0)

		seq_puts(seq, "No batman nodes in range ...\n");

}



/**

 * batadv_iv_ogm_neigh_cmp - compare the metrics of two neighbors

 * @neigh1: the first neighbor object of the comparison
@@ -1902,8 +1964,8 @@ static int batadv_iv_ogm_neigh_cmp(struct batadv_neigh_node *neigh1, 
}



/**

 * batadv_iv_ogm_neigh_is_eob - check if neigh1 is equally good or better than

 *  neigh2 from the metric prospective

 * batadv_iv_ogm_neigh_is_sob - check if neigh1 is similarly good or better

 *  than neigh2 from the metric prospective

 * @neigh1: the first neighbor object of the comparison

 * @if_outgoing1: outgoing interface for the first neighbor

 * @neigh2: the second neighbor object of the comparison
@@ -1913,7 +1975,7 @@ static int batadv_iv_ogm_neigh_cmp(struct batadv_neigh_node *neigh1, 
 * the metric via neigh2, false otherwise.

 */

static bool

batadv_iv_ogm_neigh_is_eob(struct batadv_neigh_node *neigh1,

batadv_iv_ogm_neigh_is_sob(struct batadv_neigh_node *neigh1,

			   struct batadv_hard_iface *if_outgoing1,

			   struct batadv_neigh_node *neigh2,

			   struct batadv_hard_iface *if_outgoing2)
@@ -1953,7 +2015,8 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { 
	.bat_ogm_schedule = batadv_iv_ogm_schedule,

	.bat_ogm_emit = batadv_iv_ogm_emit,

	.bat_neigh_cmp = batadv_iv_ogm_neigh_cmp,

	.bat_neigh_is_equiv_or_better = batadv_iv_ogm_neigh_is_eob,

	.bat_neigh_is_similar_or_better = batadv_iv_ogm_neigh_is_sob,

	.bat_neigh_print = batadv_iv_neigh_print,

	.bat_orig_print = batadv_iv_ogm_orig_print,

	.bat_orig_free = batadv_iv_ogm_orig_free,

	.bat_orig_add_if = batadv_iv_ogm_orig_add_if,

net/batman-adv/bridge_loop_avoidance.c

+30 −5
Original line number Diff line number Diff line
@@ -260,7 +260,9 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw) 
	}



	/* all claims gone, initialize CRC */

	spin_lock_bh(&backbone_gw->crc_lock);

	backbone_gw->crc = BATADV_BLA_CRC_INIT;

	spin_unlock_bh(&backbone_gw->crc_lock);

}



/**
@@ -408,6 +410,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, u8 *orig, 
	entry->lasttime = jiffies;

	entry->crc = BATADV_BLA_CRC_INIT;

	entry->bat_priv = bat_priv;

	spin_lock_init(&entry->crc_lock);

	atomic_set(&entry->request_sent, 0);

	atomic_set(&entry->wait_periods, 0);

	ether_addr_copy(entry->orig, orig);
@@ -557,7 +560,9 @@ static void batadv_bla_send_announce(struct batadv_priv *bat_priv, 
	__be16 crc;



	memcpy(mac, batadv_announce_mac, 4);

	spin_lock_bh(&backbone_gw->crc_lock);

	crc = htons(backbone_gw->crc);

	spin_unlock_bh(&backbone_gw->crc_lock);

	memcpy(&mac[4], &crc, 2);



	batadv_bla_send_claim(bat_priv, mac, backbone_gw->vid,
@@ -618,14 +623,18 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, 
			   "bla_add_claim(): changing ownership for %pM, vid %d\n",

			   mac, BATADV_PRINT_VID(vid));



		spin_lock_bh(&claim->backbone_gw->crc_lock);

		claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);

		spin_unlock_bh(&claim->backbone_gw->crc_lock);

		batadv_backbone_gw_free_ref(claim->backbone_gw);

	}

	/* set (new) backbone gw */

	atomic_inc(&backbone_gw->refcount);

	claim->backbone_gw = backbone_gw;



	spin_lock_bh(&backbone_gw->crc_lock);

	backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);

	spin_unlock_bh(&backbone_gw->crc_lock);

	backbone_gw->lasttime = jiffies;



claim_free_ref:
@@ -653,7 +662,9 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, 
			   batadv_choose_claim, claim);

	batadv_claim_free_ref(claim); /* reference from the hash is gone */



	spin_lock_bh(&claim->backbone_gw->crc_lock);

	claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);

	spin_unlock_bh(&claim->backbone_gw->crc_lock);



	/* don't need the reference from hash_find() anymore */

	batadv_claim_free_ref(claim);
@@ -664,7 +675,7 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, 
				  u8 *backbone_addr, unsigned short vid)

{

	struct batadv_bla_backbone_gw *backbone_gw;

	u16 crc;

	u16 backbone_crc, crc;



	if (memcmp(an_addr, batadv_announce_mac, 4) != 0)

		return 0;
@@ -683,12 +694,16 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, 
		   "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n",

		   BATADV_PRINT_VID(vid), backbone_gw->orig, crc);



	if (backbone_gw->crc != crc) {

	spin_lock_bh(&backbone_gw->crc_lock);

	backbone_crc = backbone_gw->crc;

	spin_unlock_bh(&backbone_gw->crc_lock);



	if (backbone_crc != crc) {

		batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,

			   "handle_announce(): CRC FAILED for %pM/%d (my = %#.4x, sent = %#.4x)\n",

			   backbone_gw->orig,

			   BATADV_PRINT_VID(backbone_gw->vid),

			   backbone_gw->crc, crc);

			   backbone_crc, crc);



		batadv_bla_send_request(backbone_gw);

	} else {
@@ -1647,6 +1662,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) 
	struct batadv_bla_claim *claim;

	struct batadv_hard_iface *primary_if;

	struct hlist_head *head;

	u16 backbone_crc;

	u32 i;

	bool is_own;

	u8 *primary_addr;
@@ -1669,11 +1685,15 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) 
		hlist_for_each_entry_rcu(claim, head, hash_entry) {

			is_own = batadv_compare_eth(claim->backbone_gw->orig,

						    primary_addr);



			spin_lock_bh(&claim->backbone_gw->crc_lock);

			backbone_crc = claim->backbone_gw->crc;

			spin_unlock_bh(&claim->backbone_gw->crc_lock);

			seq_printf(seq, " * %pM on %5d by %pM [%c] (%#.4x)\n",

				   claim->addr, BATADV_PRINT_VID(claim->vid),

				   claim->backbone_gw->orig,

				   (is_own ? 'x' : ' '),

				   claim->backbone_gw->crc);

				   backbone_crc);

		}

		rcu_read_unlock();

	}
@@ -1692,6 +1712,7 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) 
	struct batadv_hard_iface *primary_if;

	struct hlist_head *head;

	int secs, msecs;

	u16 backbone_crc;

	u32 i;

	bool is_own;

	u8 *primary_addr;
@@ -1722,10 +1743,14 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) 
			if (is_own)

				continue;



			spin_lock_bh(&backbone_gw->crc_lock);

			backbone_crc = backbone_gw->crc;

			spin_unlock_bh(&backbone_gw->crc_lock);



			seq_printf(seq, " * %pM on %5d %4i.%03is (%#.4x)\n",

				   backbone_gw->orig,

				   BATADV_PRINT_VID(backbone_gw->vid), secs,

				   msecs, backbone_gw->crc);

				   msecs, backbone_crc);

		}

		rcu_read_unlock();

	}

net/batman-adv/debugfs.c

+9 −0
Original line number Diff line number Diff line
@@ -262,6 +262,13 @@ static int batadv_algorithms_open(struct inode *inode, struct file *file) 
	return single_open(file, batadv_algo_seq_print_text, NULL);

}



static int neighbors_open(struct inode *inode, struct file *file)

{

	struct net_device *net_dev = (struct net_device *)inode->i_private;



	return single_open(file, batadv_hardif_neigh_seq_print_text, net_dev);

}



static int batadv_originators_open(struct inode *inode, struct file *file)

{

	struct net_device *net_dev = (struct net_device *)inode->i_private;
@@ -375,6 +382,7 @@ static struct batadv_debuginfo *batadv_general_debuginfos[] = { 
};



/* The following attributes are per soft interface */

static BATADV_DEBUGINFO(neighbors, S_IRUGO, neighbors_open);

static BATADV_DEBUGINFO(originators, S_IRUGO, batadv_originators_open);

static BATADV_DEBUGINFO(gateways, S_IRUGO, batadv_gateways_open);

static BATADV_DEBUGINFO(transtable_global, S_IRUGO,
@@ -394,6 +402,7 @@ static BATADV_DEBUGINFO(nc_nodes, S_IRUGO, batadv_nc_nodes_open); 
#endif



static struct batadv_debuginfo *batadv_mesh_debuginfos[] = {

	&batadv_debuginfo_neighbors,

	&batadv_debuginfo_originators,

	&batadv_debuginfo_gateways,

	&batadv_debuginfo_transtable_global,