On 12/17/2015 02:31 AM, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@xxxxxxxxxxxx>
>
> Convert kmalloc to be kmalloc_array to fix warnings below:
>
> WARNING: Prefer kmalloc_array over kmalloc with multiply
> + qp->sq.wrid = kmalloc(qp->sq.wqe_cnt * sizeof(u64),
>
> WARNING: Prefer kmalloc_array over kmalloc with multiply
> + qp->rq.wrid = kmalloc(qp->rq.wqe_cnt * sizeof(u64),
>
> WARNING: Prefer kmalloc_array over kmalloc with multiply
> + srq->wrid = kmalloc(srq->msrq.max * sizeof(u64),
>
> Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
> Reviewed-by: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
> ---
> drivers/infiniband/hw/mlx4/qp.c | 4 ++--
> drivers/infiniband/hw/mlx4/srq.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
> index dc86975fe1a9..70de13ed9da7 100644
> --- a/drivers/infiniband/hw/mlx4/qp.c
> +++ b/drivers/infiniband/hw/mlx4/qp.c
> @@ -796,12 +796,12 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
> if (err)
> goto err_mtt;
>
> - qp->sq.wrid = kmalloc(qp->sq.wqe_cnt * sizeof(u64),
> + qp->sq.wrid = kmalloc_array(qp->sq.wqe_cnt, sizeof(u64),
> gfp | __GFP_NOWARN);
> if (!qp->sq.wrid)
> qp->sq.wrid = __vmalloc(qp->sq.wqe_cnt * sizeof(u64),
> gfp, PAGE_KERNEL);
> - qp->rq.wrid = kmalloc(qp->rq.wqe_cnt * sizeof(u64),
> + qp->rq.wrid = kmalloc_array(qp->rq.wqe_cnt, sizeof(u64),
> gfp | __GFP_NOWARN);
> if (!qp->rq.wrid)
> qp->rq.wrid = __vmalloc(qp->rq.wqe_cnt * sizeof(u64),
> diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c
> index f416c7463827..68d5a5fda271 100644
> --- a/drivers/infiniband/hw/mlx4/srq.c
> +++ b/drivers/infiniband/hw/mlx4/srq.c
> @@ -171,7 +171,7 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
> if (err)
> goto err_mtt;
>
> - srq->wrid = kmalloc(srq->msrq.max * sizeof(u64),
> + srq->wrid = kmalloc_array(srq->msrq.max, sizeof(u64),
> GFP_KERNEL | __GFP_NOWARN);
> if (!srq->wrid) {
> srq->wrid = __vmalloc(srq->msrq.max * sizeof(u64),
>
Applied with some edits to the commit message, thanks.
--
Doug Ledford <dledford@xxxxxxxxxx>
GPG KeyID: 0E572FDD
Attachment:
signature.asc
Description: OpenPGP digital signature
