From patchwork Mon Sep 28 10:13:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kurz X-Patchwork-Id: 523368 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 32067140549 for ; Tue, 29 Sep 2015 01:11:24 +1000 (AEST) Received: from localhost ([::1]:37729 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zga5K-0006dF-3Y for incoming@patchwork.ozlabs.org; Mon, 28 Sep 2015 11:11:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgVRa-0002xX-1o for qemu-devel@nongnu.org; Mon, 28 Sep 2015 06:14:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZgVRV-0001UG-AM for qemu-devel@nongnu.org; Mon, 28 Sep 2015 06:14:01 -0400 Received: from e06smtp06.uk.ibm.com ([195.75.94.102]:54019) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgVRV-0001Tq-1R for qemu-devel@nongnu.org; Mon, 28 Sep 2015 06:13:57 -0400 Received: from /spool/local by e06smtp06.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 28 Sep 2015 11:13:52 +0100 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp06.uk.ibm.com (192.168.101.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 28 Sep 2015 11:13:50 +0100 X-Helo: d06dlp02.portsmouth.uk.ibm.com X-MailFrom: gkurz@linux.vnet.ibm.com X-RcptTo: qemu-devel@nongnu.org Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id B1FE22190061 for ; Mon, 28 Sep 2015 11:13:19 +0100 (BST) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t8SADnhn39059524 for ; Mon, 28 Sep 2015 10:13:49 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t8SADnDl021247 for ; Mon, 28 Sep 2015 04:13:49 -0600 Received: from smtp.lab.toulouse-stg.fr.ibm.com (srv01.lab.toulouse-stg.fr.ibm.com [9.101.4.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t8SADnlL021242; Mon, 28 Sep 2015 04:13:49 -0600 Received: from bahia.huguette.org (icon-9-167-236-116.megacenter.de.ibm.com [9.167.236.116]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id DABEF2204E6; Mon, 28 Sep 2015 12:13:47 +0200 (CEST) From: Greg Kurz To: David Gibson Date: Mon, 28 Sep 2015 12:13:47 +0200 Message-ID: <20150928101346.23919.3988.stgit@bahia.huguette.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15092810-0025-0000-0000-000004538937 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.102 Cc: Thomas Huth , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] spapr: add a default rng device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org A recent patch by Thomas Huth brought a new spapr-rng pseudo-device to provide high-quality random numbers to guests. The device may either be backed by a "RngBackend" or the in-kernel implementation of the H_RANDOM hypercall. Since modern POWER8 based servers always provide a hardware rng, it makes sense to create a spapr-rng device with use-kvm=true by default when it is available. Of course we want the user to have full control on how the rng is handled. The default device WILL NOT be created in the following cases: - the -nodefaults option was passed - a spapr-rng device was already passed on the command line The default device is created at reset time to ensure devices specified on the command line have been created. Signed-off-by: Greg Kurz --- hw/ppc/spapr.c | 17 +++++++++++++++++ hw/ppc/spapr_rng.c | 2 +- target-ppc/kvm.c | 9 +++++---- target-ppc/kvm_ppc.h | 6 ++++++ 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7f4f196e53e5..ee048ecffd0c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1059,6 +1059,14 @@ static int spapr_check_htab_fd(sPAPRMachineState *spapr) return rc; } +static void spapr_rng_create(void) +{ + Object *rng = object_new(TYPE_SPAPR_RNG); + + object_property_set_bool(rng, true, "use-kvm", &error_abort); + object_property_set_bool(rng, true, "realized", &error_abort); +} + static void ppc_spapr_reset(void) { sPAPRMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); @@ -1082,6 +1090,15 @@ static void ppc_spapr_reset(void) spapr->rtas_addr = rtas_limit - RTAS_MAX_SIZE; spapr->fdt_addr = spapr->rtas_addr - FDT_MAX_SIZE; + /* Create a rng device if the user did not provide it already and + * KVM has hwrng support. + */ + if (defaults_enabled() && + kvmppc_hwrng_present() && + !object_resolve_path_type("", TYPE_SPAPR_RNG, NULL)) { + spapr_rng_create(); + } + /* Load the fdt */ spapr_finalize_fdt(spapr, spapr->fdt_addr, spapr->rtas_addr, spapr->rtas_size); diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c index ed43d5e04221..ee5af302bd4d 100644 --- a/hw/ppc/spapr_rng.c +++ b/hw/ppc/spapr_rng.c @@ -114,7 +114,7 @@ static void spapr_rng_realize(DeviceState *dev, Error **errp) sPAPRRngState *rngstate = SPAPR_RNG(dev); if (rngstate->use_kvm) { - if (kvmppc_enable_hwrng() == 0) { + if (kvmppc_hwrng_present() && kvmppc_enable_hwrng() == 0) { return; } /* diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index e641680fb146..084bb034f1fd 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -2490,11 +2490,12 @@ int kvm_arch_msi_data_to_gsi(uint32_t data) return data & 0xffff; } -int kvmppc_enable_hwrng(void) +bool kvmppc_hwrng_present(void) { - if (!kvm_enabled() || !kvm_check_extension(kvm_state, KVM_CAP_PPC_HWRNG)) { - return -1; - } + return kvm_enabled() && kvm_check_extension(kvm_state, KVM_CAP_PPC_HWRNG); +} +int kvmppc_enable_hwrng(void) +{ return kvmppc_enable_hcall(kvm_state, H_RANDOM); } diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h index 470f6d62f7bb..a76338c9aa16 100644 --- a/target-ppc/kvm_ppc.h +++ b/target-ppc/kvm_ppc.h @@ -54,6 +54,7 @@ void kvmppc_hash64_free_pteg(uint64_t token); void kvmppc_hash64_write_pte(CPUPPCState *env, target_ulong pte_index, target_ulong pte0, target_ulong pte1); bool kvmppc_has_cap_fixup_hcalls(void); +bool kvmppc_hwrng_present(void); int kvmppc_enable_hwrng(void); #else @@ -252,6 +253,11 @@ static inline bool kvmppc_has_cap_fixup_hcalls(void) abort(); } +static inline bool kvmppc_hwrng_present(void) +{ + return false; +} + static inline int kvmppc_enable_hwrng(void) { return -1;