From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933416Ab2CZTCX (ORCPT ); Mon, 26 Mar 2012 15:02:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55896 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933090Ab2CZTCW (ORCPT ); Mon, 26 Mar 2012 15:02:22 -0400 From: Prarit Bhargava To: linux-kernel@vger.kernel.org Cc: Prarit Bhargava , Yinghai Lu , Thomas Gleixner , David Rientjes Subject: [PATCH] Use NUMA node cpu mask in irq affinity [v3] Date: Mon, 26 Mar 2012 15:02:18 -0400 Message-Id: <1332788538-17425-1-git-send-email-prarit@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [Resending ... Seems to have died on the vine here http://marc.info/?l=linux-kernel&m=132914231706596&q=raw ] The irq affinity files (/proc/irq/.../smp_affinity) contain a mask that is used 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. [v3]: David requests NUMA_NO_NODE instead of -1 Signed-off-by: Prarit Bhargava Acked-by: Neil Horman Cc: Yinghai Lu Cc: Thomas Gleixner Cc: David Rientjes --- 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 b0ccd1a..96a18f1 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 != NUMA_NO_NODE) { + 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