Merge branch 'next-lockdown' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux.git] / drivers / nvdimm / region_devs.c

diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c
index af30cbe7a8ea26fd5eb643af56e1a9bffaeda7ff..3fd6b59abd33049293df0ddc3c98d023f1c7cd8d 100644 (file)
--- a/drivers/nvdimm/region_devs.c
+++ b/drivers/nvdimm/region_devs.c
@@ -715,85 +715,37 @@ void nd_mapping_free_labels(struct nd_mapping *nd_mapping)
 }
 
 /*
- * Upon successful probe/remove, take/release a reference on the
- * associated interleave set (if present), and plant new btt + namespace
- * seeds.  Also, on the removal of a BLK region, notify the provider to
- * disable the region.
+ * When a namespace is activated create new seeds for the next
+ * namespace, or namespace-personality to be configured.
  */
-static void nd_region_notify_driver_action(struct nvdimm_bus *nvdimm_bus,
-               struct device *dev, bool probe)
+void nd_region_advance_seeds(struct nd_region *nd_region, struct device *dev)
 {
-       struct nd_region *nd_region;
-
-       if (!probe && is_nd_region(dev)) {
-               int i;
-
-               nd_region = to_nd_region(dev);
-               for (i = 0; i < nd_region->ndr_mappings; i++) {
-                       struct nd_mapping *nd_mapping = &nd_region->mapping[i];
-                       struct nvdimm_drvdata *ndd = nd_mapping->ndd;
-                       struct nvdimm *nvdimm = nd_mapping->nvdimm;
-
-                       mutex_lock(&nd_mapping->lock);
-                       nd_mapping_free_labels(nd_mapping);
-                       mutex_unlock(&nd_mapping->lock);
-
-                       put_ndd(ndd);
-                       nd_mapping->ndd = NULL;
-                       if (ndd)
-                               atomic_dec(&nvdimm->busy);
-               }
-       }
-       if (dev->parent && is_nd_region(dev->parent) && probe) {
-               nd_region = to_nd_region(dev->parent);
-               nvdimm_bus_lock(dev);
-               if (nd_region->ns_seed == dev)
-                       nd_region_create_ns_seed(nd_region);
-               nvdimm_bus_unlock(dev);
-       }
-       if (is_nd_btt(dev) && probe) {
+       nvdimm_bus_lock(dev);
+       if (nd_region->ns_seed == dev) {
+               nd_region_create_ns_seed(nd_region);
+       } else if (is_nd_btt(dev)) {
                struct nd_btt *nd_btt = to_nd_btt(dev);
 
-               nd_region = to_nd_region(dev->parent);
-               nvdimm_bus_lock(dev);
                if (nd_region->btt_seed == dev)
                        nd_region_create_btt_seed(nd_region);
                if (nd_region->ns_seed == &nd_btt->ndns->dev)
                        nd_region_create_ns_seed(nd_region);
-               nvdimm_bus_unlock(dev);
-       }
-       if (is_nd_pfn(dev) && probe) {
+       } else if (is_nd_pfn(dev)) {
                struct nd_pfn *nd_pfn = to_nd_pfn(dev);
 
-               nd_region = to_nd_region(dev->parent);
-               nvdimm_bus_lock(dev);
                if (nd_region->pfn_seed == dev)
                        nd_region_create_pfn_seed(nd_region);
                if (nd_region->ns_seed == &nd_pfn->ndns->dev)
                        nd_region_create_ns_seed(nd_region);
-               nvdimm_bus_unlock(dev);
-       }
-       if (is_nd_dax(dev) && probe) {
+       } else if (is_nd_dax(dev)) {
                struct nd_dax *nd_dax = to_nd_dax(dev);
 
-               nd_region = to_nd_region(dev->parent);
-               nvdimm_bus_lock(dev);
                if (nd_region->dax_seed == dev)
                        nd_region_create_dax_seed(nd_region);
                if (nd_region->ns_seed == &nd_dax->nd_pfn.ndns->dev)
                        nd_region_create_ns_seed(nd_region);
-               nvdimm_bus_unlock(dev);
        }
-}
-
-void nd_region_probe_success(struct nvdimm_bus *nvdimm_bus, struct device *dev)
-{
-       nd_region_notify_driver_action(nvdimm_bus, dev, true);
-}
-
-void nd_region_disable(struct nvdimm_bus *nvdimm_bus, struct device *dev)
-{
-       nd_region_notify_driver_action(nvdimm_bus, dev, false);
+       nvdimm_bus_unlock(dev);
 }
 
 static ssize_t mappingN(struct device *dev, char *buf, int n)
@@ -992,10 +944,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;
                }
 
@@ -1025,10 +977,9 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,
                }
                region_buf = ndbr;
        } else {
-               nd_region = kzalloc(sizeof(struct nd_region)
-                               + sizeof(struct nd_mapping)
-                               * ndr_desc->num_mappings,
-                               GFP_KERNEL);
+               nd_region = kzalloc(struct_size(nd_region, mapping,
+                                               ndr_desc->num_mappings),
+                                   GFP_KERNEL);
                region_buf = nd_region;
        }