Use NUMA node cpu mask in irq affinity [v2]
PATCH 1/1 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.
--- kernel/irq/manage.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
kernel/irq/manage.c +7 -0
@@ -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 :
Signature · 1 line
1.7.1
kernel/irq/manage.c setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask) · line 304
Quoted 9 lines · Prarit Bhargava
kernel/irq/manage.c +1
-0@@ -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 ) {
Should probably be using NUMA_NO_NODE.
Quoted 9 lines
kernel/irq/manage.c +6
-0+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 :