From: Jorge Ramirez-Ortiz <jorge@foundries.io>
To: jorge@foundries.io, sumit.garg@linaro.org, jens.wiklander@linaro.org
Cc: mpm@selenic.com, herbert@gondor.apana.org.au, arnd@arndb.de,
ricardo@foundries.io, mike@foundries.io,
gregkh@linuxfoundation.org, op-tee@lists.trustedfirmware.org,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCHv3 2/2] hwrng: optee: fix wait use case
Date: Thu, 6 Aug 2020 12:00:10 +0200 [thread overview]
Message-ID: <20200806100010.20509-2-jorge@foundries.io> (raw)
In-Reply-To: <20200806100010.20509-1-jorge@foundries.io>
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.
Signed-off-by: Jorge Ramirez-Ortiz <jorge@foundries.io>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
---
drivers/char/hw_random/optee-rng.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/char/hw_random/optee-rng.c b/drivers/char/hw_random/optee-rng.c
index 5bc4700c4dae..a99d82949981 100644
--- a/drivers/char/hw_random/optee-rng.c
+++ b/drivers/char/hw_random/optee-rng.c
@@ -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 {
--
2.17.1
next prev parent reply other threads:[~2020-08-06 11:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-06 10:00 [PATCHv3 1/2] hwrng: optee: handle unlimited data rates Jorge Ramirez-Ortiz
2020-08-06 10:00 ` Jorge Ramirez-Ortiz [this message]
2020-08-21 7:57 ` Herbert Xu
-- strict thread matches above, loose matches on Subject: below --
2020-08-06 9:58 [PATCHv3 2/2] hwrng: optee: fix wait use case Jorge Ramirez-Ortiz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200806100010.20509-2-jorge@foundries.io \
--to=jorge@foundries.io \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=jens.wiklander@linaro.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mike@foundries.io \
--cc=mpm@selenic.com \
--cc=op-tee@lists.trustedfirmware.org \
--cc=ricardo@foundries.io \
--cc=sumit.garg@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®