OSDN Git Service

IB/rxe: Fix incorrect cache cleanup in error flow
authorYuval Shaia <yuval.shaia@oracle.com>
Sun, 9 Dec 2018 13:53:49 +0000 (15:53 +0200)
committerJason Gunthorpe <jgg@mellanox.com>
Tue, 11 Dec 2018 19:26:35 +0000 (12:26 -0700)
Array iterator stays at the same slot, fix it.

Fixes: 8700e3e7c485 ("Soft RoCE driver")
Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
drivers/infiniband/sw/rxe/rxe_pool.c

index a04a076..b5c91df 100644 (file)
@@ -112,6 +112,18 @@ static inline struct kmem_cache *pool_cache(struct rxe_pool *pool)
        return rxe_type_info[pool->type].cache;
 }
 
+static void rxe_cache_clean(size_t cnt)
+{
+       int i;
+       struct rxe_type_info *type;
+
+       for (i = 0; i < cnt; i++) {
+               type = &rxe_type_info[i];
+               kmem_cache_destroy(type->cache);
+               type->cache = NULL;
+       }
+}
+
 int rxe_cache_init(void)
 {
        int err;
@@ -136,24 +148,14 @@ int rxe_cache_init(void)
        return 0;
 
 err1:
-       while (--i >= 0) {
-               kmem_cache_destroy(type->cache);
-               type->cache = NULL;
-       }
+       rxe_cache_clean(i);
 
        return err;
 }
 
 void rxe_cache_exit(void)
 {
-       int i;
-       struct rxe_type_info *type;
-
-       for (i = 0; i < RXE_NUM_TYPES; i++) {
-               type = &rxe_type_info[i];
-               kmem_cache_destroy(type->cache);
-               type->cache = NULL;
-       }
+       rxe_cache_clean(RXE_NUM_TYPES);
 }
 
 static int rxe_pool_init_index(struct rxe_pool *pool, u32 max, u32 min)