| Message ID | 755f6c2c-03a2-7248-a5e3-9190d119cdaf@users.sourceforge.net (mailing list archive) |
|---|---|
| State | Deferred |
| Headers | show |
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
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 -- 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
> 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
--
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
On Mon, Apr 24, 2017 at 03:23:52PM +0200, SF Markus Elfring wrote: > > 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? > Dennis, He didn't check it, this is why in most susbsystems his patches are ignored. Thanks > Regards, > Markus
> He didn't check it, this is why in most susbsystems his patches are ignored.
I assume that it does only partly matter how much I could check
such an update suggestion when you would generally prefer to exclude
some special change possibilities.
It can eventually happen a bit more software evolution, can't it there?
Regards,
Markus
--
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
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.
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 >
On Mon, Apr 24, 2017 at 12:38:58PM -0400, Doug Ledford wrote: > 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. Fine to me. Thanks > > > 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 >
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;