From patchwork Tue Nov 1 11:56:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 13636 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2911596wru; Tue, 1 Nov 2022 05:01:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6pJmlHU1EDCQF3bIRcpMSa0rSV6zoGlBGi9vaWdyQ58R9eNlVeuYOLgt7BGKPi7RZNBm1e X-Received: by 2002:a17:907:5ce:b0:730:bae0:deb with SMTP id wg14-20020a17090705ce00b00730bae00debmr18362707ejb.181.1667304071333; Tue, 01 Nov 2022 05:01:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667304071; cv=none; d=google.com; s=arc-20160816; b=QRRuX4Xu+cv7+UtRsonYTIvCvsOkYqnnoR6poOZj1CfGKh1N4OLvH0zU5V+IHcxeJq rNpgUGZHmVWkupI9ru+78KUynJfQIvwiGIJJCzFbQ2+e0jQJZHw1EhLCfF4iJ05D9LvR dytct+TstFlJzKQJTx/N7ijcBmXqUlDXc4+DBY5AZGkxsR7b4OooOsKb9Wp5LnVLAb6+ UDud+03dkYVkrmH7I6gOJ7AMuvM0XkWqrTVbbwKWgKK+INlEdTxwKVS9XRRLtZNPbt7s mJxsrBB1+8HtADniwjZ3TB2848hMrWQN4T1Aqbd7qikkRUpRdnwGHCLT91giiT5YD3bj OYew== 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=gcDMCA2pNwAIIUS0ol1RxOSoa5/R/rF12jX2wBMhrao=; b=PvLjeNGdEj3p5fqwmURFKYj5Y7NGaMS3AQk+c7kgjXJE9064eCgZg1IS+3ziQ5C0N4 WnDswRCsBPIqoplCMgcnP7E2qp82uHVS2ezGO8h9nwDUb3C7UaQTXeGMpqfVlfWMxUTC dRMfa02kLJyJj2oSkFFi3JzZQXruWVrd6xFNdu6bWVCdnJC0LXf5wVb/qFd1veAbEQNg LqFeGvauRe1s0YwvQDl4PDb29C/WUmlMg8qmZzMXeZawV4afh/6MOH6MTsGNLIAfCZvP HDEn8AC5ke9ozDXRlS6fWKkGWulujlObFKDbYS59Lqank4vonyiHD2tlAXZo+0U65l1Q +PVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=20210105 header.b="aY/SJREF"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=zx2c4.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cw14-20020a170906478e00b007ade0bd0306si6059457ejc.227.2022.11.01.05.00.46; Tue, 01 Nov 2022 05:01:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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="aY/SJREF"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S230064AbiKAL4k (ORCPT + 99 others); Tue, 1 Nov 2022 07:56:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229824AbiKAL4h (ORCPT ); Tue, 1 Nov 2022 07:56:37 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE2DBC43 for ; Tue, 1 Nov 2022 04:56:36 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 661F2B81CE6 for ; Tue, 1 Nov 2022 11:56:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AEFDC433D6; Tue, 1 Nov 2022 11:56:33 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="aY/SJREF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1667303791; 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=gcDMCA2pNwAIIUS0ol1RxOSoa5/R/rF12jX2wBMhrao=; b=aY/SJREFIg0Wmm2R3c7zPh4CvioKNqKo1I+CI7NL48Kp1Og1Bgdbj2FZhP+nP03DeONxHz DLo1hz0Ae2uWbIVRKxwGbcj+RBkT6+NEKgDZXN2dajoUxmA1AfX5YBDm2t7C8b3jHGrEQg W11+bT5kNKhJiK6Ivxj58gt50poZEm4= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 8abfdb34 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 1 Nov 2022 11:56:31 +0000 (UTC) From: "Jason A. Donenfeld" To: Catalin Marinas , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Jason A. Donenfeld" , Will Deacon , Ard Biesheuvel , Jean-Philippe Brucker Subject: [PATCH v4] random: remove early archrandom abstraction Date: Tue, 1 Nov 2022 12:56:16 +0100 Message-Id: <20221101115616.232884-1-Jason@zx2c4.com> In-Reply-To: References: MIME-Version: 1.0 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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747977860464325685?= X-GMAIL-MSGID: =?utf-8?q?1748295034153678653?= The arch_get_random*_early() abstraction is not completely useful and adds complexity, because it's not a given that there will be no calls to arch_get_random*() between random_init_early(), which uses arch_get_random*_early(), and init_cpu_features(). During that gap, crng_reseed() might be called, which uses arch_get_random*(), since it's mostly not init code. Instead we can test whether we're in the early phase in arch_get_random*() itself, and in doing so avoid all ambiguity about where we are. Fortunately, the only architecture that currently implements arch_get_random*_early() also has an alternatives-based cpu feature system, one flag of which determines whether the other flags have been initialized. This makes it possible to do the early check with zero cost once the system is initialized. Cc: Catalin Marinas Cc: Will Deacon Cc: Ard Biesheuvel Cc: Jean-Philippe Brucker Signed-off-by: Jason A. Donenfeld --- Changes v3->v4: - use !preemptible() rather than early_boot_irqs_disabled. arch/arm64/include/asm/archrandom.h | 62 ++++++++--------------------- drivers/char/random.c | 4 +- include/linux/random.h | 20 ---------- 3 files changed, 19 insertions(+), 67 deletions(-) diff --git a/arch/arm64/include/asm/archrandom.h b/arch/arm64/include/asm/archrandom.h index 109e2a4454be..3dcfc32075fc 100644 --- a/arch/arm64/include/asm/archrandom.h +++ b/arch/arm64/include/asm/archrandom.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #define ARM_SMCCC_TRNG_MIN_VERSION 0x10000UL @@ -58,6 +59,20 @@ static inline bool __arm64_rndrrs(unsigned long *v) return ok; } +static inline bool __early_cpu_has_rndr(void) +{ + /* Open code as we run prior to the first call to cpufeature. */ + unsigned long ftr = read_sysreg_s(SYS_ID_AA64ISAR0_EL1); + return (ftr >> ID_AA64ISAR0_EL1_RNDR_SHIFT) & 0xf; +} + +static __always_inline bool __cpu_has_rng(void) +{ + if (!system_capabilities_finalized() && !preemptible()) + return __early_cpu_has_rndr(); + return cpus_have_const_cap(ARM64_HAS_RNG); +} + static inline size_t __must_check arch_get_random_longs(unsigned long *v, size_t max_longs) { /* @@ -66,7 +81,7 @@ static inline size_t __must_check arch_get_random_longs(unsigned long *v, size_t * cpufeature code and with potential scheduling between CPUs * with and without the feature. */ - if (max_longs && cpus_have_const_cap(ARM64_HAS_RNG) && __arm64_rndr(v)) + if (max_longs && __cpu_has_rng() && __arm64_rndr(v)) return 1; return 0; } @@ -108,53 +123,10 @@ static inline size_t __must_check arch_get_random_seed_longs(unsigned long *v, s * reseeded after each invocation. This is not a 100% fit but good * enough to implement this API if no other entropy source exists. */ - if (cpus_have_const_cap(ARM64_HAS_RNG) && __arm64_rndrrs(v)) - return 1; - - return 0; -} - -static inline bool __init __early_cpu_has_rndr(void) -{ - /* Open code as we run prior to the first call to cpufeature. */ - unsigned long ftr = read_sysreg_s(SYS_ID_AA64ISAR0_EL1); - return (ftr >> ID_AA64ISAR0_EL1_RNDR_SHIFT) & 0xf; -} - -static inline size_t __init __must_check -arch_get_random_seed_longs_early(unsigned long *v, size_t max_longs) -{ - WARN_ON(system_state != SYSTEM_BOOTING); - - if (!max_longs) - return 0; - - if (smccc_trng_available) { - struct arm_smccc_res res; - - max_longs = min_t(size_t, 3, max_longs); - arm_smccc_1_1_invoke(ARM_SMCCC_TRNG_RND64, max_longs * 64, &res); - if ((int)res.a0 >= 0) { - switch (max_longs) { - case 3: - *v++ = res.a1; - fallthrough; - case 2: - *v++ = res.a2; - fallthrough; - case 1: - *v++ = res.a3; - break; - } - return max_longs; - } - } - - if (__early_cpu_has_rndr() && __arm64_rndr(v)) + if (__cpu_has_rng() && __arm64_rndrrs(v)) return 1; return 0; } -#define arch_get_random_seed_longs_early arch_get_random_seed_longs_early #endif /* _ASM_ARCHRANDOM_H */ diff --git a/drivers/char/random.c b/drivers/char/random.c index 6f323344d0b9..e3cf4f51ed58 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -813,13 +813,13 @@ void __init random_init_early(const char *command_line) #endif for (i = 0, arch_bits = sizeof(entropy) * 8; i < ARRAY_SIZE(entropy);) { - longs = arch_get_random_seed_longs_early(entropy, ARRAY_SIZE(entropy) - i); + longs = arch_get_random_seed_longs(entropy, ARRAY_SIZE(entropy) - i); if (longs) { _mix_pool_bytes(entropy, sizeof(*entropy) * longs); i += longs; continue; } - longs = arch_get_random_longs_early(entropy, ARRAY_SIZE(entropy) - i); + longs = arch_get_random_longs(entropy, ARRAY_SIZE(entropy) - i); if (longs) { _mix_pool_bytes(entropy, sizeof(*entropy) * longs); i += longs; diff --git a/include/linux/random.h b/include/linux/random.h index 182780cafd45..2bdd3add3400 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -153,26 +153,6 @@ declare_get_random_var_wait(long, unsigned long) #include -/* - * Called from the boot CPU during startup; not valid to call once - * secondary CPUs are up and preemption is possible. - */ -#ifndef arch_get_random_seed_longs_early -static inline size_t __init arch_get_random_seed_longs_early(unsigned long *v, size_t max_longs) -{ - WARN_ON(system_state != SYSTEM_BOOTING); - return arch_get_random_seed_longs(v, max_longs); -} -#endif - -#ifndef arch_get_random_longs_early -static inline bool __init arch_get_random_longs_early(unsigned long *v, size_t max_longs) -{ - WARN_ON(system_state != SYSTEM_BOOTING); - return arch_get_random_longs(v, max_longs); -} -#endif - #ifdef CONFIG_SMP int random_prepare_cpu(unsigned int cpu); int random_online_cpu(unsigned int cpu);