powerpc/kvm: don't crash on missing rng, and use darn
Subsystems (3)
PATCH 1/1 powerpc/kvm: don't crash on missing rng, and use darn
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.
---
This patch must be applied ontop of:
1) https://github.com/linuxppc/linux/commit/f3eac426657d985b97c92fa5f7ae1d43f04721f3
2) https://lore.kernel.org/all/[email protected]/
arch/powerpc/include/asm/archrandom.h | 5 ---- arch/powerpc/kvm/book3s_hv_builtin.c | 5 ++-- arch/powerpc/platforms/powernv/rng.c | 33 +++++++-------------------- 3 files changed, 11 insertions(+), 32 deletions(-)
arch/powerpc/include/asm/archrandom.h +0 -5
@@ -38,12 +38,7 @@ static inline bool __must_check arch_get_random_seed_int(unsigned int *v)#endif /* CONFIG_ARCH_RANDOM */ #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 #endif /* _ASM_POWERPC_ARCHRANDOM_H */
arch/powerpc/kvm/book3s_hv_builtin.c +3 -2
@@ -176,13 +176,14 @@ EXPORT_SYMBOL_GPL(kvmppc_hcall_impl_hv_realmode);int kvmppc_hwrng_present (void ) { -return pnv_hwrng_present (); +return ppc_md.get_random_seed !=NULL ; }EXPORT_SYMBOL_GPL (kvmppc_hwrng_present);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 ;return H_HARDWARE ;
arch/powerpc/platforms/powernv/rng.c +8 -25
@@ -29,15 +29,6 @@ struct pnv_rng { static DEFINE_PER_CPU(struct pnv_rng *, pnv_rng); -int pnv_hwrng_present (void ) -{ -struct pnv_rng *rng; - - rng =get_cpu_var (pnv_rng); -put_cpu_var (rng); -return rng !=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, unsigned long val)return val; } -int pnv_get_random_real_mode (unsigned long *v) -{ -struct pnv_rng *rng; - - rng =raw_cpu_read (pnv_rng); - - *v =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; - rng =get_cpu_var (pnv_rng); - - *v =rng_whiten (rng,in_be64 (rng->regs)); - -put_cpu_var (rng); +if (mfmsr () &MSR_DR ) { + rng =raw_cpu_read (pnv_rng); + *v =rng_whiten (rng,__raw_rm_readq (rng->regs_real)); + }else { + rng =get_cpu_var (pnv_rng); + *v =rng_whiten (rng,in_be64 (rng->regs)); +put_cpu_var (rng); + }return 1 ; }
Signature · 1 line
2.35.1
Quoted 50 lines · Jason A. Donenfeld
On POWER8 systems that don't have ibm,power-rng available, a guest that ignores the
KVM_CAP_PPC_HWRNGflag and callsH_RANDOManyway will dereference a NULL pointer. And on machines with darn instead of ibm,power-rng,H_RANDOMwon't work at all.This patch kills two birds with one stone, by routing
H_RANDOMcalls to ppc_md.get_random_seed, and doing the real mode check inside of it.Cc [email protected] # v4.1+Cc Michael Ellerman <[email protected]>Fixes e928e9cb3601 ("KVM: PPC: Book3S HV: Add fast real-mode H_RANDOM implementation.")Signed-off-by Jason A. Donenfeld <[email protected]>---
This patch must be applied ontop of:
1) https://github.com/linuxppc/linux/commit/f3eac426657d985b97c92fa5f7ae1d43f04721f3
2) https://lore.kernel.org/all/[email protected]/arch/powerpc/include/asm/archrandom.h | 5 ---- arch/powerpc/kvm/book3s_hv_builtin.c | 5 ++-- arch/powerpc/platforms/powernv/rng.c | 33 +++++++-------------------- 3 files changed, 11 insertions(+), 32 deletions(-)arch/powerpc/include/asm/archrandom.h +0
-5@@ -38,12 +38,7 @@ static inline bool __must_check arch_get_random_seed_int(unsigned int *v)#endif /* CONFIG_ARCH_RANDOM */ #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 #endif /* _ASM_POWERPC_ARCHRANDOM_H */ arch/powerpc/kvm/book3s_hv_builtin.c +0
-1@@ -176,13 +176,14 @@ EXPORT_SYMBOL_GPL(kvmppc_hcall_impl_hv_realmode);int kvmppc_hwrng_present (void ) { -return pnv_hwrng_present ();
arch/powerpc/kvm/book3s_hv_builtin.c EXPORT_SYMBOL_GPL(kvmppc_hcall_impl_hv_realmode); · line 187
Quoted 10 lines
arch/powerpc/kvm/book3s_hv_builtin.c +3
-1+return ppc_md.get_random_seed !=NULL ; }EXPORT_SYMBOL_GPL (kvmppc_hwrng_present);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 ;
This is the same as arch_get_random_seed_long, perhaps you could use it instead.
Otherwise, the archrandom.h include is not needed anymore and could be replaced with #include <asm/machdep.h> for ppc_md.
Quoted 60 lines
arch/powerpc/kvm/book3s_hv_builtin.c +0
-0return H_HARDWARE ;arch/powerpc/platforms/powernv/rng.c +8
-25@@ -29,15 +29,6 @@ struct pnv_rng { static DEFINE_PER_CPU(struct pnv_rng *, pnv_rng); -int pnv_hwrng_present (void ) -{ -struct pnv_rng *rng; - - rng =get_cpu_var (pnv_rng); -put_cpu_var (rng); -return rng !=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, unsigned long val)return val; } -int pnv_get_random_real_mode (unsigned long *v) -{ -struct pnv_rng *rng; - - rng =raw_cpu_read (pnv_rng); - - *v =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; - rng =get_cpu_var (pnv_rng); - - *v =rng_whiten (rng,in_be64 (rng->regs)); - -put_cpu_var (rng); +if (mfmsr () &MSR_DR ) { + rng =raw_cpu_read (pnv_rng); + *v =rng_whiten (rng,__raw_rm_readq (rng->regs_real)); + }else { + rng =get_cpu_var (pnv_rng); + *v =rng_whiten (rng,in_be64 (rng->regs)); +put_cpu_var (rng); + }return 1 ; }
Hi Fabiano,
Quoted 57 lines · Fabiano Rosas
Quoted 54 lines · Jason A. Donenfeld
On POWER8 systems that don't have ibm,power-rng available, a guest that ignores the
KVM_CAP_PPC_HWRNGflag and callsH_RANDOManyway will dereference a NULL pointer. And on machines with darn instead of ibm,power-rng,H_RANDOMwon't work at all.This patch kills two birds with one stone, by routing
H_RANDOMcalls to ppc_md.get_random_seed, and doing the real mode check inside of it.Cc [email protected] # v4.1+Cc Michael Ellerman <[email protected]>Fixes e928e9cb3601 ("KVM: PPC: Book3S HV: Add fast real-mode H_RANDOM implementation.")Signed-off-by Jason A. Donenfeld <[email protected]>---
This patch must be applied ontop of:
1) https://github.com/linuxppc/linux/commit/f3eac426657d985b97c92fa5f7ae1d43f04721f3
2) https://lore.kernel.org/all/[email protected]/arch/powerpc/include/asm/archrandom.h | 5 ---- arch/powerpc/kvm/book3s_hv_builtin.c | 5 ++-- arch/powerpc/platforms/powernv/rng.c | 33 +++++++-------------------- 3 files changed, 11 insertions(+), 32 deletions(-)arch/powerpc/include/asm/archrandom.h +0
-5@@ -38,12 +38,7 @@ static inline bool __must_check arch_get_random_seed_int(unsigned int *v)#endif /* CONFIG_ARCH_RANDOM */ #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 #endif /* _ASM_POWERPC_ARCHRANDOM_H */ arch/powerpc/kvm/book3s_hv_builtin.c +1
-1@@ -176,13 +176,14 @@ EXPORT_SYMBOL_GPL(kvmppc_hcall_impl_hv_realmode);int kvmppc_hwrng_present (void ) { -return pnv_hwrng_present (); +return ppc_md.get_random_seed !=NULL ; }EXPORT_SYMBOL_GPL (kvmppc_hwrng_present);
Quoted 9 lines
arch/powerpc/kvm/book3s_hv_builtin.c EXPORT_SYMBOL_GPL(kvmppc_hcall_impl_hv_realmode); · line 187
Quoted 6 lines
arch/powerpc/kvm/book3s_hv_builtin.c +2
-1long 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 ;This is the same as
arch_get_random_seed_long, perhaps you could use it instead.
Sure, why not. Will send a v2.
Jason