evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

irq: Make irq affinity function cpu isolation aware

Browse source 
Prohibit setting the affinity of an IRQ to an isolated core.

Change-Id: I7b50778615541a64f9956573757c7f28748c4f69
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
This commit is contained in:
Olav Haugan 2016-05-29 19:35:54 -07:00
parent de1a32cd14
commit 4400ef145f
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/arm/kernel/irq.c
View file

@ -37,6 +37,7 @@
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/cpumask.h>
#include <asm/hardware/cache-l2x0.h> #include <asm/hardware/cache-l2x0.h>
#include <asm/hardware/cache-uniphier.h> #include <asm/hardware/cache-uniphier.h>
@ -127,6 +128,7 @@ static bool migrate_one_irq(struct irq_desc *desc)
const struct cpumask *affinity = irq_data_get_affinity_mask(d); const struct cpumask *affinity = irq_data_get_affinity_mask(d);
struct irq_chip *c; struct irq_chip *c;
bool ret = false; bool ret = false;
struct cpumask available_cpus;
/* /*
* If this is a per-CPU interrupt, or the affinity does not * If this is a per-CPU interrupt, or the affinity does not
@ -135,8 +137,15 @@ static bool migrate_one_irq(struct irq_desc *desc)
if (irqd_is_per_cpu(d) || !cpumask_test_cpu(smp_processor_id(), affinity)) if (irqd_is_per_cpu(d) || !cpumask_test_cpu(smp_processor_id(), affinity))
return false; return false;
cpumask_copy(&available_cpus, affinity);
cpumask_andnot(&available_cpus, &available_cpus, cpu_isolated_mask);
affinity = &available_cpus;
if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) { if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) {
affinity = cpu_online_mask; cpumask_andnot(&available_cpus, cpu_online_mask,
cpu_isolated_mask);
if (cpumask_empty(affinity))
affinity = cpu_online_mask;
ret = true; ret = true;
} }

11
kernel/irq/cpuhotplug.c
View file

@ -11,6 +11,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/cpumask.h>
#include "internals.h" #include "internals.h"
@ -20,6 +21,7 @@ static bool migrate_one_irq(struct irq_desc *desc)
const struct cpumask *affinity = d->common->affinity; const struct cpumask *affinity = d->common->affinity;
struct irq_chip *c; struct irq_chip *c;
bool ret = false; bool ret = false;
struct cpumask available_cpus;
/* /*
* If this is a per-CPU interrupt, or the affinity does not * If this is a per-CPU interrupt, or the affinity does not
@ -29,8 +31,15 @@ static bool migrate_one_irq(struct irq_desc *desc)
!cpumask_test_cpu(smp_processor_id(), affinity)) !cpumask_test_cpu(smp_processor_id(), affinity))
return false; return false;
cpumask_copy(&available_cpus, affinity);
cpumask_andnot(&available_cpus, &available_cpus, cpu_isolated_mask);
affinity = &available_cpus;
if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) { if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) {
affinity = cpu_online_mask; cpumask_andnot(&available_cpus, cpu_online_mask,
cpu_isolated_mask);
if (cpumask_empty(affinity))
affinity = cpu_online_mask;
ret = true; ret = true;
} }