From patchwork Thu Dec 17 07:31:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 7870041 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DBBCD9F46B for ; Thu, 17 Dec 2015 07:34:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0DD56203A5 for ; Thu, 17 Dec 2015 07:34:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C6DF203B8 for ; Thu, 17 Dec 2015 07:34:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934735AbbLQHec (ORCPT ); Thu, 17 Dec 2015 02:34:32 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:35997 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934483AbbLQHea (ORCPT ); Thu, 17 Dec 2015 02:34:30 -0500 Received: by mail-wm0-f49.google.com with SMTP id p187so8192007wmp.1 for ; Wed, 16 Dec 2015 23:34:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leon-nu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4K6vt/uL++fX1YsRJV111jB0mjrxSb/mwBeIEn079ME=; b=zNIJ61KLkLLi4+tOKgcZ00N7l2t9X4jMRWNvf3E1XPXjWF/52sYFxek3nl8q3cT9nI jp4rtiXOf4ZuJU47zlfpeR9YgyDRx+JZt3lusykPWo8qiZKwqmEQnEiZJR0beEeFfMML d1hcVLEG+T48dBLAilUEf+HF/x9eeL9snMU8ulizoznSBqDc5M6WXg1Hter383Ke5yHq mb7cAaWtyfBeAGJThGGZQ1Uu83uLqkBQZxCRLWesFNJnA2Wjzn2TjN+Dl2w3z6h0s9VZ eQzeMn7A+eQCC3mDQIvpv3drYM/oOiBHr8o6g+gJ6/owpBfh2pnSic5rd15hkkZRRzxd TmKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4K6vt/uL++fX1YsRJV111jB0mjrxSb/mwBeIEn079ME=; b=G1VHBFcrlTFkW2/U/4en3021+07lCwsfFWJv9LmAeefqjtx3DbjrS8Hsz3j2knHWDg yf8CYeI3e/813VZ1DItowRO9tB9x5QG8wygDr9hBuvlZkG9X/l9zu7VCd5XiWWI0aTof Gx+kyr6cd5LMPl1JlFEh04rwXAzF7ITltHQ3sJjclbjLrHSznWlVBYSPJBOzX3waYgW9 wppMfZhG1ulRbiyUWCviW+ly1uyuxxN0JYSP4fbwela4nzWvNFDE5eA57pJk4UyqLQNk sY0bnah1aCmocWP9VZiv2lBVUWlodOASKAv7cMN/0+XNa48CAOebcQQCYRC1EmIILj3T +adQ== X-Gm-Message-State: ALoCoQkl/XsBbSg3uvlBlGc9zLjpMVCGgECwPE/tLkiqjcRdeBajdkQixh9Prbwg7jyvb7CE2npAMi9PQZ4L9IPXEwC9fnrcxA== X-Received: by 10.194.114.164 with SMTP id jh4mr54956975wjb.153.1450337669178; Wed, 16 Dec 2015 23:34:29 -0800 (PST) Received: from localhost ([213.57.247.249]) by smtp.gmail.com with ESMTPSA id 197sm980648wmt.19.2015.12.16.23.34.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Dec 2015 23:34:28 -0800 (PST) From: Leon Romanovsky To: dledford@redhat.com Cc: linux-rdma@vger.kernel.org, Leon Romanovsky Subject: [PATCH 2/2] IB/mlx4: Convert kmalloc to be kmalloc_array to fix checkpatch warnings Date: Thu, 17 Dec 2015 09:31:53 +0200 Message-Id: <1450337513-22609-2-git-send-email-leon@leon.nu> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1450337513-22609-1-git-send-email-leon@leon.nu> References: <1450337513-22609-1-git-send-email-leon@leon.nu> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Leon Romanovsky 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 Reviewed-by: Or Gerlitz Reviewed-by: Sagi Grimberg --- 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),