From: Dan Williams <dan.j.williams@intel.com> To: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Cc: linux-nvdimm <linux-nvdimm@lists.01.org>, Linux MM <linux-mm@kvack.org>, linuxppc-dev <linuxppc-dev@lists.ozlabs.org> Subject: Re: [PATCH v5 3/4] mm/nvdimm: Use correct #defines instead of open coding Date: Thu, 15 Aug 2019 14:05:29 -0700 [thread overview] Message-ID: <CAPcyv4hc_-oGMp6jGVknnYs+rmj4W1A_gFCbmAX2LFw0hsfL5g@mail.gmail.com> (raw) In-Reply-To: <20190809074520.27115-4-aneesh.kumar@linux.ibm.com> On Fri, Aug 9, 2019 at 12:45 AM Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> wrote: > > Use PAGE_SIZE instead of SZ_4K and sizeof(struct page) instead of 64. > If we have a kernel built with different struct page size the previous > patch should handle marking the namespace disabled. Each of these changes carry independent non-overlapping regression risk, so lets split them into separate patches. Others might > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> > --- > drivers/nvdimm/label.c | 2 +- > drivers/nvdimm/namespace_devs.c | 6 +++--- > drivers/nvdimm/pfn_devs.c | 3 ++- > drivers/nvdimm/region_devs.c | 8 ++++---- > 4 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c > index 73e197babc2f..7ee037063be7 100644 > --- a/drivers/nvdimm/label.c > +++ b/drivers/nvdimm/label.c > @@ -355,7 +355,7 @@ static bool slot_valid(struct nvdimm_drvdata *ndd, > > /* check that DPA allocations are page aligned */ > if ((__le64_to_cpu(nd_label->dpa) > - | __le64_to_cpu(nd_label->rawsize)) % SZ_4K) > + | __le64_to_cpu(nd_label->rawsize)) % PAGE_SIZE) The UEFI label specification has no concept of PAGE_SIZE, so this check is a pure Linux-ism. There's no strict requirement why slot_valid() needs to check for page alignment and it would seem to actively hurt cross-page-size compatibility, so let's delete the check and rely on checksum validation. > return false; > > /* check checksum */ > diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c > index a16e52251a30..a9c76df12cb9 100644 > --- a/drivers/nvdimm/namespace_devs.c > +++ b/drivers/nvdimm/namespace_devs.c > @@ -1006,10 +1006,10 @@ static ssize_t __size_store(struct device *dev, unsigned long long val) > return -ENXIO; > } > > - div_u64_rem(val, SZ_4K * nd_region->ndr_mappings, &remainder); > + div_u64_rem(val, PAGE_SIZE * nd_region->ndr_mappings, &remainder); > if (remainder) { > - dev_dbg(dev, "%llu is not %dK aligned\n", val, > - (SZ_4K * nd_region->ndr_mappings) / SZ_1K); > + dev_dbg(dev, "%llu is not %ldK aligned\n", val, > + (PAGE_SIZE * nd_region->ndr_mappings) / SZ_1K); > return -EINVAL; Yes, looks good, but this deserves its own independent patch. > } > > diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c > index 37e96811c2fc..c1d9be609322 100644 > --- a/drivers/nvdimm/pfn_devs.c > +++ b/drivers/nvdimm/pfn_devs.c > @@ -725,7 +725,8 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) > * when populating the vmemmap. This *should* be equal to > * PMD_SIZE for most architectures. > */ > - offset = ALIGN(start + SZ_8K + 64 * npfns, align) - start; > + offset = ALIGN(start + SZ_8K + sizeof(struct page) * npfns, I'd prefer if this was not dynamic and was instead set to the maximum size of 'struct page' across all archs just to enhance cross-arch compatibility. I think that answer is '64'. > + align) - start; > } else if (nd_pfn->mode == PFN_MODE_RAM) > offset = ALIGN(start + SZ_8K, align) - start; > else > diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c > index af30cbe7a8ea..20e265a534f8 100644 > --- a/drivers/nvdimm/region_devs.c > +++ b/drivers/nvdimm/region_devs.c > @@ -992,10 +992,10 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, > struct nd_mapping_desc *mapping = &ndr_desc->mapping[i]; > struct nvdimm *nvdimm = mapping->nvdimm; > > - if ((mapping->start | mapping->size) % SZ_4K) { > - dev_err(&nvdimm_bus->dev, "%s: %s mapping%d is not 4K aligned\n", > - caller, dev_name(&nvdimm->dev), i); > - > + if ((mapping->start | mapping->size) % PAGE_SIZE) { > + dev_err(&nvdimm_bus->dev, > + "%s: %s mapping%d is not %ld aligned\n", > + caller, dev_name(&nvdimm->dev), i, PAGE_SIZE); > return NULL; > } > > -- > 2.21.0 >
WARNING: multiple messages have this Message-ID (diff)
From: Dan Williams <dan.j.williams@intel.com> To: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Cc: Linux MM <linux-mm@kvack.org>, linuxppc-dev <linuxppc-dev@lists.ozlabs.org>, linux-nvdimm <linux-nvdimm@lists.01.org> Subject: Re: [PATCH v5 3/4] mm/nvdimm: Use correct #defines instead of open coding Date: Thu, 15 Aug 2019 14:05:29 -0700 [thread overview] Message-ID: <CAPcyv4hc_-oGMp6jGVknnYs+rmj4W1A_gFCbmAX2LFw0hsfL5g@mail.gmail.com> (raw) In-Reply-To: <20190809074520.27115-4-aneesh.kumar@linux.ibm.com> On Fri, Aug 9, 2019 at 12:45 AM Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> wrote: > > Use PAGE_SIZE instead of SZ_4K and sizeof(struct page) instead of 64. > If we have a kernel built with different struct page size the previous > patch should handle marking the namespace disabled. Each of these changes carry independent non-overlapping regression risk, so lets split them into separate patches. Others might > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> > --- > drivers/nvdimm/label.c | 2 +- > drivers/nvdimm/namespace_devs.c | 6 +++--- > drivers/nvdimm/pfn_devs.c | 3 ++- > drivers/nvdimm/region_devs.c | 8 ++++---- > 4 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c > index 73e197babc2f..7ee037063be7 100644 > --- a/drivers/nvdimm/label.c > +++ b/drivers/nvdimm/label.c > @@ -355,7 +355,7 @@ static bool slot_valid(struct nvdimm_drvdata *ndd, > > /* check that DPA allocations are page aligned */ > if ((__le64_to_cpu(nd_label->dpa) > - | __le64_to_cpu(nd_label->rawsize)) % SZ_4K) > + | __le64_to_cpu(nd_label->rawsize)) % PAGE_SIZE) The UEFI label specification has no concept of PAGE_SIZE, so this check is a pure Linux-ism. There's no strict requirement why slot_valid() needs to check for page alignment and it would seem to actively hurt cross-page-size compatibility, so let's delete the check and rely on checksum validation. > return false; > > /* check checksum */ > diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c > index a16e52251a30..a9c76df12cb9 100644 > --- a/drivers/nvdimm/namespace_devs.c > +++ b/drivers/nvdimm/namespace_devs.c > @@ -1006,10 +1006,10 @@ static ssize_t __size_store(struct device *dev, unsigned long long val) > return -ENXIO; > } > > - div_u64_rem(val, SZ_4K * nd_region->ndr_mappings, &remainder); > + div_u64_rem(val, PAGE_SIZE * nd_region->ndr_mappings, &remainder); > if (remainder) { > - dev_dbg(dev, "%llu is not %dK aligned\n", val, > - (SZ_4K * nd_region->ndr_mappings) / SZ_1K); > + dev_dbg(dev, "%llu is not %ldK aligned\n", val, > + (PAGE_SIZE * nd_region->ndr_mappings) / SZ_1K); > return -EINVAL; Yes, looks good, but this deserves its own independent patch. > } > > diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c > index 37e96811c2fc..c1d9be609322 100644 > --- a/drivers/nvdimm/pfn_devs.c > +++ b/drivers/nvdimm/pfn_devs.c > @@ -725,7 +725,8 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) > * when populating the vmemmap. This *should* be equal to > * PMD_SIZE for most architectures. > */ > - offset = ALIGN(start + SZ_8K + 64 * npfns, align) - start; > + offset = ALIGN(start + SZ_8K + sizeof(struct page) * npfns, I'd prefer if this was not dynamic and was instead set to the maximum size of 'struct page' across all archs just to enhance cross-arch compatibility. I think that answer is '64'. > + align) - start; > } else if (nd_pfn->mode == PFN_MODE_RAM) > offset = ALIGN(start + SZ_8K, align) - start; > else > diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c > index af30cbe7a8ea..20e265a534f8 100644 > --- a/drivers/nvdimm/region_devs.c > +++ b/drivers/nvdimm/region_devs.c > @@ -992,10 +992,10 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, > struct nd_mapping_desc *mapping = &ndr_desc->mapping[i]; > struct nvdimm *nvdimm = mapping->nvdimm; > > - if ((mapping->start | mapping->size) % SZ_4K) { > - dev_err(&nvdimm_bus->dev, "%s: %s mapping%d is not 4K aligned\n", > - caller, dev_name(&nvdimm->dev), i); > - > + if ((mapping->start | mapping->size) % PAGE_SIZE) { > + dev_err(&nvdimm_bus->dev, > + "%s: %s mapping%d is not %ld aligned\n", > + caller, dev_name(&nvdimm->dev), i, PAGE_SIZE); > return NULL; > } > > -- > 2.21.0 >
next prev parent reply other threads:[~2019-08-15 21:05 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-09 7:45 [PATCH v5 0/4] Mark the namespace disabled on pfn superblock mismatch Aneesh Kumar K.V 2019-08-09 7:45 ` Aneesh Kumar K.V 2019-08-09 7:45 ` Aneesh Kumar K.V 2019-08-09 7:45 ` [PATCH v5 1/4] nvdimm: Consider probe return -EOPNOTSUPP as success Aneesh Kumar K.V 2019-08-09 7:45 ` Aneesh Kumar K.V 2019-08-09 7:45 ` Aneesh Kumar K.V 2019-08-14 4:22 ` Dan Williams 2019-08-14 4:22 ` Dan Williams 2019-08-14 4:22 ` Dan Williams 2019-08-15 19:54 ` Dan Williams 2019-08-15 19:54 ` Dan Williams 2019-08-15 19:54 ` Dan Williams 2019-08-19 7:05 ` Aneesh Kumar K.V 2019-08-19 7:05 ` Aneesh Kumar K.V 2019-08-19 7:05 ` Aneesh Kumar K.V 2019-08-19 16:57 ` Dan Williams 2019-08-19 16:57 ` Dan Williams 2019-08-19 16:57 ` Dan Williams 2019-08-09 7:45 ` [PATCH v5 2/4] mm/nvdimm: Add page size and struct page size to pfn superblock Aneesh Kumar K.V 2019-08-09 7:45 ` Aneesh Kumar K.V 2019-08-09 7:45 ` Aneesh Kumar K.V 2019-08-10 4:21 ` Aneesh Kumar K.V 2019-08-14 21:06 ` Dan Williams 2019-08-09 7:45 ` [PATCH v5 3/4] mm/nvdimm: Use correct #defines instead of open coding Aneesh Kumar K.V 2019-08-09 7:45 ` Aneesh Kumar K.V 2019-08-09 7:45 ` Aneesh Kumar K.V 2019-08-15 21:05 ` Dan Williams [this message] 2019-08-15 21:05 ` Dan Williams 2019-08-15 21:05 ` Dan Williams 2019-08-19 7:11 ` Aneesh Kumar K.V 2019-08-19 7:11 ` Aneesh Kumar K.V 2019-08-19 7:11 ` Aneesh Kumar K.V 2019-08-19 9:30 ` Aneesh Kumar K.V 2019-08-19 9:30 ` Aneesh Kumar K.V 2019-08-19 20:33 ` Dan Williams 2019-08-19 20:33 ` Dan Williams 2019-08-19 20:33 ` Dan Williams 2019-08-09 7:45 ` [PATCH v5 4/4] mm/nvdimm: Pick the right alignment default when creating dax devices Aneesh Kumar K.V 2019-08-09 7:45 ` Aneesh Kumar K.V 2019-08-09 7:45 ` Aneesh Kumar K.V
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=CAPcyv4hc_-oGMp6jGVknnYs+rmj4W1A_gFCbmAX2LFw0hsfL5g@mail.gmail.com \ --to=dan.j.williams@intel.com \ --cc=aneesh.kumar@linux.ibm.com \ --cc=linux-mm@kvack.org \ --cc=linux-nvdimm@lists.01.org \ --cc=linuxppc-dev@lists.ozlabs.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: linkBe 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.