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

Commit a1a8e1dc authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

iio:trigger: Fix use_count race condition 



When using more than one trigger consumer it can happen that multiple threads
perform a read-modify-update cycle on 'use_count' concurrently. This can cause
updates to be lost and use_count can get stuck at non-zero value, in which case
the IIO core assumes that at least one thread is still running and will wait for
it to finish before running any trigger handlers again. This effectively renders
the trigger disabled and a reboot is necessary before it can be used again. To
fix this make use_count an atomic variable. Also set it to the number of
consumers before starting the first consumer, otherwise it might happen that
use_count drops to 0 even though not all consumers have been run yet.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Tested-by: default avatarDenis Ciocca <denis.ciocca@st.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 78077256

drivers/iio/industrialio-trigger.c

+22 −12
Original line number Diff line number Diff line
@@ -127,11 +127,16 @@ static struct iio_trigger *iio_trigger_find_by_name(const char *name, 
void iio_trigger_poll(struct iio_trigger *trig, s64 time)

{

	int i;

	if (!trig->use_count)

		for (i = 0; i < CONFIG_IIO_CONSUMERS_PER_TRIGGER; i++)

			if (trig->subirqs[i].enabled) {

				trig->use_count++;



	if (!atomic_read(&trig->use_count)) {

		atomic_set(&trig->use_count, CONFIG_IIO_CONSUMERS_PER_TRIGGER);



		for (i = 0; i < CONFIG_IIO_CONSUMERS_PER_TRIGGER; i++) {

			if (trig->subirqs[i].enabled)

				generic_handle_irq(trig->subirq_base + i);

			else

				iio_trigger_notify_done(trig);

		}

	}

}

EXPORT_SYMBOL(iio_trigger_poll);
@@ -146,19 +151,24 @@ EXPORT_SYMBOL(iio_trigger_generic_data_rdy_poll); 
void iio_trigger_poll_chained(struct iio_trigger *trig, s64 time)

{

	int i;

	if (!trig->use_count)

		for (i = 0; i < CONFIG_IIO_CONSUMERS_PER_TRIGGER; i++)

			if (trig->subirqs[i].enabled) {

				trig->use_count++;



	if (!atomic_read(&trig->use_count)) {

		atomic_set(&trig->use_count, CONFIG_IIO_CONSUMERS_PER_TRIGGER);



		for (i = 0; i < CONFIG_IIO_CONSUMERS_PER_TRIGGER; i++) {

			if (trig->subirqs[i].enabled)

				handle_nested_irq(trig->subirq_base + i);

			else

				iio_trigger_notify_done(trig);

		}

	}

}

EXPORT_SYMBOL(iio_trigger_poll_chained);



void iio_trigger_notify_done(struct iio_trigger *trig)

{

	trig->use_count--;

	if (trig->use_count == 0 && trig->ops && trig->ops->try_reenable)

	if (atomic_dec_and_test(&trig->use_count) && trig->ops &&

		trig->ops->try_reenable)

		if (trig->ops->try_reenable(trig))

			/* Missed an interrupt so launch new poll now */

			iio_trigger_poll(trig, 0);

include/linux/iio/trigger.h

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */

#include <linux/irq.h>

#include <linux/module.h>

#include <linux/atomic.h>



#ifndef _IIO_TRIGGER_H_

#define _IIO_TRIGGER_H_
@@ -61,7 +62,7 @@ struct iio_trigger { 


	struct list_head		list;

	struct list_head		alloc_list;

	int use_count;

	atomic_t			use_count;



	struct irq_chip			subirq_chip;

	int				subirq_base;