genirq/proc: Reject invalid affinity masks (again) (cba6437a) · Commits · 戴 / test

Qian Cai reported that the WARN_ON() in the x86/msi affinity setting code, which catches cases where the affinity setting is not done on the CPU which is the current target of the interrupt, triggers during CPU hotplug stress testing. It turns out that the warning which was added with the commit addressing the MSI affinity race unearthed yet another long standing bug. If user space writes a bogus affinity mask, i.e. it contains no online CPUs, then it calls irq_select_affinity_usr(). This was introduced for ALPHA in ("[PATCH] Alpha: convert to generic irq framework (generic part)") and subsequently made available for all architectures in ("genirq: Expose default irq affinity mask (take 3)") which introduced the circumvention of the affinity setting restrictions for interrupt which cannot be moved in process context. The whole exercise is bogus in various aspects: 1) If the interrupt is already started up then there is absolutely no point to honour a bogus interrupt affinity setting from user space. The interrupt is already assigned to an online CPU and it does not make any sense to reassign it to some other randomly chosen online CPU. 2) If the interupt is not yet started up then there is no point either. A subsequent startup of the interrupt will invoke irq_setup_affinity() anyway which will chose a valid target CPU. So the only correct solution is to just return -EINVAL in case user space wrote an affinity mask which does not contain any online CPUs, except for ALPHA which has it's own magic sauce for this. Fixes: ("genirq: Expose default irq affinity mask (take 3)") Reported-by:

Qian Cai <cai@lca.pw> Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Tested-by:

Qian Cai <cai@lca.pw> Link: https://lkml.kernel.org/r/878sl8xdbm.fsf@nanos.tec.linutronix.de

kernel/irq/internals.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -128,8 +128,6 @@ static inline void unregister_handler_proc(unsigned int irq,

		extern bool irq_can_set_affinity_usr(unsigned int irq);

		extern int irq_select_affinity_usr(unsigned int irq);

		extern void irq_set_thread_affinity(struct irq_desc *desc);

		extern int irq_do_set_affinity(struct irq_data *data,

kernel/irq/manage.c

+2 −16

Original line number	Diff line number	Diff line
		@@ -481,23 +481,9 @@ int irq_setup_affinity(struct irq_desc *desc)
		{
		return irq_select_affinity(irq_desc_get_irq(desc));
		}
		#endif
		#endif /* CONFIG_AUTO_IRQ_AFFINITY */
		#endif /* CONFIG_SMP */

		/*
		* Called when a bogus affinity is set via /proc/irq
		*/
		int irq_select_affinity_usr(unsigned int irq)
		{
		struct irq_desc *desc = irq_to_desc(irq);
		unsigned long flags;
		int ret;

		raw_spin_lock_irqsave(&desc->lock, flags);
		ret = irq_setup_affinity(desc);
		raw_spin_unlock_irqrestore(&desc->lock, flags);
		return ret;
		}
		#endif

		/**
		* irq_set_vcpu_affinity - Set vcpu affinity for the interrupt

kernel/irq/proc.c

+22 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,28 @@ static int irq_affinity_list_proc_show(struct seq_file m, void v)
		return show_irq_affinity(AFFINITY_LIST, m);
		}

		#ifndef CONFIG_AUTO_IRQ_AFFINITY
		static inline int irq_select_affinity_usr(unsigned int irq)
		{
		/*
		* If the interrupt is started up already then this fails. The
		* interrupt is assigned to an online CPU already. There is no
		* point to move it around randomly. Tell user space that the
		* selected mask is bogus.
		*
		* If not then any change to the affinity is pointless because the
		* startup code invokes irq_setup_affinity() which will select
		* a online CPU anyway.
		*/
		return -EINVAL;
		}
		#else
		/* ALPHA magic affinity auto selector. Keep it for historical reasons. */
		static inline int irq_select_affinity_usr(unsigned int irq)
		{
		return irq_select_affinity(irq);
		}
		#endif

		static ssize_t write_irq_affinity(int type, struct file *file,
		const char __user buffer, size_t count, loff_t pos)

Admin message