Architectures like ppc64 use different page size than PAGE_SIZE to map
direct-map address range. The kernel needs to make sure the namespace size is 
aligned
correctly for the direct-map page size.

kernel log will contain the below details
[  939.620064] nd namespace0.3: 1071644672 is not 16384K aligned

Signed-off-by: Aneesh Kumar K.V <[email protected]>
---
 drivers/nvdimm/namespace_devs.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index d77d9c9e449d..0e4c04765cb8 100644
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -917,6 +917,17 @@ static int grow_dpa_allocation(struct nd_region *nd_region,
        return 0;
 }
 
+static unsigned long nvdimm_validate_namespace_size(struct nd_region 
*nd_region,
+               unsigned long size, unsigned long align_size)
+{
+       u32 remainder;
+
+       div_u64_rem(size, align_size * nd_region->ndr_mappings, &remainder);
+       if (remainder)
+               return align_size * nd_region->ndr_mappings;
+       return 0;
+}
+
 static void nd_namespace_pmem_set_resource(struct nd_region *nd_region,
                struct nd_namespace_pmem *nspm, resource_size_t size)
 {
@@ -975,7 +986,8 @@ static ssize_t __size_store(struct device *dev, unsigned 
long long val)
        struct nd_mapping *nd_mapping;
        struct nvdimm_drvdata *ndd;
        struct nd_label_id label_id;
-       u32 flags = 0, remainder;
+       unsigned long map_size;
+       u32 flags = 0;
        int rc, i, id = -1;
        u8 *uuid = NULL;
 
@@ -1006,10 +1018,9 @@ static ssize_t __size_store(struct device *dev, unsigned 
long long val)
                return -ENXIO;
        }
 
-       div_u64_rem(val, PAGE_SIZE * nd_region->ndr_mappings, &remainder);
-       if (remainder) {
-               dev_dbg(dev, "%llu is not %ldK aligned\n", val,
-                               (PAGE_SIZE * nd_region->ndr_mappings) / SZ_1K);
+       map_size = nvdimm_validate_namespace_size(nd_region, val, 
arch_namespace_align_size());
+       if (map_size) {
+               dev_err(dev, "%llu is not %ldK aligned\n", val, map_size / 
SZ_1K);
                return -EINVAL;
        }
 
-- 
2.23.0
_______________________________________________
Linux-nvdimm mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to