RDMA/rxe: Clean kzalloc failure paths
Subsystems (2)
PATCH 1/1 RDMA/rxe: Clean kzalloc failure paths
From: Leon Romanovsky <[email protected]>
There is no need to print any debug messages after failure to allocate memory, because kernel will print OOM dumps anyway.
Together with removal of these messages, remove useless goto jumps.
--- drivers/infiniband/sw/rxe/rxe_queue.c | 5 ++--- drivers/infiniband/sw/rxe/rxe_verbs.c | 23 ++++++----------------- 2 files changed, 8 insertions(+), 20 deletions(-)
drivers/infiniband/sw/rxe/rxe_queue.c +2 -3
@@ -61,11 +61,11 @@ struct rxe_queue *rxe_queue_init(struct rxe_dev *rxe, int *num_elem,/* num_elem == 0 is allowed, but uninteresting */ if (*num_elem <0 ) - goto err1; +return NULL ; q =kzalloc (sizeof (*q),GFP_KERNEL );if (!q) - goto err1; +return NULL ; q->rxe = rxe; q->type = type;
@@ -100,7 +100,6 @@ struct rxe_queue *rxe_queue_init(struct rxe_dev *rxe, int *num_elem, err2:kfree (q); -err1:return NULL ; }
drivers/infiniband/sw/rxe/rxe_verbs.c +6 -17
@@ -1198,11 +1198,8 @@ static struct ib_mr *rxe_get_dma_mr(struct ib_pd *ibpd, int access)int err; mr =kzalloc (sizeof (*mr),GFP_KERNEL ); -if (!mr) { - err = -ENOMEM ; -rxe_dbg_dev (rxe,"no memory for mr" ); - goto err_out; - } +if (!mr) +return ERR_PTR (-ENOMEM ); err =rxe_add_to_pool (&rxe->mr_pool, mr);if (err) {
@@ -1220,7 +1217,6 @@ static struct ib_mr *rxe_get_dma_mr(struct ib_pd *ibpd, int access) err_free:kfree (mr); -err_out:rxe_err_pd (pd,"returned err = %d" , err);return ERR_PTR (err); }
@@ -1235,11 +1231,8 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd, u64 start,int err, cleanup_err; mr =kzalloc (sizeof (*mr),GFP_KERNEL ); -if (!mr) { - err = -ENOMEM ; -rxe_dbg_pd (pd,"no memory for mr" ); - goto err_out; - } +if (!mr) +return ERR_PTR (-ENOMEM ); err =rxe_add_to_pool (&rxe->mr_pool, mr);if (err) {
@@ -1266,7 +1259,6 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd, u64 start,rxe_err_mr (mr,"cleanup failed, err = %d" , cleanup_err); err_free:kfree (mr); -err_out:rxe_err_pd (pd,"returned err = %d" , err);return ERR_PTR (err); }
@@ -1287,11 +1279,8 @@ static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type, } mr =kzalloc (sizeof (*mr),GFP_KERNEL ); -if (!mr) { - err = -ENOMEM ; -rxe_dbg_mr (mr,"no memory for mr" ); - goto err_out; - } +if (!mr) +return ERR_PTR (-ENOMEM ); err =rxe_add_to_pool (&rxe->mr_pool, mr);if (err) {
Signature · 1 line
2.39.2
Quoted 4 lines · Leon Romanovsky
drivers/infiniband/sw/rxe/rxe_verbs.c +0
-0@@ -1287,11 +1279,8 @@ static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type, } mr =kzalloc (sizeof (*mr),GFP_KERNEL );
drivers/infiniband/sw/rxe/rxe_verbs.c static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type, · line 1286
Quoted 10 lines
drivers/infiniband/sw/rxe/rxe_verbs.c +2
-5-if (!mr) { - err = -ENOMEM ; -rxe_dbg_mr (mr,"no memory for mr" ); - goto err_out; - } +if (!mr) +return ERR_PTR (-ENOMEM ); err =rxe_add_to_pool (&rxe->mr_pool, mr);if (err) {
^^^^^^^^^^
If the rxe_add_to_pool() fails then it calls:
rxe_dbg_mr(mr, "unable to create mr, err = %d", err);
^^"rm" is zeroed mem and not useful at this point. Possibly in a later patch though.
regards,
dan carpenter
Quoted 16 lines · Dan Carpenter
Quoted 4 lines · Leon Romanovsky
drivers/infiniband/sw/rxe/rxe_verbs.c +0
-0@@ -1287,11 +1279,8 @@ static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type, } mr =kzalloc (sizeof (*mr),GFP_KERNEL );drivers/infiniband/sw/rxe/rxe_verbs.c static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type, · line 1286
Quoted 10 lines
drivers/infiniband/sw/rxe/rxe_verbs.c +2
-5-if (!mr) { - err = -ENOMEM ; -rxe_dbg_mr (mr,"no memory for mr" ); - goto err_out; - } +if (!mr) +return ERR_PTR (-ENOMEM ); err =rxe_add_to_pool (&rxe->mr_pool, mr);if (err) {^^^^^^^^^^
Quoted 7 lines
If the
rxe_add_to_pool()fails then it calls:rxe_dbg_mr(mr, "unable to create mr, err = %d", err); ^^"rm" is zeroed mem and not useful at this point. Possibly in a later patch though.
I will delete that line when will apply the patch.
Thanks
Quoted 4 lines
regards,
dan carpenter
Quoted 94 lines · Leon Romanovsky
From: Leon Romanovsky <[email protected]>
There is no need to print any debug messages after failure to allocate memory, because kernel will print OOM dumps anyway.
Together with removal of these messages, remove useless goto jumps.
Fixes 5bf944f24129 ("RDMA/rxe: Add error messages")Reported-by Dan Carpenter <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>--- drivers/infiniband/sw/rxe/rxe_queue.c | 5 ++--- drivers/infiniband/sw/rxe/rxe_verbs.c | 23 ++++++----------------- 2 files changed, 8 insertions(+), 20 deletions(-)drivers/infiniband/sw/rxe/rxe_queue.c +2
-3@@ -61,11 +61,11 @@ struct rxe_queue *rxe_queue_init(struct rxe_dev *rxe, int *num_elem,/* num_elem == 0 is allowed, but uninteresting */ if (*num_elem <0 ) - goto err1; +return NULL ; q =kzalloc (sizeof (*q),GFP_KERNEL );if (!q) - goto err1; +return NULL ; q->rxe = rxe; q->type = type;@@ -100,7 +100,6 @@ struct rxe_queue *rxe_queue_init(struct rxe_dev *rxe, int *num_elem, err2:kfree (q); -err1:return NULL ; }drivers/infiniband/sw/rxe/rxe_verbs.c +4
-12@@ -1198,11 +1198,8 @@ static struct ib_mr *rxe_get_dma_mr(struct ib_pd *ibpd, int access)int err; mr =kzalloc (sizeof (*mr),GFP_KERNEL ); -if (!mr) { - err = -ENOMEM ; -rxe_dbg_dev (rxe,"no memory for mr" ); - goto err_out; - } +if (!mr) +return ERR_PTR (-ENOMEM ); err =rxe_add_to_pool (&rxe->mr_pool, mr);if (err) {@@ -1220,7 +1217,6 @@ static struct ib_mr *rxe_get_dma_mr(struct ib_pd *ibpd, int access) err_free:kfree (mr); -err_out:rxe_err_pd (pd,"returned err = %d" , err);return ERR_PTR (err); }@@ -1235,11 +1231,8 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd, u64 start,int err, cleanup_err; mr =kzalloc (sizeof (*mr),GFP_KERNEL ); -if (!mr) { - err = -ENOMEM ; -rxe_dbg_pd (pd,"no memory for mr" ); - goto err_out; - } +if (!mr) +return ERR_PTR (-ENOMEM ); err =rxe_add_to_pool (&rxe->mr_pool, mr);if (err) {@@ -1266,7 +1259,6 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd, u64 start,rxe_err_mr (mr,"cleanup failed, err = %d" , cleanup_err); err_free:kfree (mr); -err_out:rxe_err_pd (pd,"returned err = %d" , err);return ERR_PTR (err); }@@ -1287,11 +1279,8 @@ static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type, } mr =kzalloc (sizeof (*mr),GFP_KERNEL );
drivers/infiniband/sw/rxe/rxe_verbs.c static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type, · line 1286
Quoted 10 lines
drivers/infiniband/sw/rxe/rxe_verbs.c +2
-5-if (!mr) { - err = -ENOMEM ; -rxe_dbg_mr (mr,"no memory for mr" ); - goto err_out; - } +if (!mr) +return ERR_PTR (-ENOMEM ); err =rxe_add_to_pool (&rxe->mr_pool, mr);if (err) {
These are all fine. Thanks!
Leon Romanovsky
AppliedQuoted 6 lines · Leon Romanovsky
There is no need to print any debug messages after failure to allocate memory, because kernel will print OOM dumps anyway.
Together with removal of these messages, remove useless goto jumps.
Applied, thanks!
[1/1] RDMA/rxe: Clean kzalloc failure paths
https://git.kernel.org/rdma/rdma/c/b6ba68555d75fd
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>