From: Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>
To: xiaolinkui <xiaolinkui@kylinos.cn>, "axboe@kernel.dk" <axboe@kernel.dk>
Cc: "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] block: bio: use struct_size() in kmalloc()
Date: Fri, 17 May 2019 17:18:05 +0000 [thread overview]
Message-ID: <SN6PR04MB452786C2CE869D353697B9A7860B0@SN6PR04MB4527.namprd04.prod.outlook.com> (raw)
In-Reply-To: 1558084350-25632-1-git-send-email-xiaolinkui@kylinos.cn
Looks good.
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
On 5/17/19 2:17 AM, xiaolinkui wrote:
> One of the more common cases of allocation size calculations is finding
> the size of a structure that has a zero-sized array at the end, along
> with memory for some number of elements for that array. For example:
>
> struct foo {
> int stuff;
> struct boo entry[];
> };
>
> instance = kmalloc(sizeof(struct foo) + count * sizeof(struct boo), GFP_KERNEL);
>
> Instead of leaving these open-coded and prone to type mistakes, we can
> now use the new struct_size() helper:
>
> instance = kmalloc(struct_size(instance, entry, count), GFP_KERNEL);
>
> Signed-off-by: xiaolinkui <xiaolinkui@kylinos.cn>
> ---
> block/bio.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/block/bio.c b/block/bio.c
> index 683cbb4..847ac60 100644
> --- a/block/bio.c
> +++ b/block/bio.c
> @@ -436,9 +436,7 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, unsigned int nr_iovecs,
> if (nr_iovecs > UIO_MAXIOV)
> return NULL;
>
> - p = kmalloc(sizeof(struct bio) +
> - nr_iovecs * sizeof(struct bio_vec),
> - gfp_mask);
> + p = kmalloc(struct_size(bio, bi_io_vec, nr_iovecs), gfp_mask);
> front_pad = 0;
> inline_vecs = nr_iovecs;
> } else {
> @@ -1120,8 +1118,7 @@ static struct bio_map_data *bio_alloc_map_data(struct iov_iter *data,
> if (data->nr_segs > UIO_MAXIOV)
> return NULL;
>
> - bmd = kmalloc(sizeof(struct bio_map_data) +
> - sizeof(struct iovec) * data->nr_segs, gfp_mask);
> + bmd = kmalloc(struct_size(bmd, iov, data->nr_segs), gfp_mask);
> if (!bmd)
> return NULL;
> memcpy(bmd->iov, data->iov, sizeof(struct iovec) * data->nr_segs);
next prev parent reply other threads:[~2019-05-17 17:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-17 9:12 [PATCH] block: bio: use struct_size() in kmalloc() xiaolinkui
2019-05-17 17:18 ` Chaitanya Kulkarni [this message]
2019-05-17 21:17 ` Jens Axboe
2019-05-17 22:59 ` Jens Axboe
2019-06-10 15:04 [PATCH] block: bio: Use " Gustavo A. R. Silva
2019-06-10 17:53 ` Kees Cook
2019-06-15 7:45 ` Jens Axboe
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=SN6PR04MB452786C2CE869D353697B9A7860B0@SN6PR04MB4527.namprd04.prod.outlook.com \
--to=chaitanya.kulkarni@wdc.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=xiaolinkui@kylinos.cn \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).