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

Commit 06efc7df authored Jul 30, 2017 by Linus Torvalds

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq fix from Thomas Gleixner:
 "Fix for a regression caused by the conversion of x86 to the generic
  hotplug code.

  Instead of doing a plain single line revert, this adds a pile of
  comments so the semantics of the force argument are clear"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq/cpuhotplug: Revert "Set force affinity flag on hotplug migration"

parents 0a07b238 83979133

include/linux/irq.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -388,7 +388,12 @@ static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d)
		* @irq_mask_ack: ack and mask an interrupt source
		* @irq_unmask: unmask an interrupt source
		* @irq_eoi: end of interrupt
		* @irq_set_affinity: set the CPU affinity on SMP machines
		* @irq_set_affinity: Set the CPU affinity on SMP machines. If the force
		* argument is true, it tells the driver to
		* unconditionally apply the affinity setting. Sanity
		* checks against the supplied affinity mask are not
		* required. This is used for CPU hotplug where the
		* target CPU is not yet set in the cpu_online_mask.
		* @irq_retrigger: resend an IRQ to the CPU
		* @irq_set_type: set the flow type (IRQ_TYPE_LEVEL/etc.) of an IRQ
		* @irq_set_wake: enable/disable power-management wake-on of an IRQ

kernel/irq/cpuhotplug.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -95,8 +95,13 @@ static bool migrate_one_irq(struct irq_desc *desc)
		affinity = cpu_online_mask;
		brokeaff = true;
		}

		err = irq_do_set_affinity(d, affinity, true);
		/*
		* Do not set the force argument of irq_do_set_affinity() as this
		* disables the masking of offline CPUs from the supplied affinity
		* mask and therefore might keep/reassign the irq to the outgoing
		* CPU.
		*/
		err = irq_do_set_affinity(d, affinity, false);
		if (err) {
		pr_warn_ratelimited("IRQ%u: set affinity failed(%d).\n",
		d->irq, err);