Commit d10032dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libnvdimm-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm 

Pull libnvdimm updates from Dan Williams:
 "The highlight this cycle is continuing integration fixes for PowerPC
  and some resulting optimizations.

  Summary:

   - Updates to better support vmalloc space restrictions on PowerPC
     platforms.

   - Cleanups to move common sysfs attributes to core 'struct
     device_type' objects.

   - Export the 'target_node' attribute (the effective numa node if pmem
     is marked online) for regions and namespaces.

   - Miscellaneous fixups and optimizations"

* tag 'libnvdimm-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (21 commits)
  MAINTAINERS: Remove Keith from NVDIMM maintainers
  libnvdimm: Export the target_node attribute for regions and namespaces
  dax: Add numa_node to the default device-dax attributes
  libnvdimm: Simplify root read-only definition for the 'resource' attribute
  dax: Simplify root read-only definition for the 'resource' attribute
  dax: Create a dax device_type
  libnvdimm: Move nvdimm_bus_attribute_group to device_type
  libnvdimm: Move nvdimm_attribute_group to device_type
  libnvdimm: Move nd_mapping_attribute_group to device_type
  libnvdimm: Move nd_region_attribute_group to device_type
  libnvdimm: Move nd_numa_attribute_group to device_type
  libnvdimm: Move nd_device_attribute_group to device_type
  libnvdimm: Move region attribute group definition
  libnvdimm: Move attribute groups to device type
  libnvdimm: Remove prototypes for nonexistent functions
  libnvdimm/btt: fix variable 'rc' set but not used
  libnvdimm/pmem: Delete include of nd-core.h
  libnvdimm/namespace: Differentiate between probe mapping and runtime mapping
  libnvdimm/pfn_dev: Don't clear device memmap area during generic namespace probe
  libnvdimm: Trivial comment fix
  ...
parents 43fd4bd7 0dfbb932

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -4911,7 +4911,6 @@ F: include/trace/events/fs_dax.h 
DEVICE DIRECT ACCESS (DAX)

M:	Dan Williams <dan.j.williams@intel.com>

M:	Vishal Verma <vishal.l.verma@intel.com>

M:	Keith Busch <keith.busch@intel.com>

M:	Dave Jiang <dave.jiang@intel.com>

L:	linux-nvdimm@lists.01.org

S:	Supported
@@ -9439,7 +9438,6 @@ LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM 
M:	Dan Williams <dan.j.williams@intel.com>

M:	Vishal Verma <vishal.l.verma@intel.com>

M:	Dave Jiang <dave.jiang@intel.com>

M:	Keith Busch <keith.busch@intel.com>

M:	Ira Weiny <ira.weiny@intel.com>

L:	linux-nvdimm@lists.01.org

Q:	https://patchwork.kernel.org/project/linux-nvdimm/list/

arch/powerpc/platforms/pseries/papr_scm.c

+2 −23
Original line number Diff line number Diff line
@@ -284,25 +284,6 @@ int papr_scm_ndctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, 
	return 0;

}



static const struct attribute_group *region_attr_groups[] = {

	&nd_region_attribute_group,

	&nd_device_attribute_group,

	&nd_mapping_attribute_group,

	&nd_numa_attribute_group,

	NULL,

};



static const struct attribute_group *bus_attr_groups[] = {

	&nvdimm_bus_attribute_group,

	NULL,

};



static const struct attribute_group *papr_scm_dimm_groups[] = {

	&nvdimm_attribute_group,

	&nd_device_attribute_group,

	NULL,

};



static inline int papr_scm_node(int node)

{

	int min_dist = INT_MAX, dist;
@@ -333,7 +314,6 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p) 
	p->bus_desc.ndctl = papr_scm_ndctl;

	p->bus_desc.module = THIS_MODULE;

	p->bus_desc.of_node = p->pdev->dev.of_node;

	p->bus_desc.attr_groups = bus_attr_groups;

	p->bus_desc.provider_name = kstrdup(p->pdev->name, GFP_KERNEL);



	if (!p->bus_desc.provider_name)
@@ -348,8 +328,8 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p) 
	dimm_flags = 0;

	set_bit(NDD_ALIASING, &dimm_flags);



	p->nvdimm = nvdimm_create(p->bus, p, papr_scm_dimm_groups,

				dimm_flags, PAPR_SCM_DIMM_CMD_MASK, 0, NULL);

	p->nvdimm = nvdimm_create(p->bus, p, NULL, dimm_flags,

				  PAPR_SCM_DIMM_CMD_MASK, 0, NULL);

	if (!p->nvdimm) {

		dev_err(dev, "Error creating DIMM object for %pOF\n", p->dn);

		goto err;
@@ -366,7 +346,6 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p) 
	mapping.size = p->blocks * p->block_size; // XXX: potential overflow?



	memset(&ndr_desc, 0, sizeof(ndr_desc));

	ndr_desc.attr_groups = region_attr_groups;

	target_nid = dev_to_node(&p->pdev->dev);

	online_nid = papr_scm_node(target_nid);

	ndr_desc.numa_node = online_nid;

