batman-adv: Add lockdep_asserts for documented external locks

Some functions already have documentation about locks they require inside
their kerneldoc header. These can be directly tested during runtime using
the lockdep asserts.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>

diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
index ec5f7bcad66eadbb70266cd2316bf345add93127..700c96c82a15100fca157d9b14ba5157430d024b 100644 (file)
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@ -25,6 +25,7 @@
 #include <linux/if_ether.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
+#include <linux/lockdep.h>
 #include <linux/netdevice.h>
 #include <linux/pkt_sched.h>
 #include <linux/skbuff.h>
@@ -112,6 +113,8 @@ static int batadv_frag_size_limit(void)
 static bool batadv_frag_init_chain(struct batadv_frag_table_entry *chain,
                                   u16 seqno)
 {
+       lockdep_assert_held(&chain->lock);
+
        if (chain->seqno == seqno)
                return false;
 

diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index 410f34cf85c258e00797d5c89a552424a3dbc596..eb76386f8d4b51efd4d8134a176d8000d736efbf 100644 (file)
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -609,6 +609,8 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,
        struct hlist_node *node = &orig->mcast_want_all_unsnoopables_node;
        struct hlist_head *head = &bat_priv->mcast.want_all_unsnoopables_list;
 
+       lockdep_assert_held(&orig->mcast_handler_lock);
+
        /* switched from flag unset to set */
        if (mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES &&
            !(orig->mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES)) {
@@ -652,6 +654,8 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,
        struct hlist_node *node = &orig->mcast_want_all_ipv4_node;
        struct hlist_head *head = &bat_priv->mcast.want_all_ipv4_list;
 
+       lockdep_assert_held(&orig->mcast_handler_lock);
+
        /* switched from flag unset to set */
        if (mcast_flags & BATADV_MCAST_WANT_ALL_IPV4 &&
            !(orig->mcast_flags & BATADV_MCAST_WANT_ALL_IPV4)) {
@@ -695,6 +699,8 @@ static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,
        struct hlist_node *node = &orig->mcast_want_all_ipv6_node;
        struct hlist_head *head = &bat_priv->mcast.want_all_ipv6_list;
 
+       lockdep_assert_held(&orig->mcast_handler_lock);
+
        /* switched from flag unset to set */
        if (mcast_flags & BATADV_MCAST_WANT_ALL_IPV6 &&
            !(orig->mcast_flags & BATADV_MCAST_WANT_ALL_IPV6)) {

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 79cee7b771dc915fb8fdf3ce48a7e9473a225103..4228b10c47ead06db9284997afc1899e181d6505 100644 (file)
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -3271,6 +3271,8 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv)
  */
 static void batadv_tt_local_commit_changes_nolock(struct batadv_priv *bat_priv)
 {
+       lockdep_assert_held(&bat_priv->tt.commit_lock);
+
        /* Update multicast addresses in local translation table */
        batadv_mcast_mla_update(bat_priv);