[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1328805897-16359-1-git-send-email-prarit@redhat.com>
Date: Thu, 9 Feb 2012 11:44:57 -0500
From: Prarit Bhargava <prarit@...hat.com>
To: linux-kernel@...r.kernel.org
Cc: Prarit Bhargava <prarit@...hat.com>,
Yinghai Lu <yinghai@...nel.org>,
Thomas Gleixner <tglx@...utronix.de>
Subject: [PATCH] Use NUMA node cpu mask in irq affinity [v2]
The irq affinity files (/proc/irq/.../smp_affinity) contain a mask that is u
to "pin" an irq to a set of cpus. On boot this set is currently all cpus.
This can be incorrect as ACPI SRAT may tell us that a specific device or
bus is attached to a particular node and it's cpus.
When setting up the irq affinity we should take into account the NUMA node
cpu mask by and'ing it into the irq's affinity mask.
[v2]: Thomas and Yinghai pointed out that it is possible that the mask is
empty after and'ing in the NUMA node's cpumask. The code now checks to see
if the mask will be empty before applying the NUMA node's cpumask.
Signed-off-by: Prarit Bhargava <prarit@...hat.com>
Acked-by: Neil Horman <nhorman@...driver.com>
Cc: Yinghai Lu <yinghai@...nel.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
---
kernel/irq/manage.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index a9a9dbe..3064f2f 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -301,6 +301,13 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)
}
cpumask_and(mask, cpu_online_mask, set);
+ if (desc->irq_data.node != -1) {
+ const struct cpumask *nodemask =
+ cpumask_of_node(desc->irq_data.node);
+ /* make sure at least one of the cpus in nodemask is online */
+ if (cpumask_intersects(mask, nodemask))
+ cpumask_and(mask, mask, nodemask);
+ }
ret = chip->irq_set_affinity(&desc->irq_data, mask, false);
switch (ret) {
case IRQ_SET_MASK_OK:
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists