Commit 7b4967c5 authored by Mike Travis's avatar Mike Travis Committed by Rusty Russell
Browse files

cpumask: Add alloc_cpumask_var_node() 



Impact: New API

This will be needed in x86 code to allocate the domain and old_domain
cpumasks on the same node as where the containing irq_cfg struct is
allocated.

(Also fixes double-dump_stack on rare CONFIG_DEBUG_PER_CPU_MAPS case)

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (re-impl alloc_cpumask_var)
parent 7be75853

include/linux/cpumask.h

+7 −0
Original line number Diff line number Diff line
@@ -1025,6 +1025,7 @@ static inline size_t cpumask_size(void) 
#ifdef CONFIG_CPUMASK_OFFSTACK

typedef struct cpumask *cpumask_var_t;



bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node);

bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags);

void alloc_bootmem_cpumask_var(cpumask_var_t *mask);

void free_cpumask_var(cpumask_var_t mask);
@@ -1038,6 +1039,12 @@ static inline bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags) 
	return true;

}



static inline bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags,

					  int node)

{

	return true;

}



static inline void alloc_bootmem_cpumask_var(cpumask_var_t *mask)

{

}

lib/cpumask.c

+8 −3
Original line number Diff line number Diff line
@@ -76,15 +76,14 @@ int cpumask_any_but(const struct cpumask *mask, unsigned int cpu) 


/* These are not inline because of header tangles. */

#ifdef CONFIG_CPUMASK_OFFSTACK

bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)

bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node)

{

	if (likely(slab_is_available()))

		*mask = kmalloc(cpumask_size(), flags);

		*mask = kmalloc_node(cpumask_size(), flags, node);

	else {

#ifdef CONFIG_DEBUG_PER_CPU_MAPS

		printk(KERN_ERR

			"=> alloc_cpumask_var: kmalloc not available!\n");

		dump_stack();

#endif

		*mask = NULL;

	}
@@ -96,6 +95,12 @@ bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags) 
#endif

	return *mask != NULL;

}

EXPORT_SYMBOL(alloc_cpumask_var_node);



bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)

{

	return alloc_cpumask_var_node(mask, flags, numa_node_id());

}

EXPORT_SYMBOL(alloc_cpumask_var);



void __init alloc_bootmem_cpumask_var(cpumask_var_t *mask)

CRA Git | Maintained and supported by SUSTech CRA and CCSE