Commit 41d7a6d6 authored by Toshi Kani's avatar Toshi Kani Committed by Dan Williams
Browse files

libnvdimm: Set numa_node to NVDIMM devices 



ACPI NFIT table has System Physical Address Range Structure entries that
describe a proximity ID of each range when ACPI_NFIT_PROXIMITY_VALID is
set in the flags.

Change acpi_nfit_register_region() to map a proximity ID to its node ID,
and set it to a new numa_node field of nd_region_desc, which is then
conveyed to the nd_region device.

The device core arranges for btt and namespace devices to inherit their
node from their parent region.

Signed-off-by: default avatarToshi Kani <toshi.kani@hp.com>
[djbw: move set_dev_node() from region.c to bus.c]
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 99759869

arch/x86/kernel/pmem.c

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ static __init int register_e820_pmem(void) 
		memset(&ndr_desc, 0, sizeof(ndr_desc));

		ndr_desc.res = &res;

		ndr_desc.attr_groups = e820_pmem_region_attribute_groups;

		ndr_desc.numa_node = NUMA_NO_NODE;

		if (!nvdimm_pmem_region_create(nvdimm_bus, &ndr_desc))

			goto err;

	}

drivers/acpi/nfit.c

+6 −0
Original line number Diff line number Diff line
@@ -1392,6 +1392,12 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc, 
	ndr_desc->res = &res;

	ndr_desc->provider_data = nfit_spa;

	ndr_desc->attr_groups = acpi_nfit_region_attribute_groups;

	if (spa->flags & ACPI_NFIT_PROXIMITY_VALID)

		ndr_desc->numa_node = acpi_map_pxm_to_online_node(

						spa->proximity_domain);

	else

		ndr_desc->numa_node = NUMA_NO_NODE;



	list_for_each_entry(nfit_memdev, &acpi_desc->memdevs, list) {

		struct acpi_nfit_memory_map *memdev = nfit_memdev->memdev;

		struct nd_mapping *nd_mapping;

drivers/nvdimm/bus.c

+6 −0
Original line number Diff line number Diff line
@@ -48,6 +48,12 @@ static int to_nd_device_type(struct device *dev) 


static int nvdimm_bus_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	/*

	 * Ensure that region devices always have their numa node set as

	 * early as possible.

	 */

	if (is_nd_pmem(dev) || is_nd_blk(dev))

		set_dev_node(dev, to_nd_region(dev)->numa_node);

	return add_uevent_var(env, "MODALIAS=" ND_DEVICE_MODALIAS_FMT,

			to_nd_device_type(dev));

}

drivers/nvdimm/nd.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ struct nd_region { 
	u16 ndr_mappings;

	u64 ndr_size;

	u64 ndr_start;

	int id, num_lanes, ro;

	int id, num_lanes, ro, numa_node;

	void *provider_data;

	struct nd_interleave_set *nd_set;

	struct nd_percpu_lane __percpu *lane;

drivers/nvdimm/region_devs.c

+1 −0
Original line number Diff line number Diff line
@@ -736,6 +736,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, 
	nd_region->nd_set = ndr_desc->nd_set;

	nd_region->num_lanes = ndr_desc->num_lanes;

	nd_region->ro = ro;

	nd_region->numa_node = ndr_desc->numa_node;

	ida_init(&nd_region->ns_ida);

	ida_init(&nd_region->btt_ida);

	dev = &nd_region->dev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE