hwrng: optee: handle unlimited data rates
Subsystems (3)
PATCH v3 1/2 hwrng: optee: handle unlimited data rates
Data rates of MAX_UINT32 will schedule an unnecessary one jiffy timeout on the call to msleep. Avoid this scenario by using 0 as the unlimited data rate.
--- drivers/char/hw_random/optee-rng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/hw_random/optee-rng.c +1 -1
@@ -128,7 +128,7 @@ static int optee_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait) data += rng_size; read += rng_size; -if (wait) { +if (wait && pvt_data->data_rate) {if (timeout-- ==0 )return read;msleep ((1000 * (max - read)) / pvt_data->data_rate);
Signature · 1 line
2.17.1
PATCH v3 2/2 hwrng: optee: fix wait use case
The current code waits for data to be available before attempting a second read. However the second read would not be executed as the while loop will exit.
This fix does not wait if all data has been read (skips the call to msleep(0)) and reads a second time if partial data was retrieved on the first read.
Worth noticing that since msleep(0) schedules a one jiffy timeout is better to skip such a call.
--- drivers/char/hw_random/optee-rng.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/hw_random/optee-rng.c +2 -2
@@ -122,14 +122,14 @@ static int optee_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)if (max >MAX_ENTROPY_REQ_SZ ) max =MAX_ENTROPY_REQ_SZ ; -while (read ==0 ) { +while (read < max) { rng_size =get_optee_rng_data (pvt_data, data, (max - read)); data += rng_size; read += rng_size;if (wait && pvt_data->data_rate) { -if (timeout-- ==0 ) +if ((timeout-- ==0 ) || (read == max))return read;msleep ((1000 * (max - read)) / pvt_data->data_rate); }else {
Signature · 1 line
2.17.1
Herbert Xu
maintainerQuoted 9 lines · Jorge Ramirez-Ortiz
Data rates of
MAX_UINT32will schedule an unnecessary one jiffy timeout on the call to msleep. Avoid this scenario by using 0 as the unlimited data rate.Signed-off-by Jorge Ramirez-Ortiz <[email protected]>Reviewed-by Sumit Garg <[email protected]>--- drivers/char/hw_random/optee-rng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
All applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt