workaround regression in ina2xx introduced by cb47755725da("time: Prevent undefined behaviour in timespec64_to_ns()")
PATCH v3 1/1 workaround regression in ina2xx introduced by cb47755725da("time: Prevent undefined behaviour in timespec64_to_ns()")
From: Iain Hunter <[email protected]>
That change adds an error check to avoid saturation during multiplication to calculate nano seconds in timespec64_to_ns().
In ina2xx_capture_thread() a timespec64 structure is used to calculate the delta time until the next sample time. This delta can be negative if the next sample time was in the past. In the -1 case timespec64_to_ns() now clamps the -1 second value to KTIME_MAX. This essentially puts ina2xx thread to sleep forever.
Proposed patch is to split the functionality in the loop into two parts:
1 do while loop only does the test to see if the next sample time is in the future or in the past. If it is in the past it will be skipped and the sample time incremented until it is in the future. This comparision can be done with timespec64_compare() as we are only interested in the sign being positive or negative.
2 after do while loop we know that next is later than now and so delta is guaranteed to be positive. This means timespec64_to_ns() can be safely used.
--- drivers/iio/adc/ina2xx-adc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/adc/ina2xx-adc.c +3 -3
@@ -817,10 +817,10 @@ static int ina2xx_capture_thread(void *data)*/ do {timespec64_add_ns (&next,1000 * sampling_us); - delta =timespec64_sub (next, now); - delay_us =div_s64 (timespec64_to_ns (&delta),1000 ); - }while (delay_us <=0 ); + }while (timespec64_compare (&next, &now) <0 ); + delta =timespec64_sub (next, now); + delay_us =div_s64 (timespec64_to_ns (&delta),1000 );usleep_range (delay_us, (delay_us *3 ) >>1 ); }while (!kthread_should_stop ());
Signature · 1 line
2.17.1
drivers/iio/adc/ina2xx-adc.c static int ina2xx_capture_thread(void *data) · line 823
Quoted 13 lines · Iain Hunter
drivers/iio/adc/ina2xx-adc.c +3
-3@@ -817,10 +817,10 @@ static int ina2xx_capture_thread(void *data)*/ do {timespec64_add_ns (&next,1000 * sampling_us); - delta =timespec64_sub (next, now); - delay_us =div_s64 (timespec64_to_ns (&delta),1000 ); - }while (delay_us <=0 ); + }while (timespec64_compare (&next, &now) <0 ); + delta =timespec64_sub (next, now); + delay_us =div_s64 (timespec64_to_ns (&delta),1000 );
This whole timespec dance does not make any sense and can be completely avoided by using just scalar nanoseconds. Untested patch below.
Thanks,
tglx
---
drivers/iio/adc/ina2xx-adc.c +7 -8
@@ -775,7 +775,7 @@ static int ina2xx_capture_thread(void *dstruct ina2xx_chip_info *chip =iio_priv (indio_dev);int sampling_us =SAMPLING_PERIOD (chip);int ret; -struct timespec64 next, now, delta; +ktime_t next, now, delta;s64 delay_us;/*
@@ -785,7 +785,7 @@ static int ina2xx_capture_thread(void *dif (!chip->allow_async_readout) sampling_us -=200 ; -ktime_get_ts64 (&next); + next =ktime_get (); do { while (!chip->allow_async_readout) {
@@ -798,7 +798,7 @@ static int ina2xx_capture_thread(void *d* reset the reference timestamp. */ if (ret ==0 ) -ktime_get_ts64 (&next); + next =ktime_get ();else break ; }
@@ -807,7 +807,7 @@ static int ina2xx_capture_thread(void *dif (ret <0 )return ret; -ktime_get_ts64 (&now); + now =ktime_get ();/* * Advance the timestamp for the next poll by one sampling
@@ -816,11 +816,10 @@ static int ina2xx_capture_thread(void *d* multiple times, i.e. samples are dropped. */ do { -timespec64_add_ns (&next,1000 * sampling_us); - delta =timespec64_sub (next, now); - delay_us =div_s64 (timespec64_to_ns (&delta),1000 ); - }while (delay_us <=0 ); + next =ktime_add_us (next, sampling_us); + }while (next <= now); + delay_us =ktime_to_us (ktime_sub (next, now));usleep_range (delay_us, (delay_us *3 ) >>1 ); }while (!kthread_should_stop ());
Jonathan Cameron
maintainerQuoted 18 lines · On Sun, 26 Sep 2021 23:18:42 +0200 Thomas Gleixner <[email protected]> wrote:
drivers/iio/adc/ina2xx-adc.c static int ina2xx_capture_thread(void *data) · line 823
Quoted 13 lines · Iain Hunter
drivers/iio/adc/ina2xx-adc.c +3
-3@@ -817,10 +817,10 @@ static int ina2xx_capture_thread(void *data)*/ do {timespec64_add_ns (&next,1000 * sampling_us); - delta =timespec64_sub (next, now); - delay_us =div_s64 (timespec64_to_ns (&delta),1000 ); - }while (delay_us <=0 ); + }while (timespec64_compare (&next, &now) <0 ); + delta =timespec64_sub (next, now); + delay_us =div_s64 (timespec64_to_ns (&delta),1000 );This whole timespec dance does not make any sense and can be completely avoided by using just scalar nanoseconds. Untested patch below.
Quoted 3 lines
Thanks,
tglx
Thanks Thomas.
Iain could you test this approach?
Thanks,
Jonathan
Quoted 56 lines
---
drivers/iio/adc/ina2xx-adc.c +7
-8@@ -775,7 +775,7 @@ static int ina2xx_capture_thread(void *dstruct ina2xx_chip_info *chip =iio_priv (indio_dev);int sampling_us =SAMPLING_PERIOD (chip);int ret; -struct timespec64 next, now, delta; +ktime_t next, now, delta;s64 delay_us;/* @@ -785,7 +785,7 @@ static int ina2xx_capture_thread(void *dif (!chip->allow_async_readout) sampling_us -=200 ; -ktime_get_ts64 (&next); + next =ktime_get (); do { while (!chip->allow_async_readout) {@@ -798,7 +798,7 @@ static int ina2xx_capture_thread(void *d* reset the reference timestamp. */ if (ret ==0 ) -ktime_get_ts64 (&next); + next =ktime_get ();else break ; }@@ -807,7 +807,7 @@ static int ina2xx_capture_thread(void *dif (ret <0 )return ret; -ktime_get_ts64 (&now); + now =ktime_get ();/* * Advance the timestamp for the next poll by one sampling @@ -816,11 +816,10 @@ static int ina2xx_capture_thread(void *d* multiple times, i.e. samples are dropped. */ do { -timespec64_add_ns (&next,1000 * sampling_us); - delta =timespec64_sub (next, now); - delay_us =div_s64 (timespec64_to_ns (&delta),1000 ); - }while (delay_us <=0 ); + next =ktime_add_us (next, sampling_us); + }while (next <= now); + delay_us =ktime_to_us (ktime_sub (next, now));usleep_range (delay_us, (delay_us *3 ) >>1 ); }while (!kthread_should_stop ());
Jonathan Cameron
maintainerQuoted 21 lines · On Thu, 30 Sep 2021 17:18:44 +0100 Jonathan Cameron <[email protected]> wrote:
Quoted 18 lines · On Sun, 26 Sep 2021 23:18:42 +0200 Thomas Gleixner <[email protected]> wrote:
drivers/iio/adc/ina2xx-adc.c static int ina2xx_capture_thread(void *data) · line 823
Quoted 13 lines · Iain Hunter
drivers/iio/adc/ina2xx-adc.c +3
-3@@ -817,10 +817,10 @@ static int ina2xx_capture_thread(void *data)*/ do {timespec64_add_ns (&next,1000 * sampling_us); - delta =timespec64_sub (next, now); - delay_us =div_s64 (timespec64_to_ns (&delta),1000 ); - }while (delay_us <=0 ); + }while (timespec64_compare (&next, &now) <0 ); + delta =timespec64_sub (next, now); + delay_us =div_s64 (timespec64_to_ns (&delta),1000 );This whole timespec dance does not make any sense and can be completely avoided by using just scalar nanoseconds. Untested patch below.
Quoted 7 lines
Quoted 3 lines
Thanks,
tglx
Thanks Thomas.
Iain could you test this approach?
Ah. Just seen v4, so I guess you did.
Thanks,
J
Quoted 62 lines
Thanks,
Jonathan
Quoted 56 lines
---
drivers/iio/adc/ina2xx-adc.c +7
-8@@ -775,7 +775,7 @@ static int ina2xx_capture_thread(void *dstruct ina2xx_chip_info *chip =iio_priv (indio_dev);int sampling_us =SAMPLING_PERIOD (chip);int ret; -struct timespec64 next, now, delta; +ktime_t next, now, delta;s64 delay_us;/* @@ -785,7 +785,7 @@ static int ina2xx_capture_thread(void *dif (!chip->allow_async_readout) sampling_us -=200 ; -ktime_get_ts64 (&next); + next =ktime_get (); do { while (!chip->allow_async_readout) {@@ -798,7 +798,7 @@ static int ina2xx_capture_thread(void *d* reset the reference timestamp. */ if (ret ==0 ) -ktime_get_ts64 (&next); + next =ktime_get ();else break ; }@@ -807,7 +807,7 @@ static int ina2xx_capture_thread(void *dif (ret <0 )return ret; -ktime_get_ts64 (&now); + now =ktime_get ();/* * Advance the timestamp for the next poll by one sampling @@ -816,11 +816,10 @@ static int ina2xx_capture_thread(void *d* multiple times, i.e. samples are dropped. */ do { -timespec64_add_ns (&next,1000 * sampling_us); - delta =timespec64_sub (next, now); - delay_us =div_s64 (timespec64_to_ns (&delta),1000 ); - }while (delay_us <=0 ); + next =ktime_add_us (next, sampling_us); + }while (next <= now); + delay_us =ktime_to_us (ktime_sub (next, now));usleep_range (delay_us, (delay_us *3 ) >>1 ); }while (!kthread_should_stop ());