linux-kernel - Re: [PATCH] x86/irq: using move_irq

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <49F8E1DE.9010301@kernel.org>
Date:	Wed, 29 Apr 2009 16:25:18 -0700
From:	Yinghai Lu <yinghai@...nel.org>
To:	Ingo Molnar <mingo@...e.hu>
CC:	Thomas Gleixner <tglx@...utronix.de>,
	"H. Peter Anvin" <hpa@...or.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Suresh Siddha <suresh.b.siddha@...el.com>,
	"Eric W. Biederman" <ebiederm@...ssion.com>,
	Rusty Russell <rusty@...tcorp.com.au>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] x86/irq: using move_irq_desc

Ingo Molnar wrote:
> * Ingo Molnar <mingo@...e.hu> wrote:
> 
>> * Yinghai Lu <yinghai@...nel.org> wrote:
>>
>>> move_irq_desc will try to move irq_desc to node wanted if allocated one is not correct.
>>> (happen on device on different nodes that are using MSI, drivers are loaded and unloaded
>>> randomly)
>>>
>>> [ Impact: make irq_desc go with device on node ]
>>>
>>> Signed-off-by: Yinghai Lu <yinghai@...nel.org>
>>>
>>> ---
>>>  arch/x86/kernel/apic/io_apic.c |    6 +-----
>>>  include/linux/irq.h            |    4 ++++
>>>  2 files changed, 5 insertions(+), 5 deletions(-)
>> applied, thanks. I'll look into merging it into the irq tree 
>> tomorrow and testing it.
> 
> gave it a brief try and got:
> 
> kernel/irq/numa_migrate.c: In function ‘init_copy_one_irq_desc’:
> kernel/irq/numa_migrate.c:46: error: ‘struct irq_desc’ has no member named ‘node’
> kernel/irq/numa_migrate.c: In function ‘move_irq_desc’:
> kernel/irq/numa_migrate.c:114: error: ‘struct irq_desc’ has no member named ‘node’
> kernel/irq/numa_migrate.c:114: error: ‘struct irq_desc’ has no member named ‘node’
> kernel/irq/numa_migrate.c:114: error: ‘struct irq_desc’ has no member named ‘node’

[PATCH] x86/irq: using move_irq_desc -v2

move_irq_desc will try to move irq_desc to node wanted if allocated one is not correct.
(happen on device on different nodes that are using MSI, drivers are loaded and unloaded
randomly)

v2: fix non smp compiling

[ Impact: make irq_desc go with device on node ]

Signed-off-by: Yinghai Lu <yinghai@...nel.org>

---
 arch/x86/kernel/apic/io_apic.c |    6 +-----
 include/linux/irq.h            |   11 +++++++++--
 kernel/irq/Makefile            |    2 ++
 3 files changed, 12 insertions(+), 7 deletions(-)

Index: linux-2.6/arch/x86/kernel/apic/io_apic.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c
+++ linux-2.6/arch/x86/kernel/apic/io_apic.c
@@ -3155,11 +3155,7 @@ unsigned int create_irq_nr(unsigned int
 		if (cfg_new->vector != 0)
 			continue;
 
-#ifdef CONFIG_NUMA_IRQ_DESC
-		/* different node ?*/
-		if (desc_new->node != node)
-			desc = move_irq_desc(desc, node);
-#endif
+		desc_new = move_irq_desc(desc_new, node);
 
 		if (__assign_irq_vector(new, cfg_new, apic->target_cpus()) == 0)
 			irq = new;
Index: linux-2.6/include/linux/irq.h
===================================================================
--- linux-2.6.orig/include/linux/irq.h
+++ linux-2.6/include/linux/irq.h
@@ -206,9 +206,16 @@ extern void arch_free_chip_data(struct i
 
 #ifndef CONFIG_SPARSE_IRQ
 extern struct irq_desc irq_desc[NR_IRQS];
-#else /* CONFIG_SPARSE_IRQ */
+#endif
+
+#if defined(CONFIG_SPARSE_IRQ) && defined(CONFIG_SMP)
 extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int node);
-#endif /* CONFIG_SPARSE_IRQ */
+#else
+static inline struct irq_desc *move_irq_desc(struct irq_desc *desc, int node)
+{
+	return desc;
+}
+#endif
 
 extern struct irq_desc *irq_to_desc_alloc_node(unsigned int irq, int node);
 
Index: linux-2.6/kernel/irq/Makefile
===================================================================
--- linux-2.6.orig/kernel/irq/Makefile
+++ linux-2.6/kernel/irq/Makefile
@@ -3,5 +3,7 @@ obj-y := handle.o manage.o spurious.o re
 obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o
 obj-$(CONFIG_PROC_FS) += proc.o
 obj-$(CONFIG_GENERIC_PENDING_IRQ) += migration.o
+ifdef CONFIG_SMP
 obj-$(CONFIG_SPARSE_IRQ) += numa_migrate.o
+endif
 obj-$(CONFIG_PM_SLEEP) += pm.o

--
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/