Commit 7ef3d06f authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Michael Ellerman
Browse files

powerpc/powernv/kvm: Use darn for H_RANDOM on Power9 



The existing logic in KVM to support guests calling H_RANDOM only works
on Power8, because it looks for an RNG in the device tree, but on Power9
we just use darn.

In addition the existing code needs to work in real mode, so we have the
special cased powernv_get_random_real_mode() to deal with that.

Instead just have KVM call ppc_md.get_random_seed(), and do the real
mode check inside of there, that way we use whatever RNG is available,
including darn on Power9.

Fixes: e928e9cb ("KVM: PPC: Book3S HV: Add fast real-mode H_RANDOM implementation.")
Cc: stable@vger.kernel.org # v4.1+
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Tested-by: default avatarSachin Sant <sachinp@linux.ibm.com>
[mpe: Rebase on previous commit, update change log appropriately]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220727143219.2684192-2-mpe@ellerman.id.au
parent 90b5d4fe

arch/powerpc/include/asm/archrandom.h

+0 −5
Original line number Diff line number Diff line
@@ -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 powernv_hwrng_present(void);

int powernv_get_random_long(unsigned long *v);

int powernv_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; }

#endif



#endif /* _ASM_POWERPC_ARCHRANDOM_H */

arch/powerpc/kvm/book3s_hv_builtin.c

+4 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <asm/interrupt.h>

#include <asm/kvm_ppc.h>

#include <asm/kvm_book3s.h>

#include <asm/archrandom.h>

#include <asm/machdep.h>

#include <asm/xics.h>

#include <asm/xive.h>

#include <asm/dbell.h>
@@ -176,13 +176,14 @@ EXPORT_SYMBOL_GPL(kvmppc_hcall_impl_hv_realmode); 


int kvmppc_hwrng_present(void)

{

	return powernv_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 (powernv_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 −28
Original line number Diff line number Diff line
@@ -29,15 +29,6 @@ struct powernv_rng { 


static DEFINE_PER_CPU(struct powernv_rng *, powernv_rng);



int powernv_hwrng_present(void)

{

	struct powernv_rng *rng;



	rng = get_cpu_var(powernv_rng);

	put_cpu_var(rng);

	return rng != NULL;

}



static unsigned long rng_whiten(struct powernv_rng *rng, unsigned long val)

{

	unsigned long parity;
@@ -58,19 +49,6 @@ static unsigned long rng_whiten(struct powernv_rng *rng, unsigned long val) 
	return val;

}



int powernv_get_random_real_mode(unsigned long *v)

{

	struct powernv_rng *rng;



	rng = raw_cpu_read(powernv_rng);

	if (!rng)

		return 0;



	*v = rng_whiten(rng, __raw_rm_readq(rng->regs_real));



	return 1;

}



static int powernv_get_random_darn(unsigned long *v)

{

	unsigned long val;
@@ -107,12 +85,14 @@ int powernv_get_random_long(unsigned long *v) 
{

	struct powernv_rng *rng;



	if (mfmsr() & MSR_DR) {

		rng = get_cpu_var(powernv_rng);



		*v = rng_whiten(rng, in_be64(rng->regs));



		put_cpu_var(rng);



	} else {

		rng = raw_cpu_read(powernv_rng);

		*v = rng_whiten(rng, __raw_rm_readq(rng->regs_real));

	}

	return 1;

}

EXPORT_SYMBOL_GPL(powernv_get_random_long);