The rxe driver used the field pool->flag to mark a pool as it was
begin shut down and checked this flag in several pool APIs to
validate that the pool had not been shut dowm. This is really
unneeded because the pools were not marked invalid unless the
entire driver was being removed at which point no functional
APIs should or could be executing. This patch removes this
flag, associated enums and spinlock code, and unneeded labels.
Signed-off-by: Bob Pearson <rpearson@xxxxxxx>
---
drivers/infiniband/sw/rxe/rxe_pool.c | 38 ----------------------------
drivers/infiniband/sw/rxe/rxe_pool.h | 6 -----
2 files changed, 44 deletions(-)
diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c
index 157fb340a3fb..0d177a823365 100644
--- a/drivers/infiniband/sw/rxe/rxe_pool.c
+++ b/drivers/infiniband/sw/rxe/rxe_pool.c
@@ -159,8 +159,6 @@ int rxe_pool_init(
pool->key.key_size = rxe_type_info[type].key_size;
}
- pool->state = RXE_POOL_STATE_VALID;
-
out:
return err;
}
@@ -169,7 +167,6 @@ static void rxe_pool_release(struct kref *kref)
{
struct rxe_pool *pool = container_of(kref, struct rxe_pool, ref_cnt);
- pool->state = RXE_POOL_STATE_INVALID;
kfree(pool->index.table);
}
@@ -180,14 +177,9 @@ static void rxe_pool_put(struct rxe_pool *pool)
void rxe_pool_cleanup(struct rxe_pool *pool)
{
- unsigned long flags;
-
- write_lock_irqsave(&pool->pool_lock, flags);
- pool->state = RXE_POOL_STATE_INVALID;
if (atomic_read(&pool->num_elem) > 0)
pr_warn("%s pool destroyed with unfree'd elem\n",
pool_name(pool));
- write_unlock_irqrestore(&pool->pool_lock, flags);
rxe_pool_put(pool);
}
@@ -342,9 +334,6 @@ void *rxe_alloc__(struct rxe_pool *pool)
struct rxe_pool_entry *elem;
u8 *obj;
- if (pool->state != RXE_POOL_STATE_VALID)
- return NULL;
-
kref_get(&pool->ref_cnt);
if (atomic_inc_return(&pool->num_elem) > pool->max_elem)
@@ -363,26 +352,17 @@ void *rxe_alloc__(struct rxe_pool *pool)
out_cnt:
atomic_dec(&pool->num_elem);
-out_put_pool:
rxe_pool_put(pool);
return NULL;
}
void *rxe_alloc(struct rxe_pool *pool)
{
- unsigned long flags;
struct rxe_type_info *info = &rxe_type_info[pool->type];
struct rxe_pool_entry *elem;
u8 *obj;
- read_lock_irqsave(&pool->pool_lock, flags);
- if (pool->state != RXE_POOL_STATE_VALID) {
- read_unlock_irqrestore(&pool->pool_lock, flags);
- return NULL;
- }
-
kref_get(&pool->ref_cnt);
- read_unlock_irqrestore(&pool->pool_lock, flags);
if (atomic_inc_return(&pool->num_elem) > pool->max_elem)
goto out_cnt;
@@ -400,22 +380,13 @@ void *rxe_alloc(struct rxe_pool *pool)
out_cnt:
atomic_dec(&pool->num_elem);
-out_put_pool:
rxe_pool_put(pool);
return NULL;
}
int __rxe_add_to_pool(struct rxe_pool *pool, struct rxe_pool_entry *elem)
{
- unsigned long flags;
-
- read_lock_irqsave(&pool->pool_lock, flags);
- if (pool->state != RXE_POOL_STATE_VALID) {
- read_unlock_irqrestore(&pool->pool_lock, flags);
- return -EINVAL;
- }
kref_get(&pool->ref_cnt);
- read_unlock_irqrestore(&pool->pool_lock, flags);
if (atomic_inc_return(&pool->num_elem) > pool->max_elem)
goto out_cnt;
@@ -427,7 +398,6 @@ int __rxe_add_to_pool(struct rxe_pool *pool, struct rxe_pool_entry *elem)
out_cnt:
atomic_dec(&pool->num_elem);
-out_put_pool:
rxe_pool_put(pool);
return -EINVAL;
}
@@ -462,9 +432,6 @@ void *rxe_pool_get_index(struct rxe_pool *pool, u32 index)
read_lock_irqsave(&pool->pool_lock, flags);
- if (pool->state != RXE_POOL_STATE_VALID)
- goto out;
-
node = pool->index.tree.rb_node;
while (node) {
@@ -485,7 +452,6 @@ void *rxe_pool_get_index(struct rxe_pool *pool, u32 index)
obj = NULL;
}
-out:
read_unlock_irqrestore(&pool->pool_lock, flags);
return obj;
}
@@ -498,9 +464,6 @@ void *rxe_pool_get_key__(struct rxe_pool *pool, void *key)
u8 *obj = NULL;
int cmp;
- if (pool->state != RXE_POOL_STATE_VALID)
- goto out;
-
node = pool->key.tree.rb_node;
while (node) {
@@ -524,7 +487,6 @@ void *rxe_pool_get_key__(struct rxe_pool *pool, void *key)
obj = NULL;
}
-out:
return obj;
}
diff --git a/drivers/infiniband/sw/rxe/rxe_pool.h b/drivers/infiniband/sw/rxe/rxe_pool.h
index f916ad4d0406..d259531430d7 100644
--- a/drivers/infiniband/sw/rxe/rxe_pool.h
+++ b/drivers/infiniband/sw/rxe/rxe_pool.h
@@ -46,11 +46,6 @@ struct rxe_type_info {
extern struct rxe_type_info rxe_type_info[];
-enum rxe_pool_state {
- RXE_POOL_STATE_INVALID,
- RXE_POOL_STATE_VALID,
-};
-
struct rxe_pool_entry {
struct rxe_pool *pool;
struct kref ref_cnt;
@@ -70,7 +65,6 @@ struct rxe_pool {
size_t elem_size;
struct kref ref_cnt;
void (*cleanup)(struct rxe_pool_entry *obj);
- enum rxe_pool_state state;
enum rxe_pool_flags flags;
enum rxe_elem_type type;
--
2.27.0
