lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 079/639] IB/rxe: Fix incorrect cache cleanup in error flow
    Date
    From: Yuval Shaia <yuval.shaia@oracle.com>

    [ Upstream commit 6db21d8986e14e2e86573a3b055b05296188bd2c ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/sw/rxe/rxe_pool.c | 26 ++++++++++++++------------
    1 file changed, 14 insertions(+), 12 deletions(-)

    diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c
    index b4a8acc7bb7d6..0e2425f282335 100644
    --- a/drivers/infiniband/sw/rxe/rxe_pool.c
    +++ b/drivers/infiniband/sw/rxe/rxe_pool.c
    @@ -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)
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:04    [W:4.058 / U:0.524 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site