RDMA/core: Use simpler spin lock irq API from blocking context
add_client_context(), ib_unregister_device() and ib_unregister_client() are designed to call from blocking context. There is no need to save and restore last interrupt state when called from such blocking context. Even though this is not a performance path, using the right spin lock API is desired for code clarity. To avoid checkpatch warning while removing flags, sizeof() is used. Signed-off-by: Parav Pandit <parav@mellanox.com> Reviewed-by: Daniel Jurgens <danielj@mellanox.com> Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:

committed by
Jason Gunthorpe

parent
4512acd0d3
commit
2d65f49ff9
@@ -297,9 +297,8 @@ EXPORT_SYMBOL(ib_dealloc_device);
|
|||||||
static int add_client_context(struct ib_device *device, struct ib_client *client)
|
static int add_client_context(struct ib_device *device, struct ib_client *client)
|
||||||
{
|
{
|
||||||
struct ib_client_data *context;
|
struct ib_client_data *context;
|
||||||
unsigned long flags;
|
|
||||||
|
|
||||||
context = kmalloc(sizeof *context, GFP_KERNEL);
|
context = kmalloc(sizeof(*context), GFP_KERNEL);
|
||||||
if (!context)
|
if (!context)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
@@ -308,9 +307,9 @@ static int add_client_context(struct ib_device *device, struct ib_client *client
|
|||||||
context->going_down = false;
|
context->going_down = false;
|
||||||
|
|
||||||
down_write(&lists_rwsem);
|
down_write(&lists_rwsem);
|
||||||
spin_lock_irqsave(&device->client_data_lock, flags);
|
spin_lock_irq(&device->client_data_lock);
|
||||||
list_add(&context->list, &device->client_data_list);
|
list_add(&context->list, &device->client_data_list);
|
||||||
spin_unlock_irqrestore(&device->client_data_lock, flags);
|
spin_unlock_irq(&device->client_data_lock);
|
||||||
up_write(&lists_rwsem);
|
up_write(&lists_rwsem);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -587,10 +586,10 @@ void ib_unregister_device(struct ib_device *device)
|
|||||||
|
|
||||||
down_write(&lists_rwsem);
|
down_write(&lists_rwsem);
|
||||||
list_del(&device->core_list);
|
list_del(&device->core_list);
|
||||||
spin_lock_irqsave(&device->client_data_lock, flags);
|
spin_lock_irq(&device->client_data_lock);
|
||||||
list_for_each_entry(context, &device->client_data_list, list)
|
list_for_each_entry(context, &device->client_data_list, list)
|
||||||
context->going_down = true;
|
context->going_down = true;
|
||||||
spin_unlock_irqrestore(&device->client_data_lock, flags);
|
spin_unlock_irq(&device->client_data_lock);
|
||||||
downgrade_write(&lists_rwsem);
|
downgrade_write(&lists_rwsem);
|
||||||
|
|
||||||
list_for_each_entry(context, &device->client_data_list, list) {
|
list_for_each_entry(context, &device->client_data_list, list) {
|
||||||
@@ -668,7 +667,6 @@ void ib_unregister_client(struct ib_client *client)
|
|||||||
{
|
{
|
||||||
struct ib_client_data *context;
|
struct ib_client_data *context;
|
||||||
struct ib_device *device;
|
struct ib_device *device;
|
||||||
unsigned long flags;
|
|
||||||
|
|
||||||
mutex_lock(&device_mutex);
|
mutex_lock(&device_mutex);
|
||||||
|
|
||||||
@@ -680,14 +678,14 @@ void ib_unregister_client(struct ib_client *client)
|
|||||||
struct ib_client_data *found_context = NULL;
|
struct ib_client_data *found_context = NULL;
|
||||||
|
|
||||||
down_write(&lists_rwsem);
|
down_write(&lists_rwsem);
|
||||||
spin_lock_irqsave(&device->client_data_lock, flags);
|
spin_lock_irq(&device->client_data_lock);
|
||||||
list_for_each_entry(context, &device->client_data_list, list)
|
list_for_each_entry(context, &device->client_data_list, list)
|
||||||
if (context->client == client) {
|
if (context->client == client) {
|
||||||
context->going_down = true;
|
context->going_down = true;
|
||||||
found_context = context;
|
found_context = context;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
spin_unlock_irqrestore(&device->client_data_lock, flags);
|
spin_unlock_irq(&device->client_data_lock);
|
||||||
up_write(&lists_rwsem);
|
up_write(&lists_rwsem);
|
||||||
|
|
||||||
if (client->remove)
|
if (client->remove)
|
||||||
@@ -701,9 +699,9 @@ void ib_unregister_client(struct ib_client *client)
|
|||||||
}
|
}
|
||||||
|
|
||||||
down_write(&lists_rwsem);
|
down_write(&lists_rwsem);
|
||||||
spin_lock_irqsave(&device->client_data_lock, flags);
|
spin_lock_irq(&device->client_data_lock);
|
||||||
list_del(&found_context->list);
|
list_del(&found_context->list);
|
||||||
spin_unlock_irqrestore(&device->client_data_lock, flags);
|
spin_unlock_irq(&device->client_data_lock);
|
||||||
up_write(&lists_rwsem);
|
up_write(&lists_rwsem);
|
||||||
kfree(found_context);
|
kfree(found_context);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user