Commit 33dd7075 authored by Dan Williams's avatar Dan Williams Committed by Rafael J. Wysocki
Browse files

lib: Uplevel the pmem "region" ida to a global allocator 



In preparation for handling platform differentiated memory types beyond
persistent memory, uplevel the "region" identifier to a global number
space. This enables a device-dax instance to be registered to any memory
type with guaranteed unique names.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 199c8471

drivers/nvdimm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ menuconfig LIBNVDIMM 
	depends on PHYS_ADDR_T_64BIT

	depends on HAS_IOMEM

	depends on BLK_DEV

	select MEMREGION

	help

	  Generic support for non-volatile memory devices including

	  ACPI-6-NFIT defined resources.  On platforms that define an

drivers/nvdimm/core.c

+0 −1
Original line number Diff line number Diff line
@@ -455,7 +455,6 @@ static __exit void libnvdimm_exit(void) 
	nd_region_exit();

	nvdimm_exit();

	nvdimm_bus_exit();

	nd_region_devs_exit();

	nvdimm_devs_exit();

}

drivers/nvdimm/nd-core.h

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ struct nvdimm_bus *walk_to_nvdimm_bus(struct device *nd_dev); 
int __init nvdimm_bus_init(void);

void nvdimm_bus_exit(void);

void nvdimm_devs_exit(void);

void nd_region_devs_exit(void);

struct nd_region;

void nd_region_advance_seeds(struct nd_region *nd_region, struct device *dev);

void nd_region_create_ns_seed(struct nd_region *nd_region);

drivers/nvdimm/region_devs.c

+4 −9
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright(c) 2013-2015 Intel Corporation. All rights reserved.

 */

#include <linux/scatterlist.h>

#include <linux/memregion.h>

#include <linux/highmem.h>

#include <linux/sched.h>

#include <linux/slab.h>
@@ -19,7 +20,6 @@ 
 */

#include <linux/io-64-nonatomic-hi-lo.h>



static DEFINE_IDA(region_ida);

static DEFINE_PER_CPU(int, flush_idx);



static int nvdimm_map_flush(struct device *dev, struct nvdimm *nvdimm, int dimm,
@@ -133,7 +133,7 @@ static void nd_region_release(struct device *dev) 
		put_device(&nvdimm->dev);

	}

	free_percpu(nd_region->lane);

	ida_simple_remove(&region_ida, nd_region->id);

	memregion_free(nd_region->id);

	if (is_nd_blk(dev))

		kfree(to_nd_blk_region(dev));

	else
@@ -985,7 +985,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, 


	if (!region_buf)

		return NULL;

	nd_region->id = ida_simple_get(&region_ida, 0, 0, GFP_KERNEL);

	nd_region->id = memregion_alloc(GFP_KERNEL);

	if (nd_region->id < 0)

		goto err_id;
@@ -1044,7 +1044,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, 
	return nd_region;



 err_percpu:

	ida_simple_remove(&region_ida, nd_region->id);

	memregion_free(nd_region->id);

 err_id:

	kfree(region_buf);

	return NULL;
@@ -1216,8 +1216,3 @@ int nd_region_conflict(struct nd_region *nd_region, resource_size_t start, 


	return device_for_each_child(&nvdimm_bus->dev, &ctx, region_conflict);

}
 


void __exit nd_region_devs_exit(void)

{

	ida_destroy(&region_ida);

}

include/linux/memregion.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _MEMREGION_H_

#define _MEMREGION_H_

#include <linux/types.h>

#include <linux/errno.h>



#ifdef CONFIG_MEMREGION

int memregion_alloc(gfp_t gfp);

void memregion_free(int id);

#else

static inline int memregion_alloc(gfp_t gfp)

{

	return -ENOMEM;

}

void memregion_free(int id)

{

}

#endif

#endif /* _MEMREGION_H_ */