From nobody Fri Aug 25 19:34:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RXVX45Dx7z4qhm0; Fri, 25 Aug 2023 19:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RXVX44c1kz3Sw5; Fri, 25 Aug 2023 19:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692992084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VAn/kaw9DsUhNqR3+7oiR4CuGjOPkeDCTxR8TU9WM+c=; b=EZTb7/tV0hO5/pb0fdPNzVW6GR2UbPqEQeu6QyzxAPRbw83OtLJ5Lbz2UhVtvQlf3RyaX6 qov8JbuWHI9n1qi5ggEZaRATnWf7aTjV9cZ28WAxXVb5sof7Wnji3UQss3SN0Hf8/VCJnY PUAV8iAFQ6e2feRI749H7Uzr+0sRy6o29vcgEUAbTSM/vd3MOqP75t3VWqs+YvV5F12znt Ddpbr8KAs+Jtib2dM/xJEOKLNk2GWpkSHJUMQERwDLQDvDRqUY9PLFllMgfvCGYhnDoUm/ Q7PhiEy5bHPPr/yihDLNW3cc1m51ZgUENJ5fJBnmNh3cEiV1almnf/VnCBzq4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692992084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VAn/kaw9DsUhNqR3+7oiR4CuGjOPkeDCTxR8TU9WM+c=; b=ngEqQEAJsTKBewJ13EhfRvIRw/8sMQ8egMhZsvex3R54WmQwFWNzLlMDvIM6d4elEfyz9i CzGftA78lFW7mQzZUhq1agHAr4vPTq93PgsoWrhaMrONYr12V7Eue6et82PoBVY6KXzsAx RX/WQ/A3AMIceDIt2z/mbrUEWwveuEPvDWDyBDFqXfyrIT3M2pH0s1m+tsxBonxCtLkGhT crjym0ZmmSUEq55mCUKl2grfiHmRBtmgi6J/ZkSczP9V5/jaGPWpgTo2/A+luava9ZEfP9 pbPehgDPdc341Su4uNKl0vfZM8CFVjjRoZD3O/beZXS4Stnm5WP4fg6xDHEbNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692992084; a=rsa-sha256; cv=none; b=YeLuoYQ3i14sN6XRJTMnDLEFP7IZ29h8YXWj6+jMabn3VYHBjPkGd8UgKEBgg0VamDtIkT Bq1+YPqnRuLIwTdxebo6cJt/I88seqMjHKGgWpVSVRT06PrfyKOcZ3mqhY4ooHzPQbABZL R8Mu8QpUfFQ7vNwBEdBUsxBA8+nRglI3p5sk1Gk/ufK9/sCUXpITjX4H2HEfMrY+lk/0am 0RJBWTDsm3Q2A2frecSXIR7ErNv1N84ByEB9JNTgH88bz/edhhhvjlzMydzY37cKmRUisq PlvL5B5ZlOji6l0ARa6mtV7rW3p1vl3Ha0a3P5U79Hdlf3q6xLDQCvdd9J0NSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXVX43Y1Vz1KWH; Fri, 25 Aug 2023 19:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PJYi2d099615; Fri, 25 Aug 2023 19:34:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PJYifX099612; Fri, 25 Aug 2023 19:34:44 GMT (envelope-from git) Date: Fri, 25 Aug 2023 19:34:44 GMT Message-Id: <202308251934.37PJYifX099612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7aec088cbce8 - main - nehemiah RNG: Switch to using FPU_KERN_NOCTX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7aec088cbce8381bd5bf730419b8fdcddf43b08d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7aec088cbce8381bd5bf730419b8fdcddf43b08d commit 7aec088cbce8381bd5bf730419b8fdcddf43b08d Author: John Baldwin AuthorDate: 2023-08-25 19:34:16 +0000 Commit: John Baldwin CommitDate: 2023-08-25 19:34:16 +0000 nehemiah RNG: Switch to using FPU_KERN_NOCTX Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D41583 --- sys/dev/random/nehemiah.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/sys/dev/random/nehemiah.c b/sys/dev/random/nehemiah.c index 09c8c32c6d39..e01fdb952108 100644 --- a/sys/dev/random/nehemiah.c +++ b/sys/dev/random/nehemiah.c @@ -43,8 +43,6 @@ #include -static void random_nehemiah_init(void); -static void random_nehemiah_deinit(void); static u_int random_nehemiah_read(void *, u_int); static struct random_source random_nehemiah = { @@ -53,8 +51,6 @@ static struct random_source random_nehemiah = { .rs_read = random_nehemiah_read }; -static struct fpu_kern_ctx *fpu_ctx_save; - /* This H/W source never stores more than 8 bytes in one go */ /* ARGSUSED */ static __inline size_t @@ -75,20 +71,6 @@ VIA_RNG_store(void *buf) return (0); } -static void -random_nehemiah_init(void) -{ - - fpu_ctx_save = fpu_kern_alloc_ctx(FPU_KERN_NORMAL); -} - -static void -random_nehemiah_deinit(void) -{ - - fpu_kern_free_ctx(fpu_ctx_save); -} - /* It is specifically allowed that buf is a multiple of sizeof(long) */ static u_int random_nehemiah_read(void *buf, u_int c) @@ -97,14 +79,14 @@ random_nehemiah_read(void *buf, u_int c) size_t count, ret; uint64_t tmp; - fpu_kern_enter(curthread, fpu_ctx_save, FPU_KERN_NORMAL); + fpu_kern_enter(curthread, NULL, FPU_KERN_NORMAL | FPU_KERN_NOCTX); b = buf; for (count = c; count > 0; count -= ret) { ret = MIN(VIA_RNG_store(&tmp), count); memcpy(b, &tmp, ret); b += ret; } - fpu_kern_leave(curthread, fpu_ctx_save); + fpu_kern_leave(curthread, NULL); return (c); } @@ -119,13 +101,11 @@ nehemiah_modevent(module_t mod, int type, void *unused) if (via_feature_rng & VIA_HAS_RNG) { random_source_register(&random_nehemiah); printf("random: fast provider: \"%s\"\n", random_nehemiah.rs_ident); - random_nehemiah_init(); } break; case MOD_UNLOAD: if (via_feature_rng & VIA_HAS_RNG) { - random_nehemiah_deinit(); random_source_deregister(&random_nehemiah); } break;