Commit fa74c907 authored Mar 24, 2009 by Yinghai Lu Committed by Ingo Molnar Mar 24, 2009

x86: fix set_extra_move_desc calling



Impact: fix bug with irq-descriptor moving when logical flat

Rusty observed:

> The effect of setting desc->affinity (ie. from userspace via sysfs) has varied
> over time.  In 2.6.27, the 32-bit code anded the value with cpu_online_map,
> and both 32 and 64-bit did that anding whenever a cpu was unplugged.
>
> 2.6.29 consolidated this into one routine (and fixed hotplug) but introduced
> another variation: anding the affinity with cfg->domain.  Is this right, or
> should we just set it to what the user said?  Or as now, indicate that we're
> restricting it.

Eric pointed out that desc->affinity should be what the user requested,
if it is at all possible to honor the user space request.

This bug got introduced by commit 22f65d31 "x86: Update io_apic.c to use
new cpumask API".

Fix it by moving the masking to before the descriptor moving ...

Reported-by: Rusty Russell <rusty@rustcorp.com.au>
Reported-by: Eric W. Biederman <ebiederm@xmission.com>
LKML-Reference: <49C94134.4000408@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 29219683

arch/x86/kernel/apic/io_apic.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -592,8 +592,9 @@ set_desc_affinity(struct irq_desc desc, const struct cpumask mask)
		if (assign_irq_vector(irq, cfg, mask))
		return BAD_APICID;

		cpumask_and(desc->affinity, cfg->domain, mask);
		/* check that before desc->addinity get updated */
		set_extra_move_desc(desc, mask);
		cpumask_and(desc->affinity, cfg->domain, mask);

		return apic->cpu_mask_to_apicid_and(desc->affinity, cpu_online_mask);
		}