* [PATCH] RDMA/qedr: Fix some error handling
@ 2017-02-18 11:28 ` Christophe JAILLET
0 siblings, 0 replies; 7+ messages in thread
From: Christophe JAILLET @ 2017-02-18 11:28 UTC (permalink / raw)
To: dledford, sean.hefty, hal.rosenstock, Ram.Amrani, Michal.Kalderon,
rajesh.borundia, weiyongjun1
Cc: linux-rdma, linux-kernel, kernel-janitors, Christophe JAILLET
'qedr_alloc_pbl_tbl()' can not return NULL.
In qedr_init_user_queue():
- simplify the test for the return value, no need to test for NULL
- propagate the error pointer if needed, otherwise 0 (success) is returned.
This is spurious.
In init_mr_info():
- test the return value with IS_ERR
- propagate the error pointer if needed instead of an exlictit -ENOMEM.
This is a no-op as the only error pointer that we can have here is
already -ENOMEM
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/infiniband/hw/qedr/verbs.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
index ef83a3f322d6..0c51657af151 100644
--- a/drivers/infiniband/hw/qedr/verbs.c
+++ b/drivers/infiniband/hw/qedr/verbs.c
@@ -771,8 +771,10 @@ static inline int qedr_init_user_queue(struct ib_ucontext *ib_ctx,
goto err0;
q->pbl_tbl = qedr_alloc_pbl_tbl(dev, &q->pbl_info, GFP_KERNEL);
- if (IS_ERR_OR_NULL(q->pbl_tbl))
+ if (IS_ERR(q->pbl_tbl)) {
+ rc = PTR_ERR(q->pbl_tbl);
goto err0;
+ }
qedr_populate_pbls(dev, q->umem, q->pbl_tbl, &q->pbl_info);
@@ -2105,8 +2107,8 @@ static int init_mr_info(struct qedr_dev *dev, struct mr_info *info,
goto done;
info->pbl_table = qedr_alloc_pbl_tbl(dev, &info->pbl_info, GFP_KERNEL);
- if (!info->pbl_table) {
- rc = -ENOMEM;
+ if (IS_ERR(info->pbl_table)) {
+ rc = PTR_ERR(info->pbl_table);
goto done;
}
@@ -2117,7 +2119,7 @@ static int init_mr_info(struct qedr_dev *dev, struct mr_info *info,
* list and allocating another one
*/
tmp = qedr_alloc_pbl_tbl(dev, &info->pbl_info, GFP_KERNEL);
- if (!tmp) {
+ if (IS_ERR(tmp)) {
DP_DEBUG(dev, QEDR_MSG_MR, "Extra PBL is not allocated\n");
goto done;
}
--
2.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH] RDMA/qedr: Fix some error handling
@ 2017-02-18 11:28 ` Christophe JAILLET
0 siblings, 0 replies; 7+ messages in thread
From: Christophe JAILLET @ 2017-02-18 11:28 UTC (permalink / raw)
To: dledford-H+wXaHxf7aLQT0dZR+AlfA,
sean.hefty-ral2JQCrhuEAvxtiuMwx3w,
hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w,
Ram.Amrani-74tsMCuadCbQT0dZR+AlfA,
Michal.Kalderon-YGCgFSpz5w/QT0dZR+AlfA,
rajesh.borundia-YGCgFSpz5w/QT0dZR+AlfA,
weiyongjun1-hv44wF8Li93QT0dZR+AlfA
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA, Christophe JAILLET
'qedr_alloc_pbl_tbl()' can not return NULL.
In qedr_init_user_queue():
- simplify the test for the return value, no need to test for NULL
- propagate the error pointer if needed, otherwise 0 (success) is returned.
This is spurious.
In init_mr_info():
- test the return value with IS_ERR
- propagate the error pointer if needed instead of an exlictit -ENOMEM.
This is a no-op as the only error pointer that we can have here is
already -ENOMEM
Signed-off-by: Christophe JAILLET <christophe.jaillet-39ZsbGIQGT5GWvitb5QawA@public.gmane.org>
---
drivers/infiniband/hw/qedr/verbs.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
index ef83a3f322d6..0c51657af151 100644
--- a/drivers/infiniband/hw/qedr/verbs.c
+++ b/drivers/infiniband/hw/qedr/verbs.c
@@ -771,8 +771,10 @@ static inline int qedr_init_user_queue(struct ib_ucontext *ib_ctx,
goto err0;
q->pbl_tbl = qedr_alloc_pbl_tbl(dev, &q->pbl_info, GFP_KERNEL);
- if (IS_ERR_OR_NULL(q->pbl_tbl))
+ if (IS_ERR(q->pbl_tbl)) {
+ rc = PTR_ERR(q->pbl_tbl);
goto err0;
+ }
qedr_populate_pbls(dev, q->umem, q->pbl_tbl, &q->pbl_info);
@@ -2105,8 +2107,8 @@ static int init_mr_info(struct qedr_dev *dev, struct mr_info *info,
goto done;
info->pbl_table = qedr_alloc_pbl_tbl(dev, &info->pbl_info, GFP_KERNEL);
- if (!info->pbl_table) {
- rc = -ENOMEM;
+ if (IS_ERR(info->pbl_table)) {
+ rc = PTR_ERR(info->pbl_table);
goto done;
}
@@ -2117,7 +2119,7 @@ static int init_mr_info(struct qedr_dev *dev, struct mr_info *info,
* list and allocating another one
*/
tmp = qedr_alloc_pbl_tbl(dev, &info->pbl_info, GFP_KERNEL);
- if (!tmp) {
+ if (IS_ERR(tmp)) {
DP_DEBUG(dev, QEDR_MSG_MR, "Extra PBL is not allocated\n");
goto done;
}
--
2.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 7+ messages in thread* RE: [PATCH] RDMA/qedr: Fix some error handling
2017-02-18 11:28 ` Christophe JAILLET
(?)
(?)
@ 2017-02-19 11:46 ` Amrani, Ram
-1 siblings, 0 replies; 7+ messages in thread
From: Amrani, Ram @ 2017-02-19 11:46 UTC (permalink / raw)
To: Christophe JAILLET, dledford@redhat.com, sean.hefty@intel.com,
hal.rosenstock@gmail.com, Kalderon, Michal, Borundia, Rajesh,
weiyongjun1@huawei.com
Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
> 'qedr_alloc_pbl_tbl()' can not return NULL.
>
> In qedr_init_user_queue():
> - simplify the test for the return value, no need to test for NULL
> - propagate the error pointer if needed, otherwise 0 (success) is returned.
> This is spurious.
>
> In init_mr_info():
> - test the return value with IS_ERR
> - propagate the error pointer if needed instead of an exlictit -ENOMEM.
> This is a no-op as the only error pointer that we can have here is
> already -ENOMEM
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> drivers/infiniband/hw/qedr/verbs.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
> index ef83a3f322d6..0c51657af151 100644
> --- a/drivers/infiniband/hw/qedr/verbs.c
> +++ b/drivers/infiniband/hw/qedr/verbs.c
> @@ -771,8 +771,10 @@ static inline int qedr_init_user_queue(struct ib_ucontext *ib_ctx,
> goto err0;
>
> q->pbl_tbl = qedr_alloc_pbl_tbl(dev, &q->pbl_info, GFP_KERNEL);
> - if (IS_ERR_OR_NULL(q->pbl_tbl))
> + if (IS_ERR(q->pbl_tbl)) {
> + rc = PTR_ERR(q->pbl_tbl);
> goto err0;
> + }
>
> qedr_populate_pbls(dev, q->umem, q->pbl_tbl, &q->pbl_info);
>
> @@ -2105,8 +2107,8 @@ static int init_mr_info(struct qedr_dev *dev, struct mr_info *info,
> goto done;
>
> info->pbl_table = qedr_alloc_pbl_tbl(dev, &info->pbl_info, GFP_KERNEL);
> - if (!info->pbl_table) {
> - rc = -ENOMEM;
> + if (IS_ERR(info->pbl_table)) {
> + rc = PTR_ERR(info->pbl_table);
> goto done;
> }
>
> @@ -2117,7 +2119,7 @@ static int init_mr_info(struct qedr_dev *dev, struct mr_info *info,
> * list and allocating another one
> */
> tmp = qedr_alloc_pbl_tbl(dev, &info->pbl_info, GFP_KERNEL);
> - if (!tmp) {
> + if (IS_ERR(tmp)) {
> DP_DEBUG(dev, QEDR_MSG_MR, "Extra PBL is not allocated\n");
> goto done;
> }
> --
> 2.9.3
Acked-by: Ram Amrani <Ram.Amrani@cavium.com>
Merci
^ permalink raw reply [flat|nested] 7+ messages in thread[parent not found: <20170218112815.9329-1-christophe.jaillet-39ZsbGIQGT5GWvitb5QawA@public.gmane.org>]
* Re: [PATCH] RDMA/qedr: Fix some error handling
[not found] ` <20170218112815.9329-1-christophe.jaillet-39ZsbGIQGT5GWvitb5QawA@public.gmane.org>
2017-02-19 13:59 ` Doug Ledford
@ 2017-02-19 13:59 ` Doug Ledford
0 siblings, 0 replies; 7+ messages in thread
From: Doug Ledford @ 2017-02-19 13:59 UTC (permalink / raw)
To: Christophe JAILLET, sean.hefty-ral2JQCrhuEAvxtiuMwx3w,
hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w,
Ram.Amrani-74tsMCuadCbQT0dZR+AlfA,
Michal.Kalderon-74tsMCuadCbQT0dZR+AlfA,
rajesh.borundia-74tsMCuadCbQT0dZR+AlfA,
weiyongjun1-hv44wF8Li93QT0dZR+AlfA
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
On Sat, 2017-02-18 at 12:28 +0100, Christophe JAILLET wrote:
> 'qedr_alloc_pbl_tbl()' can not return NULL.
>
> In qedr_init_user_queue():
> - simplify the test for the return value, no need to test for NULL
> - propagate the error pointer if needed, otherwise 0 (success) is
> returned.
> This is spurious.
>
> In init_mr_info():
> - test the return value with IS_ERR
> - propagate the error pointer if needed instead of an exlictit
> -ENOMEM.
> This is a no-op as the only error pointer that we can have here is
> already -ENOMEM
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Thanks, applied.
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] RDMA/qedr: Fix some error handling
@ 2017-02-19 13:59 ` Doug Ledford
0 siblings, 0 replies; 7+ messages in thread
From: Doug Ledford @ 2017-02-19 13:59 UTC (permalink / raw)
To: Christophe JAILLET, sean.hefty, hal.rosenstock, Ram.Amrani,
Michal.Kalderon, rajesh.borundia, weiyongjun1
Cc: linux-rdma, linux-kernel, kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
On Sat, 2017-02-18 at 12:28 +0100, Christophe JAILLET wrote:
> 'qedr_alloc_pbl_tbl()' can not return NULL.
>
> In qedr_init_user_queue():
> - simplify the test for the return value, no need to test for NULL
> - propagate the error pointer if needed, otherwise 0 (success) is
> returned.
> This is spurious.
>
> In init_mr_info():
> - test the return value with IS_ERR
> - propagate the error pointer if needed instead of an exlictit
> -ENOMEM.
> This is a no-op as the only error pointer that we can have here is
> already -ENOMEM
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Thanks, applied.
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] RDMA/qedr: Fix some error handling
@ 2017-02-19 13:59 ` Doug Ledford
0 siblings, 0 replies; 7+ messages in thread
From: Doug Ledford @ 2017-02-19 13:59 UTC (permalink / raw)
To: Christophe JAILLET, sean.hefty-ral2JQCrhuEAvxtiuMwx3w,
hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w,
Ram.Amrani-74tsMCuadCbQT0dZR+AlfA,
Michal.Kalderon-74tsMCuadCbQT0dZR+AlfA,
rajesh.borundia-74tsMCuadCbQT0dZR+AlfA,
weiyongjun1-hv44wF8Li93QT0dZR+AlfA
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 878 bytes --]
On Sat, 2017-02-18 at 12:28 +0100, Christophe JAILLET wrote:
> 'qedr_alloc_pbl_tbl()' can not return NULL.
>
> In qedr_init_user_queue():
> - simplify the test for the return value, no need to test for NULL
> - propagate the error pointer if needed, otherwise 0 (success) is
> returned.
> This is spurious.
>
> In init_mr_info():
> - test the return value with IS_ERR
> - propagate the error pointer if needed instead of an exlictit
> -ENOMEM.
> This is a no-op as the only error pointer that we can have here is
> already -ENOMEM
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet-39ZsbGIQGT5GWvitb5QawA@public.gmane.org>
Thanks, applied.
--
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread