Skip to contentSkip to conversation

iio: adc: ti-ads131e08: Add iio_device_claim_direct() to protect buffered captures

PATCH RESEND In review Octávio Carneiro 2 participants 2 messages May 14, 2025 – May 18, 2025 IIO

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 iio: adc: ti-ads131e08: Add iio_device_claim_direct() to protect buffered captures

Add iio_device_claim_direct() to protect buffered captures. In ads131e08_debugfs_reg_access and ads131e08_trigger_handler, data reads are protected by the function call to avoid possible errors caused by concurrent access.

---
 drivers/iio/adc/ti-ads131e08.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/iio/adc/ti-ads131e08.c +9 -2
index c6096b646..00a7e6494 100644
@@ -578,12 +578,16 @@ static int ads131e08_debugfs_reg_access(struct iio_dev *indio_dev,
 {
 	struct ads131e08_state *st = iio_priv(indio_dev);
 
+	if (!iio_device_claim_direct(indio_dev))
+		return -EBUSY;
+
 	if (readval) {
 		int ret = ads131e08_read_reg(st, reg);
 		*readval = ret;
 		return ret;
 	}
 
+	iio_device_release_direct(indio_dev);
 	return ads131e08_write_reg(st, reg, writeval);
 }
 
@@ -627,9 +631,11 @@ static irqreturn_t ads131e08_trigger_handler(int irq, void *private)
 	unsigned int num_bytes = ADS131E08_NUM_DATA_BYTES(st->data_rate);
 	u8 tweek_offset = num_bytes == 2 ? 1 : 0;
 
-	if (iio_trigger_using_own(indio_dev))
+	if (iio_trigger_using_own(indio_dev)) {
+		if (!iio_device_claim_direct(indio_dev))
+			return -EBUSY;
 		ret = ads131e08_read_data(st, st->readback_len);
-	else
+	} else
 		ret = ads131e08_pool_data(st);
 
 	if (ret)
@@ -670,6 +676,7 @@ static irqreturn_t ads131e08_trigger_handler(int irq, void *private)
 out:
 	iio_trigger_notify_done(indio_dev->trig);
 
+	iio_device_release_direct(indio_dev);
 	return IRQ_HANDLED;
 }
 
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 5 lines · On Wed, 14 May 2025 16:09:01 -0300 Octávio Carneiro <[email protected]>…

Add iio_device_claim_direct() to protect buffered captures. In ads131e08_debugfs_reg_access and ads131e08_trigger_handler, data reads are protected by the function call to avoid possible errors caused by concurrent access.

Quoted 7 lines

---

Firstly - why the resend? If you do that, please put a message here about it.

Comments inline.

drivers/iio/adc/ti-ads131e08.c static int ads131e08_debugfs_reg_access(struct iio_dev *indio_dev, · line 581

Quoted 12 lines
 drivers/iio/adc/ti-ads131e08.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/iio/adc/ti-ads131e08.c +1 -0
index c6096b646..00a7e6494 100644
@@ -578,12 +578,16 @@ static int ads131e08_debugfs_reg_access(struct iio_dev *indio_dev,
 {
 	struct ads131e08_state *st = iio_priv(indio_dev);
 
+	if (!iio_device_claim_direct(indio_dev))

Why? This is a debug accessor. If it is even vaguely possible to access the registers whilst in buffered mode this might be very useful for debug.

These interfaces are not hardened against a user shooting themselves in the foot.

Quoted 13 lines
drivers/iio/adc/ti-ads131e08.c +3 -0
+		return -EBUSY;
+
 	if (readval) {
 		int ret = ads131e08_read_reg(st, reg);
 		*readval = ret;
 		return ret;
 	}
 
+	iio_device_release_direct(indio_dev);
 	return ads131e08_write_reg(st, reg, writeval);
 }
 

drivers/iio/adc/ti-ads131e08.c static irqreturn_t ads131e08_trigger_handler(int irq, void *private) · line 636

Quoted 7 lines
drivers/iio/adc/ti-ads131e08.c +3 -1
@@ -627,9 +631,11 @@ static irqreturn_t ads131e08_trigger_handler(int irq, void *private)
 	unsigned int num_bytes = ADS131E08_NUM_DATA_BYTES(st->data_rate);
 	u8 tweek_offset = num_bytes == 2 ? 1 : 0;
 
-	if (iio_trigger_using_own(indio_dev))
+	if (iio_trigger_using_own(indio_dev)) {
+		if (!iio_device_claim_direct(indio_dev))
+			return -EBUSY;

Why? I think this is showing a rather critical failure to undertand what iio_device_claim_direct() is for.
It's about preventing state transitions whilst we are in the middle of some action that plays badly with buffered mode.
If you are in the trigger handler, then you are very much in buffered mode already.

drivers/iio/adc/ti-ads131e08.c static irqreturn_t ads131e08_trigger_handler(int irq, void *private) · line 639

Quoted 4 lines
drivers/iio/adc/ti-ads131e08.c +1 -1
 		ret = ads131e08_read_data(st, st->readback_len);
-	else
+	} else
 		ret = ads131e08_pool_data(st);

If the above was valid then this is no longer correct kernel code c style. All legs of an if else should have {} if any need them due to being multiline.

Quoted 10 lines
drivers/iio/adc/ti-ads131e08.c +1 -0
 	if (ret)
@@ -670,6 +676,7 @@ static irqreturn_t ads131e08_trigger_handler(int irq, void *private)
 out:
 	iio_trigger_notify_done(indio_dev->trig);
 
+	iio_device_release_direct(indio_dev);
 	return IRQ_HANDLED;
 }