Commit 47778f33 authored by Ming Lei's avatar Ming Lei Committed by Thomas Gleixner

genirq/affinity: Rename *node_to_possible_cpumask as *node_to_cpumask

The following patches will introduce two stage irq spreading for improving
irq spread on all possible CPUs.

No functional change.
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org
Cc: Laurence Oberman <loberman@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Link: https://lkml.kernel.org/r/20180308105358.1506-2-ming.lei@redhat.com
parent 0211e12d
...@@ -39,7 +39,7 @@ static void irq_spread_init_one(struct cpumask *irqmsk, struct cpumask *nmsk, ...@@ -39,7 +39,7 @@ static void irq_spread_init_one(struct cpumask *irqmsk, struct cpumask *nmsk,
} }
} }
static cpumask_var_t *alloc_node_to_possible_cpumask(void) static cpumask_var_t *alloc_node_to_cpumask(void)
{ {
cpumask_var_t *masks; cpumask_var_t *masks;
int node; int node;
...@@ -62,7 +62,7 @@ static cpumask_var_t *alloc_node_to_possible_cpumask(void) ...@@ -62,7 +62,7 @@ static cpumask_var_t *alloc_node_to_possible_cpumask(void)
return NULL; return NULL;
} }
static void free_node_to_possible_cpumask(cpumask_var_t *masks) static void free_node_to_cpumask(cpumask_var_t *masks)
{ {
int node; int node;
...@@ -71,7 +71,7 @@ static void free_node_to_possible_cpumask(cpumask_var_t *masks) ...@@ -71,7 +71,7 @@ static void free_node_to_possible_cpumask(cpumask_var_t *masks)
kfree(masks); kfree(masks);
} }
static void build_node_to_possible_cpumask(cpumask_var_t *masks) static void build_node_to_cpumask(cpumask_var_t *masks)
{ {
int cpu; int cpu;
...@@ -79,14 +79,14 @@ static void build_node_to_possible_cpumask(cpumask_var_t *masks) ...@@ -79,14 +79,14 @@ static void build_node_to_possible_cpumask(cpumask_var_t *masks)
cpumask_set_cpu(cpu, masks[cpu_to_node(cpu)]); cpumask_set_cpu(cpu, masks[cpu_to_node(cpu)]);
} }
static int get_nodes_in_cpumask(cpumask_var_t *node_to_possible_cpumask, static int get_nodes_in_cpumask(cpumask_var_t *node_to_cpumask,
const struct cpumask *mask, nodemask_t *nodemsk) const struct cpumask *mask, nodemask_t *nodemsk)
{ {
int n, nodes = 0; int n, nodes = 0;
/* Calculate the number of nodes in the supplied affinity mask */ /* Calculate the number of nodes in the supplied affinity mask */
for_each_node(n) { for_each_node(n) {
if (cpumask_intersects(mask, node_to_possible_cpumask[n])) { if (cpumask_intersects(mask, node_to_cpumask[n])) {
node_set(n, *nodemsk); node_set(n, *nodemsk);
nodes++; nodes++;
} }
...@@ -109,7 +109,7 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd) ...@@ -109,7 +109,7 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
int last_affv = affv + affd->pre_vectors; int last_affv = affv + affd->pre_vectors;
nodemask_t nodemsk = NODE_MASK_NONE; nodemask_t nodemsk = NODE_MASK_NONE;
struct cpumask *masks = NULL; struct cpumask *masks = NULL;
cpumask_var_t nmsk, *node_to_possible_cpumask; cpumask_var_t nmsk, *node_to_cpumask;
/* /*
* If there aren't any vectors left after applying the pre/post * If there aren't any vectors left after applying the pre/post
...@@ -121,8 +121,8 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd) ...@@ -121,8 +121,8 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
if (!zalloc_cpumask_var(&nmsk, GFP_KERNEL)) if (!zalloc_cpumask_var(&nmsk, GFP_KERNEL))
return NULL; return NULL;
node_to_possible_cpumask = alloc_node_to_possible_cpumask(); node_to_cpumask = alloc_node_to_cpumask();
if (!node_to_possible_cpumask) if (!node_to_cpumask)
goto outcpumsk; goto outcpumsk;
masks = kcalloc(nvecs, sizeof(*masks), GFP_KERNEL); masks = kcalloc(nvecs, sizeof(*masks), GFP_KERNEL);
...@@ -135,8 +135,8 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd) ...@@ -135,8 +135,8 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
/* Stabilize the cpumasks */ /* Stabilize the cpumasks */
get_online_cpus(); get_online_cpus();
build_node_to_possible_cpumask(node_to_possible_cpumask); build_node_to_cpumask(node_to_cpumask);
nodes = get_nodes_in_cpumask(node_to_possible_cpumask, cpu_possible_mask, nodes = get_nodes_in_cpumask(node_to_cpumask, cpu_possible_mask,
&nodemsk); &nodemsk);
/* /*
...@@ -146,7 +146,7 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd) ...@@ -146,7 +146,7 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
if (affv <= nodes) { if (affv <= nodes) {
for_each_node_mask(n, nodemsk) { for_each_node_mask(n, nodemsk) {
cpumask_copy(masks + curvec, cpumask_copy(masks + curvec,
node_to_possible_cpumask[n]); node_to_cpumask[n]);
if (++curvec == last_affv) if (++curvec == last_affv)
break; break;
} }
...@@ -160,7 +160,7 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd) ...@@ -160,7 +160,7 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
vecs_per_node = (affv - (curvec - affd->pre_vectors)) / nodes; vecs_per_node = (affv - (curvec - affd->pre_vectors)) / nodes;
/* Get the cpus on this node which are in the mask */ /* Get the cpus on this node which are in the mask */
cpumask_and(nmsk, cpu_possible_mask, node_to_possible_cpumask[n]); cpumask_and(nmsk, cpu_possible_mask, node_to_cpumask[n]);
/* Calculate the number of cpus per vector */ /* Calculate the number of cpus per vector */
ncpus = cpumask_weight(nmsk); ncpus = cpumask_weight(nmsk);
...@@ -193,7 +193,7 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd) ...@@ -193,7 +193,7 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
for (; curvec < nvecs; curvec++) for (; curvec < nvecs; curvec++)
cpumask_copy(masks + curvec, irq_default_affinity); cpumask_copy(masks + curvec, irq_default_affinity);
outnodemsk: outnodemsk:
free_node_to_possible_cpumask(node_to_possible_cpumask); free_node_to_cpumask(node_to_cpumask);
outcpumsk: outcpumsk:
free_cpumask_var(nmsk); free_cpumask_var(nmsk);
return masks; return masks;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment