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

Commit 5d52dad2 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Initialize lockdep class keys for hashes 



The hash for claim and backbone hash in the bridge loop avoidance code receive
the same key because they are getting initialized by hash_new with the same
key. Lockdep will create a backtrace when they are used recursively. This can
be avoided by reinitializing the key directly after the hash_new.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent d2b6cc8e

net/batman-adv/bridge_loop_avoidance.c

+13 −0
Original line number Diff line number Diff line
@@ -1127,6 +1127,14 @@ out: 
	bla_start_timer(bat_priv);

}



/* The hash for claim and backbone hash receive the same key because they

 * are getting initialized by hash_new with the same key. Reinitializing

 * them with to different keys to allow nested locking without generating

 * lockdep warnings

 */

static struct lock_class_key claim_hash_lock_class_key;

static struct lock_class_key backbone_hash_lock_class_key;



/* initialize all bla structures */

int bla_init(struct bat_priv *bat_priv)

{
@@ -1164,6 +1172,11 @@ int bla_init(struct bat_priv *bat_priv) 
	if (!bat_priv->claim_hash || !bat_priv->backbone_hash)

		return -1;



	batadv_hash_set_lock_class(bat_priv->claim_hash,

				   &claim_hash_lock_class_key);

	batadv_hash_set_lock_class(bat_priv->backbone_hash,

				   &backbone_hash_lock_class_key);



	bat_dbg(DBG_BLA, bat_priv, "bla hashes initialized\n");



	bla_start_timer(bat_priv);

net/batman-adv/hash.c

+9 −0
Original line number Diff line number Diff line
@@ -69,3 +69,12 @@ free_hash: 
	kfree(hash);

	return NULL;

}



void batadv_hash_set_lock_class(struct hashtable_t *hash,

				struct lock_class_key *key)

{

	uint32_t i;



	for (i = 0; i < hash->size; i++)

		lockdep_set_class(&hash->list_locks[i], key);

}

net/batman-adv/hash.h

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ struct hashtable_t { 
/* allocates and clears the hash */

struct hashtable_t *hash_new(uint32_t size);



/* set class key for all locks */

void batadv_hash_set_lock_class(struct hashtable_t *hash,

				struct lock_class_key *key);



/* free only the hashtable and the hash itself. */

void hash_destroy(struct hashtable_t *hash);