提交 785aebd0 编写于 作者: T Thomas Gleixner

ia64: Validate online cpus in irq_set_affinity() callbacks

The [user space] interface does not filter out offline cpus. It merily
guarantees that the mask contains at least one online cpu.

So the selector in the irq chip implementation needs to make sure to
pick only an online cpu because otherwise:

     Offline Core 1
     Set affinity to 0xe (is valid due to online mask 0xd)
     cpumask_first will pick core 1, which is offline
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: ia64 <linux-ia64@vger.kernel.org>
Link: http://lkml.kernel.org/r/20140304203100.650414633@linutronix.deSigned-off-by: NThomas Gleixner <tglx@linutronix.de>
上级 8783dd3a
...@@ -17,12 +17,9 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata, ...@@ -17,12 +17,9 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata,
{ {
struct msi_msg msg; struct msi_msg msg;
u32 addr, data; u32 addr, data;
int cpu = first_cpu(*cpu_mask); int cpu = cpumask_first_and(cpu_mask, cpu_online_mask);
unsigned int irq = idata->irq; unsigned int irq = idata->irq;
if (!cpu_online(cpu))
return -1;
if (irq_prepare_move(irq, cpu)) if (irq_prepare_move(irq, cpu))
return -1; return -1;
...@@ -139,10 +136,7 @@ static int dmar_msi_set_affinity(struct irq_data *data, ...@@ -139,10 +136,7 @@ static int dmar_msi_set_affinity(struct irq_data *data,
unsigned int irq = data->irq; unsigned int irq = data->irq;
struct irq_cfg *cfg = irq_cfg + irq; struct irq_cfg *cfg = irq_cfg + irq;
struct msi_msg msg; struct msi_msg msg;
int cpu = cpumask_first(mask); int cpu = cpumask_first_and(mask, cpu_online_mask);
if (!cpu_online(cpu))
return -1;
if (irq_prepare_move(irq, cpu)) if (irq_prepare_move(irq, cpu))
return -1; return -1;
......
...@@ -209,8 +209,8 @@ static int sn_set_affinity_irq(struct irq_data *data, ...@@ -209,8 +209,8 @@ static int sn_set_affinity_irq(struct irq_data *data,
nasid_t nasid; nasid_t nasid;
int slice; int slice;
nasid = cpuid_to_nasid(cpumask_first(mask)); nasid = cpuid_to_nasid(cpumask_first_and(mask, cpu_online_mask));
slice = cpuid_to_slice(cpumask_first(mask)); slice = cpuid_to_slice(cpumask_first_and(mask, cpu_online_mask));
list_for_each_entry_safe(sn_irq_info, sn_irq_info_safe, list_for_each_entry_safe(sn_irq_info, sn_irq_info_safe,
sn_irq_lh[irq], list) sn_irq_lh[irq], list)
......
...@@ -166,7 +166,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, ...@@ -166,7 +166,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data,
struct sn_pcibus_provider *provider; struct sn_pcibus_provider *provider;
unsigned int cpu, irq = data->irq; unsigned int cpu, irq = data->irq;
cpu = cpumask_first(cpu_mask); cpu = cpumask_first_and(cpu_mask, cpu_online_mask);
sn_irq_info = sn_msi_info[irq].sn_irq_info; sn_irq_info = sn_msi_info[irq].sn_irq_info;
if (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0) if (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0)
return -1; return -1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册