Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp358611rwb; Sun, 6 Nov 2022 07:04:28 -0800 (PST) X-Google-Smtp-Source: AMsMyM5ebhW5tcbBXXoY471kKw4oG0yEIedUeqemkt9xpGTISvLD276oDche6jgpS9elFo1zXJ/K X-Received: by 2002:a17:902:7c12:b0:186:8111:ade2 with SMTP id x18-20020a1709027c1200b001868111ade2mr45674293pll.111.1667747068447; Sun, 06 Nov 2022 07:04:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667747068; cv=none; d=google.com; s=arc-20160816; b=ZCW7fy7lI/O+41B/c0VR2vADv5JeqVVzntzSIuxAb/yH9d8T9vR0Li6mYT0rdl6uas KnT1som8ecesH9xDV6CInHxlsf2ogXMrRzALtIIcM81bOlZ3FP4M4a3woIuuTn376s4H 2HpFTQRa/sSTJRYVhn6mEeiRxMfvPm5ZVA5vtvCWMqsKhNVlJQp7gy0TIAtW/KctYGUL oZU14SNzvGfUPc4NjiIazu414SuRcF6p8FuSg4AQdIexyplWsCO8POYfU9whf5U4XA9V rcYPSNLdEKuoZu2GyrPlmne8mrFib7KrPa+lCMl8dtvZAY418+ntqN8cyfJ90wXtuYAW y2hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6GaS41hZszBCQzn0fOCoR0LjbYe8JSeNMqXqYWyZe3o=; b=V1WZq//MJh6FQ7+AGspBnMXQRfPojPxwP6atL7CSlGowrXTtr7dwq49qPDkOOvNTG9 URZtggmsCKdi2v54OCwVUz/MZGIWvYH6HxylztFq8DDC3bZ9GKVk+eZodcQnEI9mO/9g FJoRcdX40BaxPOsWWWdaBqsHdL2SlagQvDZcmhJhxf9RZf7Ax+EhUxzKWtu7O6sGsAA8 oTjqQv+HZ8O+b2/MgDxTvJsMq5VLRu2UjQLEXeLFlZ+nDX2JYIeBedZYU/so6P7ylIWN 851jZd0YwDd6z33pg/W3DyF+gpxbAtX+7aN0ul4h+KkBc1HQ3R9+I7Ey6lwMU1dduVGF M70w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=20210105 header.b=phqMxy2L; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=zx2c4.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id me5-20020a17090b17c500b00213dce992c1si8599984pjb.7.2022.11.06.07.04.11; Sun, 06 Nov 2022 07:04:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@zx2c4.com header.s=20210105 header.b=phqMxy2L; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=zx2c4.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229875AbiKFPDI (ORCPT + 99 others); Sun, 6 Nov 2022 10:03:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbiKFPDH (ORCPT ); Sun, 6 Nov 2022 10:03:07 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD38E2733 for ; Sun, 6 Nov 2022 07:02:53 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 66F3760C02 for ; Sun, 6 Nov 2022 15:02:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 630DDC433C1; Sun, 6 Nov 2022 15:02:52 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="phqMxy2L" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1667746970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6GaS41hZszBCQzn0fOCoR0LjbYe8JSeNMqXqYWyZe3o=; b=phqMxy2LuYBQsau8mMZCAx4Q3f1Ph+gHkSH1M8FgRKGH/UtFWk80Kj3nztNgxu0+WInFdK 6wX9jNdI7qOapoDzeNjDQdrSVTTlzXr+wYh/FFJMqt/OtMC2QTSXxZQG1ldyGoU842N3YS 6M+P4t9f7HFkcagWLitcT1Tu8X8MTBU= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id e58b3333 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 6 Nov 2022 15:02:49 +0000 (UTC) From: "Jason A. Donenfeld" To: herbert@gondor.apana.org.au, linux-crypto@vger.kernel.org Cc: "Jason A. Donenfeld" , Dominik Brodowski Subject: [PATCH v3] hw_random: use add_hwgenerator_randomness() for early entropy Date: Sun, 6 Nov 2022 16:02:43 +0100 Message-Id: <20221106150243.150437-1-Jason@zx2c4.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Rather than calling add_device_randomness(), the add_early_randomness() function should use add_hwgenerator_randomness(), so that the early entropy can be potentially credited, which allows for the RNG to initialize earlier without having to wait for the kthread to come up. This requires some minor API refactoring, by adding a `sleep_after` parameter to add_hwgenerator_randomness(), so that we don't hit a blocking sleep from add_early_randomness(). Cc: Herbert Xu Cc: Dominik Brodowski Signed-off-by: Jason A. Donenfeld --- Herbert - it might be easiest for me to take this patch if you want? Or if this will interfere with what you have going on, you can take it. Let me know what you feel like. -Jason drivers/char/hw_random/core.c | 8 +++++--- drivers/char/random.c | 12 ++++++------ include/linux/random.h | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c index cc002b0c2f0c..63a0a8e4505d 100644 --- a/drivers/char/hw_random/core.c +++ b/drivers/char/hw_random/core.c @@ -69,8 +69,10 @@ static void add_early_randomness(struct hwrng *rng) mutex_lock(&reading_mutex); bytes_read = rng_get_data(rng, rng_fillbuf, 32, 0); mutex_unlock(&reading_mutex); - if (bytes_read > 0) - add_device_randomness(rng_fillbuf, bytes_read); + if (bytes_read > 0) { + size_t entropy = bytes_read * 8 * rng->quality / 1024; + add_hwgenerator_randomness(rng_fillbuf, bytes_read, entropy, false); + } } static inline void cleanup_rng(struct kref *kref) @@ -528,7 +530,7 @@ static int hwrng_fillfn(void *unused) /* Outside lock, sure, but y'know: randomness. */ add_hwgenerator_randomness((void *)rng_fillbuf, rc, - entropy >> 10); + entropy >> 10, true); } hwrng_fill = NULL; return 0; diff --git a/drivers/char/random.c b/drivers/char/random.c index 4591d55cb135..70ecfcfdb1d7 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -711,7 +711,7 @@ static void __cold _credit_init_bits(size_t bits) * the above entropy accumulation routines: * * void add_device_randomness(const void *buf, size_t len); - * void add_hwgenerator_randomness(const void *buf, size_t len, size_t entropy); + * void add_hwgenerator_randomness(const void *buf, size_t len, size_t entropy, bool sleep_after); * void add_bootloader_randomness(const void *buf, size_t len); * void add_vmfork_randomness(const void *unique_vm_id, size_t len); * void add_interrupt_randomness(int irq); @@ -891,11 +891,11 @@ void add_device_randomness(const void *buf, size_t len) EXPORT_SYMBOL(add_device_randomness); /* - * Interface for in-kernel drivers of true hardware RNGs. - * Those devices may produce endless random bits and will be throttled - * when our pool is full. + * Interface for in-kernel drivers of true hardware RNGs. Those devices + * may produce endless random bits, so this function will sleep for + * some amount of time after, if the sleep_after parameter is true. */ -void add_hwgenerator_randomness(const void *buf, size_t len, size_t entropy) +void add_hwgenerator_randomness(const void *buf, size_t len, size_t entropy, bool sleep_after) { mix_pool_bytes(buf, len); credit_init_bits(entropy); @@ -904,7 +904,7 @@ void add_hwgenerator_randomness(const void *buf, size_t len, size_t entropy) * Throttle writing to once every reseed interval, unless we're not yet * initialized or no entropy is credited. */ - if (!kthread_should_stop() && (crng_ready() || !entropy)) + if (!kthread_should_stop() && (crng_ready() || !entropy) && sleep_after) schedule_timeout_interruptible(crng_reseed_interval()); } EXPORT_SYMBOL_GPL(add_hwgenerator_randomness); diff --git a/include/linux/random.h b/include/linux/random.h index 2bdd3add3400..728b29ade208 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -17,7 +17,7 @@ void __init add_bootloader_randomness(const void *buf, size_t len); void add_input_randomness(unsigned int type, unsigned int code, unsigned int value) __latent_entropy; void add_interrupt_randomness(int irq) __latent_entropy; -void add_hwgenerator_randomness(const void *buf, size_t len, size_t entropy); +void add_hwgenerator_randomness(const void *buf, size_t len, size_t entropy, bool sleep_after); #if defined(LATENT_ENTROPY_PLUGIN) && !defined(__CHECKER__) static inline void add_latent_entropy(void) -- 2.38.1