Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 538ea4aa authored by Dan Williams's avatar Dan Williams
Browse files

pmem, memremap: convert to numa aware allocations 



Given that pmem ranges come with numa-locality hints, arrange for the
resulting driver objects to be obtained from node-local memory.

Reviewed-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 7eff93b7

drivers/nvdimm/pmem.c

+3 −2
Original line number Diff line number Diff line
@@ -176,9 +176,10 @@ static void pmem_detach_disk(struct pmem_device *pmem) 
static int pmem_attach_disk(struct device *dev,

		struct nd_namespace_common *ndns, struct pmem_device *pmem)

{

	int nid = dev_to_node(dev);

	struct gendisk *disk;



	pmem->pmem_queue = blk_alloc_queue(GFP_KERNEL);

	pmem->pmem_queue = blk_alloc_queue_node(GFP_KERNEL, nid);

	if (!pmem->pmem_queue)

		return -ENOMEM;
@@ -188,7 +189,7 @@ static int pmem_attach_disk(struct device *dev, 
	blk_queue_bounce_limit(pmem->pmem_queue, BLK_BOUNCE_ANY);

	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, pmem->pmem_queue);



	disk = alloc_disk(0);

	disk = alloc_disk_node(0, nid);

	if (!disk) {

		blk_cleanup_queue(pmem->pmem_queue);

		return -ENOMEM;

kernel/memremap.c

+4 −3
Original line number Diff line number Diff line
@@ -114,7 +114,8 @@ void *devm_memremap(struct device *dev, resource_size_t offset, 
{

	void **ptr, *addr;



	ptr = devres_alloc(devm_memremap_release, sizeof(*ptr), GFP_KERNEL);

	ptr = devres_alloc_node(devm_memremap_release, sizeof(*ptr), GFP_KERNEL,

			dev_to_node(dev));

	if (!ptr)

		return ERR_PTR(-ENOMEM);
@@ -165,8 +166,8 @@ void *devm_memremap_pages(struct device *dev, struct resource *res) 
	if (is_ram == REGION_INTERSECTS)

		return __va(res->start);



	page_map = devres_alloc(devm_memremap_pages_release,

			sizeof(*page_map), GFP_KERNEL);

	page_map = devres_alloc_node(devm_memremap_pages_release,

			sizeof(*page_map), GFP_KERNEL, dev_to_node(dev));

	if (!page_map)

		return ERR_PTR(-ENOMEM);