x86: fix cpu_mask_to_apicid_and to include cpu_online_mask
Impact: fix potential APIC crash In determining the destination apicid, there are usually three cpumasks that are considered: the incoming cpumask arg, cfg->domain and the cpu_online_mask. Since we are just introducing the cpu_mask_to_apicid_and function, make sure it includes the cpu_online_mask in it's evaluation. [Added with this patch.] There are two io_apic.c functions that did not previously use the cpu_online_mask: setup_IO_APIC_irq and msi_compose_msg. Both of these simply used cpu_mask_to_apicid(cfg->domain & TARGET_CPUS), and all but one arch (NUMAQ[*]) returns only online cpus in the TARGET_CPUS mask, so the behavior is identical for all cases. [*: NUMAQ bug?] Note that alloc_cpumask_var is only used for the 32-bit cases where it's highly likely that the cpumask set size will be small and therefore CPUMASK_OFFSTACK=n. But if that's not the case, failing the allocate will cause the same return value as the default. Signed-off-by:Mike Travis <travis@sgi.com> Signed-off-by:
Ingo Molnar <mingo@elte.hu>
Showing
- arch/x86/include/asm/bigsmp/apic.h 3 additions, 1 deletionarch/x86/include/asm/bigsmp/apic.h
- arch/x86/include/asm/es7000/apic.h 18 additions, 22 deletionsarch/x86/include/asm/es7000/apic.h
- arch/x86/include/asm/mach-default/mach_apic.h 2 additions, 1 deletionarch/x86/include/asm/mach-default/mach_apic.h
- arch/x86/include/asm/summit/apic.h 17 additions, 13 deletionsarch/x86/include/asm/summit/apic.h
- arch/x86/kernel/genapic_flat_64.c 3 additions, 1 deletionarch/x86/kernel/genapic_flat_64.c
- arch/x86/kernel/genx2apic_cluster.c 3 additions, 1 deletionarch/x86/kernel/genx2apic_cluster.c
- arch/x86/kernel/genx2apic_phys.c 3 additions, 1 deletionarch/x86/kernel/genx2apic_phys.c
- arch/x86/kernel/genx2apic_uv_x.c 3 additions, 1 deletionarch/x86/kernel/genx2apic_uv_x.c
Loading
Please register or sign in to comment