From nobody Sun Apr 26 16:02:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37D75C43334 for ; Fri, 24 Jun 2022 14:23:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232269AbiFXOXl (ORCPT ); Fri, 24 Jun 2022 10:23:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232500AbiFXOXh (ORCPT ); Fri, 24 Jun 2022 10:23:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5393A49252 for ; Fri, 24 Jun 2022 07:23: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 dfw.source.kernel.org (Postfix) with ESMTPS id D2ED162030 for ; Fri, 24 Jun 2022 14:23:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF03BC3411C; Fri, 24 Jun 2022 14:23:34 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="mzkWu2f4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1656080613; 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=jJfl1GH0XNDioFoW1Ys1u2Ptf2MdQky8PrpHURnqz+U=; b=mzkWu2f4Zmtcxccu8J1Gb9aOYrlGdtSlrX3E0bsaT10hai6POM4ef2xO5cKdjSRxpt1XJ7 qgFKIcZBJBWdLLhZ3Xny6NkJgV1/cNN0PZwb/9SJZ2VnMlv20q0UgmscTtE8fb9EhFSjtq Xle17Ca1x6mQEhCOHp2L+48lyBAQU0Q= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 49541e4a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Fri, 24 Jun 2022 14:23:33 +0000 (UTC) From: "Jason A. Donenfeld" To: Fabiano Rosas , linuxppc-dev@lists.ozlabs.org, LKML , Michael Ellerman Cc: "Jason A. Donenfeld" Subject: [PATCH v2 1/2] powerpc/powernv: rename remaining rng powernv_ functions to pnv_ Date: Fri, 24 Jun 2022 16:23:21 +0200 Message-Id: <20220624142322.2049826-2-Jason@zx2c4.com> In-Reply-To: <20220624142322.2049826-1-Jason@zx2c4.com> References: <20220624142322.2049826-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The preferred nomenclature is pnv_, not powernv_, but rng.c used powernv_ for some reason, which isn't consistent with the rest. A recent commit added a few pnv_ functions to rng.c, making the file a bit of a mishmash. This commit just replaces the rest of them. Cc: Michael Ellerman Fixes: f3eac426657 ("powerpc/powernv: wire up rng during setup_arch") Signed-off-by: Jason A. Donenfeld Reviewed-by: Fabiano Rosas --- arch/powerpc/include/asm/archrandom.h | 10 +++---- arch/powerpc/kvm/book3s_hv_builtin.c | 4 +-- arch/powerpc/platforms/powernv/rng.c | 42 +++++++++++++-------------- drivers/char/hw_random/powernv-rng.c | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/arch/powerpc/include/asm/archrandom.h b/arch/powerpc/include/a= sm/archrandom.h index 9a53e29680f4..11d4815841ab 100644 --- a/arch/powerpc/include/asm/archrandom.h +++ b/arch/powerpc/include/asm/archrandom.h @@ -38,12 +38,12 @@ static inline bool __must_check arch_get_random_seed_in= t(unsigned int *v) #endif /* CONFIG_ARCH_RANDOM */ =20 #ifdef CONFIG_PPC_POWERNV -int powernv_hwrng_present(void); -int powernv_get_random_long(unsigned long *v); -int powernv_get_random_real_mode(unsigned long *v); +int pnv_hwrng_present(void); +int pnv_get_random_long(unsigned long *v); +int pnv_get_random_real_mode(unsigned long *v); #else -static inline int powernv_hwrng_present(void) { return 0; } -static inline int powernv_get_random_real_mode(unsigned long *v) { return = 0; } +static inline int pnv_hwrng_present(void) { return 0; } +static inline int pnv_get_random_real_mode(unsigned long *v) { return 0; } #endif =20 #endif /* _ASM_POWERPC_ARCHRANDOM_H */ diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s= _hv_builtin.c index 88a8f6473c4e..799d40c2ab4f 100644 --- a/arch/powerpc/kvm/book3s_hv_builtin.c +++ b/arch/powerpc/kvm/book3s_hv_builtin.c @@ -176,13 +176,13 @@ EXPORT_SYMBOL_GPL(kvmppc_hcall_impl_hv_realmode); =20 int kvmppc_hwrng_present(void) { - return powernv_hwrng_present(); + return pnv_hwrng_present(); } EXPORT_SYMBOL_GPL(kvmppc_hwrng_present); =20 long kvmppc_rm_h_random(struct kvm_vcpu *vcpu) { - if (powernv_get_random_real_mode(&vcpu->arch.regs.gpr[4])) + if (pnv_get_random_real_mode(&vcpu->arch.regs.gpr[4])) return H_SUCCESS; =20 return H_HARDWARE; diff --git a/arch/powerpc/platforms/powernv/rng.c b/arch/powerpc/platforms/= powernv/rng.c index 463c78c52cc5..868bb9777425 100644 --- a/arch/powerpc/platforms/powernv/rng.c +++ b/arch/powerpc/platforms/powernv/rng.c @@ -21,24 +21,24 @@ =20 #define DARN_ERR 0xFFFFFFFFFFFFFFFFul =20 -struct powernv_rng { +struct pnv_rng { void __iomem *regs; void __iomem *regs_real; unsigned long mask; }; =20 -static DEFINE_PER_CPU(struct powernv_rng *, powernv_rng); +static DEFINE_PER_CPU(struct pnv_rng *, pnv_rng); =20 -int powernv_hwrng_present(void) +int pnv_hwrng_present(void) { - struct powernv_rng *rng; + struct pnv_rng *rng; =20 - rng =3D get_cpu_var(powernv_rng); + rng =3D get_cpu_var(pnv_rng); put_cpu_var(rng); return rng !=3D NULL; } =20 -static unsigned long rng_whiten(struct powernv_rng *rng, unsigned long val) +static unsigned long rng_whiten(struct pnv_rng *rng, unsigned long val) { unsigned long parity; =20 @@ -58,18 +58,18 @@ static unsigned long rng_whiten(struct powernv_rng *rng= , unsigned long val) return val; } =20 -int powernv_get_random_real_mode(unsigned long *v) +int pnv_get_random_real_mode(unsigned long *v) { - struct powernv_rng *rng; + struct pnv_rng *rng; =20 - rng =3D raw_cpu_read(powernv_rng); + rng =3D raw_cpu_read(pnv_rng); =20 *v =3D rng_whiten(rng, __raw_rm_readq(rng->regs_real)); =20 return 1; } =20 -static int powernv_get_random_darn(unsigned long *v) +static int pnv_get_random_darn(unsigned long *v) { unsigned long val; =20 @@ -93,19 +93,19 @@ static int __init initialise_darn(void) return -ENODEV; =20 for (i =3D 0; i < 10; i++) { - if (powernv_get_random_darn(&val)) { - ppc_md.get_random_seed =3D powernv_get_random_darn; + if (pnv_get_random_darn(&val)) { + ppc_md.get_random_seed =3D pnv_get_random_darn; return 0; } } return -EIO; } =20 -int powernv_get_random_long(unsigned long *v) +int pnv_get_random_long(unsigned long *v) { - struct powernv_rng *rng; + struct pnv_rng *rng; =20 - rng =3D get_cpu_var(powernv_rng); + rng =3D get_cpu_var(pnv_rng); =20 *v =3D rng_whiten(rng, in_be64(rng->regs)); =20 @@ -113,9 +113,9 @@ int powernv_get_random_long(unsigned long *v) =20 return 1; } -EXPORT_SYMBOL_GPL(powernv_get_random_long); +EXPORT_SYMBOL_GPL(pnv_get_random_long); =20 -static __init void rng_init_per_cpu(struct powernv_rng *rng, +static __init void rng_init_per_cpu(struct pnv_rng *rng, struct device_node *dn) { int chip_id, cpu; @@ -125,16 +125,16 @@ static __init void rng_init_per_cpu(struct powernv_rn= g *rng, pr_warn("No ibm,chip-id found for %pOF.\n", dn); =20 for_each_possible_cpu(cpu) { - if (per_cpu(powernv_rng, cpu) =3D=3D NULL || + if (per_cpu(pnv_rng, cpu) =3D=3D NULL || cpu_to_chip_id(cpu) =3D=3D chip_id) { - per_cpu(powernv_rng, cpu) =3D rng; + per_cpu(pnv_rng, cpu) =3D rng; } } } =20 static __init int rng_create(struct device_node *dn) { - struct powernv_rng *rng; + struct pnv_rng *rng; struct resource res; unsigned long val; =20 @@ -160,7 +160,7 @@ static __init int rng_create(struct device_node *dn) =20 rng_init_per_cpu(rng, dn); =20 - ppc_md.get_random_seed =3D powernv_get_random_long; + ppc_md.get_random_seed =3D pnv_get_random_long; =20 return 0; } diff --git a/drivers/char/hw_random/powernv-rng.c b/drivers/char/hw_random/= powernv-rng.c index 8da1d7917bdc..429e956f34e1 100644 --- a/drivers/char/hw_random/powernv-rng.c +++ b/drivers/char/hw_random/powernv-rng.c @@ -23,7 +23,7 @@ static int powernv_rng_read(struct hwrng *rng, void *data= , size_t max, bool wait buf =3D (unsigned long *)data; =20 for (i =3D 0; i < len; i++) - powernv_get_random_long(buf++); + pnv_get_random_long(buf++); =20 return len * sizeof(unsigned long); } --=20 2.35.1 From nobody Sun Apr 26 16:02:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67E75C433EF for ; Fri, 24 Jun 2022 14:23:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232498AbiFXOXo (ORCPT ); Fri, 24 Jun 2022 10:23:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231966AbiFXOXk (ORCPT ); Fri, 24 Jun 2022 10:23:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FDD23EF2E; Fri, 24 Jun 2022 07:23:39 -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 dfw.source.kernel.org (Postfix) with ESMTPS id B31B862030; Fri, 24 Jun 2022 14:23:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86855C34114; Fri, 24 Jun 2022 14:23:37 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="QsgtejW0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1656080616; 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=Ysi4JdQvNZMCj4pc6gtKX3vFcf+fL/Uqup65oCETDo4=; b=QsgtejW0CQq7ggop0eSEJg+l5u+P/hz084z191p3L5T3XMN7sQxqRSE10pZSYqohM01tTA FOMOFpL/v+D/5IFtE4AI0cQ70NwuOYDsfRhl83xQyjGqVsUTG1EoQ3SViiaM6Yhxh4dISV aWLEd3jyRui2dJm8UPHC5Kps620lH2c= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 2d632f11 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Fri, 24 Jun 2022 14:23:36 +0000 (UTC) From: "Jason A. Donenfeld" To: Fabiano Rosas , linuxppc-dev@lists.ozlabs.org, LKML , Michael Ellerman Cc: "Jason A. Donenfeld" , stable@vger.kernel.org Subject: [PATCH v2 2/2] powerpc/kvm: don't crash on missing rng, and use darn Date: Fri, 24 Jun 2022 16:23:22 +0200 Message-Id: <20220624142322.2049826-3-Jason@zx2c4.com> In-Reply-To: <20220624142322.2049826-1-Jason@zx2c4.com> References: <20220624142322.2049826-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" On POWER8 systems that don't have ibm,power-rng available, a guest that ignores the KVM_CAP_PPC_HWRNG flag and calls H_RANDOM anyway will dereference a NULL pointer. And on machines with darn instead of ibm,power-rng, H_RANDOM won't work at all. This patch kills two birds with one stone, by routing H_RANDOM calls to ppc_md.get_random_seed, and doing the real mode check inside of it. Cc: stable@vger.kernel.org # v4.1+ Cc: Michael Ellerman Fixes: e928e9cb3601 ("KVM: PPC: Book3S HV: Add fast real-mode H_RANDOM impl= ementation.") Signed-off-by: Jason A. Donenfeld Reviewed-by: Fabiano Rosas --- arch/powerpc/include/asm/archrandom.h | 5 ---- arch/powerpc/kvm/book3s_hv_builtin.c | 7 +++--- arch/powerpc/platforms/powernv/rng.c | 33 +++++++-------------------- 3 files changed, 12 insertions(+), 33 deletions(-) diff --git a/arch/powerpc/include/asm/archrandom.h b/arch/powerpc/include/a= sm/archrandom.h index 11d4815841ab..3af27bb84a3d 100644 --- a/arch/powerpc/include/asm/archrandom.h +++ b/arch/powerpc/include/asm/archrandom.h @@ -38,12 +38,7 @@ static inline bool __must_check arch_get_random_seed_int= (unsigned int *v) #endif /* CONFIG_ARCH_RANDOM */ =20 #ifdef CONFIG_PPC_POWERNV -int pnv_hwrng_present(void); int pnv_get_random_long(unsigned long *v); -int pnv_get_random_real_mode(unsigned long *v); -#else -static inline int pnv_hwrng_present(void) { return 0; } -static inline int pnv_get_random_real_mode(unsigned long *v) { return 0; } #endif =20 #endif /* _ASM_POWERPC_ARCHRANDOM_H */ diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s= _hv_builtin.c index 799d40c2ab4f..3abaef5f9ac2 100644 --- a/arch/powerpc/kvm/book3s_hv_builtin.c +++ b/arch/powerpc/kvm/book3s_hv_builtin.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -176,13 +176,14 @@ EXPORT_SYMBOL_GPL(kvmppc_hcall_impl_hv_realmode); =20 int kvmppc_hwrng_present(void) { - return pnv_hwrng_present(); + return ppc_md.get_random_seed !=3D NULL; } EXPORT_SYMBOL_GPL(kvmppc_hwrng_present); =20 long kvmppc_rm_h_random(struct kvm_vcpu *vcpu) { - if (pnv_get_random_real_mode(&vcpu->arch.regs.gpr[4])) + if (ppc_md.get_random_seed && + ppc_md.get_random_seed(&vcpu->arch.regs.gpr[4])) return H_SUCCESS; =20 return H_HARDWARE; diff --git a/arch/powerpc/platforms/powernv/rng.c b/arch/powerpc/platforms/= powernv/rng.c index 868bb9777425..c748567cd47e 100644 --- a/arch/powerpc/platforms/powernv/rng.c +++ b/arch/powerpc/platforms/powernv/rng.c @@ -29,15 +29,6 @@ struct pnv_rng { =20 static DEFINE_PER_CPU(struct pnv_rng *, pnv_rng); =20 -int pnv_hwrng_present(void) -{ - struct pnv_rng *rng; - - rng =3D get_cpu_var(pnv_rng); - put_cpu_var(rng); - return rng !=3D NULL; -} - static unsigned long rng_whiten(struct pnv_rng *rng, unsigned long val) { unsigned long parity; @@ -58,17 +49,6 @@ static unsigned long rng_whiten(struct pnv_rng *rng, uns= igned long val) return val; } =20 -int pnv_get_random_real_mode(unsigned long *v) -{ - struct pnv_rng *rng; - - rng =3D raw_cpu_read(pnv_rng); - - *v =3D rng_whiten(rng, __raw_rm_readq(rng->regs_real)); - - return 1; -} - static int pnv_get_random_darn(unsigned long *v) { unsigned long val; @@ -105,11 +85,14 @@ int pnv_get_random_long(unsigned long *v) { struct pnv_rng *rng; =20 - rng =3D get_cpu_var(pnv_rng); - - *v =3D rng_whiten(rng, in_be64(rng->regs)); - - put_cpu_var(rng); + if (mfmsr() & MSR_DR) { + rng =3D raw_cpu_read(pnv_rng); + *v =3D rng_whiten(rng, __raw_rm_readq(rng->regs_real)); + } else { + rng =3D get_cpu_var(pnv_rng); + *v =3D rng_whiten(rng, in_be64(rng->regs)); + put_cpu_var(rng); + } =20 return 1; } --=20 2.35.1