Commit 56594ae1 authored by Parav Pandit's avatar Parav Pandit Committed by Jason Gunthorpe
Browse files

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: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent a511f822

drivers/infiniband/core/cache.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}

drivers/infiniband/core/cma_configfs.c

+7 −1
Original line number Diff line number Diff line
@@ -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);

}

drivers/infiniband/core/counters.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/infiniband/core/device.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

drivers/infiniband/core/user_mad.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE