leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libnvdimm, namespace: sort namespaces by dpa at init

Browse Source 
Add more determinism to initial namespace device-name assignments by
sorting the namespaces by starting dpa.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2016-10-05 14:04:15 -07:00
parent 0e3b0d123c
commit 6ff3e912d3
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/nvdimm/namespace_devs.c
View File

@ -12,6 +12,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/sort.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pmem.h> #include <linux/pmem.h>
#include <linux/list.h> #include <linux/list.h>
@ -66,17 +67,17 @@ static struct device_type namespace_blk_device_type = {
.release = namespace_blk_release, .release = namespace_blk_release,
}; };
static bool is_namespace_pmem(struct device *dev) static bool is_namespace_pmem(const struct device *dev)
{ {
return dev ? dev->type == &namespace_pmem_device_type : false; return dev ? dev->type == &namespace_pmem_device_type : false;
} }
static bool is_namespace_blk(struct device *dev) static bool is_namespace_blk(const struct device *dev)
{ {
return dev ? dev->type == &namespace_blk_device_type : false; return dev ? dev->type == &namespace_blk_device_type : false;
} }
static bool is_namespace_io(struct device *dev) static bool is_namespace_io(const struct device *dev)
{ {
return dev ? dev->type == &namespace_io_device_type : false; return dev ? dev->type == &namespace_io_device_type : false;
} }
@ -1919,6 +1920,31 @@ struct device *create_namespace_blk(struct nd_region *nd_region,
return ERR_PTR(-ENXIO); return ERR_PTR(-ENXIO);
} }
static int cmp_dpa(const void *a, const void *b)
{
const struct device *dev_a = *(const struct device **) a;
const struct device *dev_b = *(const struct device **) b;
struct nd_namespace_blk *nsblk_a, *nsblk_b;
struct nd_namespace_pmem *nspm_a, *nspm_b;
if (is_namespace_io(dev_a))
return 0;
if (is_namespace_blk(dev_a)) {
nsblk_a = to_nd_namespace_blk(dev_a);
nsblk_b = to_nd_namespace_blk(dev_b);
return memcmp(&nsblk_a->res[0]->start, &nsblk_b->res[0]->start,
sizeof(resource_size_t));
}
nspm_a = to_nd_namespace_pmem(dev_a);
nspm_b = to_nd_namespace_pmem(dev_b);
return memcmp(&nspm_a->nsio.res.start, &nspm_b->nsio.res.start,
sizeof(resource_size_t));
}
static struct device **scan_labels(struct nd_region *nd_region) static struct device **scan_labels(struct nd_region *nd_region)
{ {
struct nd_mapping *nd_mapping = &nd_region->mapping[0]; struct nd_mapping *nd_mapping = &nd_region->mapping[0];
@ -2034,6 +2060,9 @@ static struct device **scan_labels(struct nd_region *nd_region)
} }
} }
if (count > 1)
sort(devs, count, sizeof(struct device *), cmp_dpa, NULL);
return devs; return devs;
err: err:

6
include/linux/nd.h
View File

@ -107,19 +107,19 @@ struct nd_namespace_blk {
struct resource **res; struct resource **res;
}; };
static inline struct nd_namespace_io *to_nd_namespace_io(struct device *dev) static inline struct nd_namespace_io *to_nd_namespace_io(const struct device *dev)
{ {
return container_of(dev, struct nd_namespace_io, common.dev); return container_of(dev, struct nd_namespace_io, common.dev);
} }
static inline struct nd_namespace_pmem *to_nd_namespace_pmem(struct device *dev) static inline struct nd_namespace_pmem *to_nd_namespace_pmem(const struct device *dev)
{ {
struct nd_namespace_io *nsio = to_nd_namespace_io(dev); struct nd_namespace_io *nsio = to_nd_namespace_io(dev);
return container_of(nsio, struct nd_namespace_pmem, nsio); return container_of(nsio, struct nd_namespace_pmem, nsio);
} }
static inline struct nd_namespace_blk *to_nd_namespace_blk(struct device *dev) static inline struct nd_namespace_blk *to_nd_namespace_blk(const struct device *dev)
{ {
return container_of(dev, struct nd_namespace_blk, common.dev); return container_of(dev, struct nd_namespace_blk, common.dev);
} }