From: Dominik Brodowski <linux@dominikbrodowski.net>
To: "Jason A. Donenfeld" <Jason@zx2c4.com>
Cc: miaoqing@codeaurora.org, rsalvaterra@gmail.com,
"Toke Høiland-Jørgensen" <toke@toke.dk>,
"Sepehrdad, Pouyan" <pouyans@qti.qualcomm.com>,
ath9k-devel <ath9k-devel@qca.qualcomm.com>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
"Kalle Valo" <kvalo@kernel.org>,
"Linux Crypto Mailing List" <linux-crypto@vger.kernel.org>,
"Herbert Xu" <herbert@gondor.apana.org.au>,
LKML <linux-kernel@vger.kernel.org>,
Netdev <netdev@vger.kernel.org>,
"Toke Høiland-Jørgensen" <toke@redhat.com>
Subject: Re: [PATCH v2] ath9k: use hw_random API instead of directly dumping into random.c
Date: Wed, 16 Feb 2022 08:15:25 +0100 [thread overview]
Message-ID: <YgykjbhgdqeYyiY5@owl.dominikbrodowski.net> (raw)
In-Reply-To: <20220216000230.22625-1-Jason@zx2c4.com>
Am Wed, Feb 16, 2022 at 01:02:30AM +0100 schrieb Jason A. Donenfeld:
> Hardware random number generators are supposed to use the hw_random
> framework. This commit turns ath9k's kthread-based design into a proper
> hw_random driver.
>
> This compiles, but I have no hardware or other ability to determine
> whether it works. I'll leave further development up to the ath9k
> and hw_random maintainers.
>
> Cc: Toke Høiland-Jørgensen <toke@redhat.com>
> Cc: Kalle Valo <kvalo@kernel.org>
> Cc: Dominik Brodowski <linux@dominikbrodowski.net>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> ---
> v2 operates on whole words when possible.
>
> drivers/net/wireless/ath/ath9k/ath9k.h | 2 +-
> drivers/net/wireless/ath/ath9k/rng.c | 72 +++++++++++---------------
> 2 files changed, 30 insertions(+), 44 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
> index ef6f5ea06c1f..142f472903dc 100644
> --- a/drivers/net/wireless/ath/ath9k/ath9k.h
> +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
> @@ -1072,7 +1072,7 @@ struct ath_softc {
>
> #ifdef CONFIG_ATH9K_HWRNG
> u32 rng_last;
> - struct task_struct *rng_task;
> + struct hwrng rng_ops;
> #endif
> };
>
> diff --git a/drivers/net/wireless/ath/ath9k/rng.c b/drivers/net/wireless/ath/ath9k/rng.c
> index aae2bd3cac69..a0a58f8e08d3 100644
> --- a/drivers/net/wireless/ath/ath9k/rng.c
> +++ b/drivers/net/wireless/ath/ath9k/rng.c
> @@ -22,11 +22,6 @@
> #include "hw.h"
> #include "ar9003_phy.h"
>
> -#define ATH9K_RNG_BUF_SIZE 320
> -#define ATH9K_RNG_ENTROPY(x) (((x) * 8 * 10) >> 5) /* quality: 10/32 */
> -
> -static DECLARE_WAIT_QUEUE_HEAD(rng_queue);
> -
> static int ath9k_rng_data_read(struct ath_softc *sc, u32 *buf, u32 buf_size)
> {
> int i, j;
> @@ -72,61 +67,52 @@ static u32 ath9k_rng_delay_get(u32 fail_stats)
> return delay;
> }
>
> -static int ath9k_rng_kthread(void *data)
> +static int ath9k_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
> {
> - int bytes_read;
> - struct ath_softc *sc = data;
> - u32 *rng_buf;
> - u32 delay, fail_stats = 0;
> -
> - rng_buf = kmalloc_array(ATH9K_RNG_BUF_SIZE, sizeof(u32), GFP_KERNEL);
> - if (!rng_buf)
> - goto out;
> -
> - while (!kthread_should_stop()) {
> - bytes_read = ath9k_rng_data_read(sc, rng_buf,
> - ATH9K_RNG_BUF_SIZE);
> - if (unlikely(!bytes_read)) {
> - delay = ath9k_rng_delay_get(++fail_stats);
> - wait_event_interruptible_timeout(rng_queue,
> - kthread_should_stop(),
> - msecs_to_jiffies(delay));
> - continue;
> - }
> -
> - fail_stats = 0;
> -
> - /* sleep until entropy bits under write_wakeup_threshold */
> - add_hwgenerator_randomness((void *)rng_buf, bytes_read,
> - ATH9K_RNG_ENTROPY(bytes_read));
> + struct ath_softc *sc = container_of(rng, struct ath_softc, rng_ops);
> + int bytes_read = 0;
> + u32 fail_stats = 0, word;
> +
> +retry:
> + if (max & ~3UL)
> + bytes_read = ath9k_rng_data_read(sc, buf, max >> 2);
> + if ((max & 3UL) && ath9k_rng_data_read(sc, &word, 1)) {
> + memcpy(buf + bytes_read, &word, max & 3);
> + bytes_read += max & 3;
> + memzero_explicit(&word, sizeof(word));
> + }
> + if (max && unlikely(!bytes_read) && wait) {
> + msleep(ath9k_rng_delay_get(++fail_stats));
> + goto retry;
> }
Potentially, this waits forever, if wait is set and no data is returned.
Instead, it should return to the main kthread loop every once in a while.
Thanks,
Dominik
next prev parent reply other threads:[~2022-02-16 7:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAHmME9rkTP7bJBDvnejQ6BGPu13qpHKbtnjt3h33NEaTnYLirg@mail.gmail.com>
2022-02-15 15:38 ` ath9k should perhaps use hw_random api? Jason A. Donenfeld
2022-02-15 16:28 ` [PATCH] ath9k: use hw_random API instead of directly dumping into random.c Jason A. Donenfeld
2022-02-15 22:55 ` Rui Salvaterra
2022-02-15 23:22 ` Toke Høiland-Jørgensen
2022-02-15 23:52 ` Jason A. Donenfeld
2022-02-16 0:02 ` [PATCH v2] " Jason A. Donenfeld
2022-02-16 3:13 ` Florian Fainelli
2022-02-16 10:43 ` Jason A. Donenfeld
2022-02-16 11:33 ` [PATCH v3] " Jason A. Donenfeld
2022-02-16 13:27 ` Rui Salvaterra
2022-02-17 13:51 ` Toke Høiland-Jørgensen
2022-02-21 10:22 ` Kalle Valo
2022-02-22 10:01 ` Ard Biesheuvel
2022-02-22 10:13 ` Jason A. Donenfeld
2022-02-16 5:38 ` [PATCH v2] " Kalle Valo
2022-02-16 7:15 ` Dominik Brodowski [this message]
2022-02-16 7:11 ` [PATCH] " Dominik Brodowski
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=YgykjbhgdqeYyiY5@owl.dominikbrodowski.net \
--to=linux@dominikbrodowski.net \
--cc=Jason@zx2c4.com \
--cc=ath9k-devel@qca.qualcomm.com \
--cc=herbert@gondor.apana.org.au \
--cc=kvalo@kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=miaoqing@codeaurora.org \
--cc=netdev@vger.kernel.org \
--cc=pouyans@qti.qualcomm.com \
--cc=rsalvaterra@gmail.com \
--cc=toke@redhat.com \
--cc=toke@toke.dk \
/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;
as well as URLs for NNTP newsgroup(s).