Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 330597a3 authored by Olav Haugan's avatar Olav Haugan Committed by Gerrit - the friendly Code Review server
Browse files

irq: Make irq affinity function cpu isolation aware 



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

[markivx: Ported to 4.14, fixed conflict with managed irq]
Signed-off-by: default avatarOlav Haugan <ohaugan@codeaurora.org>

Change-Id: I2a2f75250eb410ace1e54772e4807b9fe620041a
Signed-off-by: default avatarSatya Durga Srinivasu Prabhala <satyap@codeaurora.org>
parent 5f7b7a9f

arch/arm/kernel/irq.c

+10 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/kallsyms.h>

#include <linux/proc_fs.h>

#include <linux/export.h>

#include <linux/cpumask.h>



#include <asm/hardware/cache-l2x0.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);

	struct irq_chip *c;

	bool ret = false;

	struct cpumask available_cpus;



	/*

	 * If this is a per-CPU interrupt, or the affinity does not
@@ -135,7 +137,14 @@ static bool migrate_one_irq(struct irq_desc *desc) 
	if (irqd_is_per_cpu(d) || !cpumask_test_cpu(smp_processor_id(), affinity))

		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) {

		cpumask_andnot(&available_cpus, cpu_online_mask,

			       cpu_isolated_mask);

		if (cpumask_empty(affinity))

			affinity = cpu_online_mask;

		ret = true;

	}

kernel/irq/cpuhotplug.c

+10 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/interrupt.h>

#include <linux/ratelimit.h>

#include <linux/irq.h>

#include <linux/cpumask.h>



#include "internals.h"
@@ -56,6 +57,7 @@ static bool migrate_one_irq(struct irq_desc *desc) 
	const struct cpumask *affinity;

	bool brokeaff = false;

	int err;

	struct cpumask available_cpus;



	/*

	 * IRQ chip might be already torn down, but the irq descriptor is
@@ -108,6 +110,10 @@ static bool migrate_one_irq(struct irq_desc *desc) 
	if (maskchip && chip->irq_mask)

		chip->irq_mask(d);



	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 the interrupt is managed, then shut it down and leave
@@ -118,6 +124,9 @@ static bool migrate_one_irq(struct irq_desc *desc) 
			irq_shutdown(desc);

			return false;

		}

		cpumask_andnot(&available_cpus, cpu_online_mask,

							cpu_isolated_mask);

		if (cpumask_empty(affinity))

			affinity = cpu_online_mask;

		brokeaff = true;

	}