drivers/acpi/nfit/core.c

+0 −7
Original line number Diff line number Diff line
@@ -1404,7 +1404,6 @@ static const struct attribute_group acpi_nfit_attribute_group = { 
};



static const struct attribute_group *acpi_nfit_attribute_groups[] = {

	&nvdimm_bus_attribute_group,

	&acpi_nfit_attribute_group,

	NULL,

};
@@ -1698,8 +1697,6 @@ static const struct attribute_group acpi_nfit_dimm_attribute_group = { 
};



static const struct attribute_group *acpi_nfit_dimm_attribute_groups[] = {

	&nvdimm_attribute_group,

	&nd_device_attribute_group,

	&acpi_nfit_dimm_attribute_group,

	NULL,

};
@@ -2197,10 +2194,6 @@ static const struct attribute_group acpi_nfit_region_attribute_group = { 
};



static const struct attribute_group *acpi_nfit_region_attribute_groups[] = {

	&nd_region_attribute_group,

	&nd_mapping_attribute_group,

	&nd_device_attribute_group,

	&nd_numa_attribute_group,

	&acpi_nfit_region_attribute_group,

	NULL,

};

drivers/dax/bus.c

+17 −5
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static ssize_t resource_show(struct device *dev, 


	return sprintf(buf, "%#llx\n", dev_dax_resource(dev_dax));

}

static DEVICE_ATTR_RO(resource);

static DEVICE_ATTR(resource, 0400, resource_show, NULL);



static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,

		char *buf)
@@ -322,6 +322,13 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, 
}

static DEVICE_ATTR_RO(modalias);



static ssize_t numa_node_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "%d\n", dev_to_node(dev));

}

static DEVICE_ATTR_RO(numa_node);



static umode_t dev_dax_visible(struct kobject *kobj, struct attribute *a, int n)

{

	struct device *dev = container_of(kobj, struct device, kobj);
@@ -329,8 +336,8 @@ static umode_t dev_dax_visible(struct kobject *kobj, struct attribute *a, int n) 


	if (a == &dev_attr_target_node.attr && dev_dax_target_node(dev_dax) < 0)

		return 0;

	if (a == &dev_attr_resource.attr)

		return 0400;

	if (a == &dev_attr_numa_node.attr && !IS_ENABLED(CONFIG_NUMA))

		return 0;

	return a->mode;

}
@@ -339,6 +346,7 @@ static struct attribute *dev_dax_attributes[] = { 
	&dev_attr_size.attr,

	&dev_attr_target_node.attr,

	&dev_attr_resource.attr,

	&dev_attr_numa_node.attr,

	NULL,

};
@@ -373,6 +381,11 @@ static void dev_dax_release(struct device *dev) 
	kfree(dev_dax);

}



static const struct device_type dev_dax_type = {

	.release = dev_dax_release,

	.groups = dax_attribute_groups,

};



static void unregister_dev_dax(void *dev)

{

	struct dev_dax *dev_dax = to_dev_dax(dev);
@@ -430,8 +443,7 @@ struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id, 
	else

		dev->class = dax_class;

	dev->parent = parent;

	dev->groups = dax_attribute_groups;

	dev->release = dev_dax_release;

	dev->type = &dev_dax_type;

	dev_set_name(dev, "dax%d.%d", dax_region->id, id);



	rc = device_add(dev);

drivers/dax/pmem/core.c

+3 −3
Original line number Diff line number Diff line
@@ -25,20 +25,20 @@ struct dev_dax *__dax_pmem_probe(struct device *dev, enum dev_dax_subsys subsys) 
	ndns = nvdimm_namespace_common_probe(dev);

	if (IS_ERR(ndns))

		return ERR_CAST(ndns);

	nsio = to_nd_namespace_io(&ndns->dev);



	/* parse the 'pfn' info block via ->rw_bytes */

	rc = devm_nsio_enable(dev, nsio);

	rc = devm_namespace_enable(dev, ndns, nd_info_block_reserve());

	if (rc)

		return ERR_PTR(rc);

	rc = nvdimm_setup_pfn(nd_pfn, &pgmap);

	if (rc)

		return ERR_PTR(rc);

	devm_nsio_disable(dev, nsio);

	devm_namespace_disable(dev, ndns);



	/* reserve the metadata area, device-dax will reserve the data */

	pfn_sb = nd_pfn->pfn_sb;

	offset = le64_to_cpu(pfn_sb->dataoff);

	nsio = to_nd_namespace_io(&ndns->dev);

	if (!devm_request_mem_region(dev, nsio->res.start, offset,

				dev_name(&ndns->dev))) {

		dev_warn(dev, "could not reserve metadata\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE