From patchwork Mon Sep 21 07:58:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolai Stange X-Patchwork-Id: 11788693 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7A8B11668 for ; Mon, 21 Sep 2020 08:00:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BDC920EDD for ; Mon, 21 Sep 2020 08:00:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726702AbgIUIA2 (ORCPT ); Mon, 21 Sep 2020 04:00:28 -0400 Received: from mx2.suse.de ([195.135.220.15]:57144 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726489AbgIUH7W (ORCPT ); Mon, 21 Sep 2020 03:59:22 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 1B007B50A; Mon, 21 Sep 2020 07:59:56 +0000 (UTC) From: Nicolai Stange To: "Theodore Y. Ts'o" Cc: linux-crypto@vger.kernel.org, LKML , Arnd Bergmann , Greg Kroah-Hartman , "Eric W. Biederman" , "Alexander E. Patrakov" , "Ahmed S. Darwish" , Willy Tarreau , Matthew Garrett , Vito Caputo , Andreas Dilger , Jan Kara , Ray Strode , William Jon McCann , zhangjs , Andy Lutomirski , Florian Weimer , Lennart Poettering , Peter Matthias , Marcelo Henrique Cerri , Roman Drahtmueller , Neil Horman , Randy Dunlap , Julia Lawall , Dan Carpenter , Andy Lavr , Eric Biggers , "Jason A. Donenfeld" , =?utf-8?q?Stephan_M=C3=BCller?= , Torsten Duwe , Petr Tesarik , Nicolai Stange Subject: [RFC PATCH 12/41] random: convert add_interrupt_randomness() to queued_entropy API Date: Mon, 21 Sep 2020 09:58:28 +0200 Message-Id: <20200921075857.4424-13-nstange@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200921075857.4424-1-nstange@suse.de> References: <20200921075857.4424-1-nstange@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org In an effort to drop __credit_entropy_bits_fast() in favor of the new __queue_entropy()/__dispatch_queued_entropy_fast() API, convert add_interrupt_randomness() from the former to the latter. There is no change in functionality at this point, because __credit_entropy_bits_fast() has already been reimplemented on top of the new API before. Signed-off-by: Nicolai Stange --- drivers/char/random.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index e8c86abde901..bd3774c6be4b 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1512,6 +1512,7 @@ void add_interrupt_randomness(int irq, int irq_flags) unsigned long seed; int credit = 0; bool reseed; + struct queued_entropy q = { 0 }; if (cycles == 0) cycles = get_reg(fast_pool, regs); @@ -1546,24 +1547,27 @@ void add_interrupt_randomness(int irq, int irq_flags) if (!spin_trylock(&r->lock)) return; - fast_pool->last = now; - __mix_pool_bytes(r, &fast_pool->pool, sizeof(fast_pool->pool)); - /* * If we have architectural seed generator, produce a seed and - * add it to the pool. For the sake of paranoia don't let the - * architectural seed generator dominate the input from the - * interrupt noise. + * add it to the pool further below. For the sake of paranoia + * don't let the architectural seed generator dominate the + * input from the interrupt noise. */ - if (arch_get_random_seed_long(&seed)) { - __mix_pool_bytes(r, &seed, sizeof(seed)); - credit = 1; - } + credit = !!arch_get_random_long(&seed); + fast_pool->last = now; fast_pool->count = 0; - /* award one bit for the contents of the fast pool */ - reseed = __credit_entropy_bits_fast(r, credit + 1); + __queue_entropy(r, &q, (credit + 1) << ENTROPY_SHIFT); + __mix_pool_bytes(r, &fast_pool->pool, sizeof(fast_pool->pool)); + if (credit) { + /* + * A seed has been obtained from + * arch_get_random_seed_long() above, mix it in. + */ + __mix_pool_bytes(r, &seed, sizeof(seed)); + } + reseed = __dispatch_queued_entropy_fast(r, &q); spin_unlock(&r->lock); if (reseed) crng_reseed(&primary_crng, r);