* [PATCH 01/26] IB/ocrdma: Use kcalloc() in ocrdma_create_eqs()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
@ 2017-03-08 12:36 ` SF Markus Elfring
2017-03-08 12:41 ` [PATCH 02/26] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range() SF Markus Elfring
` (20 subsequent siblings)
21 siblings, 0 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 12:36 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 17:56:45 +0100
* A multiplication for the size determination of a memory allocation
indicated that an array data structure should be processed.
Thus reuse the corresponding function "kcalloc".
This issue was detected by using the Coccinelle software.
* Replace the specification of a data structure by a pointer dereference
to make the corresponding size determination a bit safer according to
the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index aa6967197620..cbac41b15d94 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -3103,7 +3103,7 @@ static int ocrdma_create_eqs(struct ocrdma_dev *dev)
if (!num_eq)
return -EINVAL;
- dev->eq_tbl = kzalloc(sizeof(struct ocrdma_eq) * num_eq, GFP_KERNEL);
+ dev->eq_tbl = kcalloc(num_eq, sizeof(*dev->eq_tbl), GFP_KERNEL);
if (!dev->eq_tbl)
return -ENOMEM;
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 02/26] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
2017-03-08 12:36 ` [PATCH 01/26] IB/ocrdma: Use kcalloc() in ocrdma_create_eqs() SF Markus Elfring
@ 2017-03-08 12:41 ` SF Markus Elfring
2017-03-08 14:03 ` Yuval Shaia
2017-03-08 12:48 ` [PATCH 04/26] IB/ocrdma: Delete unnecessary variable initialisations in ocrdma_mbx_get_dcbx_config() SF Markus Elfring
` (19 subsequent siblings)
21 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 12:41 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 18:23:54 +0100
* Multiplications for the size determination of memory allocations
indicated that array data structures should be processed.
Thus reuse the corresponding function "kcalloc".
This issue was detected by using the Coccinelle software.
* Delete the local variable "pd_bitmap_size" which became unnecessary with
this refactoring.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index cbac41b15d94..d5a3127b6df8 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -1505,7 +1505,6 @@ int ocrdma_mbx_dealloc_pd(struct ocrdma_dev *dev, struct ocrdma_pd *pd)
static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
{
int status = -ENOMEM;
- size_t pd_bitmap_size;
struct ocrdma_alloc_pd_range *cmd;
struct ocrdma_alloc_pd_range_rsp *rsp;
@@ -1527,10 +1526,10 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
dev->pd_mgr->pd_dpp_start = rsp->dpp_page_pdid &
OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;
dev->pd_mgr->max_dpp_pd = rsp->pd_count;
- pd_bitmap_size - BITS_TO_LONGS(rsp->pd_count) * sizeof(long);
- dev->pd_mgr->pd_dpp_bitmap = kzalloc(pd_bitmap_size,
- GFP_KERNEL);
+ dev->pd_mgr->pd_dpp_bitmap
+ = kcalloc(BITS_TO_LONGS(rsp->pd_count),
+ sizeof(long),
+ GFP_KERNEL);
}
kfree(cmd);
}
@@ -1546,9 +1545,10 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
dev->pd_mgr->pd_norm_start = rsp->dpp_page_pdid &
OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;
dev->pd_mgr->max_normal_pd = rsp->pd_count;
- pd_bitmap_size = BITS_TO_LONGS(rsp->pd_count) * sizeof(long);
- dev->pd_mgr->pd_norm_bitmap = kzalloc(pd_bitmap_size,
- GFP_KERNEL);
+ dev->pd_mgr->pd_norm_bitmap
+ = kcalloc(BITS_TO_LONGS(rsp->pd_count),
+ sizeof(long),
+ GFP_KERNEL);
}
kfree(cmd);
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 02/26] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range()
2017-03-08 12:41 ` [PATCH 02/26] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range() SF Markus Elfring
@ 2017-03-08 14:03 ` Yuval Shaia
2017-04-20 20:40 ` Doug Ledford
0 siblings, 1 reply; 88+ messages in thread
From: Yuval Shaia @ 2017-03-08 14:03 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 01:41:00PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 18:23:54 +0100
>
> * Multiplications for the size determination of memory allocations
> indicated that array data structures should be processed.
> Thus reuse the corresponding function "kcalloc".
>
> This issue was detected by using the Coccinelle software.
>
> * Delete the local variable "pd_bitmap_size" which became unnecessary with
> this refactoring.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> index cbac41b15d94..d5a3127b6df8 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> @@ -1505,7 +1505,6 @@ int ocrdma_mbx_dealloc_pd(struct ocrdma_dev *dev, struct ocrdma_pd *pd)
> static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
> {
> int status = -ENOMEM;
> - size_t pd_bitmap_size;
> struct ocrdma_alloc_pd_range *cmd;
> struct ocrdma_alloc_pd_range_rsp *rsp;
>
> @@ -1527,10 +1526,10 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
> dev->pd_mgr->pd_dpp_start = rsp->dpp_page_pdid &
> OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;
> dev->pd_mgr->max_dpp_pd = rsp->pd_count;
> - pd_bitmap_size > - BITS_TO_LONGS(rsp->pd_count) * sizeof(long);
> - dev->pd_mgr->pd_dpp_bitmap = kzalloc(pd_bitmap_size,
> - GFP_KERNEL);
> + dev->pd_mgr->pd_dpp_bitmap
> + = kcalloc(BITS_TO_LONGS(rsp->pd_count),
> + sizeof(long),
> + GFP_KERNEL);
kzalloc gives "clean" buffer.
Just making sure that it is fine with you if the array is not "clean".
(looking at _ocrdma_pd_mgr_get_bitmap i think it should).
> }
> kfree(cmd);
> }
> @@ -1546,9 +1545,10 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
> dev->pd_mgr->pd_norm_start = rsp->dpp_page_pdid &
> OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;
> dev->pd_mgr->max_normal_pd = rsp->pd_count;
> - pd_bitmap_size = BITS_TO_LONGS(rsp->pd_count) * sizeof(long);
> - dev->pd_mgr->pd_norm_bitmap = kzalloc(pd_bitmap_size,
> - GFP_KERNEL);
> + dev->pd_mgr->pd_norm_bitmap
> + = kcalloc(BITS_TO_LONGS(rsp->pd_count),
> + sizeof(long),
> + GFP_KERNEL);
> }
> kfree(cmd);
>
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 02/26] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range()
2017-03-08 14:03 ` Yuval Shaia
@ 2017-04-20 20:40 ` Doug Ledford
0 siblings, 0 replies; 88+ messages in thread
From: Doug Ledford @ 2017-04-20 20:40 UTC (permalink / raw)
To: Yuval Shaia, SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Hal Rosenstock, Sean Hefty,
Selvin Xavier, LKML, kernel-janitors
On Wed, 2017-03-08 at 16:03 +0200, Yuval Shaia wrote:
> On Wed, Mar 08, 2017 at 01:41:00PM +0100, SF Markus Elfring wrote:
> >
> > From: Markus Elfring <elfring@users.sourceforge.net>
> > Date: Tue, 7 Mar 2017 18:23:54 +0100
> >
> > * Multiplications for the size determination of memory allocations
> > indicated that array data structures should be processed.
> > Thus reuse the corresponding function "kcalloc".
> >
> > This issue was detected by using the Coccinelle software.
> >
> > * Delete the local variable "pd_bitmap_size" which became
> > unnecessary with
> > this refactoring.
> >
> > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> > ---
> > drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 16 ++++++++--------
> > 1 file changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> > b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> > index cbac41b15d94..d5a3127b6df8 100644
> > --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> > +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> > @@ -1505,7 +1505,6 @@ int ocrdma_mbx_dealloc_pd(struct ocrdma_dev
> > *dev, struct ocrdma_pd *pd)
> > static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
> > {
> > int status = -ENOMEM;
> > - size_t pd_bitmap_size;
> > struct ocrdma_alloc_pd_range *cmd;
> > struct ocrdma_alloc_pd_range_rsp *rsp;
> >
> > @@ -1527,10 +1526,10 @@ static int ocrdma_mbx_alloc_pd_range(struct
> > ocrdma_dev *dev)
> > dev->pd_mgr->pd_dpp_start = rsp-
> > >dpp_page_pdid &
> > OCRDMA_ALLOC_PD_RNG_RSP_ST
> > ART_PDID_MASK;
> > dev->pd_mgr->max_dpp_pd = rsp->pd_count;
> > - pd_bitmap_size > > - BITS_TO_LONGS(rsp->pd_count) *
> > sizeof(long);
> > - dev->pd_mgr->pd_dpp_bitmap > > kzalloc(pd_bitmap_size,
> > - GFP_K
> > ERNEL);
> > + dev->pd_mgr->pd_dpp_bitmap
> > + = kcalloc(BITS_TO_LONGS(rsp-
> > >pd_count),
> > + sizeof(lon
> > g),
> > + GFP_KERNEL
> > );
>
> kzalloc gives "clean" buffer.
> Just making sure that it is fine with you if the array is not
> "clean".
> (looking at _ocrdma_pd_mgr_get_bitmap i think it should).
kcalloc is documented to return memory set to 0.
> >
> > }
> > kfree(cmd);
> > }
> > @@ -1546,9 +1545,10 @@ static int ocrdma_mbx_alloc_pd_range(struct
> > ocrdma_dev *dev)
> > dev->pd_mgr->pd_norm_start = rsp->dpp_page_pdid &
> > OCRDMA_ALLOC_PD_RNG_RSP_ST
> > ART_PDID_MASK;
> > dev->pd_mgr->max_normal_pd = rsp->pd_count;
> > - pd_bitmap_size = BITS_TO_LONGS(rsp->pd_count) *
> > sizeof(long);
> > - dev->pd_mgr->pd_norm_bitmap > > kzalloc(pd_bitmap_size,
> > - GFP_KERNEL);
> > + dev->pd_mgr->pd_norm_bitmap
> > + = kcalloc(BITS_TO_LONGS(rsp->pd_count),
> > + sizeof(long),
> > + GFP_KERNEL);
> > }
> > kfree(cmd);
> >
> > --
> > 2.12.0
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-
> > rdma" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 04/26] IB/ocrdma: Delete unnecessary variable initialisations in ocrdma_mbx_get_dcbx_config()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
2017-03-08 12:36 ` [PATCH 01/26] IB/ocrdma: Use kcalloc() in ocrdma_create_eqs() SF Markus Elfring
2017-03-08 12:41 ` [PATCH 02/26] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range() SF Markus Elfring
@ 2017-03-08 12:48 ` SF Markus Elfring
2017-03-08 14:06 ` [PATCH 04/26] IB/ocrdma: Delete unnecessary variable initialisations in ocrdma_mbx_get_dcbx_conf Yuval Shaia
2017-03-08 12:50 ` [PATCH 05/26] IB/ocrdma: Improve another size determination in ocrdma_mbx_query_qp() SF Markus Elfring
` (18 subsequent siblings)
21 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 12:48 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 19:25:55 +0100
The local variables "req" and "rsp" will be set to appropriate pointers
a bit later. Thus omit the explicit initialisations at the beginning.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 85bebb887c5c..517a18e9351a 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -2895,9 +2895,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
int status;
dma_addr_t pa;
struct ocrdma_mqe cmd;
-
- struct ocrdma_get_dcbx_cfg_req *req = NULL;
- struct ocrdma_get_dcbx_cfg_rsp *rsp = NULL;
+ struct ocrdma_get_dcbx_cfg_req *req;
+ struct ocrdma_get_dcbx_cfg_rsp *rsp;
struct pci_dev *pdev = dev->nic_info.pdev;
struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 04/26] IB/ocrdma: Delete unnecessary variable initialisations in ocrdma_mbx_get_dcbx_conf
2017-03-08 12:48 ` [PATCH 04/26] IB/ocrdma: Delete unnecessary variable initialisations in ocrdma_mbx_get_dcbx_config() SF Markus Elfring
@ 2017-03-08 14:06 ` Yuval Shaia
0 siblings, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-08 14:06 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 01:48:46PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 19:25:55 +0100
>
> The local variables "req" and "rsp" will be set to appropriate pointers
> a bit later. Thus omit the explicit initialisations at the beginning.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> index 85bebb887c5c..517a18e9351a 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> @@ -2895,9 +2895,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
> int status;
> dma_addr_t pa;
> struct ocrdma_mqe cmd;
> -
> - struct ocrdma_get_dcbx_cfg_req *req = NULL;
> - struct ocrdma_get_dcbx_cfg_rsp *rsp = NULL;
> + struct ocrdma_get_dcbx_cfg_req *req;
> + struct ocrdma_get_dcbx_cfg_rsp *rsp;
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> struct pci_dev *pdev = dev->nic_info.pdev;
> struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
>
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 05/26] IB/ocrdma: Improve another size determination in ocrdma_mbx_query_qp()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (2 preceding siblings ...)
2017-03-08 12:48 ` [PATCH 04/26] IB/ocrdma: Delete unnecessary variable initialisations in ocrdma_mbx_get_dcbx_config() SF Markus Elfring
@ 2017-03-08 12:50 ` SF Markus Elfring
2017-03-08 14:07 ` Yuval Shaia
2017-03-08 12:53 ` [PATCH 06/26] IB/ocrdma: Improve another size determination in ocrdma_alloc_pd_pool() SF Markus Elfring
` (17 subsequent siblings)
21 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 12:50 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 19:40:31 +0100
Replace the specification of a data structure by a pointer dereference
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 517a18e9351a..8122a1c7d2ae 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -2487,7 +2487,7 @@ int ocrdma_mbx_query_qp(struct ocrdma_dev *dev, struct ocrdma_qp *qp,
if (status)
goto mbx_err;
rsp = (struct ocrdma_query_qp_rsp *)cmd;
- memcpy(param, &rsp->params, sizeof(struct ocrdma_qp_params));
+ memcpy(param, &rsp->params, sizeof(*param));
mbx_err:
kfree(cmd);
return status;
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 05/26] IB/ocrdma: Improve another size determination in ocrdma_mbx_query_qp()
2017-03-08 12:50 ` [PATCH 05/26] IB/ocrdma: Improve another size determination in ocrdma_mbx_query_qp() SF Markus Elfring
@ 2017-03-08 14:07 ` Yuval Shaia
0 siblings, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-08 14:07 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 01:50:59PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 19:40:31 +0100
>
> Replace the specification of a data structure by a pointer dereference
> as the parameter for the operator "sizeof" to make the corresponding size
> determination a bit safer according to the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> index 517a18e9351a..8122a1c7d2ae 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> @@ -2487,7 +2487,7 @@ int ocrdma_mbx_query_qp(struct ocrdma_dev *dev, struct ocrdma_qp *qp,
> if (status)
> goto mbx_err;
> rsp = (struct ocrdma_query_qp_rsp *)cmd;
> - memcpy(param, &rsp->params, sizeof(struct ocrdma_qp_params));
> + memcpy(param, &rsp->params, sizeof(*param));
> mbx_err:
> kfree(cmd);
> return status;
> --
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 06/26] IB/ocrdma: Improve another size determination in ocrdma_alloc_pd_pool()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (3 preceding siblings ...)
2017-03-08 12:50 ` [PATCH 05/26] IB/ocrdma: Improve another size determination in ocrdma_mbx_query_qp() SF Markus Elfring
@ 2017-03-08 12:53 ` SF Markus Elfring
2017-03-08 12:55 ` [PATCH 07/26] IB/ocrdma: Improve another size determination in ocrdma_mbx_get_ctrl_attribs() SF Markus Elfring
` (16 subsequent siblings)
21 siblings, 0 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 12:53 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 19:54:38 +0100
Replace the specification of a data structure by a pointer dereference
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 8122a1c7d2ae..56f29e06dfe4 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -1595,8 +1595,7 @@ void ocrdma_alloc_pd_pool(struct ocrdma_dev *dev)
{
int status;
- dev->pd_mgr = kzalloc(sizeof(struct ocrdma_pd_resource_mgr),
- GFP_KERNEL);
+ dev->pd_mgr = kzalloc(sizeof(*dev->pd_mgr), GFP_KERNEL);
if (!dev->pd_mgr)
return;
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 07/26] IB/ocrdma: Improve another size determination in ocrdma_mbx_get_ctrl_attribs()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (4 preceding siblings ...)
2017-03-08 12:53 ` [PATCH 06/26] IB/ocrdma: Improve another size determination in ocrdma_alloc_pd_pool() SF Markus Elfring
@ 2017-03-08 12:55 ` SF Markus Elfring
2017-03-08 14:08 ` Yuval Shaia
2017-03-08 13:00 ` [PATCH 09/26] IB/ocrdma: Improve another size determination in ocrdma_mq_cq_handler() SF Markus Elfring
` (15 subsequent siblings)
21 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 12:55 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 20:07:25 +0100
Replace the specification of a data structure by a pointer dereference
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 56f29e06dfe4..1f7d88d7569e 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -1331,7 +1331,7 @@ static int ocrdma_mbx_get_ctrl_attribs(struct ocrdma_dev *dev)
struct ocrdma_get_ctrl_attribs_rsp *ctrl_attr_rsp;
struct mgmt_hba_attribs *hba_attribs;
- mqe = kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL);
+ mqe = kzalloc(sizeof(*mqe), GFP_KERNEL);
if (!mqe)
return status;
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 07/26] IB/ocrdma: Improve another size determination in ocrdma_mbx_get_ctrl_attribs()
2017-03-08 12:55 ` [PATCH 07/26] IB/ocrdma: Improve another size determination in ocrdma_mbx_get_ctrl_attribs() SF Markus Elfring
@ 2017-03-08 14:08 ` Yuval Shaia
0 siblings, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-08 14:08 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 01:55:59PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 20:07:25 +0100
>
> Replace the specification of a data structure by a pointer dereference
> as the parameter for the operator "sizeof" to make the corresponding size
> determination a bit safer according to the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> index 56f29e06dfe4..1f7d88d7569e 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> @@ -1331,7 +1331,7 @@ static int ocrdma_mbx_get_ctrl_attribs(struct ocrdma_dev *dev)
> struct ocrdma_get_ctrl_attribs_rsp *ctrl_attr_rsp;
> struct mgmt_hba_attribs *hba_attribs;
>
> - mqe = kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL);
> + mqe = kzalloc(sizeof(*mqe), GFP_KERNEL);
> if (!mqe)
> return status;
>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 09/26] IB/ocrdma: Improve another size determination in ocrdma_mq_cq_handler()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (5 preceding siblings ...)
2017-03-08 12:55 ` [PATCH 07/26] IB/ocrdma: Improve another size determination in ocrdma_mbx_get_ctrl_attribs() SF Markus Elfring
@ 2017-03-08 13:00 ` SF Markus Elfring
2017-03-08 14:22 ` Yuval Shaia
2017-03-08 13:02 ` [PATCH 10/26] IB/ocrdma: Improve another size determination in ocrdma_init_emb_mqe() SF Markus Elfring
` (14 subsequent siblings)
21 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:00 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 20:20:45 +0100
Replace the specification of a data structure by a pointer dereference
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 0628600bee56..7d1e1caa90de 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -890,7 +890,7 @@ static int ocrdma_mq_cq_handler(struct ocrdma_dev *dev, u16 cq_id)
ocrdma_process_acqe(dev, cqe);
else if (cqe->valid_ae_cmpl_cons & OCRDMA_MCQE_CMPL_MASK)
ocrdma_process_mcqe(dev, cqe);
- memset(cqe, 0, sizeof(struct ocrdma_mcqe));
+ memset(cqe, 0, sizeof(*cqe));
ocrdma_mcq_inc_tail(dev);
}
ocrdma_ring_cq_db(dev, dev->mq.cq.id, true, false, cqe_popped);
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 09/26] IB/ocrdma: Improve another size determination in ocrdma_mq_cq_handler()
2017-03-08 13:00 ` [PATCH 09/26] IB/ocrdma: Improve another size determination in ocrdma_mq_cq_handler() SF Markus Elfring
@ 2017-03-08 14:22 ` Yuval Shaia
0 siblings, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-08 14:22 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 02:00:56PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 20:20:45 +0100
>
> Replace the specification of a data structure by a pointer dereference
> as the parameter for the operator "sizeof" to make the corresponding size
> determination a bit safer according to the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> index 0628600bee56..7d1e1caa90de 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> @@ -890,7 +890,7 @@ static int ocrdma_mq_cq_handler(struct ocrdma_dev *dev, u16 cq_id)
> ocrdma_process_acqe(dev, cqe);
> else if (cqe->valid_ae_cmpl_cons & OCRDMA_MCQE_CMPL_MASK)
> ocrdma_process_mcqe(dev, cqe);
> - memset(cqe, 0, sizeof(struct ocrdma_mcqe));
> + memset(cqe, 0, sizeof(*cqe));
> ocrdma_mcq_inc_tail(dev);
> }
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> ocrdma_ring_cq_db(dev, dev->mq.cq.id, true, false, cqe_popped);
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 10/26] IB/ocrdma: Improve another size determination in ocrdma_init_emb_mqe()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (6 preceding siblings ...)
2017-03-08 13:00 ` [PATCH 09/26] IB/ocrdma: Improve another size determination in ocrdma_mq_cq_handler() SF Markus Elfring
@ 2017-03-08 13:02 ` SF Markus Elfring
2017-03-08 14:22 ` Yuval Shaia
2017-03-08 13:07 ` [PATCH 12/26] IB/ocrdma: Adjust ten checks for null pointers SF Markus Elfring
` (13 subsequent siblings)
21 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:02 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 20:33:29 +0100
Replace the specification of a data structure by a pointer dereference
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 7d1e1caa90de..aa32bc9f323d 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -352,7 +352,7 @@ static void *ocrdma_init_emb_mqe(u8 opcode, u32 cmd_len)
{
struct ocrdma_mqe *mqe;
- mqe = kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL);
+ mqe = kzalloc(sizeof(*mqe), GFP_KERNEL);
if (!mqe)
return NULL;
mqe->hdr.spcl_sge_cnt_emb |--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 10/26] IB/ocrdma: Improve another size determination in ocrdma_init_emb_mqe()
2017-03-08 13:02 ` [PATCH 10/26] IB/ocrdma: Improve another size determination in ocrdma_init_emb_mqe() SF Markus Elfring
@ 2017-03-08 14:22 ` Yuval Shaia
2017-03-08 14:54 ` Devesh Sharma
0 siblings, 1 reply; 88+ messages in thread
From: Yuval Shaia @ 2017-03-08 14:22 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 02:02:46PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 20:33:29 +0100
>
> Replace the specification of a data structure by a pointer dereference
> as the parameter for the operator "sizeof" to make the corresponding size
> determination a bit safer according to the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> index 7d1e1caa90de..aa32bc9f323d 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> @@ -352,7 +352,7 @@ static void *ocrdma_init_emb_mqe(u8 opcode, u32 cmd_len)
> {
> struct ocrdma_mqe *mqe;
>
> - mqe = kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL);
> + mqe = kzalloc(sizeof(*mqe), GFP_KERNEL);
> if (!mqe)
> return NULL;
> mqe->hdr.spcl_sge_cnt_emb |
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 10/26] IB/ocrdma: Improve another size determination in ocrdma_init_emb_mqe()
2017-03-08 14:22 ` Yuval Shaia
@ 2017-03-08 14:54 ` Devesh Sharma
0 siblings, 0 replies; 88+ messages in thread
From: Devesh Sharma @ 2017-03-08 14:54 UTC (permalink / raw)
To: Yuval Shaia
Cc: SF Markus Elfring, linux-rdma, Devesh Sharma, Doug Ledford,
Hal Rosenstock, Sean Hefty, Selvin Xavier, LKML, kernel-janitors
Acked-by: Devesh Sharma <devesh.sharma@broadcom.com>
On Wed, Mar 8, 2017 at 7:52 PM, Yuval Shaia <yuval.shaia@oracle.com> wrote:
> On Wed, Mar 08, 2017 at 02:02:46PM +0100, SF Markus Elfring wrote:
>> From: Markus Elfring <elfring@users.sourceforge.net>
>> Date: Tue, 7 Mar 2017 20:33:29 +0100
>>
>> Replace the specification of a data structure by a pointer dereference
>> as the parameter for the operator "sizeof" to make the corresponding size
>> determination a bit safer according to the Linux coding style convention.
>>
>> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
>> ---
>> drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
>> index 7d1e1caa90de..aa32bc9f323d 100644
>> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
>> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
>> @@ -352,7 +352,7 @@ static void *ocrdma_init_emb_mqe(u8 opcode, u32 cmd_len)
>> {
>> struct ocrdma_mqe *mqe;
>>
>> - mqe = kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL);
>> + mqe = kzalloc(sizeof(*mqe), GFP_KERNEL);
>> if (!mqe)
>> return NULL;
>> mqe->hdr.spcl_sge_cnt_emb |>
> Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
>
>> --
>> 2.12.0
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 12/26] IB/ocrdma: Adjust ten checks for null pointers
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (7 preceding siblings ...)
2017-03-08 13:02 ` [PATCH 10/26] IB/ocrdma: Improve another size determination in ocrdma_init_emb_mqe() SF Markus Elfring
@ 2017-03-08 13:07 ` SF Markus Elfring
[not found] ` <8795100d-0577-bdcf-f4f2-04d04154bf71-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-03-08 13:09 ` [PATCH 13/26] IB/ocrdma: Use kcalloc() in ocrdma_alloc_resources() SF Markus Elfring
` (12 subsequent siblings)
21 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:07 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 21:32:22 +0100
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The script “checkpatch.pl“ pointed information out like the following.
Comparison to NULL could be written !…
Thus fix the affected source code places.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index d5b988b011d1..8c7f0b108a7f 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -665,7 +665,7 @@ static void ocrdma_process_qpcat_error(struct ocrdma_dev *dev,
enum ib_qp_state new_ib_qps = IB_QPS_ERR;
enum ib_qp_state old_ib_qps;
- if (qp = NULL)
+ if (!qp)
BUG();
ocrdma_qp_state_change(qp, new_ib_qps, &old_ib_qps);
}
@@ -693,7 +693,7 @@ static void ocrdma_dispatch_ibevent(struct ocrdma_dev *dev,
if (cqe->qpvalid_qpid & OCRDMA_AE_MCQE_QPVALID) {
if (qpid < dev->attr.max_qp)
qp = dev->qp_tbl[qpid];
- if (qp = NULL) {
+ if (!qp) {
pr_err("ocrdma%d:Async event - qpid %u is not valid\n",
dev->id, qpid);
return;
@@ -703,7 +703,7 @@ static void ocrdma_dispatch_ibevent(struct ocrdma_dev *dev,
if (cqe->cqvalid_cqid & OCRDMA_AE_MCQE_CQVALID) {
if (cqid < dev->attr.max_cq)
cq = dev->cq_tbl[cqid];
- if (cq = NULL) {
+ if (!cq) {
pr_err("ocrdma%d:Async event - cqid %u is not valid\n",
dev->id, cqid);
return;
@@ -882,7 +882,7 @@ static int ocrdma_mq_cq_handler(struct ocrdma_dev *dev, u16 cq_id)
while (1) {
cqe = ocrdma_get_mcqe(dev);
- if (cqe = NULL)
+ if (!cqe)
break;
ocrdma_le32_to_cpu(cqe, sizeof(*cqe));
cqe_popped += 1;
@@ -948,7 +948,7 @@ static void ocrdma_qp_buddy_cq_handler(struct ocrdma_dev *dev,
* false - Check for RQ CQ
*/
bcq = _ocrdma_qp_buddy_cq_handler(dev, cq, true);
- if (bcq = NULL)
+ if (!bcq)
bcq = _ocrdma_qp_buddy_cq_handler(dev, cq, false);
spin_unlock_irqrestore(&dev->flush_q_lock, flags);
@@ -969,7 +969,7 @@ static void ocrdma_qp_cq_handler(struct ocrdma_dev *dev, u16 cq_idx)
BUG();
cq = dev->cq_tbl[cq_idx];
- if (cq = NULL)
+ if (!cq)
return;
if (cq->ibcq.comp_handler) {
@@ -1289,7 +1289,7 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
int status;
old_stats = kmalloc(sizeof(*old_stats), GFP_KERNEL);
- if (old_stats = NULL)
+ if (!old_stats)
return -ENOMEM;
memset(mqe, 0, sizeof(*mqe));
@@ -1676,12 +1676,12 @@ static int ocrdma_mbx_create_ah_tbl(struct ocrdma_dev *dev)
dev->av_tbl.pbl.va = dma_alloc_coherent(&pdev->dev, PAGE_SIZE,
&dev->av_tbl.pbl.pa,
GFP_KERNEL);
- if (dev->av_tbl.pbl.va = NULL)
+ if (!dev->av_tbl.pbl.va)
goto mem_err;
dev->av_tbl.va = dma_alloc_coherent(&pdev->dev, dev->av_tbl.size,
&pa, GFP_KERNEL);
- if (dev->av_tbl.va = NULL)
+ if (!dev->av_tbl.va)
goto mem_err_ah;
dev->av_tbl.pa = pa;
dev->av_tbl.num_ah = max_ah;
@@ -1722,7 +1722,7 @@ static void ocrdma_mbx_delete_ah_tbl(struct ocrdma_dev *dev)
struct ocrdma_delete_ah_tbl *cmd;
struct pci_dev *pdev = dev->nic_info.pdev;
- if (dev->av_tbl.va = NULL)
+ if (!dev->av_tbl.va)
return;
cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_DELETE_AH_TBL, sizeof(*cmd));
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 13/26] IB/ocrdma: Use kcalloc() in ocrdma_alloc_resources()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (8 preceding siblings ...)
2017-03-08 13:07 ` [PATCH 12/26] IB/ocrdma: Adjust ten checks for null pointers SF Markus Elfring
@ 2017-03-08 13:09 ` SF Markus Elfring
[not found] ` <fc421509-4069-da8a-b308-60b49ea91ada-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
` (11 subsequent siblings)
21 siblings, 0 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:09 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 21:55:42 +0100
* Multiplications for the size determination of memory allocations
indicated that array data structures should be processed.
Thus reuse the corresponding function "kcalloc".
This issue was detected by using the Coccinelle software.
* Replace the specification of data types by pointer dereferences
to make the corresponding size determinations a bit safer according to
the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 3e43bdc81e7a..9caa4c564e34 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -225,19 +225,19 @@ static int ocrdma_register_device(struct ocrdma_dev *dev)
static int ocrdma_alloc_resources(struct ocrdma_dev *dev)
{
mutex_init(&dev->dev_lock);
- dev->cq_tbl = kzalloc(sizeof(struct ocrdma_cq *) *
- OCRDMA_MAX_CQ, GFP_KERNEL);
+ dev->cq_tbl = kcalloc(OCRDMA_MAX_CQ, sizeof(*dev->cq_tbl), GFP_KERNEL);
if (!dev->cq_tbl)
goto alloc_err;
if (dev->attr.max_qp) {
- dev->qp_tbl = kzalloc(sizeof(struct ocrdma_qp *) *
- OCRDMA_MAX_QP, GFP_KERNEL);
+ dev->qp_tbl = kcalloc(OCRDMA_MAX_QP, sizeof(*dev->qp_tbl),
+ GFP_KERNEL);
if (!dev->qp_tbl)
goto alloc_err;
}
- dev->stag_arr = kzalloc(sizeof(u64) * OCRDMA_MAX_STAG, GFP_KERNEL);
+ dev->stag_arr = kcalloc(OCRDMA_MAX_STAG, sizeof(*dev->stag_arr),
+ GFP_KERNEL);
if (dev->stag_arr = NULL)
goto alloc_err;
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread[parent not found: <fc421509-4069-da8a-b308-60b49ea91ada-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>]
* [PATCH 03/26] IB/ocrdma: Improve size determinations in ocrdma_mbx_get_dcbx_config()
[not found] ` <fc421509-4069-da8a-b308-60b49ea91ada-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
@ 2017-03-08 12:45 ` SF Markus Elfring
2017-03-08 13:54 ` Yuval Shaia
2017-03-08 12:58 ` [PATCH 08/26] IB/ocrdma: Improve size determinations in ocrdma_mbx_rdma_stats() SF Markus Elfring
` (4 subsequent siblings)
5 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 12:45 UTC (permalink / raw)
To: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Devesh Sharma, Doug Ledford,
Hal Rosenstock, Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors-u79uwXL29TY76Z2rM5mHXA
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 19:09:20 +0100
Replace the specification of data structures by references for variables
as the parameter for the operator "sizeof" to make the corresponding size
determinations a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index d5a3127b6df8..85bebb887c5c 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -2901,9 +2901,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
struct pci_dev *pdev = dev->nic_info.pdev;
struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
- memset(&cmd, 0, sizeof(struct ocrdma_mqe));
- cmd.hdr.pyld_len = max_t (u32, sizeof(struct ocrdma_get_dcbx_cfg_rsp),
- sizeof(struct ocrdma_get_dcbx_cfg_req));
+ memset(&cmd, 0, sizeof(cmd));
+ cmd.hdr.pyld_len = max_t(u32, sizeof(*rsp), sizeof(*req));
req = dma_alloc_coherent(&pdev->dev, cmd.hdr.pyld_len, &pa, GFP_KERNEL);
if (!req) {
status = -ENOMEM;
@@ -2915,8 +2914,7 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
mqe_sge->pa_lo = (u32) (pa & 0xFFFFFFFFUL);
mqe_sge->pa_hi = (u32) upper_32_bits(pa);
mqe_sge->len = cmd.hdr.pyld_len;
-
- memset(req, 0, sizeof(struct ocrdma_get_dcbx_cfg_req));
+ memset(req, 0, sizeof(*req));
ocrdma_init_mch(&req->hdr, OCRDMA_CMD_GET_DCBX_CONFIG,
OCRDMA_SUBSYS_DCBX, cmd.hdr.pyld_len);
req->param_type = ptype;
@@ -2926,9 +2924,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
goto mbx_err;
rsp = (struct ocrdma_get_dcbx_cfg_rsp *)req;
- ocrdma_le32_to_cpu(rsp, sizeof(struct ocrdma_get_dcbx_cfg_rsp));
- memcpy(dcbxcfg, &rsp->cfg, sizeof(struct ocrdma_dcbx_cfg));
-
+ ocrdma_le32_to_cpu(rsp, sizeof(*rsp));
+ memcpy(dcbxcfg, &rsp->cfg, sizeof(*dcbxcfg));
mbx_err:
dma_free_coherent(&pdev->dev, cmd.hdr.pyld_len, req, pa);
mem_err:
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 03/26] IB/ocrdma: Improve size determinations in ocrdma_mbx_get_dcbx_config()
2017-03-08 12:45 ` [PATCH 03/26] IB/ocrdma: Improve size determinations in ocrdma_mbx_get_dcbx_config() SF Markus Elfring
@ 2017-03-08 13:54 ` Yuval Shaia
2017-03-08 14:58 ` Devesh Sharma
0 siblings, 1 reply; 88+ messages in thread
From: Yuval Shaia @ 2017-03-08 13:54 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 01:45:43PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 19:09:20 +0100
>
> Replace the specification of data structures by references for variables
> as the parameter for the operator "sizeof" to make the corresponding size
> determinations a bit safer according to the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> index d5a3127b6df8..85bebb887c5c 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> @@ -2901,9 +2901,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
> struct pci_dev *pdev = dev->nic_info.pdev;
> struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
>
> - memset(&cmd, 0, sizeof(struct ocrdma_mqe));
> - cmd.hdr.pyld_len = max_t (u32, sizeof(struct ocrdma_get_dcbx_cfg_rsp),
> - sizeof(struct ocrdma_get_dcbx_cfg_req));
> + memset(&cmd, 0, sizeof(cmd));
> + cmd.hdr.pyld_len = max_t(u32, sizeof(*rsp), sizeof(*req));
> req = dma_alloc_coherent(&pdev->dev, cmd.hdr.pyld_len, &pa, GFP_KERNEL);
> if (!req) {
> status = -ENOMEM;
> @@ -2915,8 +2914,7 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
> mqe_sge->pa_lo = (u32) (pa & 0xFFFFFFFFUL);
> mqe_sge->pa_hi = (u32) upper_32_bits(pa);
> mqe_sge->len = cmd.hdr.pyld_len;
> -
> - memset(req, 0, sizeof(struct ocrdma_get_dcbx_cfg_req));
> + memset(req, 0, sizeof(*req));
> ocrdma_init_mch(&req->hdr, OCRDMA_CMD_GET_DCBX_CONFIG,
> OCRDMA_SUBSYS_DCBX, cmd.hdr.pyld_len);
> req->param_type = ptype;
> @@ -2926,9 +2924,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
> goto mbx_err;
>
> rsp = (struct ocrdma_get_dcbx_cfg_rsp *)req;
> - ocrdma_le32_to_cpu(rsp, sizeof(struct ocrdma_get_dcbx_cfg_rsp));
> - memcpy(dcbxcfg, &rsp->cfg, sizeof(struct ocrdma_dcbx_cfg));
> -
> + ocrdma_le32_to_cpu(rsp, sizeof(*rsp));
> + memcpy(dcbxcfg, &rsp->cfg, sizeof(*dcbxcfg));
> mbx_err:
> dma_free_coherent(&pdev->dev, cmd.hdr.pyld_len, req, pa);
> mem_err:
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 03/26] IB/ocrdma: Improve size determinations in ocrdma_mbx_get_dcbx_config()
2017-03-08 13:54 ` Yuval Shaia
@ 2017-03-08 14:58 ` Devesh Sharma
0 siblings, 0 replies; 88+ messages in thread
From: Devesh Sharma @ 2017-03-08 14:58 UTC (permalink / raw)
To: Yuval Shaia
Cc: SF Markus Elfring, linux-rdma, Devesh Sharma, Doug Ledford,
Hal Rosenstock, Sean Hefty, Selvin Xavier, LKML, kernel-janitors
Acked-By: Devesh Sharma <devesh.sharma@broadcom.com>
On Wed, Mar 8, 2017 at 7:24 PM, Yuval Shaia <yuval.shaia@oracle.com> wrote:
> On Wed, Mar 08, 2017 at 01:45:43PM +0100, SF Markus Elfring wrote:
>> From: Markus Elfring <elfring@users.sourceforge.net>
>> Date: Tue, 7 Mar 2017 19:09:20 +0100
>>
>> Replace the specification of data structures by references for variables
>> as the parameter for the operator "sizeof" to make the corresponding size
>> determinations a bit safer according to the Linux coding style convention.
>>
>> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
>> ---
>> drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 13 +++++--------
>> 1 file changed, 5 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
>> index d5a3127b6df8..85bebb887c5c 100644
>> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
>> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
>> @@ -2901,9 +2901,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
>> struct pci_dev *pdev = dev->nic_info.pdev;
>> struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
>>
>> - memset(&cmd, 0, sizeof(struct ocrdma_mqe));
>> - cmd.hdr.pyld_len = max_t (u32, sizeof(struct ocrdma_get_dcbx_cfg_rsp),
>> - sizeof(struct ocrdma_get_dcbx_cfg_req));
>> + memset(&cmd, 0, sizeof(cmd));
>> + cmd.hdr.pyld_len = max_t(u32, sizeof(*rsp), sizeof(*req));
>> req = dma_alloc_coherent(&pdev->dev, cmd.hdr.pyld_len, &pa, GFP_KERNEL);
>> if (!req) {
>> status = -ENOMEM;
>> @@ -2915,8 +2914,7 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
>> mqe_sge->pa_lo = (u32) (pa & 0xFFFFFFFFUL);
>> mqe_sge->pa_hi = (u32) upper_32_bits(pa);
>> mqe_sge->len = cmd.hdr.pyld_len;
>> -
>> - memset(req, 0, sizeof(struct ocrdma_get_dcbx_cfg_req));
>> + memset(req, 0, sizeof(*req));
>> ocrdma_init_mch(&req->hdr, OCRDMA_CMD_GET_DCBX_CONFIG,
>> OCRDMA_SUBSYS_DCBX, cmd.hdr.pyld_len);
>> req->param_type = ptype;
>> @@ -2926,9 +2924,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
>> goto mbx_err;
>>
>> rsp = (struct ocrdma_get_dcbx_cfg_rsp *)req;
>> - ocrdma_le32_to_cpu(rsp, sizeof(struct ocrdma_get_dcbx_cfg_rsp));
>> - memcpy(dcbxcfg, &rsp->cfg, sizeof(struct ocrdma_dcbx_cfg));
>> -
>> + ocrdma_le32_to_cpu(rsp, sizeof(*rsp));
>> + memcpy(dcbxcfg, &rsp->cfg, sizeof(*dcbxcfg));
>> mbx_err:
>> dma_free_coherent(&pdev->dev, cmd.hdr.pyld_len, req, pa);
>> mem_err:
>
> Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
>
>> --
>> 2.12.0
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 08/26] IB/ocrdma: Improve size determinations in ocrdma_mbx_rdma_stats()
[not found] ` <fc421509-4069-da8a-b308-60b49ea91ada-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-03-08 12:45 ` [PATCH 03/26] IB/ocrdma: Improve size determinations in ocrdma_mbx_get_dcbx_config() SF Markus Elfring
@ 2017-03-08 12:58 ` SF Markus Elfring
2017-03-08 14:20 ` Yuval Shaia
2017-03-08 13:04 ` [PATCH 11/26] IB/ocrdma: Delete unnecessary braces SF Markus Elfring
` (3 subsequent siblings)
5 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 12:58 UTC (permalink / raw)
To: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Devesh Sharma, Doug Ledford,
Hal Rosenstock, Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors-u79uwXL29TY76Z2rM5mHXA
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 20:16:16 +0100
Replace the specification of two data structures by pointer dereferences
as the parameter for the operator "sizeof" to make the corresponding size
determinations a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 1f7d88d7569e..0628600bee56 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -1302,7 +1302,7 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
mqe->u.nonemb_req.sge[0].len = dev->stats_mem.size;
/* Cache the old stats */
- memcpy(old_stats, req, sizeof(struct ocrdma_rdma_stats_resp));
+ memcpy(old_stats, req, sizeof(*old_stats));
memset(req, 0, dev->stats_mem.size);
ocrdma_init_mch((struct ocrdma_mbx_hdr *)req,
@@ -1315,7 +1315,7 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
status = ocrdma_nonemb_mbx_cmd(dev, mqe, dev->stats_mem.va);
if (status)
/* Copy from cache, if mbox fails */
- memcpy(req, old_stats, sizeof(struct ocrdma_rdma_stats_resp));
+ memcpy(req, old_stats, sizeof(*old_stats));
else
ocrdma_le32_to_cpu(req, dev->stats_mem.size);
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 08/26] IB/ocrdma: Improve size determinations in ocrdma_mbx_rdma_stats()
2017-03-08 12:58 ` [PATCH 08/26] IB/ocrdma: Improve size determinations in ocrdma_mbx_rdma_stats() SF Markus Elfring
@ 2017-03-08 14:20 ` Yuval Shaia
0 siblings, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-08 14:20 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 01:58:49PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 20:16:16 +0100
>
> Replace the specification of two data structures by pointer dereferences
> as the parameter for the operator "sizeof" to make the corresponding size
> determinations a bit safer according to the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> index 1f7d88d7569e..0628600bee56 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> @@ -1302,7 +1302,7 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
> mqe->u.nonemb_req.sge[0].len = dev->stats_mem.size;
>
> /* Cache the old stats */
> - memcpy(old_stats, req, sizeof(struct ocrdma_rdma_stats_resp));
> + memcpy(old_stats, req, sizeof(*old_stats));
Isn't sizeof(req) smaller than sizeof(*old_stats)?
> memset(req, 0, dev->stats_mem.size);
>
> ocrdma_init_mch((struct ocrdma_mbx_hdr *)req,
> @@ -1315,7 +1315,7 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
> status = ocrdma_nonemb_mbx_cmd(dev, mqe, dev->stats_mem.va);
> if (status)
> /* Copy from cache, if mbox fails */
> - memcpy(req, old_stats, sizeof(struct ocrdma_rdma_stats_resp));
> + memcpy(req, old_stats, sizeof(*old_stats));
Fix itself looks fine but original code seems strange and makes me anxious
since resp is (much) bigger than req.
> else
> ocrdma_le32_to_cpu(req, dev->stats_mem.size);
>
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 11/26] IB/ocrdma: Delete unnecessary braces
[not found] ` <fc421509-4069-da8a-b308-60b49ea91ada-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-03-08 12:45 ` [PATCH 03/26] IB/ocrdma: Improve size determinations in ocrdma_mbx_get_dcbx_config() SF Markus Elfring
2017-03-08 12:58 ` [PATCH 08/26] IB/ocrdma: Improve size determinations in ocrdma_mbx_rdma_stats() SF Markus Elfring
@ 2017-03-08 13:04 ` SF Markus Elfring
[not found] ` <c4c62b82-db2a-3db9-03c4-9f8d95a6a29b-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-03-08 13:10 ` [PATCH 14/26] IB/ocrdma: Improve another size determination in ocrdma_add() SF Markus Elfring
` (2 subsequent siblings)
5 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:04 UTC (permalink / raw)
To: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Devesh Sharma, Doug Ledford,
Hal Rosenstock, Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors-u79uwXL29TY76Z2rM5mHXA
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 21:12:56 +0100
Do not use curly brackets at some source code places
where a single statement should be sufficient.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index aa32bc9f323d..d5b988b011d1 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -1092,14 +1092,14 @@ static int ocrdma_mbx_cmd(struct ocrdma_dev *dev, struct ocrdma_mqe *mqe)
if (cqe_status || ext_status) {
pr_err("%s() cqe_status=0x%x, ext_status=0x%x,",
__func__, cqe_status, ext_status);
- if (rsp) {
+ if (rsp)
/* This is for embedded cmds. */
pr_err("opcode=0x%x, subsystem=0x%x\n",
(rsp->subsys_op & OCRDMA_MBX_RSP_OPCODE_MASK) >>
OCRDMA_MBX_RSP_OPCODE_SHIFT,
(rsp->subsys_op & OCRDMA_MBX_RSP_SUBSYS_MASK) >>
OCRDMA_MBX_RSP_SUBSYS_SHIFT);
- }
+
status = ocrdma_get_mbx_cqe_errno(cqe_status);
goto mbx_err;
}
@@ -1600,10 +1600,9 @@ void ocrdma_alloc_pd_pool(struct ocrdma_dev *dev)
return;
status = ocrdma_mbx_alloc_pd_range(dev);
- if (status) {
+ if (status)
pr_err("%s(%d) Unable to initialize PD pool, using default.\n",
__func__, dev->id);
- }
}
static void ocrdma_free_pd_pool(struct ocrdma_dev *dev)
@@ -2997,11 +2996,10 @@ static int ocrdma_parse_dcbxcfg_rsp(struct ocrdma_dev *dev, int ptype,
goto out;
}
}
- if (slindx = OCRDMA_MAX_SERVICE_LEVEL_INDEX) {
+ if (slindx = OCRDMA_MAX_SERVICE_LEVEL_INDEX)
pr_info("%s ocrdma%d application priority not set for 0x%x protocol\n",
dev_name(&dev->nic_info.pdev->dev),
dev->id, proto);
- }
}
}
@@ -3158,16 +3156,17 @@ static int ocrdma_modify_eqd(struct ocrdma_dev *dev, struct ocrdma_eq *eq,
int num)
{
int num_eqs, i = 0;
- if (num > 8) {
+
+ if (num > 8)
while (num) {
num_eqs = min(num, 8);
ocrdma_mbx_modify_eqd(dev, &eq[i], num_eqs);
i += num_eqs;
num -= num_eqs;
}
- } else {
+ else
ocrdma_mbx_modify_eqd(dev, eq, num);
- }
+
return 0;
}
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 14/26] IB/ocrdma: Improve another size determination in ocrdma_add()
[not found] ` <fc421509-4069-da8a-b308-60b49ea91ada-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
` (2 preceding siblings ...)
2017-03-08 13:04 ` [PATCH 11/26] IB/ocrdma: Delete unnecessary braces SF Markus Elfring
@ 2017-03-08 13:10 ` SF Markus Elfring
2017-03-08 14:27 ` Yuval Shaia
2017-03-08 13:20 ` [PATCH 19/26] IB/ocrdma: Improve another size determination in ocrdma_alloc_mr() SF Markus Elfring
2017-03-08 13:34 ` [PATCH 26/26] IB/ocrdma: Adjust further ten checks for null pointers SF Markus Elfring
5 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:10 UTC (permalink / raw)
To: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Devesh Sharma, Doug Ledford,
Hal Rosenstock, Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors-u79uwXL29TY76Z2rM5mHXA
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 22:12:36 +0100
Replace the specification of a data structure by a pointer dereference
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 9caa4c564e34..c49b4491d4e7 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -303,7 +303,7 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
u8 lstate = 0;
struct ocrdma_dev *dev;
- dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(struct ocrdma_dev));
+ dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(*dev));
if (!dev) {
pr_err("Unable to allocate ib device\n");
return NULL;
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 14/26] IB/ocrdma: Improve another size determination in ocrdma_add()
2017-03-08 13:10 ` [PATCH 14/26] IB/ocrdma: Improve another size determination in ocrdma_add() SF Markus Elfring
@ 2017-03-08 14:27 ` Yuval Shaia
0 siblings, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-08 14:27 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 02:10:33PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 22:12:36 +0100
>
> Replace the specification of a data structure by a pointer dereference
> as the parameter for the operator "sizeof" to make the corresponding size
> determination a bit safer according to the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> index 9caa4c564e34..c49b4491d4e7 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> @@ -303,7 +303,7 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
> u8 lstate = 0;
> struct ocrdma_dev *dev;
>
> - dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(struct ocrdma_dev));
> + dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(*dev));
> if (!dev) {
> pr_err("Unable to allocate ib device\n");
> return NULL;
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 19/26] IB/ocrdma: Improve another size determination in ocrdma_alloc_mr()
[not found] ` <fc421509-4069-da8a-b308-60b49ea91ada-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
` (3 preceding siblings ...)
2017-03-08 13:10 ` [PATCH 14/26] IB/ocrdma: Improve another size determination in ocrdma_add() SF Markus Elfring
@ 2017-03-08 13:20 ` SF Markus Elfring
2017-03-08 15:19 ` Devesh Sharma
[not found] ` <efefdc96-2db5-dd80-3cc4-e88537fe2d49-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-03-08 13:34 ` [PATCH 26/26] IB/ocrdma: Adjust further ten checks for null pointers SF Markus Elfring
5 siblings, 2 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:20 UTC (permalink / raw)
To: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Devesh Sharma, Doug Ledford,
Hal Rosenstock, Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors-u79uwXL29TY76Z2rM5mHXA
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Mar 2017 09:54:42 +0100
Replace the specification of a data type by a pointer dereference
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 330617e1ef75..05d55d361cfe 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -3030,7 +3030,7 @@ struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd,
if (!mr)
return ERR_PTR(-ENOMEM);
- mr->pages = kcalloc(max_num_sg, sizeof(u64), GFP_KERNEL);
+ mr->pages = kcalloc(max_num_sg, sizeof(*mr->pages), GFP_KERNEL);
if (!mr->pages) {
status = -ENOMEM;
goto pl_err;
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 19/26] IB/ocrdma: Improve another size determination in ocrdma_alloc_mr()
2017-03-08 13:20 ` [PATCH 19/26] IB/ocrdma: Improve another size determination in ocrdma_alloc_mr() SF Markus Elfring
@ 2017-03-08 15:19 ` Devesh Sharma
[not found] ` <efefdc96-2db5-dd80-3cc4-e88537fe2d49-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
1 sibling, 0 replies; 88+ messages in thread
From: Devesh Sharma @ 2017-03-08 15:19 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
Acked-By: Devesh Sharma <devesh.sharma@broadcom.com>
On Wed, Mar 8, 2017 at 6:50 PM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Mar 2017 09:54:42 +0100
>
> Replace the specification of a data type by a pointer dereference
> as the parameter for the operator "sizeof" to make the corresponding size
> determination a bit safer according to the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index 330617e1ef75..05d55d361cfe 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -3030,7 +3030,7 @@ struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd,
> if (!mr)
> return ERR_PTR(-ENOMEM);
>
> - mr->pages = kcalloc(max_num_sg, sizeof(u64), GFP_KERNEL);
> + mr->pages = kcalloc(max_num_sg, sizeof(*mr->pages), GFP_KERNEL);
> if (!mr->pages) {
> status = -ENOMEM;
> goto pl_err;
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread[parent not found: <efefdc96-2db5-dd80-3cc4-e88537fe2d49-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>]
* Re: [PATCH 19/26] IB/ocrdma: Improve another size determination in ocrdma_alloc_mr()
[not found] ` <efefdc96-2db5-dd80-3cc4-e88537fe2d49-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
@ 2017-03-09 12:03 ` Yuval Shaia
0 siblings, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-09 12:03 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Devesh Sharma, Doug Ledford,
Hal Rosenstock, Sean Hefty, Selvin Xavier, LKML,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA
On Wed, Mar 08, 2017 at 02:20:42PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Mar 2017 09:54:42 +0100
>
> Replace the specification of a data type by a pointer dereference
> as the parameter for the operator "sizeof" to make the corresponding size
> determination a bit safer according to the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index 330617e1ef75..05d55d361cfe 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -3030,7 +3030,7 @@ struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd,
> if (!mr)
> return ERR_PTR(-ENOMEM);
>
> - mr->pages = kcalloc(max_num_sg, sizeof(u64), GFP_KERNEL);
> + mr->pages = kcalloc(max_num_sg, sizeof(*mr->pages), GFP_KERNEL);
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> if (!mr->pages) {
> status = -ENOMEM;
> goto pl_err;
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 26/26] IB/ocrdma: Adjust further ten checks for null pointers
[not found] ` <fc421509-4069-da8a-b308-60b49ea91ada-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
` (4 preceding siblings ...)
2017-03-08 13:20 ` [PATCH 19/26] IB/ocrdma: Improve another size determination in ocrdma_alloc_mr() SF Markus Elfring
@ 2017-03-08 13:34 ` SF Markus Elfring
[not found] ` <19973137-7453-6a50-822a-c3a075e1c18f-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
5 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:34 UTC (permalink / raw)
To: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Devesh Sharma, Doug Ledford,
Hal Rosenstock, Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors-u79uwXL29TY76Z2rM5mHXA
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Mar 2017 12:50:14 +0100
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The script “checkpatch.pl“ pointed information out like the following.
Comparison to NULL could be written !…
Thus fix affected source code places.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index bfd86fd08847..bd719e7f134e 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -267,7 +267,7 @@ static int ocrdma_add_mmap(struct ocrdma_ucontext *uctx, u64 phy_addr,
struct ocrdma_mm *mm;
mm = kzalloc(sizeof(*mm), GFP_KERNEL);
- if (mm = NULL)
+ if (!mm)
return -ENOMEM;
mm->key.phy_addr = phy_addr;
mm->key.len = len;
@@ -1187,7 +1187,7 @@ static int ocrdma_add_qpn_map(struct ocrdma_dev *dev, struct ocrdma_qp *qp)
{
int status = -EINVAL;
- if (qp->id < OCRDMA_MAX_QP && dev->qp_tbl[qp->id] = NULL) {
+ if (qp->id < OCRDMA_MAX_QP && !dev->qp_tbl[qp->id]) {
dev->qp_tbl[qp->id] = qp;
status = 0;
}
@@ -1355,11 +1355,11 @@ static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp)
{
qp->wqe_wr_id_tbl = kcalloc(qp->sq.max_cnt, sizeof(*qp->wqe_wr_id_tbl),
GFP_KERNEL);
- if (qp->wqe_wr_id_tbl = NULL)
+ if (!qp->wqe_wr_id_tbl)
return -ENOMEM;
qp->rqe_wr_id_tbl = kcalloc(qp->rq.max_cnt, sizeof(*qp->rqe_wr_id_tbl),
GFP_KERNEL);
- if (qp->rqe_wr_id_tbl = NULL)
+ if (!qp->rqe_wr_id_tbl)
return -ENOMEM;
return 0;
@@ -1419,7 +1419,7 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd,
goto gen_err;
}
ocrdma_set_qp_init_params(qp, pd, attrs);
- if (udata = NULL)
+ if (!udata)
qp->cap_flags |= (OCRDMA_QP_MW_BIND | OCRDMA_QP_LKEY0 |
OCRDMA_QP_FAST_REG);
@@ -1431,7 +1431,7 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd,
goto mbx_err;
/* user space QP's wr_id table are managed in library */
- if (udata = NULL) {
+ if (!udata) {
status = ocrdma_alloc_wr_id_tbl(qp);
if (status)
goto map_err;
@@ -1892,11 +1892,11 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
if (status)
goto err;
- if (udata = NULL) {
+ if (!udata) {
srq->rqe_wr_id_tbl = kcalloc(srq->rq.max_cnt,
sizeof(*srq->rqe_wr_id_tbl),
GFP_KERNEL);
- if (srq->rqe_wr_id_tbl = NULL)
+ if (!srq->rqe_wr_id_tbl)
goto arm_err;
srq->bit_fields_len = (srq->rq.max_cnt / 32) +
@@ -1904,7 +1904,7 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
srq->idx_bit_fields = kmalloc_array(srq->bit_fields_len,
sizeof(*srq->idx_bit_fields),
GFP_KERNEL);
- if (srq->idx_bit_fields = NULL)
+ if (!srq->idx_bit_fields)
goto arm_err;
memset(srq->idx_bit_fields, 0xff,
srq->bit_fields_len * sizeof(*srq->idx_bit_fields));
@@ -2878,7 +2878,7 @@ static int ocrdma_poll_hwcq(struct ocrdma_cq *cq, int num_entries,
if (qpn = 0)
goto skip_cqe;
qp = dev->qp_tbl[qpn];
- BUG_ON(qp = NULL);
+ BUG_ON(!qp);
expand = is_cqe_for_sq(cqe)
? ocrdma_poll_scqe(qp, cqe, ibwc, &polled, &stop)
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [PATCH 15/26] IB/ocrdma: Delete an error message for a failed memory allocation in ocrdma_add()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (10 preceding siblings ...)
[not found] ` <fc421509-4069-da8a-b308-60b49ea91ada-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
@ 2017-03-08 13:13 ` SF Markus Elfring
2017-03-08 15:15 ` Devesh Sharma
2017-03-08 15:26 ` Yuval Shaia
2017-03-08 13:15 ` [PATCH 16/26] IB/ocrdma: Adjust a null pointer check in ocrdma_alloc_resources() SF Markus Elfring
` (9 subsequent siblings)
21 siblings, 2 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:13 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors, Wolfram Sang
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 22:23:17 +0100
Omit an extra message for a memory allocation failure in this function.
Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index c49b4491d4e7..93113feeb2d5 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -304,10 +304,9 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
struct ocrdma_dev *dev;
dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(*dev));
- if (!dev) {
- pr_err("Unable to allocate ib device\n");
+ if (!dev)
return NULL;
- }
+
dev->mbx_cmd = kzalloc(sizeof(struct ocrdma_mqe_emb_cmd), GFP_KERNEL);
if (!dev->mbx_cmd)
goto idr_err;
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 15/26] IB/ocrdma: Delete an error message for a failed memory allocation in ocrdma_add()
2017-03-08 13:13 ` [PATCH 15/26] IB/ocrdma: Delete an error message for a failed memory allocation in ocrdma_add() SF Markus Elfring
@ 2017-03-08 15:15 ` Devesh Sharma
2017-03-08 15:26 ` Yuval Shaia
1 sibling, 0 replies; 88+ messages in thread
From: Devesh Sharma @ 2017-03-08 15:15 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors, Wolfram Sang
Acked-By: Devesh sharma <devesh.sharma@broadcom.com>
On Wed, Mar 8, 2017 at 6:43 PM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 22:23:17 +0100
>
> Omit an extra message for a memory allocation failure in this function.
>
> Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_main.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> index c49b4491d4e7..93113feeb2d5 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> @@ -304,10 +304,9 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
> struct ocrdma_dev *dev;
>
> dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(*dev));
> - if (!dev) {
> - pr_err("Unable to allocate ib device\n");
> + if (!dev)
> return NULL;
> - }
> +
> dev->mbx_cmd = kzalloc(sizeof(struct ocrdma_mqe_emb_cmd), GFP_KERNEL);
> if (!dev->mbx_cmd)
> goto idr_err;
> --
> 2.12.0
>
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 15/26] IB/ocrdma: Delete an error message for a failed memory allocation in ocrdma_add()
2017-03-08 13:13 ` [PATCH 15/26] IB/ocrdma: Delete an error message for a failed memory allocation in ocrdma_add() SF Markus Elfring
2017-03-08 15:15 ` Devesh Sharma
@ 2017-03-08 15:26 ` Yuval Shaia
1 sibling, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-08 15:26 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors, Wolfram Sang
On Wed, Mar 08, 2017 at 02:13:11PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 22:23:17 +0100
>
> Omit an extra message for a memory allocation failure in this function.
>
> Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
Suggesting to add blank line here.
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_main.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> index c49b4491d4e7..93113feeb2d5 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> @@ -304,10 +304,9 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
> struct ocrdma_dev *dev;
>
> dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(*dev));
> - if (!dev) {
> - pr_err("Unable to allocate ib device\n");
> + if (!dev)
> return NULL;
> - }
> +
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> dev->mbx_cmd = kzalloc(sizeof(struct ocrdma_mqe_emb_cmd), GFP_KERNEL);
> if (!dev->mbx_cmd)
> goto idr_err;
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 16/26] IB/ocrdma: Adjust a null pointer check in ocrdma_alloc_resources()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (11 preceding siblings ...)
2017-03-08 13:13 ` [PATCH 15/26] IB/ocrdma: Delete an error message for a failed memory allocation in ocrdma_add() SF Markus Elfring
@ 2017-03-08 13:15 ` SF Markus Elfring
2017-03-08 15:15 ` Devesh Sharma
[not found] ` <54750756-91cd-b508-109a-83b7b2375193-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-03-08 13:17 ` [PATCH 17/26] IB/ocrdma: Use kmalloc_array() in ocrdma_create_srq() SF Markus Elfring
` (8 subsequent siblings)
21 siblings, 2 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:15 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Mar 2017 22:34:33 +0100
The script "checkpatch.pl" pointed information out like the following.
Comparison to NULL could be written "!dev->stag_arr".
Thus fix the affected source code place.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 93113feeb2d5..fbf672c79d5f 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -238,7 +238,7 @@ static int ocrdma_alloc_resources(struct ocrdma_dev *dev)
dev->stag_arr = kcalloc(OCRDMA_MAX_STAG, sizeof(*dev->stag_arr),
GFP_KERNEL);
- if (dev->stag_arr = NULL)
+ if (!dev->stag_arr)
goto alloc_err;
ocrdma_alloc_pd_pool(dev);
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 16/26] IB/ocrdma: Adjust a null pointer check in ocrdma_alloc_resources()
2017-03-08 13:15 ` [PATCH 16/26] IB/ocrdma: Adjust a null pointer check in ocrdma_alloc_resources() SF Markus Elfring
@ 2017-03-08 15:15 ` Devesh Sharma
[not found] ` <54750756-91cd-b508-109a-83b7b2375193-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
1 sibling, 0 replies; 88+ messages in thread
From: Devesh Sharma @ 2017-03-08 15:15 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
Acked-By: Devesh Sharma <devesh.sharma@broadcom.com>
On Wed, Mar 8, 2017 at 6:45 PM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 22:34:33 +0100
>
> The script "checkpatch.pl" pointed information out like the following.
>
> Comparison to NULL could be written "!dev->stag_arr".
>
> Thus fix the affected source code place.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> index 93113feeb2d5..fbf672c79d5f 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> @@ -238,7 +238,7 @@ static int ocrdma_alloc_resources(struct ocrdma_dev *dev)
>
> dev->stag_arr = kcalloc(OCRDMA_MAX_STAG, sizeof(*dev->stag_arr),
> GFP_KERNEL);
> - if (dev->stag_arr = NULL)
> + if (!dev->stag_arr)
> goto alloc_err;
>
> ocrdma_alloc_pd_pool(dev);
> --
> 2.12.0
>
^ permalink raw reply [flat|nested] 88+ messages in thread[parent not found: <54750756-91cd-b508-109a-83b7b2375193-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>]
* Re: [PATCH 16/26] IB/ocrdma: Adjust a null pointer check in ocrdma_alloc_resources()
[not found] ` <54750756-91cd-b508-109a-83b7b2375193-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
@ 2017-03-09 11:42 ` Yuval Shaia
0 siblings, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-09 11:42 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Devesh Sharma, Doug Ledford,
Hal Rosenstock, Sean Hefty, Selvin Xavier, LKML,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA
On Wed, Mar 08, 2017 at 02:15:34PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 7 Mar 2017 22:34:33 +0100
>
> The script "checkpatch.pl" pointed information out like the following.
>
> Comparison to NULL could be written "!dev->stag_arr".
>
> Thus fix the affected source code place.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> index 93113feeb2d5..fbf672c79d5f 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> @@ -238,7 +238,7 @@ static int ocrdma_alloc_resources(struct ocrdma_dev *dev)
>
> dev->stag_arr = kcalloc(OCRDMA_MAX_STAG, sizeof(*dev->stag_arr),
> GFP_KERNEL);
> - if (dev->stag_arr = NULL)
> + if (!dev->stag_arr)
> goto alloc_err;
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
>
> ocrdma_alloc_pd_pool(dev);
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 17/26] IB/ocrdma: Use kmalloc_array() in ocrdma_create_srq()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (12 preceding siblings ...)
2017-03-08 13:15 ` [PATCH 16/26] IB/ocrdma: Adjust a null pointer check in ocrdma_alloc_resources() SF Markus Elfring
@ 2017-03-08 13:17 ` SF Markus Elfring
[not found] ` <b621d28f-08b5-8d4a-e6ea-b1208f10bb85-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-03-08 13:19 ` [PATCH 18/26] IB/ocrdma: Use kcalloc() in three functions SF Markus Elfring
` (7 subsequent siblings)
21 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:17 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Mar 2017 08:45:31 +0100
* A multiplication for the size determination of a memory allocation
indicated that an array data structure should be processed.
Thus use the corresponding function "kmalloc_array".
This issue was detected by using the Coccinelle software.
* Replace the specification of a data type by a pointer dereference
to make the corresponding size determination a bit safer according to
the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index bc9fb144e57b..ef670ac1cbe9 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1910,8 +1910,9 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
srq->bit_fields_len = (srq->rq.max_cnt / 32) +
(srq->rq.max_cnt % 32 ? 1 : 0);
- srq->idx_bit_fields - kmalloc(srq->bit_fields_len * sizeof(u32), GFP_KERNEL);
+ srq->idx_bit_fields = kmalloc_array(srq->bit_fields_len,
+ sizeof(*srq->idx_bit_fields),
+ GFP_KERNEL);
if (srq->idx_bit_fields = NULL)
goto arm_err;
memset(srq->idx_bit_fields, 0xff,
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 18/26] IB/ocrdma: Use kcalloc() in three functions
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (13 preceding siblings ...)
2017-03-08 13:17 ` [PATCH 17/26] IB/ocrdma: Use kmalloc_array() in ocrdma_create_srq() SF Markus Elfring
@ 2017-03-08 13:19 ` SF Markus Elfring
2017-03-08 15:22 ` Devesh Sharma
2017-03-08 13:22 ` [PATCH 20/26] IB/ocrdma: Delete an unnecessary variable assignment in ocrdma_alloc_mr() SF Markus Elfring
` (6 subsequent siblings)
21 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:19 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Mar 2017 09:19:47 +0100
* Multiplications for the size determination of memory allocations
indicated that array data structures should be processed.
Thus reuse the corresponding function "kcalloc".
This issue was detected by using the Coccinelle software.
* Replace the specification of data types by pointer dereferences
to make the corresponding size determinations a bit safer according to
the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index ef670ac1cbe9..330617e1ef75 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -879,9 +879,8 @@ static int ocrdma_build_pbl_tbl(struct ocrdma_dev *dev, struct ocrdma_hw_mr *mr)
void *va;
dma_addr_t pa;
- mr->pbl_table = kzalloc(sizeof(struct ocrdma_pbl) *
- mr->num_pbls, GFP_KERNEL);
-
+ mr->pbl_table = kcalloc(mr->num_pbls, sizeof(*mr->pbl_table),
+ GFP_KERNEL);
if (!mr->pbl_table)
return -ENOMEM;
@@ -1362,13 +1361,12 @@ static void ocrdma_set_qp_db(struct ocrdma_dev *dev, struct ocrdma_qp *qp,
static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp)
{
- qp->wqe_wr_id_tbl - kzalloc(sizeof(*(qp->wqe_wr_id_tbl)) * qp->sq.max_cnt,
- GFP_KERNEL);
+ qp->wqe_wr_id_tbl = kcalloc(qp->sq.max_cnt, sizeof(*qp->wqe_wr_id_tbl),
+ GFP_KERNEL);
if (qp->wqe_wr_id_tbl = NULL)
return -ENOMEM;
- qp->rqe_wr_id_tbl - kzalloc(sizeof(u64) * qp->rq.max_cnt, GFP_KERNEL);
+ qp->rqe_wr_id_tbl = kcalloc(qp->rq.max_cnt, sizeof(*qp->rqe_wr_id_tbl),
+ GFP_KERNEL);
if (qp->rqe_wr_id_tbl = NULL)
return -ENOMEM;
@@ -1903,8 +1901,9 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
goto err;
if (udata = NULL) {
- srq->rqe_wr_id_tbl = kzalloc(sizeof(u64) * srq->rq.max_cnt,
- GFP_KERNEL);
+ srq->rqe_wr_id_tbl = kcalloc(srq->rq.max_cnt,
+ sizeof(*srq->rqe_wr_id_tbl),
+ GFP_KERNEL);
if (srq->rqe_wr_id_tbl = NULL)
goto arm_err;
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 18/26] IB/ocrdma: Use kcalloc() in three functions
2017-03-08 13:19 ` [PATCH 18/26] IB/ocrdma: Use kcalloc() in three functions SF Markus Elfring
@ 2017-03-08 15:22 ` Devesh Sharma
0 siblings, 0 replies; 88+ messages in thread
From: Devesh Sharma @ 2017-03-08 15:22 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
Acked-By:Devesh Sharma <devesh.sharma@broadcom.com>
On Wed, Mar 8, 2017 at 6:49 PM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Mar 2017 09:19:47 +0100
>
> * Multiplications for the size determination of memory allocations
> indicated that array data structures should be processed.
> Thus reuse the corresponding function "kcalloc".
>
> This issue was detected by using the Coccinelle software.
>
> * Replace the specification of data types by pointer dereferences
> to make the corresponding size determinations a bit safer according to
> the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index ef670ac1cbe9..330617e1ef75 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -879,9 +879,8 @@ static int ocrdma_build_pbl_tbl(struct ocrdma_dev *dev, struct ocrdma_hw_mr *mr)
> void *va;
> dma_addr_t pa;
>
> - mr->pbl_table = kzalloc(sizeof(struct ocrdma_pbl) *
> - mr->num_pbls, GFP_KERNEL);
> -
> + mr->pbl_table = kcalloc(mr->num_pbls, sizeof(*mr->pbl_table),
> + GFP_KERNEL);
> if (!mr->pbl_table)
> return -ENOMEM;
>
> @@ -1362,13 +1361,12 @@ static void ocrdma_set_qp_db(struct ocrdma_dev *dev, struct ocrdma_qp *qp,
>
> static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp)
> {
> - qp->wqe_wr_id_tbl > - kzalloc(sizeof(*(qp->wqe_wr_id_tbl)) * qp->sq.max_cnt,
> - GFP_KERNEL);
> + qp->wqe_wr_id_tbl = kcalloc(qp->sq.max_cnt, sizeof(*qp->wqe_wr_id_tbl),
> + GFP_KERNEL);
> if (qp->wqe_wr_id_tbl = NULL)
> return -ENOMEM;
> - qp->rqe_wr_id_tbl > - kzalloc(sizeof(u64) * qp->rq.max_cnt, GFP_KERNEL);
> + qp->rqe_wr_id_tbl = kcalloc(qp->rq.max_cnt, sizeof(*qp->rqe_wr_id_tbl),
> + GFP_KERNEL);
> if (qp->rqe_wr_id_tbl = NULL)
> return -ENOMEM;
>
> @@ -1903,8 +1901,9 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
> goto err;
>
> if (udata = NULL) {
> - srq->rqe_wr_id_tbl = kzalloc(sizeof(u64) * srq->rq.max_cnt,
> - GFP_KERNEL);
> + srq->rqe_wr_id_tbl = kcalloc(srq->rq.max_cnt,
> + sizeof(*srq->rqe_wr_id_tbl),
> + GFP_KERNEL);
> if (srq->rqe_wr_id_tbl = NULL)
> goto arm_err;
>
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 20/26] IB/ocrdma: Delete an unnecessary variable assignment in ocrdma_alloc_mr()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (14 preceding siblings ...)
2017-03-08 13:19 ` [PATCH 18/26] IB/ocrdma: Use kcalloc() in three functions SF Markus Elfring
@ 2017-03-08 13:22 ` SF Markus Elfring
2017-03-08 15:25 ` Devesh Sharma
2017-03-09 11:59 ` Yuval Shaia
2017-03-08 13:24 ` [PATCH 21/26] IB/ocrdma: Improve another size determination in ocrdma_create_srq() SF Markus Elfring
` (5 subsequent siblings)
21 siblings, 2 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:22 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Mar 2017 10:00:41 +0100
Delete an assignment for the local variable "status" in an if branch
because the desired failure indication is already specified by a constant
error code at the end.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 05d55d361cfe..af8798fd35b1 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -3031,10 +3031,8 @@ struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd,
return ERR_PTR(-ENOMEM);
mr->pages = kcalloc(max_num_sg, sizeof(*mr->pages), GFP_KERNEL);
- if (!mr->pages) {
- status = -ENOMEM;
+ if (!mr->pages)
goto pl_err;
- }
status = ocrdma_get_pbl_info(dev, mr, max_num_sg);
if (status)
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 20/26] IB/ocrdma: Delete an unnecessary variable assignment in ocrdma_alloc_mr()
2017-03-08 13:22 ` [PATCH 20/26] IB/ocrdma: Delete an unnecessary variable assignment in ocrdma_alloc_mr() SF Markus Elfring
@ 2017-03-08 15:25 ` Devesh Sharma
2017-03-09 11:59 ` Yuval Shaia
1 sibling, 0 replies; 88+ messages in thread
From: Devesh Sharma @ 2017-03-08 15:25 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
Acked-By: Devesh Sharma <devesh.sharma@broadcom.com>
On Wed, Mar 8, 2017 at 6:52 PM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Mar 2017 10:00:41 +0100
>
> Delete an assignment for the local variable "status" in an if branch
> because the desired failure indication is already specified by a constant
> error code at the end.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index 05d55d361cfe..af8798fd35b1 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -3031,10 +3031,8 @@ struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd,
> return ERR_PTR(-ENOMEM);
>
> mr->pages = kcalloc(max_num_sg, sizeof(*mr->pages), GFP_KERNEL);
> - if (!mr->pages) {
> - status = -ENOMEM;
> + if (!mr->pages)
> goto pl_err;
> - }
>
> status = ocrdma_get_pbl_info(dev, mr, max_num_sg);
> if (status)
> --
> 2.12.0
>
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 20/26] IB/ocrdma: Delete an unnecessary variable assignment in ocrdma_alloc_mr()
2017-03-08 13:22 ` [PATCH 20/26] IB/ocrdma: Delete an unnecessary variable assignment in ocrdma_alloc_mr() SF Markus Elfring
2017-03-08 15:25 ` Devesh Sharma
@ 2017-03-09 11:59 ` Yuval Shaia
1 sibling, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-09 11:59 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 02:22:21PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Mar 2017 10:00:41 +0100
>
> Delete an assignment for the local variable "status" in an if branch
> because the desired failure indication is already specified by a constant
> error code at the end.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index 05d55d361cfe..af8798fd35b1 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -3031,10 +3031,8 @@ struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd,
> return ERR_PTR(-ENOMEM);
>
> mr->pages = kcalloc(max_num_sg, sizeof(*mr->pages), GFP_KERNEL);
> - if (!mr->pages) {
> - status = -ENOMEM;
> + if (!mr->pages)
> goto pl_err;
> - }
>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> status = ocrdma_get_pbl_info(dev, mr, max_num_sg);
> if (status)
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 21/26] IB/ocrdma: Improve another size determination in ocrdma_create_srq()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (15 preceding siblings ...)
2017-03-08 13:22 ` [PATCH 20/26] IB/ocrdma: Delete an unnecessary variable assignment in ocrdma_alloc_mr() SF Markus Elfring
@ 2017-03-08 13:24 ` SF Markus Elfring
[not found] ` <53b2ab35-8b0c-5cdd-dbc9-d38c7cf9e580-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-03-09 11:46 ` Yuval Shaia
2017-03-08 13:26 ` [PATCH 22/26] IB/ocrdma: Returning only value constants in ocrdma_resize_cq() SF Markus Elfring
` (4 subsequent siblings)
21 siblings, 2 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:24 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Mar 2017 10:10:50 +0100
Replace the specification of a data type by a pointer dereference
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index af8798fd35b1..bedc229be89d 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1915,7 +1915,7 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
if (srq->idx_bit_fields = NULL)
goto arm_err;
memset(srq->idx_bit_fields, 0xff,
- srq->bit_fields_len * sizeof(u32));
+ srq->bit_fields_len * sizeof(*srq->idx_bit_fields));
}
if (init_attr->attr.srq_limit) {
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread[parent not found: <53b2ab35-8b0c-5cdd-dbc9-d38c7cf9e580-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>]
* Re: [PATCH 21/26] IB/ocrdma: Improve another size determination in ocrdma_create_srq()
[not found] ` <53b2ab35-8b0c-5cdd-dbc9-d38c7cf9e580-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
@ 2017-03-08 15:27 ` Devesh Sharma
0 siblings, 0 replies; 88+ messages in thread
From: Devesh Sharma @ 2017-03-08 15:27 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA
Acked-By: Devesh Sharma <devesh.sharma@broadcom.com>
On Wed, Mar 8, 2017 at 6:54 PM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Mar 2017 10:10:50 +0100
>
> Replace the specification of a data type by a pointer dereference
> as the parameter for the operator "sizeof" to make the corresponding size
> determination a bit safer according to the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index af8798fd35b1..bedc229be89d 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -1915,7 +1915,7 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
> if (srq->idx_bit_fields = NULL)
> goto arm_err;
> memset(srq->idx_bit_fields, 0xff,
> - srq->bit_fields_len * sizeof(u32));
> + srq->bit_fields_len * sizeof(*srq->idx_bit_fields));
> }
>
> if (init_attr->attr.srq_limit) {
> --
> 2.12.0
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [PATCH 21/26] IB/ocrdma: Improve another size determination in ocrdma_create_srq()
2017-03-08 13:24 ` [PATCH 21/26] IB/ocrdma: Improve another size determination in ocrdma_create_srq() SF Markus Elfring
[not found] ` <53b2ab35-8b0c-5cdd-dbc9-d38c7cf9e580-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
@ 2017-03-09 11:46 ` Yuval Shaia
1 sibling, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-09 11:46 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 02:24:00PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Mar 2017 10:10:50 +0100
>
> Replace the specification of a data type by a pointer dereference
> as the parameter for the operator "sizeof" to make the corresponding size
> determination a bit safer according to the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index af8798fd35b1..bedc229be89d 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -1915,7 +1915,7 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
> if (srq->idx_bit_fields = NULL)
> goto arm_err;
> memset(srq->idx_bit_fields, 0xff,
> - srq->bit_fields_len * sizeof(u32));
> + srq->bit_fields_len * sizeof(*srq->idx_bit_fields));
> }
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
>
> if (init_attr->attr.srq_limit) {
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 22/26] IB/ocrdma: Returning only value constants in ocrdma_resize_cq()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (16 preceding siblings ...)
2017-03-08 13:24 ` [PATCH 21/26] IB/ocrdma: Improve another size determination in ocrdma_create_srq() SF Markus Elfring
@ 2017-03-08 13:26 ` SF Markus Elfring
2017-03-08 15:28 ` Devesh Sharma
[not found] ` <dd638070-d1d6-44e8-6c10-16919b59482c-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-03-08 13:28 ` [PATCH 23/26] IB/ocrdma: Delete an unnecessary variable in ocrdma_dealloc_pd() SF Markus Elfring
` (3 subsequent siblings)
21 siblings, 2 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:26 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Mar 2017 10:48:24 +0100
Return constant integer values without storing them in the local
variable "status".
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index bedc229be89d..1d25512416f5 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1123,15 +1123,12 @@ struct ib_cq *ocrdma_create_cq(struct ib_device *ibdev,
int ocrdma_resize_cq(struct ib_cq *ibcq, int new_cnt,
struct ib_udata *udata)
{
- int status = 0;
struct ocrdma_cq *cq = get_ocrdma_cq(ibcq);
- if (new_cnt < 1 || new_cnt > cq->max_hw_cqe) {
- status = -EINVAL;
- return status;
- }
+ if (new_cnt < 1 || new_cnt > cq->max_hw_cqe)
+ return -EINVAL;
ibcq->cqe = new_cnt;
- return status;
+ return 0;
}
static void ocrdma_flush_cq(struct ocrdma_cq *cq)
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 22/26] IB/ocrdma: Returning only value constants in ocrdma_resize_cq()
2017-03-08 13:26 ` [PATCH 22/26] IB/ocrdma: Returning only value constants in ocrdma_resize_cq() SF Markus Elfring
@ 2017-03-08 15:28 ` Devesh Sharma
[not found] ` <dd638070-d1d6-44e8-6c10-16919b59482c-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
1 sibling, 0 replies; 88+ messages in thread
From: Devesh Sharma @ 2017-03-08 15:28 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
Acked-By:Devesh Sharma <devesh.sharma@broadcom.com>
On Wed, Mar 8, 2017 at 6:56 PM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Mar 2017 10:48:24 +0100
>
> Return constant integer values without storing them in the local
> variable "status".
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index bedc229be89d..1d25512416f5 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -1123,15 +1123,12 @@ struct ib_cq *ocrdma_create_cq(struct ib_device *ibdev,
> int ocrdma_resize_cq(struct ib_cq *ibcq, int new_cnt,
> struct ib_udata *udata)
> {
> - int status = 0;
> struct ocrdma_cq *cq = get_ocrdma_cq(ibcq);
>
> - if (new_cnt < 1 || new_cnt > cq->max_hw_cqe) {
> - status = -EINVAL;
> - return status;
> - }
> + if (new_cnt < 1 || new_cnt > cq->max_hw_cqe)
> + return -EINVAL;
> ibcq->cqe = new_cnt;
> - return status;
> + return 0;
> }
>
> static void ocrdma_flush_cq(struct ocrdma_cq *cq)
> --
> 2.12.0
>
^ permalink raw reply [flat|nested] 88+ messages in thread[parent not found: <dd638070-d1d6-44e8-6c10-16919b59482c-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>]
* Re: [PATCH 22/26] IB/ocrdma: Returning only value constants in ocrdma_resize_cq()
[not found] ` <dd638070-d1d6-44e8-6c10-16919b59482c-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
@ 2017-03-09 12:01 ` Yuval Shaia
0 siblings, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-09 12:01 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Devesh Sharma, Doug Ledford,
Hal Rosenstock, Sean Hefty, Selvin Xavier, LKML,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA
On Wed, Mar 08, 2017 at 02:26:16PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Mar 2017 10:48:24 +0100
>
> Return constant integer values without storing them in the local
> variable "status".
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index bedc229be89d..1d25512416f5 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -1123,15 +1123,12 @@ struct ib_cq *ocrdma_create_cq(struct ib_device *ibdev,
> int ocrdma_resize_cq(struct ib_cq *ibcq, int new_cnt,
> struct ib_udata *udata)
> {
> - int status = 0;
> struct ocrdma_cq *cq = get_ocrdma_cq(ibcq);
>
> - if (new_cnt < 1 || new_cnt > cq->max_hw_cqe) {
> - status = -EINVAL;
> - return status;
> - }
> + if (new_cnt < 1 || new_cnt > cq->max_hw_cqe)
> + return -EINVAL;
> ibcq->cqe = new_cnt;
> - return status;
> + return 0;
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> }
>
> static void ocrdma_flush_cq(struct ocrdma_cq *cq)
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 23/26] IB/ocrdma: Delete an unnecessary variable in ocrdma_dealloc_pd()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (17 preceding siblings ...)
2017-03-08 13:26 ` [PATCH 22/26] IB/ocrdma: Returning only value constants in ocrdma_resize_cq() SF Markus Elfring
@ 2017-03-08 13:28 ` SF Markus Elfring
2017-03-08 15:28 ` Devesh Sharma
2017-03-09 11:57 ` Yuval Shaia
2017-03-08 13:30 ` [PATCH 24/26] IB/ocrdma: One jump label less in ocrdma_alloc_ucontext_pd() SF Markus Elfring
` (2 subsequent siblings)
21 siblings, 2 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:28 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Mar 2017 10:58:34 +0100
1. Return zero in one case directly.
2. Return the value from a call of the function "_ocrdma_dealloc_pd"
without using an extra assignment for the local variable.
3. Remove the variable "status" in this function then.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 1d25512416f5..ae0d343d1731 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -755,7 +755,6 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd)
struct ocrdma_pd *pd = get_ocrdma_pd(ibpd);
struct ocrdma_dev *dev = get_ocrdma_dev(ibpd->device);
struct ocrdma_ucontext *uctx = NULL;
- int status = 0;
u64 usr_db;
uctx = pd->uctx;
@@ -769,11 +768,10 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd)
if (is_ucontext_pd(uctx, pd)) {
ocrdma_release_ucontext_pd(uctx);
- return status;
+ return 0;
}
}
- status = _ocrdma_dealloc_pd(dev, pd);
- return status;
+ return _ocrdma_dealloc_pd(dev, pd);
}
static int ocrdma_alloc_lkey(struct ocrdma_dev *dev, struct ocrdma_mr *mr,
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 23/26] IB/ocrdma: Delete an unnecessary variable in ocrdma_dealloc_pd()
2017-03-08 13:28 ` [PATCH 23/26] IB/ocrdma: Delete an unnecessary variable in ocrdma_dealloc_pd() SF Markus Elfring
@ 2017-03-08 15:28 ` Devesh Sharma
2017-03-09 11:57 ` Yuval Shaia
1 sibling, 0 replies; 88+ messages in thread
From: Devesh Sharma @ 2017-03-08 15:28 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
Acked-By: Devesh Sharma <devesh.sharma@broadcom.com>
On Wed, Mar 8, 2017 at 6:58 PM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Mar 2017 10:58:34 +0100
>
> 1. Return zero in one case directly.
>
> 2. Return the value from a call of the function "_ocrdma_dealloc_pd"
> without using an extra assignment for the local variable.
>
> 3. Remove the variable "status" in this function then.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index 1d25512416f5..ae0d343d1731 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -755,7 +755,6 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd)
> struct ocrdma_pd *pd = get_ocrdma_pd(ibpd);
> struct ocrdma_dev *dev = get_ocrdma_dev(ibpd->device);
> struct ocrdma_ucontext *uctx = NULL;
> - int status = 0;
> u64 usr_db;
>
> uctx = pd->uctx;
> @@ -769,11 +768,10 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd)
>
> if (is_ucontext_pd(uctx, pd)) {
> ocrdma_release_ucontext_pd(uctx);
> - return status;
> + return 0;
> }
> }
> - status = _ocrdma_dealloc_pd(dev, pd);
> - return status;
> + return _ocrdma_dealloc_pd(dev, pd);
> }
>
> static int ocrdma_alloc_lkey(struct ocrdma_dev *dev, struct ocrdma_mr *mr,
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 23/26] IB/ocrdma: Delete an unnecessary variable in ocrdma_dealloc_pd()
2017-03-08 13:28 ` [PATCH 23/26] IB/ocrdma: Delete an unnecessary variable in ocrdma_dealloc_pd() SF Markus Elfring
2017-03-08 15:28 ` Devesh Sharma
@ 2017-03-09 11:57 ` Yuval Shaia
1 sibling, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-09 11:57 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 02:28:10PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Mar 2017 10:58:34 +0100
>
> 1. Return zero in one case directly.
>
> 2. Return the value from a call of the function "_ocrdma_dealloc_pd"
> without using an extra assignment for the local variable.
>
> 3. Remove the variable "status" in this function then.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index 1d25512416f5..ae0d343d1731 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -755,7 +755,6 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd)
> struct ocrdma_pd *pd = get_ocrdma_pd(ibpd);
> struct ocrdma_dev *dev = get_ocrdma_dev(ibpd->device);
> struct ocrdma_ucontext *uctx = NULL;
> - int status = 0;
> u64 usr_db;
>
> uctx = pd->uctx;
> @@ -769,11 +768,10 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd)
>
> if (is_ucontext_pd(uctx, pd)) {
> ocrdma_release_ucontext_pd(uctx);
> - return status;
> + return 0;
> }
> }
> - status = _ocrdma_dealloc_pd(dev, pd);
> - return status;
> + return _ocrdma_dealloc_pd(dev, pd);
> }
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
>
> static int ocrdma_alloc_lkey(struct ocrdma_dev *dev, struct ocrdma_mr *mr,
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 24/26] IB/ocrdma: One jump label less in ocrdma_alloc_ucontext_pd()
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (18 preceding siblings ...)
2017-03-08 13:28 ` [PATCH 23/26] IB/ocrdma: Delete an unnecessary variable in ocrdma_dealloc_pd() SF Markus Elfring
@ 2017-03-08 13:30 ` SF Markus Elfring
[not found] ` <3954cbe9-a265-bcb8-2dac-daade1a5e967-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-03-08 13:32 ` [PATCH 25/26] IB/ocrdma: Delete unnecessary braces SF Markus Elfring
[not found] ` <1492720999.3041.18.camel@redhat.com>
21 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:30 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Mar 2017 11:11:35 +0100
This issue was detected by using the Coccinelle software.
1. Return directly if a call of the function "_ocrdma_alloc_pd" failed.
2. Reduce the scope for the local variable "status" to one case
of an if statement.
3. Delete the jump label "err" then.
4. Return zero as a constant at the end.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index ae0d343d1731..d3cb8e2f099f 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -484,19 +484,17 @@ static int ocrdma_alloc_ucontext_pd(struct ocrdma_dev *dev,
struct ocrdma_ucontext *uctx,
struct ib_udata *udata)
{
- int status = 0;
-
uctx->cntxt_pd = _ocrdma_alloc_pd(dev, uctx, udata);
if (IS_ERR(uctx->cntxt_pd)) {
- status = PTR_ERR(uctx->cntxt_pd);
+ int status = PTR_ERR(uctx->cntxt_pd);
+
uctx->cntxt_pd = NULL;
- goto err;
+ return status;
}
uctx->cntxt_pd->uctx = uctx;
uctx->cntxt_pd->ibpd.device = &dev->ibdev;
-err:
- return status;
+ return 0;
}
static int ocrdma_dealloc_ucontext_pd(struct ocrdma_ucontext *uctx)
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 25/26] IB/ocrdma: Delete unnecessary braces
[not found] <fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net>
` (19 preceding siblings ...)
2017-03-08 13:30 ` [PATCH 24/26] IB/ocrdma: One jump label less in ocrdma_alloc_ucontext_pd() SF Markus Elfring
@ 2017-03-08 13:32 ` SF Markus Elfring
2017-03-09 11:50 ` Yuval Shaia
[not found] ` <1492720999.3041.18.camel@redhat.com>
21 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-03-08 13:32 UTC (permalink / raw)
To: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Mar 2017 12:36:41 +0100
Do not use curly brackets at some source code places
where a single statement should be sufficient.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 41 +++++++++++------------------
1 file changed, 16 insertions(+), 25 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index d3cb8e2f099f..bfd86fd08847 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -502,10 +502,10 @@ static int ocrdma_dealloc_ucontext_pd(struct ocrdma_ucontext *uctx)
struct ocrdma_pd *pd = uctx->cntxt_pd;
struct ocrdma_dev *dev = get_ocrdma_dev(pd->ibpd.device);
- if (uctx->pd_in_use) {
+ if (uctx->pd_in_use)
pr_err("%s(%d) Freeing in use pdid=0x%x.\n",
__func__, dev->id, pd->id);
- }
+
uctx->cntxt_pd = NULL;
(void)_ocrdma_dealloc_pd(dev, pd);
return 0;
@@ -739,11 +739,10 @@ struct ib_pd *ocrdma_alloc_pd(struct ib_device *ibdev,
return &pd->ibpd;
err:
- if (is_uctx_pd) {
+ if (is_uctx_pd)
ocrdma_release_ucontext_pd(uctx);
- } else {
+ else
status = _ocrdma_dealloc_pd(dev, pd);
- }
exit:
return ERR_PTR(status);
}
@@ -1018,10 +1017,10 @@ int ocrdma_dereg_mr(struct ib_mr *ib_mr)
kfree(mr);
/* Don't stop cleanup, in case FW is unresponsive */
- if (dev->mqe_ctx.fw_error_state) {
+ if (dev->mqe_ctx.fw_error_state)
pr_err("%s(%d) fw not responding.\n",
__func__, dev->id);
- }
+
return 0;
}
@@ -1410,10 +1409,10 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd,
goto gen_err;
memset(&ureq, 0, sizeof(ureq));
- if (udata) {
+ if (udata)
if (ib_copy_from_udata(&ureq, udata, sizeof(ureq)))
return ERR_PTR(-EFAULT);
- }
+
qp = kzalloc(sizeof(*qp), GFP_KERNEL);
if (!qp) {
status = -ENOMEM;
@@ -2829,15 +2828,11 @@ static bool ocrdma_poll_rcqe(struct ocrdma_qp *qp, struct ocrdma_cqe *cqe,
bool expand = false;
ibwc->wc_flags = 0;
- if (qp->qp_type = IB_QPT_UD || qp->qp_type = IB_QPT_GSI) {
- status = (le32_to_cpu(cqe->flags_status_srcqpn) &
- OCRDMA_CQE_UD_STATUS_MASK) >>
- OCRDMA_CQE_UD_STATUS_SHIFT;
- } else {
- status = (le32_to_cpu(cqe->flags_status_srcqpn) &
- OCRDMA_CQE_STATUS_MASK) >> OCRDMA_CQE_STATUS_SHIFT;
- }
-
+ status = (qp->qp_type = IB_QPT_UD || qp->qp_type = IB_QPT_GSI)
+ ? ((le32_to_cpu(cqe->flags_status_srcqpn) &
+ OCRDMA_CQE_UD_STATUS_MASK) >> OCRDMA_CQE_UD_STATUS_SHIFT)
+ : ((le32_to_cpu(cqe->flags_status_srcqpn) &
+ OCRDMA_CQE_STATUS_MASK) >> OCRDMA_CQE_STATUS_SHIFT);
if (status = OCRDMA_CQE_SUCCESS) {
*polled = true;
ocrdma_poll_success_rcqe(qp, cqe, ibwc);
@@ -2885,13 +2880,9 @@ static int ocrdma_poll_hwcq(struct ocrdma_cq *cq, int num_entries,
qp = dev->qp_tbl[qpn];
BUG_ON(qp = NULL);
- if (is_cqe_for_sq(cqe)) {
- expand = ocrdma_poll_scqe(qp, cqe, ibwc, &polled,
- &stop);
- } else {
- expand = ocrdma_poll_rcqe(qp, cqe, ibwc, &polled,
- &stop);
- }
+ expand = is_cqe_for_sq(cqe)
+ ? ocrdma_poll_scqe(qp, cqe, ibwc, &polled, &stop)
+ : ocrdma_poll_rcqe(qp, cqe, ibwc, &polled, &stop);
if (expand)
goto expand_cqe;
if (stop)
--
2.12.0
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 25/26] IB/ocrdma: Delete unnecessary braces
2017-03-08 13:32 ` [PATCH 25/26] IB/ocrdma: Delete unnecessary braces SF Markus Elfring
@ 2017-03-09 11:50 ` Yuval Shaia
0 siblings, 0 replies; 88+ messages in thread
From: Yuval Shaia @ 2017-03-09 11:50 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-rdma, Devesh Sharma, Doug Ledford, Hal Rosenstock,
Sean Hefty, Selvin Xavier, LKML, kernel-janitors
On Wed, Mar 08, 2017 at 02:32:15PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Mar 2017 12:36:41 +0100
>
> Do not use curly brackets at some source code places
> where a single statement should be sufficient.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 41 +++++++++++------------------
> 1 file changed, 16 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index d3cb8e2f099f..bfd86fd08847 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -502,10 +502,10 @@ static int ocrdma_dealloc_ucontext_pd(struct ocrdma_ucontext *uctx)
> struct ocrdma_pd *pd = uctx->cntxt_pd;
> struct ocrdma_dev *dev = get_ocrdma_dev(pd->ibpd.device);
>
> - if (uctx->pd_in_use) {
> + if (uctx->pd_in_use)
> pr_err("%s(%d) Freeing in use pdid=0x%x.\n",
> __func__, dev->id, pd->id);
> - }
> +
> uctx->cntxt_pd = NULL;
> (void)_ocrdma_dealloc_pd(dev, pd);
> return 0;
> @@ -739,11 +739,10 @@ struct ib_pd *ocrdma_alloc_pd(struct ib_device *ibdev,
> return &pd->ibpd;
>
> err:
> - if (is_uctx_pd) {
> + if (is_uctx_pd)
> ocrdma_release_ucontext_pd(uctx);
> - } else {
> + else
> status = _ocrdma_dealloc_pd(dev, pd);
> - }
> exit:
> return ERR_PTR(status);
> }
> @@ -1018,10 +1017,10 @@ int ocrdma_dereg_mr(struct ib_mr *ib_mr)
> kfree(mr);
>
> /* Don't stop cleanup, in case FW is unresponsive */
> - if (dev->mqe_ctx.fw_error_state) {
> + if (dev->mqe_ctx.fw_error_state)
> pr_err("%s(%d) fw not responding.\n",
> __func__, dev->id);
> - }
> +
> return 0;
> }
>
> @@ -1410,10 +1409,10 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd,
> goto gen_err;
>
> memset(&ureq, 0, sizeof(ureq));
> - if (udata) {
> + if (udata)
> if (ib_copy_from_udata(&ureq, udata, sizeof(ureq)))
> return ERR_PTR(-EFAULT);
> - }
> +
> qp = kzalloc(sizeof(*qp), GFP_KERNEL);
> if (!qp) {
> status = -ENOMEM;
> @@ -2829,15 +2828,11 @@ static bool ocrdma_poll_rcqe(struct ocrdma_qp *qp, struct ocrdma_cqe *cqe,
> bool expand = false;
>
> ibwc->wc_flags = 0;
> - if (qp->qp_type = IB_QPT_UD || qp->qp_type = IB_QPT_GSI) {
> - status = (le32_to_cpu(cqe->flags_status_srcqpn) &
> - OCRDMA_CQE_UD_STATUS_MASK) >>
> - OCRDMA_CQE_UD_STATUS_SHIFT;
> - } else {
> - status = (le32_to_cpu(cqe->flags_status_srcqpn) &
> - OCRDMA_CQE_STATUS_MASK) >> OCRDMA_CQE_STATUS_SHIFT;
> - }
> -
> + status = (qp->qp_type = IB_QPT_UD || qp->qp_type = IB_QPT_GSI)
> + ? ((le32_to_cpu(cqe->flags_status_srcqpn) &
> + OCRDMA_CQE_UD_STATUS_MASK) >> OCRDMA_CQE_UD_STATUS_SHIFT)
> + : ((le32_to_cpu(cqe->flags_status_srcqpn) &
> + OCRDMA_CQE_STATUS_MASK) >> OCRDMA_CQE_STATUS_SHIFT);
> if (status = OCRDMA_CQE_SUCCESS) {
> *polled = true;
> ocrdma_poll_success_rcqe(qp, cqe, ibwc);
> @@ -2885,13 +2880,9 @@ static int ocrdma_poll_hwcq(struct ocrdma_cq *cq, int num_entries,
> qp = dev->qp_tbl[qpn];
> BUG_ON(qp = NULL);
>
> - if (is_cqe_for_sq(cqe)) {
> - expand = ocrdma_poll_scqe(qp, cqe, ibwc, &polled,
> - &stop);
> - } else {
> - expand = ocrdma_poll_rcqe(qp, cqe, ibwc, &polled,
> - &stop);
> - }
> + expand = is_cqe_for_sq(cqe)
> + ? ocrdma_poll_scqe(qp, cqe, ibwc, &polled, &stop)
> + : ocrdma_poll_rcqe(qp, cqe, ibwc, &polled, &stop);
> if (expand)
> goto expand_cqe;
> if (stop)
> --
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread
[parent not found: <1492720999.3041.18.camel@redhat.com>]
* [PATCH v2 00/12] InfiniBand-OCRDMA: Fine-tuning for several function implementations
[not found] ` <1492720999.3041.18.camel@redhat.com>
@ 2017-04-22 14:26 ` SF Markus Elfring
[not found] ` <86425035-7da8-d2b1-8544-d4f7540d50c6-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
` (9 more replies)
0 siblings, 10 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:26 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 16:16:06 +0200
Several update suggestions were taken into account
from static source code analysis.
Markus Elfring (12):
Use kcalloc() in ocrdma_mbx_alloc_pd_range()
Use kcalloc() in five functions
Improve size determinations in ten functions
Delete unnecessary variable initialisations in ocrdma_mbx_get_dcbx_config()
Delete unnecessary braces
Use kmalloc_array() in ocrdma_create_srq()
Adjust 21 checks for null pointers
Delete an error message for a failed memory allocation in ocrdma_add()
Delete an unnecessary variable assignment in ocrdma_alloc_mr()
Returning only value constants in ocrdma_resize_cq()
Delete an unnecessary variable in ocrdma_dealloc_pd()
One jump label less in ocrdma_alloc_ucontext_pd()
---
v2:
Changes were rebased on source files from Linux next-20170421.
Some of them were recombined into bigger update steps
as requested by Doug Ledford.
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 88 ++++++++++-----------
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 19 +++--
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 118 ++++++++++++----------------
3 files changed, 100 insertions(+), 125 deletions(-)
--
2.12.2
^ permalink raw reply [flat|nested] 88+ messages in thread[parent not found: <86425035-7da8-d2b1-8544-d4f7540d50c6-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>]
* [PATCH v2 01/12] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range()
[not found] ` <86425035-7da8-d2b1-8544-d4f7540d50c6-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
@ 2017-04-22 14:30 ` SF Markus Elfring
2017-04-24 16:39 ` Devesh Sharma
2017-04-22 14:33 ` [PATCH v2 02/12] IB/ocrdma: Use kcalloc() in five functions SF Markus Elfring
2017-04-22 14:36 ` [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten functions SF Markus Elfring
2 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:30 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma-u79uwXL29TY76Z2rM5mHXA
Cc: LKML, kernel-janitors-u79uwXL29TY76Z2rM5mHXA
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 11:33:25 +0200
* Multiplications for the size determination of memory allocations
indicated that array data structures should be processed.
Thus reuse the corresponding function "kcalloc".
This issue was detected by using the Coccinelle software.
* Delete the local variable "pd_bitmap_size" which became unnecessary
with this refactoring.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index aa6967197620..c868314222b9 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -1505,7 +1505,6 @@ int ocrdma_mbx_dealloc_pd(struct ocrdma_dev *dev, struct ocrdma_pd *pd)
static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
{
int status = -ENOMEM;
- size_t pd_bitmap_size;
struct ocrdma_alloc_pd_range *cmd;
struct ocrdma_alloc_pd_range_rsp *rsp;
@@ -1527,10 +1526,10 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
dev->pd_mgr->pd_dpp_start = rsp->dpp_page_pdid &
OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;
dev->pd_mgr->max_dpp_pd = rsp->pd_count;
- pd_bitmap_size - BITS_TO_LONGS(rsp->pd_count) * sizeof(long);
- dev->pd_mgr->pd_dpp_bitmap = kzalloc(pd_bitmap_size,
- GFP_KERNEL);
+ dev->pd_mgr->pd_dpp_bitmap
+ = kcalloc(BITS_TO_LONGS(rsp->pd_count),
+ sizeof(long),
+ GFP_KERNEL);
}
kfree(cmd);
}
@@ -1546,9 +1545,10 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
dev->pd_mgr->pd_norm_start = rsp->dpp_page_pdid &
OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;
dev->pd_mgr->max_normal_pd = rsp->pd_count;
- pd_bitmap_size = BITS_TO_LONGS(rsp->pd_count) * sizeof(long);
- dev->pd_mgr->pd_norm_bitmap = kzalloc(pd_bitmap_size,
- GFP_KERNEL);
+ dev->pd_mgr->pd_norm_bitmap
+ = kcalloc(BITS_TO_LONGS(rsp->pd_count),
+ sizeof(long),
+ GFP_KERNEL);
}
kfree(cmd);
--
2.12.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH v2 01/12] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range()
2017-04-22 14:30 ` [PATCH v2 01/12] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range() SF Markus Elfring
@ 2017-04-24 16:39 ` Devesh Sharma
2017-04-25 17:02 ` Doug Ledford
0 siblings, 1 reply; 88+ messages in thread
From: Devesh Sharma @ 2017-04-24 16:39 UTC (permalink / raw)
To: SF Markus Elfring
Cc: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma, LKML, kernel-janitors
Acked-By: Devesh Sharma <devesh.sharma@broadcom.com>
On Sat, Apr 22, 2017 at 8:00 PM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sat, 22 Apr 2017 11:33:25 +0200
>
> * Multiplications for the size determination of memory allocations
> indicated that array data structures should be processed.
> Thus reuse the corresponding function "kcalloc".
>
> This issue was detected by using the Coccinelle software.
>
> * Delete the local variable "pd_bitmap_size" which became unnecessary
> with this refactoring.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> index aa6967197620..c868314222b9 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> @@ -1505,7 +1505,6 @@ int ocrdma_mbx_dealloc_pd(struct ocrdma_dev *dev, struct ocrdma_pd *pd)
> static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
> {
> int status = -ENOMEM;
> - size_t pd_bitmap_size;
> struct ocrdma_alloc_pd_range *cmd;
> struct ocrdma_alloc_pd_range_rsp *rsp;
>
> @@ -1527,10 +1526,10 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
> dev->pd_mgr->pd_dpp_start = rsp->dpp_page_pdid &
> OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;
> dev->pd_mgr->max_dpp_pd = rsp->pd_count;
> - pd_bitmap_size > - BITS_TO_LONGS(rsp->pd_count) * sizeof(long);
> - dev->pd_mgr->pd_dpp_bitmap = kzalloc(pd_bitmap_size,
> - GFP_KERNEL);
> + dev->pd_mgr->pd_dpp_bitmap
> + = kcalloc(BITS_TO_LONGS(rsp->pd_count),
> + sizeof(long),
> + GFP_KERNEL);
> }
> kfree(cmd);
> }
> @@ -1546,9 +1545,10 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
> dev->pd_mgr->pd_norm_start = rsp->dpp_page_pdid &
> OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;
> dev->pd_mgr->max_normal_pd = rsp->pd_count;
> - pd_bitmap_size = BITS_TO_LONGS(rsp->pd_count) * sizeof(long);
> - dev->pd_mgr->pd_norm_bitmap = kzalloc(pd_bitmap_size,
> - GFP_KERNEL);
> + dev->pd_mgr->pd_norm_bitmap
> + = kcalloc(BITS_TO_LONGS(rsp->pd_count),
> + sizeof(long),
> + GFP_KERNEL);
> }
> kfree(cmd);
>
> --
> 2.12.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH v2 01/12] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range()
2017-04-24 16:39 ` Devesh Sharma
@ 2017-04-25 17:02 ` Doug Ledford
2017-08-08 17:26 ` [v2 " SF Markus Elfring
0 siblings, 1 reply; 88+ messages in thread
From: Doug Ledford @ 2017-04-25 17:02 UTC (permalink / raw)
To: Devesh Sharma, SF Markus Elfring
Cc: Devesh Sharma, Hal Rosenstock, Sean Hefty, Selvin Xavier,
Yuval Shaia, linux-rdma, LKML, kernel-janitors
On Mon, 2017-04-24 at 21:57 +0530, Devesh Sharma wrote:
> Acked-By: Devesh Sharma <devesh.sharma@broadcom.com>
Devesh, after you have reviewed any of Markus' patches that you care to
review, if you wish any of them to go into my tree, please submit them
to me yourself. Thanks.
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [v2 01/12] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range()
2017-04-25 17:02 ` Doug Ledford
@ 2017-08-08 17:26 ` SF Markus Elfring
[not found] ` <9cdbdfa6-7118-c830-7587-aa27929f7028-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
0 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-08-08 17:26 UTC (permalink / raw)
To: Dennis Dalessandro, Devesh Sharma, Leon Romanovsky
Cc: Doug Ledford, Hal Rosenstock, Sean Hefty, Selvin Xavier,
Yuval Shaia, linux-rdma, LKML, kernel-janitors
Hello,
How will the clarification be continued for the shown change possibilities?
Regards,
Markus
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH v2 02/12] IB/ocrdma: Use kcalloc() in five functions
[not found] ` <86425035-7da8-d2b1-8544-d4f7540d50c6-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-04-22 14:30 ` [PATCH v2 01/12] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range() SF Markus Elfring
@ 2017-04-22 14:33 ` SF Markus Elfring
2017-04-22 14:36 ` [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten functions SF Markus Elfring
2 siblings, 0 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:33 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma-u79uwXL29TY76Z2rM5mHXA
Cc: LKML, kernel-janitors-u79uwXL29TY76Z2rM5mHXA
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 11:41:55 +0200
* Multiplications for the size determination of memory allocations
indicated that array data structures should be processed.
Thus use the corresponding function "kcalloc".
This issue was detected by using the Coccinelle software.
* Replace the specification of data types by pointer dereferences
to make the corresponding size determinations a bit safer according to
the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
v2:
Changes were rebased on source files from Linux next-20170421.
These were recombined as requested by Doug Ledford.
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 10 +++++-----
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 19 +++++++++----------
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index c868314222b9..d5a3127b6df8 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -3103,7 +3103,7 @@ static int ocrdma_create_eqs(struct ocrdma_dev *dev)
if (!num_eq)
return -EINVAL;
- dev->eq_tbl = kzalloc(sizeof(struct ocrdma_eq) * num_eq, GFP_KERNEL);
+ dev->eq_tbl = kcalloc(num_eq, sizeof(*dev->eq_tbl), GFP_KERNEL);
if (!dev->eq_tbl)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 57c9a2ad0260..91705b10f269 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -225,19 +225,19 @@ static int ocrdma_register_device(struct ocrdma_dev *dev)
static int ocrdma_alloc_resources(struct ocrdma_dev *dev)
{
mutex_init(&dev->dev_lock);
- dev->cq_tbl = kzalloc(sizeof(struct ocrdma_cq *) *
- OCRDMA_MAX_CQ, GFP_KERNEL);
+ dev->cq_tbl = kcalloc(OCRDMA_MAX_CQ, sizeof(*dev->cq_tbl), GFP_KERNEL);
if (!dev->cq_tbl)
goto alloc_err;
if (dev->attr.max_qp) {
- dev->qp_tbl = kzalloc(sizeof(struct ocrdma_qp *) *
- OCRDMA_MAX_QP, GFP_KERNEL);
+ dev->qp_tbl = kcalloc(OCRDMA_MAX_QP, sizeof(*dev->qp_tbl),
+ GFP_KERNEL);
if (!dev->qp_tbl)
goto alloc_err;
}
- dev->stag_arr = kzalloc(sizeof(u64) * OCRDMA_MAX_STAG, GFP_KERNEL);
+ dev->stag_arr = kcalloc(OCRDMA_MAX_STAG, sizeof(*dev->stag_arr),
+ GFP_KERNEL);
if (dev->stag_arr = NULL)
goto alloc_err;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index c52edeafd616..146601c97158 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -879,9 +879,8 @@ static int ocrdma_build_pbl_tbl(struct ocrdma_dev *dev, struct ocrdma_hw_mr *mr)
void *va;
dma_addr_t pa;
- mr->pbl_table = kzalloc(sizeof(struct ocrdma_pbl) *
- mr->num_pbls, GFP_KERNEL);
-
+ mr->pbl_table = kcalloc(mr->num_pbls, sizeof(*mr->pbl_table),
+ GFP_KERNEL);
if (!mr->pbl_table)
return -ENOMEM;
@@ -1362,13 +1361,12 @@ static void ocrdma_set_qp_db(struct ocrdma_dev *dev, struct ocrdma_qp *qp,
static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp)
{
- qp->wqe_wr_id_tbl - kzalloc(sizeof(*(qp->wqe_wr_id_tbl)) * qp->sq.max_cnt,
- GFP_KERNEL);
+ qp->wqe_wr_id_tbl = kcalloc(qp->sq.max_cnt, sizeof(*qp->wqe_wr_id_tbl),
+ GFP_KERNEL);
if (qp->wqe_wr_id_tbl = NULL)
return -ENOMEM;
- qp->rqe_wr_id_tbl - kzalloc(sizeof(u64) * qp->rq.max_cnt, GFP_KERNEL);
+ qp->rqe_wr_id_tbl = kcalloc(qp->rq.max_cnt, sizeof(*qp->rqe_wr_id_tbl),
+ GFP_KERNEL);
if (qp->rqe_wr_id_tbl = NULL)
return -ENOMEM;
@@ -1903,8 +1901,9 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
goto err;
if (udata = NULL) {
- srq->rqe_wr_id_tbl = kzalloc(sizeof(u64) * srq->rq.max_cnt,
- GFP_KERNEL);
+ srq->rqe_wr_id_tbl = kcalloc(srq->rq.max_cnt,
+ sizeof(*srq->rqe_wr_id_tbl),
+ GFP_KERNEL);
if (srq->rqe_wr_id_tbl = NULL)
goto arm_err;
--
2.12.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten functions
[not found] ` <86425035-7da8-d2b1-8544-d4f7540d50c6-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-04-22 14:30 ` [PATCH v2 01/12] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range() SF Markus Elfring
2017-04-22 14:33 ` [PATCH v2 02/12] IB/ocrdma: Use kcalloc() in five functions SF Markus Elfring
@ 2017-04-22 14:36 ` SF Markus Elfring
2017-04-23 7:33 ` Leon Romanovsky
2 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:36 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma-u79uwXL29TY76Z2rM5mHXA
Cc: LKML, kernel-janitors-u79uwXL29TY76Z2rM5mHXA
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 13:26:49 +0200
Replace the specification of data types by pointer dereferences
as the parameter for the operator "sizeof" to make the corresponding size
determinations a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
v2:
Changes were rebased on source files from Linux next-20170421.
These were recombined as requested by Doug Ledford.
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 28 ++++++++++++----------------
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +-
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 ++--
3 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index d5a3127b6df8..7e58a74102f6 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -352,7 +352,7 @@ static void *ocrdma_init_emb_mqe(u8 opcode, u32 cmd_len)
{
struct ocrdma_mqe *mqe;
- mqe = kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL);
+ mqe = kzalloc(sizeof(*mqe), GFP_KERNEL);
if (!mqe)
return NULL;
mqe->hdr.spcl_sge_cnt_emb |@@ -890,7 +890,7 @@ static int ocrdma_mq_cq_handler(struct ocrdma_dev *dev, u16 cq_id)
ocrdma_process_acqe(dev, cqe);
else if (cqe->valid_ae_cmpl_cons & OCRDMA_MCQE_CMPL_MASK)
ocrdma_process_mcqe(dev, cqe);
- memset(cqe, 0, sizeof(struct ocrdma_mcqe));
+ memset(cqe, 0, sizeof(*cqe));
ocrdma_mcq_inc_tail(dev);
}
ocrdma_ring_cq_db(dev, dev->mq.cq.id, true, false, cqe_popped);
@@ -1302,7 +1302,7 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
mqe->u.nonemb_req.sge[0].len = dev->stats_mem.size;
/* Cache the old stats */
- memcpy(old_stats, req, sizeof(struct ocrdma_rdma_stats_resp));
+ memcpy(old_stats, req, sizeof(*old_stats));
memset(req, 0, dev->stats_mem.size);
ocrdma_init_mch((struct ocrdma_mbx_hdr *)req,
@@ -1315,7 +1315,7 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
status = ocrdma_nonemb_mbx_cmd(dev, mqe, dev->stats_mem.va);
if (status)
/* Copy from cache, if mbox fails */
- memcpy(req, old_stats, sizeof(struct ocrdma_rdma_stats_resp));
+ memcpy(req, old_stats, sizeof(*old_stats));
else
ocrdma_le32_to_cpu(req, dev->stats_mem.size);
@@ -1331,7 +1331,7 @@ static int ocrdma_mbx_get_ctrl_attribs(struct ocrdma_dev *dev)
struct ocrdma_get_ctrl_attribs_rsp *ctrl_attr_rsp;
struct mgmt_hba_attribs *hba_attribs;
- mqe = kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL);
+ mqe = kzalloc(sizeof(*mqe), GFP_KERNEL);
if (!mqe)
return status;
@@ -1595,8 +1595,7 @@ void ocrdma_alloc_pd_pool(struct ocrdma_dev *dev)
{
int status;
- dev->pd_mgr = kzalloc(sizeof(struct ocrdma_pd_resource_mgr),
- GFP_KERNEL);
+ dev->pd_mgr = kzalloc(sizeof(*dev->pd_mgr), GFP_KERNEL);
if (!dev->pd_mgr)
return;
@@ -2487,7 +2486,7 @@ int ocrdma_mbx_query_qp(struct ocrdma_dev *dev, struct ocrdma_qp *qp,
if (status)
goto mbx_err;
rsp = (struct ocrdma_query_qp_rsp *)cmd;
- memcpy(param, &rsp->params, sizeof(struct ocrdma_qp_params));
+ memcpy(param, &rsp->params, sizeof(*param));
mbx_err:
kfree(cmd);
return status;
@@ -2901,9 +2900,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
struct pci_dev *pdev = dev->nic_info.pdev;
struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
- memset(&cmd, 0, sizeof(struct ocrdma_mqe));
- cmd.hdr.pyld_len = max_t (u32, sizeof(struct ocrdma_get_dcbx_cfg_rsp),
- sizeof(struct ocrdma_get_dcbx_cfg_req));
+ memset(&cmd, 0, sizeof(cmd));
+ cmd.hdr.pyld_len = max_t(u32, sizeof(*rsp), sizeof(*req));
req = dma_alloc_coherent(&pdev->dev, cmd.hdr.pyld_len, &pa, GFP_KERNEL);
if (!req) {
status = -ENOMEM;
@@ -2915,8 +2913,7 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
mqe_sge->pa_lo = (u32) (pa & 0xFFFFFFFFUL);
mqe_sge->pa_hi = (u32) upper_32_bits(pa);
mqe_sge->len = cmd.hdr.pyld_len;
-
- memset(req, 0, sizeof(struct ocrdma_get_dcbx_cfg_req));
+ memset(req, 0, sizeof(*req));
ocrdma_init_mch(&req->hdr, OCRDMA_CMD_GET_DCBX_CONFIG,
OCRDMA_SUBSYS_DCBX, cmd.hdr.pyld_len);
req->param_type = ptype;
@@ -2926,9 +2923,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
goto mbx_err;
rsp = (struct ocrdma_get_dcbx_cfg_rsp *)req;
- ocrdma_le32_to_cpu(rsp, sizeof(struct ocrdma_get_dcbx_cfg_rsp));
- memcpy(dcbxcfg, &rsp->cfg, sizeof(struct ocrdma_dcbx_cfg));
-
+ ocrdma_le32_to_cpu(rsp, sizeof(*rsp));
+ memcpy(dcbxcfg, &rsp->cfg, sizeof(*dcbxcfg));
mbx_err:
dma_free_coherent(&pdev->dev, cmd.hdr.pyld_len, req, pa);
mem_err:
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 91705b10f269..e2aa67d6cbb8 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -303,7 +303,7 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
u8 lstate = 0;
struct ocrdma_dev *dev;
- dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(struct ocrdma_dev));
+ dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(*dev));
if (!dev) {
pr_err("Unable to allocate ib device\n");
return NULL;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 146601c97158..f12d1d458f28 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1914,7 +1914,7 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
if (srq->idx_bit_fields = NULL)
goto arm_err;
memset(srq->idx_bit_fields, 0xff,
- srq->bit_fields_len * sizeof(u32));
+ srq->bit_fields_len * sizeof(*srq->idx_bit_fields));
}
if (init_attr->attr.srq_limit) {
@@ -3029,7 +3029,7 @@ struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd,
if (!mr)
return ERR_PTR(-ENOMEM);
- mr->pages = kcalloc(max_num_sg, sizeof(u64), GFP_KERNEL);
+ mr->pages = kcalloc(max_num_sg, sizeof(*mr->pages), GFP_KERNEL);
if (!mr->pages) {
status = -ENOMEM;
goto pl_err;
--
2.12.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten functions
2017-04-22 14:36 ` [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten functions SF Markus Elfring
@ 2017-04-23 7:33 ` Leon Romanovsky
2017-04-24 12:54 ` Dennis Dalessandro
[not found] ` <20170423073311.GA14088-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
0 siblings, 2 replies; 88+ messages in thread
From: Leon Romanovsky @ 2017-04-23 7:33 UTC (permalink / raw)
To: Doug Ledford
Cc: SF Markus Elfring, Devesh Sharma, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma, LKML, kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 7071 bytes --]
On Sat, Apr 22, 2017 at 04:36:19PM +0200, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sat, 22 Apr 2017 13:26:49 +0200
>
> Replace the specification of data types by pointer dereferences
> as the parameter for the operator "sizeof" to make the corresponding size
> determinations a bit safer according to the Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
>
> v2:
> Changes were rebased on source files from Linux next-20170421.
> These were recombined as requested by Doug Ledford.
Hi Doug,
I recommend you to be extra cautious with this blind automatic
conversions. It requires inspection that every size before and after
match each other.
I already asked it and would be like to repeat it. Please DON'T take any
patches from Markus, which are related to mlx4/mlx5/rxe without our explicit
review of them.
Thanks
>
> drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 28 ++++++++++++----------------
> drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +-
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 ++--
> 3 files changed, 15 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> index d5a3127b6df8..7e58a74102f6 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> @@ -352,7 +352,7 @@ static void *ocrdma_init_emb_mqe(u8 opcode, u32 cmd_len)
> {
> struct ocrdma_mqe *mqe;
>
> - mqe = kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL);
> + mqe = kzalloc(sizeof(*mqe), GFP_KERNEL);
> if (!mqe)
> return NULL;
> mqe->hdr.spcl_sge_cnt_emb |=
> @@ -890,7 +890,7 @@ static int ocrdma_mq_cq_handler(struct ocrdma_dev *dev, u16 cq_id)
> ocrdma_process_acqe(dev, cqe);
> else if (cqe->valid_ae_cmpl_cons & OCRDMA_MCQE_CMPL_MASK)
> ocrdma_process_mcqe(dev, cqe);
> - memset(cqe, 0, sizeof(struct ocrdma_mcqe));
> + memset(cqe, 0, sizeof(*cqe));
> ocrdma_mcq_inc_tail(dev);
> }
> ocrdma_ring_cq_db(dev, dev->mq.cq.id, true, false, cqe_popped);
> @@ -1302,7 +1302,7 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
> mqe->u.nonemb_req.sge[0].len = dev->stats_mem.size;
>
> /* Cache the old stats */
> - memcpy(old_stats, req, sizeof(struct ocrdma_rdma_stats_resp));
> + memcpy(old_stats, req, sizeof(*old_stats));
> memset(req, 0, dev->stats_mem.size);
>
> ocrdma_init_mch((struct ocrdma_mbx_hdr *)req,
> @@ -1315,7 +1315,7 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
> status = ocrdma_nonemb_mbx_cmd(dev, mqe, dev->stats_mem.va);
> if (status)
> /* Copy from cache, if mbox fails */
> - memcpy(req, old_stats, sizeof(struct ocrdma_rdma_stats_resp));
> + memcpy(req, old_stats, sizeof(*old_stats));
> else
> ocrdma_le32_to_cpu(req, dev->stats_mem.size);
>
> @@ -1331,7 +1331,7 @@ static int ocrdma_mbx_get_ctrl_attribs(struct ocrdma_dev *dev)
> struct ocrdma_get_ctrl_attribs_rsp *ctrl_attr_rsp;
> struct mgmt_hba_attribs *hba_attribs;
>
> - mqe = kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL);
> + mqe = kzalloc(sizeof(*mqe), GFP_KERNEL);
> if (!mqe)
> return status;
>
> @@ -1595,8 +1595,7 @@ void ocrdma_alloc_pd_pool(struct ocrdma_dev *dev)
> {
> int status;
>
> - dev->pd_mgr = kzalloc(sizeof(struct ocrdma_pd_resource_mgr),
> - GFP_KERNEL);
> + dev->pd_mgr = kzalloc(sizeof(*dev->pd_mgr), GFP_KERNEL);
> if (!dev->pd_mgr)
> return;
>
> @@ -2487,7 +2486,7 @@ int ocrdma_mbx_query_qp(struct ocrdma_dev *dev, struct ocrdma_qp *qp,
> if (status)
> goto mbx_err;
> rsp = (struct ocrdma_query_qp_rsp *)cmd;
> - memcpy(param, &rsp->params, sizeof(struct ocrdma_qp_params));
> + memcpy(param, &rsp->params, sizeof(*param));
> mbx_err:
> kfree(cmd);
> return status;
> @@ -2901,9 +2900,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
> struct pci_dev *pdev = dev->nic_info.pdev;
> struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
>
> - memset(&cmd, 0, sizeof(struct ocrdma_mqe));
> - cmd.hdr.pyld_len = max_t (u32, sizeof(struct ocrdma_get_dcbx_cfg_rsp),
> - sizeof(struct ocrdma_get_dcbx_cfg_req));
> + memset(&cmd, 0, sizeof(cmd));
> + cmd.hdr.pyld_len = max_t(u32, sizeof(*rsp), sizeof(*req));
> req = dma_alloc_coherent(&pdev->dev, cmd.hdr.pyld_len, &pa, GFP_KERNEL);
> if (!req) {
> status = -ENOMEM;
> @@ -2915,8 +2913,7 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
> mqe_sge->pa_lo = (u32) (pa & 0xFFFFFFFFUL);
> mqe_sge->pa_hi = (u32) upper_32_bits(pa);
> mqe_sge->len = cmd.hdr.pyld_len;
> -
> - memset(req, 0, sizeof(struct ocrdma_get_dcbx_cfg_req));
> + memset(req, 0, sizeof(*req));
> ocrdma_init_mch(&req->hdr, OCRDMA_CMD_GET_DCBX_CONFIG,
> OCRDMA_SUBSYS_DCBX, cmd.hdr.pyld_len);
> req->param_type = ptype;
> @@ -2926,9 +2923,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
> goto mbx_err;
>
> rsp = (struct ocrdma_get_dcbx_cfg_rsp *)req;
> - ocrdma_le32_to_cpu(rsp, sizeof(struct ocrdma_get_dcbx_cfg_rsp));
> - memcpy(dcbxcfg, &rsp->cfg, sizeof(struct ocrdma_dcbx_cfg));
> -
> + ocrdma_le32_to_cpu(rsp, sizeof(*rsp));
> + memcpy(dcbxcfg, &rsp->cfg, sizeof(*dcbxcfg));
> mbx_err:
> dma_free_coherent(&pdev->dev, cmd.hdr.pyld_len, req, pa);
> mem_err:
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> index 91705b10f269..e2aa67d6cbb8 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> @@ -303,7 +303,7 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
> u8 lstate = 0;
> struct ocrdma_dev *dev;
>
> - dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(struct ocrdma_dev));
> + dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(*dev));
> if (!dev) {
> pr_err("Unable to allocate ib device\n");
> return NULL;
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index 146601c97158..f12d1d458f28 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -1914,7 +1914,7 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
> if (srq->idx_bit_fields == NULL)
> goto arm_err;
> memset(srq->idx_bit_fields, 0xff,
> - srq->bit_fields_len * sizeof(u32));
> + srq->bit_fields_len * sizeof(*srq->idx_bit_fields));
> }
>
> if (init_attr->attr.srq_limit) {
> @@ -3029,7 +3029,7 @@ struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd,
> if (!mr)
> return ERR_PTR(-ENOMEM);
>
> - mr->pages = kcalloc(max_num_sg, sizeof(u64), GFP_KERNEL);
> + mr->pages = kcalloc(max_num_sg, sizeof(*mr->pages), GFP_KERNEL);
> if (!mr->pages) {
> status = -ENOMEM;
> goto pl_err;
> --
> 2.12.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten functions
2017-04-23 7:33 ` Leon Romanovsky
@ 2017-04-24 12:54 ` Dennis Dalessandro
2017-04-24 13:23 ` SF Markus Elfring
2017-04-24 16:38 ` [PATCH v2 03/12] " Doug Ledford
[not found] ` <20170423073311.GA14088-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
1 sibling, 2 replies; 88+ messages in thread
From: Dennis Dalessandro @ 2017-04-24 12:54 UTC (permalink / raw)
To: Leon Romanovsky, Doug Ledford
Cc: SF Markus Elfring, Devesh Sharma, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma, LKML, kernel-janitors
On 04/23/2017 03:33 AM, Leon Romanovsky wrote:
> On Sat, Apr 22, 2017 at 04:36:19PM +0200, SF Markus Elfring wrote:
>> From: Markus Elfring <elfring@users.sourceforge.net>
>> Date: Sat, 22 Apr 2017 13:26:49 +0200
>>
>> Replace the specification of data types by pointer dereferences
>> as the parameter for the operator "sizeof" to make the corresponding size
>> determinations a bit safer according to the Linux coding style convention.
>>
>> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
>> ---
>>
>> v2:
>> Changes were rebased on source files from Linux next-20170421.
>> These were recombined as requested by Doug Ledford.
>
> Hi Doug,
>
> I recommend you to be extra cautious with this blind automatic
> conversions. It requires inspection that every size before and after
> match each other.
>
> I already asked it and would be like to repeat it. Please DON'T take any
> patches from Markus, which are related to mlx4/mlx5/rxe without our explicit
> review of them.
I agree with Leon here, and these sort of find/replace automagic
clean-up patches make me nervous sometimes.
Markus, what have you done to ensure your patches don't break anything?
-Denny
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: IB/ocrdma: Improve size determinations in ten functions
2017-04-24 12:54 ` Dennis Dalessandro
@ 2017-04-24 13:23 ` SF Markus Elfring
[not found] ` <a2b014f3-7674-6e33-3b22-72594b38a6b6-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-04-24 16:38 ` [PATCH v2 03/12] " Doug Ledford
1 sibling, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-24 13:23 UTC (permalink / raw)
To: Dennis Dalessandro
Cc: Leon Romanovsky, Doug Ledford, Devesh Sharma, Hal Rosenstock,
Sean Hefty, Selvin Xavier, Yuval Shaia, linux-rdma, LKML,
kernel-janitors
> Markus, what have you done to ensure your patches don't break anything?
I would expect that this update step will not change the run time behaviour
for the OCRDMA module. I guess that it will influence the run time
characteristics for compilation of three adjusted source files besides
the proposed coding style improvements.
Further update steps change other source code places. I hope that their
impact can be clarified according to your expectations for each shown update
possibility separately. Some of them got a bit of acceptance already.
How would you like to reduce any remaining software development concerns here?
Regards,
Markus
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten functions
2017-04-24 12:54 ` Dennis Dalessandro
2017-04-24 13:23 ` SF Markus Elfring
@ 2017-04-24 16:38 ` Doug Ledford
[not found] ` <1493051938.3041.52.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
1 sibling, 1 reply; 88+ messages in thread
From: Doug Ledford @ 2017-04-24 16:38 UTC (permalink / raw)
To: Dennis Dalessandro, Leon Romanovsky
Cc: SF Markus Elfring, Devesh Sharma, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma, LKML, kernel-janitors
On Mon, 2017-04-24 at 08:54 -0400, Dennis Dalessandro wrote:
> On 04/23/2017 03:33 AM, Leon Romanovsky wrote:
> >
> > On Sat, Apr 22, 2017 at 04:36:19PM +0200, SF Markus Elfring wrote:
> > >
> > > From: Markus Elfring <elfring@users.sourceforge.net>
> > > Date: Sat, 22 Apr 2017 13:26:49 +0200
> > >
> > > Replace the specification of data types by pointer dereferences
> > > as the parameter for the operator "sizeof" to make the
> > > corresponding size
> > > determinations a bit safer according to the Linux coding style
> > > convention.
> > >
> > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> > > ---
> > >
> > > v2:
> > > Changes were rebased on source files from Linux next-20170421.
> > > These were recombined as requested by Doug Ledford.
> >
> > Hi Doug,
> >
> > I recommend you to be extra cautious with this blind automatic
> > conversions. It requires inspection that every size before and
> > after
> > match each other.
> >
> > I already asked it and would be like to repeat it. Please DON'T
> > take any
> > patches from Markus, which are related to mlx4/mlx5/rxe without our
> > explicit
> > review of them.
>
> I agree with Leon here, and these sort of find/replace automagic
> clean-up patches make me nervous sometimes.
OK, the easiest way to make sure that only the things you want from his
patches get through is to have you pull them into a branch and submit
them yourself. I'll only take the ones you submit to me, that way
there is no confusion about whether or not you have checked them and
approved them.
> Markus, what have you done to ensure your patches don't break
> anything?
>
> -Denny
>
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
^ permalink raw reply [flat|nested] 88+ messages in thread
[parent not found: <20170423073311.GA14088-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>]
* Re: [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten functions
[not found] ` <20170423073311.GA14088-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
@ 2017-04-24 16:38 ` Doug Ledford
0 siblings, 0 replies; 88+ messages in thread
From: Doug Ledford @ 2017-04-24 16:38 UTC (permalink / raw)
To: Leon Romanovsky
Cc: SF Markus Elfring, Devesh Sharma, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma-u79uwXL29TY76Z2rM5mHXA,
LKML, kernel-janitors-u79uwXL29TY76Z2rM5mHXA
On Sun, 2017-04-23 at 10:33 +0300, Leon Romanovsky wrote:
> On Sat, Apr 22, 2017 at 04:36:19PM +0200, SF Markus Elfring wrote:
> >
> > From: Markus Elfring <elfring@users.sourceforge.net>
> > Date: Sat, 22 Apr 2017 13:26:49 +0200
> >
> > Replace the specification of data types by pointer dereferences
> > as the parameter for the operator "sizeof" to make the
> > corresponding size
> > determinations a bit safer according to the Linux coding style
> > convention.
> >
> > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> > ---
> >
> > v2:
> > Changes were rebased on source files from Linux next-20170421.
> > These were recombined as requested by Doug Ledford.
>
> Hi Doug,
>
> I recommend you to be extra cautious with this blind automatic
> conversions. It requires inspection that every size before and after
> match each other.
>
> I already asked it and would be like to repeat it. Please DON'T take
> any
> patches from Markus, which are related to mlx4/mlx5/rxe without our
> explicit
> review of them.
OK, the easiest way to make sure that only the things you want from his
patches get through is to have you pull them into a branch and submit
them yourself. I'll only take the ones you submit to me, that way
there is no confusion about whether or not you have checked them and
approved them.
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH v2 04/12] IB/ocrdma: Delete unnecessary variable initialisations in ocrdma_mbx_get_dcbx_confi
2017-04-22 14:26 ` [PATCH v2 00/12] InfiniBand-OCRDMA: Fine-tuning for several function implementations SF Markus Elfring
[not found] ` <86425035-7da8-d2b1-8544-d4f7540d50c6-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
@ 2017-04-22 14:40 ` SF Markus Elfring
2017-04-22 14:43 ` [PATCH v2 05/12] IB/ocrdma: Delete unnecessary braces SF Markus Elfring
` (7 subsequent siblings)
9 siblings, 0 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:40 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 13:38:33 +0200
The local variables "req" and "rsp" will be set to appropriate pointers
a bit later. Thus omit the explicit initialisations at the beginning.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
---
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 7e58a74102f6..aa32bc9f323d 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -2894,9 +2894,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
int status;
dma_addr_t pa;
struct ocrdma_mqe cmd;
-
- struct ocrdma_get_dcbx_cfg_req *req = NULL;
- struct ocrdma_get_dcbx_cfg_rsp *rsp = NULL;
+ struct ocrdma_get_dcbx_cfg_req *req;
+ struct ocrdma_get_dcbx_cfg_rsp *rsp;
struct pci_dev *pdev = dev->nic_info.pdev;
struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
--
2.12.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH v2 05/12] IB/ocrdma: Delete unnecessary braces
2017-04-22 14:26 ` [PATCH v2 00/12] InfiniBand-OCRDMA: Fine-tuning for several function implementations SF Markus Elfring
[not found] ` <86425035-7da8-d2b1-8544-d4f7540d50c6-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-04-22 14:40 ` [PATCH v2 04/12] IB/ocrdma: Delete unnecessary variable initialisations in ocrdma_mbx_get_dcbx_confi SF Markus Elfring
@ 2017-04-22 14:43 ` SF Markus Elfring
2017-04-22 14:45 ` [PATCH v2 06/12] IB/ocrdma: Use kmalloc_array() in ocrdma_create_srq() SF Markus Elfring
` (6 subsequent siblings)
9 siblings, 0 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:43 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma
Cc: LKML, kernel-janitors, trivial
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 13:54:28 +0200
Do not use curly brackets at some source code places
where a single statement should be sufficient.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
v2:
Changes were rebased on source files from Linux next-20170421.
These were recombined as requested by Doug Ledford.
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 17 ++++++------
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 41 +++++++++++------------------
2 files changed, 24 insertions(+), 34 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index aa32bc9f323d..d5b988b011d1 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -1092,14 +1092,14 @@ static int ocrdma_mbx_cmd(struct ocrdma_dev *dev, struct ocrdma_mqe *mqe)
if (cqe_status || ext_status) {
pr_err("%s() cqe_status=0x%x, ext_status=0x%x,",
__func__, cqe_status, ext_status);
- if (rsp) {
+ if (rsp)
/* This is for embedded cmds. */
pr_err("opcode=0x%x, subsystem=0x%x\n",
(rsp->subsys_op & OCRDMA_MBX_RSP_OPCODE_MASK) >>
OCRDMA_MBX_RSP_OPCODE_SHIFT,
(rsp->subsys_op & OCRDMA_MBX_RSP_SUBSYS_MASK) >>
OCRDMA_MBX_RSP_SUBSYS_SHIFT);
- }
+
status = ocrdma_get_mbx_cqe_errno(cqe_status);
goto mbx_err;
}
@@ -1600,10 +1600,9 @@ void ocrdma_alloc_pd_pool(struct ocrdma_dev *dev)
return;
status = ocrdma_mbx_alloc_pd_range(dev);
- if (status) {
+ if (status)
pr_err("%s(%d) Unable to initialize PD pool, using default.\n",
__func__, dev->id);
- }
}
static void ocrdma_free_pd_pool(struct ocrdma_dev *dev)
@@ -2997,11 +2996,10 @@ static int ocrdma_parse_dcbxcfg_rsp(struct ocrdma_dev *dev, int ptype,
goto out;
}
}
- if (slindx = OCRDMA_MAX_SERVICE_LEVEL_INDEX) {
+ if (slindx = OCRDMA_MAX_SERVICE_LEVEL_INDEX)
pr_info("%s ocrdma%d application priority not set for 0x%x protocol\n",
dev_name(&dev->nic_info.pdev->dev),
dev->id, proto);
- }
}
}
@@ -3158,16 +3156,17 @@ static int ocrdma_modify_eqd(struct ocrdma_dev *dev, struct ocrdma_eq *eq,
int num)
{
int num_eqs, i = 0;
- if (num > 8) {
+
+ if (num > 8)
while (num) {
num_eqs = min(num, 8);
ocrdma_mbx_modify_eqd(dev, &eq[i], num_eqs);
i += num_eqs;
num -= num_eqs;
}
- } else {
+ else
ocrdma_mbx_modify_eqd(dev, eq, num);
- }
+
return 0;
}
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index f12d1d458f28..16f14d4c3e85 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -504,10 +504,10 @@ static int ocrdma_dealloc_ucontext_pd(struct ocrdma_ucontext *uctx)
struct ocrdma_pd *pd = uctx->cntxt_pd;
struct ocrdma_dev *dev = get_ocrdma_dev(pd->ibpd.device);
- if (uctx->pd_in_use) {
+ if (uctx->pd_in_use)
pr_err("%s(%d) Freeing in use pdid=0x%x.\n",
__func__, dev->id, pd->id);
- }
+
uctx->cntxt_pd = NULL;
(void)_ocrdma_dealloc_pd(dev, pd);
return 0;
@@ -741,11 +741,10 @@ struct ib_pd *ocrdma_alloc_pd(struct ib_device *ibdev,
return &pd->ibpd;
err:
- if (is_uctx_pd) {
+ if (is_uctx_pd)
ocrdma_release_ucontext_pd(uctx);
- } else {
+ else
status = _ocrdma_dealloc_pd(dev, pd);
- }
exit:
return ERR_PTR(status);
}
@@ -1022,10 +1021,10 @@ int ocrdma_dereg_mr(struct ib_mr *ib_mr)
kfree(mr);
/* Don't stop cleanup, in case FW is unresponsive */
- if (dev->mqe_ctx.fw_error_state) {
+ if (dev->mqe_ctx.fw_error_state)
pr_err("%s(%d) fw not responding.\n",
__func__, dev->id);
- }
+
return 0;
}
@@ -1417,10 +1416,10 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd,
goto gen_err;
memset(&ureq, 0, sizeof(ureq));
- if (udata) {
+ if (udata)
if (ib_copy_from_udata(&ureq, udata, sizeof(ureq)))
return ERR_PTR(-EFAULT);
- }
+
qp = kzalloc(sizeof(*qp), GFP_KERNEL);
if (!qp) {
status = -ENOMEM;
@@ -2835,15 +2834,11 @@ static bool ocrdma_poll_rcqe(struct ocrdma_qp *qp, struct ocrdma_cqe *cqe,
bool expand = false;
ibwc->wc_flags = 0;
- if (qp->qp_type = IB_QPT_UD || qp->qp_type = IB_QPT_GSI) {
- status = (le32_to_cpu(cqe->flags_status_srcqpn) &
- OCRDMA_CQE_UD_STATUS_MASK) >>
- OCRDMA_CQE_UD_STATUS_SHIFT;
- } else {
- status = (le32_to_cpu(cqe->flags_status_srcqpn) &
- OCRDMA_CQE_STATUS_MASK) >> OCRDMA_CQE_STATUS_SHIFT;
- }
-
+ status = (qp->qp_type = IB_QPT_UD || qp->qp_type = IB_QPT_GSI)
+ ? ((le32_to_cpu(cqe->flags_status_srcqpn) &
+ OCRDMA_CQE_UD_STATUS_MASK) >> OCRDMA_CQE_UD_STATUS_SHIFT)
+ : ((le32_to_cpu(cqe->flags_status_srcqpn) &
+ OCRDMA_CQE_STATUS_MASK) >> OCRDMA_CQE_STATUS_SHIFT);
if (status = OCRDMA_CQE_SUCCESS) {
*polled = true;
ocrdma_poll_success_rcqe(qp, cqe, ibwc);
@@ -2891,13 +2886,9 @@ static int ocrdma_poll_hwcq(struct ocrdma_cq *cq, int num_entries,
qp = dev->qp_tbl[qpn];
BUG_ON(qp = NULL);
- if (is_cqe_for_sq(cqe)) {
- expand = ocrdma_poll_scqe(qp, cqe, ibwc, &polled,
- &stop);
- } else {
- expand = ocrdma_poll_rcqe(qp, cqe, ibwc, &polled,
- &stop);
- }
+ expand = is_cqe_for_sq(cqe)
+ ? ocrdma_poll_scqe(qp, cqe, ibwc, &polled, &stop)
+ : ocrdma_poll_rcqe(qp, cqe, ibwc, &polled, &stop);
if (expand)
goto expand_cqe;
if (stop)
--
2.12.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH v2 06/12] IB/ocrdma: Use kmalloc_array() in ocrdma_create_srq()
2017-04-22 14:26 ` [PATCH v2 00/12] InfiniBand-OCRDMA: Fine-tuning for several function implementations SF Markus Elfring
` (2 preceding siblings ...)
2017-04-22 14:43 ` [PATCH v2 05/12] IB/ocrdma: Delete unnecessary braces SF Markus Elfring
@ 2017-04-22 14:45 ` SF Markus Elfring
2017-04-22 14:47 ` [PATCH v2 07/12] IB/ocrdma: Adjust 21 checks for null pointers SF Markus Elfring
` (5 subsequent siblings)
9 siblings, 0 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:45 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 14:17:46 +0200
* A multiplication for the size determination of a memory allocation
indicated that an array data structure should be processed.
Thus use the corresponding function "kmalloc_array".
This issue was detected by using the Coccinelle software.
* Replace the specification of a data type by a pointer dereference
to make the corresponding size determination a bit safer according to
the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 16f14d4c3e85..5eaf946aeac6 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1908,8 +1908,9 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
srq->bit_fields_len = (srq->rq.max_cnt / 32) +
(srq->rq.max_cnt % 32 ? 1 : 0);
- srq->idx_bit_fields - kmalloc(srq->bit_fields_len * sizeof(u32), GFP_KERNEL);
+ srq->idx_bit_fields = kmalloc_array(srq->bit_fields_len,
+ sizeof(*srq->idx_bit_fields),
+ GFP_KERNEL);
if (srq->idx_bit_fields = NULL)
goto arm_err;
memset(srq->idx_bit_fields, 0xff,
--
2.12.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH v2 07/12] IB/ocrdma: Adjust 21 checks for null pointers
2017-04-22 14:26 ` [PATCH v2 00/12] InfiniBand-OCRDMA: Fine-tuning for several function implementations SF Markus Elfring
` (3 preceding siblings ...)
2017-04-22 14:45 ` [PATCH v2 06/12] IB/ocrdma: Use kmalloc_array() in ocrdma_create_srq() SF Markus Elfring
@ 2017-04-22 14:47 ` SF Markus Elfring
[not found] ` <3ec5ffa4-8976-e793-f22c-5f01c9d6bb9d-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-04-22 14:48 ` [PATCH v2 08/12] IB/ocrdma: Delete an error message for a failed memory allocation in ocrdma_add() SF Markus Elfring
` (4 subsequent siblings)
9 siblings, 1 reply; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:47 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 14:20:37 +0200
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The script “checkpatch.pl” pointed information out like the following.
Comparison to NULL could be written !…
Thus fix affected source code places.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
v2:
Changes were rebased on source files from Linux next-20170421.
These were recombined as requested by Doug Ledford.
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 20 ++++++++++----------
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +-
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 20 ++++++++++----------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index d5b988b011d1..8c7f0b108a7f 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -665,7 +665,7 @@ static void ocrdma_process_qpcat_error(struct ocrdma_dev *dev,
enum ib_qp_state new_ib_qps = IB_QPS_ERR;
enum ib_qp_state old_ib_qps;
- if (qp = NULL)
+ if (!qp)
BUG();
ocrdma_qp_state_change(qp, new_ib_qps, &old_ib_qps);
}
@@ -693,7 +693,7 @@ static void ocrdma_dispatch_ibevent(struct ocrdma_dev *dev,
if (cqe->qpvalid_qpid & OCRDMA_AE_MCQE_QPVALID) {
if (qpid < dev->attr.max_qp)
qp = dev->qp_tbl[qpid];
- if (qp = NULL) {
+ if (!qp) {
pr_err("ocrdma%d:Async event - qpid %u is not valid\n",
dev->id, qpid);
return;
@@ -703,7 +703,7 @@ static void ocrdma_dispatch_ibevent(struct ocrdma_dev *dev,
if (cqe->cqvalid_cqid & OCRDMA_AE_MCQE_CQVALID) {
if (cqid < dev->attr.max_cq)
cq = dev->cq_tbl[cqid];
- if (cq = NULL) {
+ if (!cq) {
pr_err("ocrdma%d:Async event - cqid %u is not valid\n",
dev->id, cqid);
return;
@@ -882,7 +882,7 @@ static int ocrdma_mq_cq_handler(struct ocrdma_dev *dev, u16 cq_id)
while (1) {
cqe = ocrdma_get_mcqe(dev);
- if (cqe = NULL)
+ if (!cqe)
break;
ocrdma_le32_to_cpu(cqe, sizeof(*cqe));
cqe_popped += 1;
@@ -948,7 +948,7 @@ static void ocrdma_qp_buddy_cq_handler(struct ocrdma_dev *dev,
* false - Check for RQ CQ
*/
bcq = _ocrdma_qp_buddy_cq_handler(dev, cq, true);
- if (bcq = NULL)
+ if (!bcq)
bcq = _ocrdma_qp_buddy_cq_handler(dev, cq, false);
spin_unlock_irqrestore(&dev->flush_q_lock, flags);
@@ -969,7 +969,7 @@ static void ocrdma_qp_cq_handler(struct ocrdma_dev *dev, u16 cq_idx)
BUG();
cq = dev->cq_tbl[cq_idx];
- if (cq = NULL)
+ if (!cq)
return;
if (cq->ibcq.comp_handler) {
@@ -1289,7 +1289,7 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
int status;
old_stats = kmalloc(sizeof(*old_stats), GFP_KERNEL);
- if (old_stats = NULL)
+ if (!old_stats)
return -ENOMEM;
memset(mqe, 0, sizeof(*mqe));
@@ -1676,12 +1676,12 @@ static int ocrdma_mbx_create_ah_tbl(struct ocrdma_dev *dev)
dev->av_tbl.pbl.va = dma_alloc_coherent(&pdev->dev, PAGE_SIZE,
&dev->av_tbl.pbl.pa,
GFP_KERNEL);
- if (dev->av_tbl.pbl.va = NULL)
+ if (!dev->av_tbl.pbl.va)
goto mem_err;
dev->av_tbl.va = dma_alloc_coherent(&pdev->dev, dev->av_tbl.size,
&pa, GFP_KERNEL);
- if (dev->av_tbl.va = NULL)
+ if (!dev->av_tbl.va)
goto mem_err_ah;
dev->av_tbl.pa = pa;
dev->av_tbl.num_ah = max_ah;
@@ -1722,7 +1722,7 @@ static void ocrdma_mbx_delete_ah_tbl(struct ocrdma_dev *dev)
struct ocrdma_delete_ah_tbl *cmd;
struct pci_dev *pdev = dev->nic_info.pdev;
- if (dev->av_tbl.va = NULL)
+ if (!dev->av_tbl.va)
return;
cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_DELETE_AH_TBL, sizeof(*cmd));
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index e2aa67d6cbb8..b82f6c6942e0 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -238,7 +238,7 @@ static int ocrdma_alloc_resources(struct ocrdma_dev *dev)
dev->stag_arr = kcalloc(OCRDMA_MAX_STAG, sizeof(*dev->stag_arr),
GFP_KERNEL);
- if (dev->stag_arr = NULL)
+ if (!dev->stag_arr)
goto alloc_err;
ocrdma_alloc_pd_pool(dev);
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 5eaf946aeac6..c804889db7e1 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -267,7 +267,7 @@ static int ocrdma_add_mmap(struct ocrdma_ucontext *uctx, u64 phy_addr,
struct ocrdma_mm *mm;
mm = kzalloc(sizeof(*mm), GFP_KERNEL);
- if (mm = NULL)
+ if (!mm)
return -ENOMEM;
mm->key.phy_addr = phy_addr;
mm->key.len = len;
@@ -1194,7 +1194,7 @@ static int ocrdma_add_qpn_map(struct ocrdma_dev *dev, struct ocrdma_qp *qp)
{
int status = -EINVAL;
- if (qp->id < OCRDMA_MAX_QP && dev->qp_tbl[qp->id] = NULL) {
+ if (qp->id < OCRDMA_MAX_QP && !dev->qp_tbl[qp->id]) {
dev->qp_tbl[qp->id] = qp;
status = 0;
}
@@ -1362,11 +1362,11 @@ static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp)
{
qp->wqe_wr_id_tbl = kcalloc(qp->sq.max_cnt, sizeof(*qp->wqe_wr_id_tbl),
GFP_KERNEL);
- if (qp->wqe_wr_id_tbl = NULL)
+ if (!qp->wqe_wr_id_tbl)
return -ENOMEM;
qp->rqe_wr_id_tbl = kcalloc(qp->rq.max_cnt, sizeof(*qp->rqe_wr_id_tbl),
GFP_KERNEL);
- if (qp->rqe_wr_id_tbl = NULL)
+ if (!qp->rqe_wr_id_tbl)
return -ENOMEM;
return 0;
@@ -1426,7 +1426,7 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd,
goto gen_err;
}
ocrdma_set_qp_init_params(qp, pd, attrs);
- if (udata = NULL)
+ if (!udata)
qp->cap_flags |= (OCRDMA_QP_MW_BIND | OCRDMA_QP_LKEY0 |
OCRDMA_QP_FAST_REG);
@@ -1438,7 +1438,7 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd,
goto mbx_err;
/* user space QP's wr_id table are managed in library */
- if (udata = NULL) {
+ if (!udata) {
status = ocrdma_alloc_wr_id_tbl(qp);
if (status)
goto map_err;
@@ -1899,11 +1899,11 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
if (status)
goto err;
- if (udata = NULL) {
+ if (!udata) {
srq->rqe_wr_id_tbl = kcalloc(srq->rq.max_cnt,
sizeof(*srq->rqe_wr_id_tbl),
GFP_KERNEL);
- if (srq->rqe_wr_id_tbl = NULL)
+ if (!srq->rqe_wr_id_tbl)
goto arm_err;
srq->bit_fields_len = (srq->rq.max_cnt / 32) +
@@ -1911,7 +1911,7 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
srq->idx_bit_fields = kmalloc_array(srq->bit_fields_len,
sizeof(*srq->idx_bit_fields),
GFP_KERNEL);
- if (srq->idx_bit_fields = NULL)
+ if (!srq->idx_bit_fields)
goto arm_err;
memset(srq->idx_bit_fields, 0xff,
srq->bit_fields_len * sizeof(*srq->idx_bit_fields));
@@ -2885,7 +2885,7 @@ static int ocrdma_poll_hwcq(struct ocrdma_cq *cq, int num_entries,
if (qpn = 0)
goto skip_cqe;
qp = dev->qp_tbl[qpn];
- BUG_ON(qp = NULL);
+ BUG_ON(!qp);
expand = is_cqe_for_sq(cqe)
? ocrdma_poll_scqe(qp, cqe, ibwc, &polled, &stop)
--
2.12.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH v2 08/12] IB/ocrdma: Delete an error message for a failed memory allocation in ocrdma_add()
2017-04-22 14:26 ` [PATCH v2 00/12] InfiniBand-OCRDMA: Fine-tuning for several function implementations SF Markus Elfring
` (4 preceding siblings ...)
2017-04-22 14:47 ` [PATCH v2 07/12] IB/ocrdma: Adjust 21 checks for null pointers SF Markus Elfring
@ 2017-04-22 14:48 ` SF Markus Elfring
2017-04-22 14:49 ` [PATCH v2 09/12] IB/ocrdma: Delete an unnecessary variable assignment in ocrdma_alloc_mr() SF Markus Elfring
` (3 subsequent siblings)
9 siblings, 0 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:48 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma
Cc: LKML, kernel-janitors, Wolfram Sang
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 14:36:30 +0200
Omit an extra message for a memory allocation failure in this function.
Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Devesh Sharma <devesh.sharma@broadcom.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
---
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index b82f6c6942e0..d3942558b083 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -304,10 +304,9 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
struct ocrdma_dev *dev;
dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(*dev));
- if (!dev) {
- pr_err("Unable to allocate ib device\n");
+ if (!dev)
return NULL;
- }
+
dev->mbx_cmd = kzalloc(sizeof(struct ocrdma_mqe_emb_cmd), GFP_KERNEL);
if (!dev->mbx_cmd)
goto idr_err;
--
2.12.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH v2 09/12] IB/ocrdma: Delete an unnecessary variable assignment in ocrdma_alloc_mr()
2017-04-22 14:26 ` [PATCH v2 00/12] InfiniBand-OCRDMA: Fine-tuning for several function implementations SF Markus Elfring
` (5 preceding siblings ...)
2017-04-22 14:48 ` [PATCH v2 08/12] IB/ocrdma: Delete an error message for a failed memory allocation in ocrdma_add() SF Markus Elfring
@ 2017-04-22 14:49 ` SF Markus Elfring
2017-04-22 14:50 ` [PATCH v2 10/12] IB/ocrdma: Returning only value constants in ocrdma_resize_cq() SF Markus Elfring
` (2 subsequent siblings)
9 siblings, 0 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:49 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 15:07:41 +0200
Delete an assignment for the local variable "status" in an if branch
because the desired failure indication is already specified by a constant
error code at the end.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Devesh Sharma <devesh.sharma@broadcom.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index c804889db7e1..2dc399eeeefd 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -3022,10 +3022,8 @@ struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd,
return ERR_PTR(-ENOMEM);
mr->pages = kcalloc(max_num_sg, sizeof(*mr->pages), GFP_KERNEL);
- if (!mr->pages) {
- status = -ENOMEM;
+ if (!mr->pages)
goto pl_err;
- }
status = ocrdma_get_pbl_info(dev, mr, max_num_sg);
if (status)
--
2.12.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH v2 10/12] IB/ocrdma: Returning only value constants in ocrdma_resize_cq()
2017-04-22 14:26 ` [PATCH v2 00/12] InfiniBand-OCRDMA: Fine-tuning for several function implementations SF Markus Elfring
` (6 preceding siblings ...)
2017-04-22 14:49 ` [PATCH v2 09/12] IB/ocrdma: Delete an unnecessary variable assignment in ocrdma_alloc_mr() SF Markus Elfring
@ 2017-04-22 14:50 ` SF Markus Elfring
2017-04-22 14:51 ` [PATCH v2 11/12] IB/ocrdma: Delete an unnecessary variable in ocrdma_dealloc_pd() SF Markus Elfring
2017-04-22 14:54 ` [PATCH v2 12/12] IB/ocrdma: One jump label less in ocrdma_alloc_ucontext_pd() SF Markus Elfring
9 siblings, 0 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:50 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 15:15:09 +0200
Return constant integer values without storing them in the local
variable "status".
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Devesh Sharma <devesh.sharma@broadcom.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 2dc399eeeefd..60b8813aff42 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1122,15 +1122,12 @@ struct ib_cq *ocrdma_create_cq(struct ib_device *ibdev,
int ocrdma_resize_cq(struct ib_cq *ibcq, int new_cnt,
struct ib_udata *udata)
{
- int status = 0;
struct ocrdma_cq *cq = get_ocrdma_cq(ibcq);
- if (new_cnt < 1 || new_cnt > cq->max_hw_cqe) {
- status = -EINVAL;
- return status;
- }
+ if (new_cnt < 1 || new_cnt > cq->max_hw_cqe)
+ return -EINVAL;
ibcq->cqe = new_cnt;
- return status;
+ return 0;
}
static void ocrdma_flush_cq(struct ocrdma_cq *cq)
--
2.12.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH v2 11/12] IB/ocrdma: Delete an unnecessary variable in ocrdma_dealloc_pd()
2017-04-22 14:26 ` [PATCH v2 00/12] InfiniBand-OCRDMA: Fine-tuning for several function implementations SF Markus Elfring
` (7 preceding siblings ...)
2017-04-22 14:50 ` [PATCH v2 10/12] IB/ocrdma: Returning only value constants in ocrdma_resize_cq() SF Markus Elfring
@ 2017-04-22 14:51 ` SF Markus Elfring
2017-04-22 14:54 ` [PATCH v2 12/12] IB/ocrdma: One jump label less in ocrdma_alloc_ucontext_pd() SF Markus Elfring
9 siblings, 0 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:51 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 15:32:05 +0200
1. Return zero in one case directly.
2. Return the value from a call of the function "_ocrdma_dealloc_pd"
without using an extra assignment for the local variable.
3. Remove the variable "status" in this function then.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Devesh Sharma <devesh.sharma@broadcom.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 60b8813aff42..712c0dc9c980 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -754,7 +754,6 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd)
struct ocrdma_pd *pd = get_ocrdma_pd(ibpd);
struct ocrdma_dev *dev = get_ocrdma_dev(ibpd->device);
struct ocrdma_ucontext *uctx = NULL;
- int status = 0;
u64 usr_db;
uctx = pd->uctx;
@@ -768,11 +767,10 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd)
if (is_ucontext_pd(uctx, pd)) {
ocrdma_release_ucontext_pd(uctx);
- return status;
+ return 0;
}
}
- status = _ocrdma_dealloc_pd(dev, pd);
- return status;
+ return _ocrdma_dealloc_pd(dev, pd);
}
static int ocrdma_alloc_lkey(struct ocrdma_dev *dev, struct ocrdma_mr *mr,
--
2.12.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH v2 12/12] IB/ocrdma: One jump label less in ocrdma_alloc_ucontext_pd()
2017-04-22 14:26 ` [PATCH v2 00/12] InfiniBand-OCRDMA: Fine-tuning for several function implementations SF Markus Elfring
` (8 preceding siblings ...)
2017-04-22 14:51 ` [PATCH v2 11/12] IB/ocrdma: Delete an unnecessary variable in ocrdma_dealloc_pd() SF Markus Elfring
@ 2017-04-22 14:54 ` SF Markus Elfring
9 siblings, 0 replies; 88+ messages in thread
From: SF Markus Elfring @ 2017-04-22 14:54 UTC (permalink / raw)
To: Devesh Sharma, Doug Ledford, Hal Rosenstock, Sean Hefty,
Selvin Xavier, Yuval Shaia, linux-rdma
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 15:45:21 +0200
This issue was detected by using the Coccinelle software.
1. Return directly if a call of the function "_ocrdma_alloc_pd" failed.
2. Reduce the scope for the local variable "status" to one case
of an if statement.
3. Delete the jump label "err" then.
4. Return zero as a constant at the end.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Devesh Sharma <devesh.sharma@broadcom.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
---
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 712c0dc9c980..fbceb9d9d5b0 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -484,19 +484,17 @@ static int ocrdma_alloc_ucontext_pd(struct ocrdma_dev *dev,
struct ocrdma_ucontext *uctx,
struct ib_udata *udata)
{
- int status = 0;
-
uctx->cntxt_pd = _ocrdma_alloc_pd(dev, uctx, udata);
if (IS_ERR(uctx->cntxt_pd)) {
- status = PTR_ERR(uctx->cntxt_pd);
+ int status = PTR_ERR(uctx->cntxt_pd);
+
uctx->cntxt_pd = NULL;
- goto err;
+ return status;
}
uctx->cntxt_pd->uctx = uctx;
uctx->cntxt_pd->ibpd.device = &dev->ibdev;
-err:
- return status;
+ return 0;
}
static int ocrdma_dealloc_ucontext_pd(struct ocrdma_ucontext *uctx)
--
2.12.2
^ permalink raw reply related [flat|nested] 88+ messages in thread