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

Commit 7c683941 authored by Dan Williams's avatar Dan Williams
Browse files

devm: make allocations numa aware by default 



Given we already have a device just use dev_to_node() to provide hint
allocations for devres.  However, current devres_alloc() users will need
to explicitly opt-in with devres_alloc_node().

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 b36f4761

drivers/base/devres.c

+10 −9
Original line number Diff line number Diff line
@@ -82,12 +82,12 @@ static struct devres_group * node_to_group(struct devres_node *node) 
}



static __always_inline struct devres * alloc_dr(dr_release_t release,

						size_t size, gfp_t gfp)

						size_t size, gfp_t gfp, int nid)

{

	size_t tot_size = sizeof(struct devres) + size;

	struct devres *dr;



	dr = kmalloc_track_caller(tot_size, gfp);

	dr = kmalloc_node_track_caller(tot_size, gfp, nid);

	if (unlikely(!dr))

		return NULL;
@@ -106,24 +106,25 @@ static void add_dr(struct device *dev, struct devres_node *node) 
}



#ifdef CONFIG_DEBUG_DEVRES

void * __devres_alloc(dr_release_t release, size_t size, gfp_t gfp,

void * __devres_alloc_node(dr_release_t release, size_t size, gfp_t gfp, int nid,

		      const char *name)

{

	struct devres *dr;



	dr = alloc_dr(release, size, gfp | __GFP_ZERO);

	dr = alloc_dr(release, size, gfp | __GFP_ZERO, nid);

	if (unlikely(!dr))

		return NULL;

	set_node_dbginfo(&dr->node, name, size);

	return dr->data;

}

EXPORT_SYMBOL_GPL(__devres_alloc);

EXPORT_SYMBOL_GPL(__devres_alloc_node);

#else

/**

 * devres_alloc - Allocate device resource data

 * @release: Release function devres will be associated with

 * @size: Allocation size

 * @gfp: Allocation flags

 * @nid: NUMA node

 *

 * Allocate devres of @size bytes.  The allocated area is zeroed, then

 * associated with @release.  The returned pointer can be passed to
@@ -132,16 +133,16 @@ EXPORT_SYMBOL_GPL(__devres_alloc); 
 * RETURNS:

 * Pointer to allocated devres on success, NULL on failure.

 */

void * devres_alloc(dr_release_t release, size_t size, gfp_t gfp)

void * devres_alloc_node(dr_release_t release, size_t size, gfp_t gfp, int nid)

{

	struct devres *dr;



	dr = alloc_dr(release, size, gfp | __GFP_ZERO);

	dr = alloc_dr(release, size, gfp | __GFP_ZERO, nid);

	if (unlikely(!dr))

		return NULL;

	return dr->data;

}

EXPORT_SYMBOL_GPL(devres_alloc);

EXPORT_SYMBOL_GPL(devres_alloc_node);

#endif



/**
@@ -776,7 +777,7 @@ void * devm_kmalloc(struct device *dev, size_t size, gfp_t gfp) 
	struct devres *dr;



	/* use raw alloc_dr for kmalloc caller tracing */

	dr = alloc_dr(devm_kmalloc_release, size, gfp);

	dr = alloc_dr(devm_kmalloc_release, size, gfp, dev_to_node(dev));

	if (unlikely(!dr))

		return NULL;

include/linux/device.h

+12 −4
Original line number Diff line number Diff line
@@ -604,13 +604,21 @@ typedef void (*dr_release_t)(struct device *dev, void *res); 
typedef int (*dr_match_t)(struct device *dev, void *res, void *match_data);



#ifdef CONFIG_DEBUG_DEVRES

extern void *__devres_alloc(dr_release_t release, size_t size, gfp_t gfp,

			     const char *name);

extern void *__devres_alloc_node(dr_release_t release, size_t size, gfp_t gfp,

				 int nid, const char *name);

#define devres_alloc(release, size, gfp) \

	__devres_alloc(release, size, gfp, #release)

	__devres_alloc_node(release, size, gfp, NUMA_NO_NODE, #release)

#define devres_alloc_node(release, size, gfp, nid) \

	__devres_alloc_node(release, size, gfp, nid, #release)

#else

extern void *devres_alloc(dr_release_t release, size_t size, gfp_t gfp);

extern void *devres_alloc_node(dr_release_t release, size_t size, gfp_t gfp,

			       int nid);

static inline void *devres_alloc(dr_release_t release, size_t size, gfp_t gfp)

{

	return devres_alloc_node(release, size, gfp, NUMA_NO_NODE);

}

#endif



extern void devres_for_each_res(struct device *dev, dr_release_t release,

				dr_match_t match, void *match_data,

				void (*fn)(struct device *, void *, void *),