From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
To: Stephen Hemminger <stephen@networkplumber.org>,
"Michael S. Tsirkin" <mst@redhat.com>
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH net-next 3/3] virtio: use kcalloc and kmalloc_array
Date: Tue, 26 Jul 2016 18:34:00 +0200 [thread overview]
Message-ID: <579790F8.2000409@cumulusnetworks.com> (raw)
In-Reply-To: <20160726162037.897138759@networkplumber.org>
On 26/07/16 18:20, Stephen Hemminger wrote:
> Preferred style is to use kcalloc and kmalloc_array.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
>
> --- a/drivers/net/virtio_net.c 2016-07-26 09:13:19.805400983 -0700
> +++ b/drivers/net/virtio_net.c 2016-07-26 09:13:19.801400965 -0700
> @@ -1551,13 +1551,13 @@ static int virtnet_find_vqs(struct virtn
> virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ);
>
> /* Allocate space for find_vqs parameters */
> - vqs = kzalloc(total_vqs * sizeof(*vqs), GFP_KERNEL);
> + vqs = kzalloc(total_vqs, sizeof(*vqs), GFP_KERNEL);
I don't think this patch will compile.
Too much args for kzalloc, s/kzalloc/kcalloc/
Cheers,
Nik
> if (!vqs)
> goto err_vq;
> - callbacks = kmalloc(total_vqs * sizeof(*callbacks), GFP_KERNEL);
> + callbacks = kmalloc_array(total_vqs, sizeof(*callbacks), GFP_KERNEL);
> if (!callbacks)
> goto err_callback;
> - names = kmalloc(total_vqs * sizeof(*names), GFP_KERNEL);
> + names = kmalloc_array(total_vqs, sizeof(*names), GFP_KERNEL);
> if (!names)
> goto err_names;
>
> @@ -1613,10 +1613,10 @@ static int virtnet_alloc_queues(struct v
> {
> int i;
>
> - vi->sq = kzalloc(sizeof(*vi->sq) * vi->max_queue_pairs, GFP_KERNEL);
> + vi->sq = kcalloc(vi->max_queue_pairs, sizeof(*vi->sq), GFP_KERNEL);
> if (!vi->sq)
> goto err_sq;
> - vi->rq = kzalloc(sizeof(*vi->rq) * vi->max_queue_pairs, GFP_KERNEL);
> + vi->rq = kcalloc(vi->max_queue_pairs, sizeof(*vi->rq), GFP_KERNEL);
> if (!vi->rq)
> goto err_rq;
>
>
next prev parent reply other threads:[~2016-07-26 16:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-26 16:20 [PATCH net-next 0/3] virtio: style cleanups Stephen Hemminger
2016-07-26 16:20 ` [PATCH net-next 1/3] virtio: whitespace cleanups Stephen Hemminger
2016-07-26 16:20 ` [PATCH net-next 2/3] virtio: cleanup sizeof usage Stephen Hemminger
2016-07-26 16:20 ` [PATCH net-next 3/3] virtio: use kcalloc and kmalloc_array Stephen Hemminger
2016-07-26 16:34 ` Nikolay Aleksandrov [this message]
2016-07-26 16:34 ` Michael S. Tsirkin
2016-07-26 16:35 ` Stephen Hemminger
2016-07-26 18:05 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=579790F8.2000409@cumulusnetworks.com \
--to=nikolay@cumulusnetworks.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.