From: Joao Martins <joao.m.martins@oracle.com>
To: linux-mm@kvack.org
Cc: Dan Williams <dan.j.williams@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Dave Jiang <dave.jiang@intel.com>,
Naoya Horiguchi <naoya.horiguchi@nec.com>,
Matthew Wilcox <willy@infradead.org>,
Jason Gunthorpe <jgg@ziepe.ca>,
John Hubbard <jhubbard@nvidia.com>,
Jane Chu <jane.chu@oracle.com>,
Muchun Song <songmuchun@bytedance.com>,
Mike Kravetz <mike.kravetz@oracle.com>,
Andrew Morton <akpm@linux-foundation.org>,
Jonathan Corbet <corbet@lwn.net>, Christoph Hellwig <hch@lst.de>,
nvdimm@lists.linux.dev, linux-doc@vger.kernel.org,
Joao Martins <joao.m.martins@oracle.com>
Subject: [PATCH v7 06/11] device-dax: use struct_size()
Date: Thu, 2 Dec 2021 20:44:17 +0000 [thread overview]
Message-ID: <20211202204422.26777-7-joao.m.martins@oracle.com> (raw)
In-Reply-To: <20211202204422.26777-1-joao.m.martins@oracle.com>
Use the struct_size() helper for the size of a struct with variable array
member at the end, rather than manually calculating it.
Suggested-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
---
drivers/dax/device.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/dax/device.c b/drivers/dax/device.c
index 0b82159b3564..038816b91af6 100644
--- a/drivers/dax/device.c
+++ b/drivers/dax/device.c
@@ -404,8 +404,9 @@ int dev_dax_probe(struct dev_dax *dev_dax)
return -EINVAL;
if (!pgmap) {
- pgmap = devm_kzalloc(dev, sizeof(*pgmap) + sizeof(struct range)
- * (dev_dax->nr_range - 1), GFP_KERNEL);
+ pgmap = devm_kzalloc(dev,
+ struct_size(pgmap, ranges, dev_dax->nr_range - 1),
+ GFP_KERNEL);
if (!pgmap)
return -ENOMEM;
pgmap->nr_range = dev_dax->nr_range;
--
2.17.2
next prev parent reply other threads:[~2021-12-02 20:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-02 20:44 [PATCH v7 00/11] mm, device-dax: Introduce compound pages in devmap Joao Martins
2021-12-02 20:44 ` [PATCH v7 01/11] memory-failure: fetch compound_head after pgmap_pfn_valid() Joao Martins
2021-12-02 20:44 ` [PATCH v7 02/11] mm/page_alloc: split prep_compound_page into head and tail subparts Joao Martins
2021-12-02 20:44 ` [PATCH v7 03/11] mm/page_alloc: refactor memmap_init_zone_device() page init Joao Martins
2021-12-02 20:44 ` [PATCH v7 04/11] mm/memremap: add ZONE_DEVICE support for compound pages Joao Martins
2021-12-02 20:44 ` [PATCH v7 05/11] device-dax: use ALIGN() for determining pgoff Joao Martins
2021-12-02 20:44 ` Joao Martins [this message]
2021-12-02 20:44 ` [PATCH v7 07/11] device-dax: ensure dev_dax->pgmap is valid for dynamic devices Joao Martins
2021-12-02 20:44 ` [PATCH v7 08/11] device-dax: factor out page mapping initialization Joao Martins
2021-12-02 20:44 ` [PATCH v7 09/11] device-dax: set mapping prior to vmf_insert_pfn{,_pmd,pud}() Joao Martins
2021-12-02 20:44 ` [PATCH v7 10/11] device-dax: remove pfn from __dev_dax_{pte,pmd,pud}_fault() Joao Martins
2021-12-03 7:30 ` kernel test robot
2021-12-03 7:30 ` [PATCH v7 10/11] device-dax: remove pfn from __dev_dax_{pte, pmd, pud}_fault() kernel test robot
2021-12-02 20:44 ` [PATCH v7 11/11] device-dax: compound devmap support Joao Martins
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=20211202204422.26777-7-joao.m.martins@oracle.com \
--to=joao.m.martins@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=corbet@lwn.net \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=hch@lst.de \
--cc=jane.chu@oracle.com \
--cc=jgg@ziepe.ca \
--cc=jhubbard@nvidia.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mike.kravetz@oracle.com \
--cc=naoya.horiguchi@nec.com \
--cc=nvdimm@lists.linux.dev \
--cc=songmuchun@bytedance.com \
--cc=vishal.l.verma@intel.com \
--cc=willy@infradead.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.