RDMA/core: Annotate destroy of mutex to ensure that it is released as unlocked

While compiled with CONFIG_DEBUG_MUTEXES, the kernel ensures that mutex is
not held during destroy. Hence add mutex_destroy() for mutexes used in
RDMA modules.

Link: https://lore.kernel.org/r/20190723065733.4899-2-leon@kernel.org
Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 18e476b3ced0718c7efc3e9079dad47fa3637508..00fb3eacda1944d780cc5810624c6ae38a881601 100644 (file)
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -810,6 +810,7 @@ static void release_gid_table(struct ib_device *device,
        if (leak)
                return;
 
+       mutex_destroy(&table->lock);
        kfree(table->data_vec);
        kfree(table);
 }

diff --git a/drivers/infiniband/core/cma_configfs.c b/drivers/infiniband/core/cma_configfs.c
index 3ec2c415bb706f947a0a59ea1c05b8e2b6207384..8b0b5ae22e4c8935385a6c883ccf30eb704044a8 100644 (file)
--- a/drivers/infiniband/core/cma_configfs.c
+++ b/drivers/infiniband/core/cma_configfs.c
@@ -342,12 +342,18 @@ static struct configfs_subsystem cma_subsys = {
 
 int __init cma_configfs_init(void)
 {
+       int ret;
+
        config_group_init(&cma_subsys.su_group);
        mutex_init(&cma_subsys.su_mutex);
-       return configfs_register_subsystem(&cma_subsys);
+       ret = configfs_register_subsystem(&cma_subsys);
+       if (ret)
+               mutex_destroy(&cma_subsys.su_mutex);
+       return ret;
 }
 
 void __exit cma_configfs_exit(void)
 {
        configfs_unregister_subsystem(&cma_subsys);
+       mutex_destroy(&cma_subsys.su_mutex);
 }

diff --git a/drivers/infiniband/core/counters.c b/drivers/infiniband/core/counters.c
index 01faef7bc0615838d37c57b82b069df0a9c89da9..9ed7fce85747d2445e078a2d7c4448ac42e4f38d 100644 (file)
--- a/drivers/infiniband/core/counters.c
+++ b/drivers/infiniband/core/counters.c
@@ -592,7 +592,7 @@ int rdma_counter_get_mode(struct ib_device *dev, u8 port,
 void rdma_counter_init(struct ib_device *dev)
 {
        struct rdma_port_counter *port_counter;
-       u32 port;
+       u32 port, i;
 
        if (!dev->ops.alloc_hw_stats || !dev->port_data)
                return;
@@ -610,13 +610,12 @@ void rdma_counter_init(struct ib_device *dev)
        return;
 
 fail:
-       rdma_for_each_port(dev, port) {
+       for (i = port; i >= rdma_start_port(dev); i--) {
                port_counter = &dev->port_data[port].port_counter;
                kfree(port_counter->hstats);
                port_counter->hstats = NULL;
+               mutex_destroy(&port_counter->lock);
        }
-
-       return;
 }
 
 void rdma_counter_release(struct ib_device *dev)
@@ -630,5 +629,6 @@ void rdma_counter_release(struct ib_device *dev)
        rdma_for_each_port(dev, port) {
                port_counter = &dev->port_data[port].port_counter;
                kfree(port_counter->hstats);
+               mutex_destroy(&port_counter->lock);
        }
 }

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 9773145dee0996d0d058230bc6ce18f9c138d34f..309210d2d4a8a4360ef9f850afa2e7bfaf0543d4 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -508,6 +508,9 @@ static void ib_device_release(struct device *device)
                          rcu_head);
        }
 
+       mutex_destroy(&dev->unregistration_lock);
+       mutex_destroy(&dev->compat_devs_mutex);
+
        xa_destroy(&dev->compat_devs);
        xa_destroy(&dev->client_data);
        kfree_rcu(dev, rcu_head);

diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 9f8a48016b4152a248f781d69760ce4fa433897c..e0512aef033c291597141df9b81540d35e06b2ec 100644 (file)
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -1038,7 +1038,7 @@ static int ib_umad_close(struct inode *inode, struct file *filp)
                                ib_unregister_mad_agent(file->agent[i]);
 
        mutex_unlock(&file->port->file_mutex);
-
+       mutex_destroy(&file->mutex);
        kfree(file);
        return 0;
 }

diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 11c13c1381cf5c9d6afdb4596c36f8d4a7203c8b..02b57240176c6e56bfc4c2c79ff5f52f65077bee 100644 (file)
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -120,6 +120,8 @@ static void ib_uverbs_release_dev(struct device *device)
 
        uverbs_destroy_api(dev->uapi);
        cleanup_srcu_struct(&dev->disassociate_srcu);
+       mutex_destroy(&dev->lists_mutex);
+       mutex_destroy(&dev->xrcd_tree_mutex);
        kfree(dev);
 }
 
@@ -212,6 +214,8 @@ void ib_uverbs_release_file(struct kref *ref)
 
        if (file->disassociate_page)
                __free_pages(file->disassociate_page, 0);
+       mutex_destroy(&file->umap_lock);
+       mutex_destroy(&file->ucontext_lock);
        kfree(file);
 }
 

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 92349bf37589f79d4fa6a589882c6de5c5c21aa0..f974b68542245206936e623a6d62d6ef948cecce 100644 (file)
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -2259,6 +2259,7 @@ int ib_dealloc_xrcd(struct ib_xrcd *xrcd, struct ib_udata *udata)
                if (ret)
                        return ret;
        }
+       mutex_destroy(&xrcd->tgt_qp_mutex);
 
        return xrcd->device->ops.dealloc_xrcd(xrcd, udata);
 }