Merge tag 'pci-v4.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[karo-tx-linux.git] / kernel / irq / affinity.c

diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c
index 9b71406d2eec551c48a02a7291c0975f6141e39a..d69bd77252a76403b11dad5d30a98e35327fda58 100644 (file)
--- a/kernel/irq/affinity.c
+++ b/kernel/irq/affinity.c
@@ -1,4 +1,7 @@
-
+/*
+ * Copyright (C) 2016 Thomas Gleixner.
+ * Copyright (C) 2016-2017 Christoph Hellwig.
+ */
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -35,13 +38,54 @@ static void irq_spread_init_one(struct cpumask *irqmsk, struct cpumask *nmsk,
        }
 }
 
-static int get_nodes_in_cpumask(const struct cpumask *mask, nodemask_t *nodemsk)
+static cpumask_var_t *alloc_node_to_present_cpumask(void)
+{
+       cpumask_var_t *masks;
+       int node;
+
+       masks = kcalloc(nr_node_ids, sizeof(cpumask_var_t), GFP_KERNEL);
+       if (!masks)
+               return NULL;
+
+       for (node = 0; node < nr_node_ids; node++) {
+               if (!zalloc_cpumask_var(&masks[node], GFP_KERNEL))
+                       goto out_unwind;
+       }
+
+       return masks;
+
+out_unwind:
+       while (--node >= 0)
+               free_cpumask_var(masks[node]);
+       kfree(masks);
+       return NULL;
+}
+
+static void free_node_to_present_cpumask(cpumask_var_t *masks)
+{
+       int node;
+
+       for (node = 0; node < nr_node_ids; node++)
+               free_cpumask_var(masks[node]);
+       kfree(masks);
+}
+
+static void build_node_to_present_cpumask(cpumask_var_t *masks)
+{
+       int cpu;
+
+       for_each_present_cpu(cpu)
+               cpumask_set_cpu(cpu, masks[cpu_to_node(cpu)]);
+}
+
+static int get_nodes_in_cpumask(cpumask_var_t *node_to_present_cpumask,
+                               const struct cpumask *mask, nodemask_t *nodemsk)
 {
        int n, nodes = 0;
 
        /* Calculate the number of nodes in the supplied affinity mask */
-       for_each_online_node(n) {
-               if (cpumask_intersects(mask, cpumask_of_node(n))) {
+       for_each_node(n) {
+               if (cpumask_intersects(mask, node_to_present_cpumask[n])) {
                        node_set(n, *nodemsk);
                        nodes++;
                }
@@ -64,7 +108,7 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
        int last_affv = affv + affd->pre_vectors;
        nodemask_t nodemsk = NODE_MASK_NONE;
        struct cpumask *masks;
-       cpumask_var_t nmsk;
+       cpumask_var_t nmsk, *node_to_present_cpumask;
 
        /*
         * If there aren't any vectors left after applying the pre/post
@@ -80,13 +124,19 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
        if (!masks)
                goto out;
 
+       node_to_present_cpumask = alloc_node_to_present_cpumask();
+       if (!node_to_present_cpumask)
+               goto out;
+
        /* Fill out vectors at the beginning that don't need affinity */
        for (curvec = 0; curvec < affd->pre_vectors; curvec++)
                cpumask_copy(masks + curvec, irq_default_affinity);
 
        /* Stabilize the cpumasks */
        get_online_cpus();
-       nodes = get_nodes_in_cpumask(cpu_online_mask, &nodemsk);
+       build_node_to_present_cpumask(node_to_present_cpumask);
+       nodes = get_nodes_in_cpumask(node_to_present_cpumask, cpu_present_mask,
+                                    &nodemsk);
 
        /*
         * If the number of nodes in the mask is greater than or equal the
@@ -94,7 +144,8 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
         */
        if (affv <= nodes) {
                for_each_node_mask(n, nodemsk) {
-                       cpumask_copy(masks + curvec, cpumask_of_node(n));
+                       cpumask_copy(masks + curvec,
+                                    node_to_present_cpumask[n]);
                        if (++curvec == last_affv)
                                break;
                }
@@ -108,7 +159,7 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
                vecs_per_node = (affv - (curvec - affd->pre_vectors)) / nodes;
 
                /* Get the cpus on this node which are in the mask */
-               cpumask_and(nmsk, cpu_online_mask, cpumask_of_node(n));
+               cpumask_and(nmsk, cpu_present_mask, node_to_present_cpumask[n]);
 
                /* Calculate the number of cpus per vector */
                ncpus = cpumask_weight(nmsk);
@@ -140,6 +191,7 @@ done:
        /* Fill out vectors at the end that don't need affinity */
        for (; curvec < nvecs; curvec++)
                cpumask_copy(masks + curvec, irq_default_affinity);
+       free_node_to_present_cpumask(node_to_present_cpumask);
 out:
        free_cpumask_var(nmsk);
        return masks;
@@ -155,15 +207,13 @@ int irq_calc_affinity_vectors(int minvec, int maxvec, const struct irq_affinity
 {
        int resv = affd->pre_vectors + affd->post_vectors;
        int vecs = maxvec - resv;
-       int cpus;
+       int ret;
 
        if (resv > minvec)
                return 0;
 
-       /* Stabilize the cpumasks */
        get_online_cpus();
-       cpus = cpumask_weight(cpu_online_mask);
+       ret = min_t(int, cpumask_weight(cpu_present_mask), vecs) + resv;
        put_online_cpus();
-
-       return min(cpus, vecs) + resv;
+       return ret;
 }