From nobody Wed May 8 07:10:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559140404; cv=none; d=zoho.com; s=zohoarc; b=Q5NlWLEY+htRD4okzXPmJAdeArxLPXSZzHHFk2C2vWfFQgpds11atNn0N5OYu+MGo/jYQfuMOwW94IbQpa4f4oBrx37QxjekrEbzQIY9cWk7sTYviA0NMn3ZyRXL7DMCcWWN5F61pX8TFuxGlb2tPjE5teUVpxqdFvD4N3DF0Gw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559140404; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=p4on6rNPZ56GYSPFYizTaKmhxXcOzLiAc5kGVbsMM7k=; b=LrwmTffvOXZJwf8S/rtbB/XD3O+pJidDOzB1Tkok8D3NVBlKb0TIkuFf9QoHto8FxMrCdurxret/ebuvcnsIZ9oluBHQi+mI1dK8YvJHvVE+OeQ9PS7mtekigE2gBIgVWV0agZyMyiYQWHYFWIBOzO0mQv7wvQGPMrk9ks9DCcQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559140404705365.7730943800891; Wed, 29 May 2019 07:33:24 -0700 (PDT) Received: from localhost ([127.0.0.1]:55448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVzdj-0003QD-2z for importer@patchew.org; Wed, 29 May 2019 10:33:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVzcC-0002bZ-Kg for qemu-devel@nongnu.org; Wed, 29 May 2019 10:31:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVzcA-0004VS-Cp for qemu-devel@nongnu.org; Wed, 29 May 2019 10:31:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34368) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVzc8-0004Kq-EZ for qemu-devel@nongnu.org; Wed, 29 May 2019 10:31:36 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BBE0B3179B44; Wed, 29 May 2019 14:31:22 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-204-181.brq.redhat.com [10.40.204.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C2E817A8F; Wed, 29 May 2019 14:31:15 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 29 May 2019 16:31:03 +0200 Message-Id: <20190529143106.11789-2-lvivier@redhat.com> In-Reply-To: <20190529143106.11789-1-lvivier@redhat.com> References: <20190529143106.11789-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 29 May 2019 14:31:27 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v7 1/4] VirtIO-RNG: Update default entropy source to `/dev/urandom` X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Kashyap Chamarthy , Amit Shah , Richard Henderson , "Richard W . M . Jones" , Markus Armbruster , "Michael S. Tsirkin" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Kashyap Chamarthy When QEMU exposes a VirtIO-RNG device to the guest, that device needs a source of entropy, and that source needs to be "non-blocking", like `/dev/urandom`. However, currently QEMU defaults to the problematic `/dev/random`, which on Linux is "blocking" (as in, it waits until sufficient entropy is available). Why prefer `/dev/urandom` over `/dev/random`? Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Hajnoczi --------------------------------------------- The man pages of urandom(4) and random(4) state: "The /dev/random device is a legacy interface which dates back to a time where the cryptographic primitives used in the implementation of /dev/urandom were not widely trusted. It will return random bytes only within the estimated number of bits of fresh noise in the entropy pool, blocking if necessary. /dev/random is suitable for applications that need high quality randomness, and can afford indeterminate delays." Further, the "Usage" section of the said man pages state: "The /dev/random interface is considered a legacy interface, and /dev/urandom is preferred and sufficient in all use cases, with the exception of applications which require randomness during early boot time; for these applications, getrandom(2) must be used instead, because it will block until the entropy pool is initialized. "If a seed file is saved across reboots as recommended below (all major Linux distributions have done this since 2000 at least), the output is cryptographically secure against attackers without local root access as soon as it is reloaded in the boot sequence, and perfectly adequate for network encryption session keys. Since reads from /dev/random may block, users will usually want to open it in nonblocking mode (or perform a read with timeout), and provide some sort of user notification if the desired entropy is not immediately available." And refer to random(7) for a comparison of `/dev/random` and `/dev/urandom`. What about other OSes? ---------------------- `/dev/urandom` exists and works on OS-X, FreeBSD, DragonFlyBSD, NetBSD and OpenBSD, which cover all the non-Linux platforms we explicitly support, aside from Windows. On Windows `/dev/random` doesn't work either so we don't regress. This is actually another argument in favour of using the newly proposed 'rng-builtin' backend by default, as that will work on Windows. - - - Given the above, change the entropy source for VirtIO-RNG device to `/dev/urandom`. Related discussion in these[1][2] past threads. [1] https://lists.nongnu.org/archive/html/qemu-devel/2018-06/msg08335.html -- "RNG: Any reason QEMU doesn't default to `/dev/urandom`?" [2] https://lists.nongnu.org/archive/html/qemu-devel/2018-09/msg02724.html -- "[RFC] Virtio RNG: Consider changing the default entropy source to /dev/urandom" Signed-off-by: Kashyap Chamarthy Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Stefan Hajnoczi Reviewed-by: Markus Armbruster Signed-off-by: Laurent Vivier --- backends/rng-random.c | 2 +- qemu-options.hx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backends/rng-random.c b/backends/rng-random.c index e2a49b0571d7..eff36ef14084 100644 --- a/backends/rng-random.c +++ b/backends/rng-random.c @@ -112,7 +112,7 @@ static void rng_random_init(Object *obj) rng_random_set_filename, NULL); =20 - s->filename =3D g_strdup("/dev/random"); + s->filename =3D g_strdup("/dev/urandom"); s->fd =3D -1; } =20 diff --git a/qemu-options.hx b/qemu-options.hx index 39dc17042967..f6e9bd1d9c42 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4328,7 +4328,7 @@ Creates a random number generator backend which obtai= ns entropy from a device on the host. The @option{id} parameter is a unique ID that will be used to reference this entropy backend from the @option{virtio-rng} device. The @option{filename} parameter specifies which file to obtain -entropy from and if omitted defaults to @option{/dev/random}. +entropy from and if omitted defaults to @option{/dev/urandom}. =20 @item -object rng-egd,id=3D@var{id},chardev=3D@var{chardevid} =20 --=20 2.20.1 From nobody Wed May 8 07:10:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559140567; cv=none; d=zoho.com; s=zohoarc; b=Xx6D7X7iCOCWugGALPDgRaINPQv1k8FEn4EheMfw3UfzJFWVYjp7saBnDM/8i34jcdFKimUEz2cbzI5BFgppNFf22Dl3jqNVaFJIVPIE68mrFMgO4UZn/A3vl2jTBWhH2gPi01jvVW8KlCZLkPaGjaUc6P6yqQ4fjdDg6j3QaTc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559140567; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=kXCTMvu1qjksDD6FGOSIsIG/NqcNhcjki1JS3+FMAj4=; b=SOV1wS5ZPHG/ee33W+oMB0J2LcSV5OMc6gTCNlvWEd5yrsoku08TxZKAKEl1vW0dRv1mFclNARtigvoipMhKILBwj6KlodtfPhjQjCaTefNLWXY32kSEPP1HPLEdkc555HPHQ9umGX770wP4NkkOdyAR5kWNfDdDT5Bd7tYDqU8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559140567322136.12607794880023; Wed, 29 May 2019 07:36:07 -0700 (PDT) Received: from localhost ([127.0.0.1]:55498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVzgP-00056s-Cw for importer@patchew.org; Wed, 29 May 2019 10:36:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVzcK-0002e0-FC for qemu-devel@nongnu.org; Wed, 29 May 2019 10:31:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVzcJ-0004ed-Bt for qemu-devel@nongnu.org; Wed, 29 May 2019 10:31:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34332) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVzcI-0004J5-Uy for qemu-devel@nongnu.org; Wed, 29 May 2019 10:31:47 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 95E023179B5E; Wed, 29 May 2019 14:31:25 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-204-181.brq.redhat.com [10.40.204.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2797B611AD; Wed, 29 May 2019 14:31:22 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 29 May 2019 16:31:04 +0200 Message-Id: <20190529143106.11789-3-lvivier@redhat.com> In-Reply-To: <20190529143106.11789-1-lvivier@redhat.com> References: <20190529143106.11789-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 29 May 2019 14:31:25 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v7 2/4] rng-builtin: add an RNG backend that uses qemu_guest_getrandom() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Kashyap Chamarthy , Amit Shah , Richard Henderson , "Richard W . M . Jones" , Markus Armbruster , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add a new RNG backend using QEMU builtin getrandom function. It can be created and used with something like: ... -object rng-builtin,id=3Drng0 -device virtio-rng,rng=3Drng0 ... Signed-off-by: Laurent Vivier Reviewed-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin --- backends/Makefile.objs | 2 +- backends/rng-builtin.c | 78 ++++++++++++++++++++++++++++++++++++++++++ qemu-options.hx | 7 ++++ 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 backends/rng-builtin.c diff --git a/backends/Makefile.objs b/backends/Makefile.objs index 981e8e122f2c..f0691116e86e 100644 --- a/backends/Makefile.objs +++ b/backends/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-y +=3D rng.o rng-egd.o +common-obj-y +=3D rng.o rng-egd.o rng-builtin.o common-obj-$(CONFIG_POSIX) +=3D rng-random.o =20 common-obj-$(CONFIG_TPM) +=3D tpm.o diff --git a/backends/rng-builtin.c b/backends/rng-builtin.c new file mode 100644 index 000000000000..3381d47174df --- /dev/null +++ b/backends/rng-builtin.c @@ -0,0 +1,78 @@ +/* + * QEMU Builtin Random Number Generator Backend + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "sysemu/rng.h" +#include "qemu/main-loop.h" +#include "qemu/guest-random.h" + +#define TYPE_RNG_BUILTIN "rng-builtin" +#define RNG_BUILTIN(obj) OBJECT_CHECK(RngBuiltin, (obj), TYPE_RNG_BUILTIN) + +typedef struct RngBuiltin { + RngBackend parent; + QEMUBH *bh; +} RngBuiltin; + +static void rng_builtin_receive_entropy_bh(void *opaque) +{ + RngBuiltin *s =3D opaque; + + while (!QSIMPLEQ_EMPTY(&s->parent.requests)) { + RngRequest *req =3D QSIMPLEQ_FIRST(&s->parent.requests); + + qemu_guest_getrandom_nofail(req->data, req->size); + + req->receive_entropy(req->opaque, req->data, req->size); + + rng_backend_finalize_request(&s->parent, req); + } +} + +static void rng_builtin_request_entropy(RngBackend *b, RngRequest *req) +{ + RngBuiltin *s =3D RNG_BUILTIN(b); + + qemu_bh_schedule(s->bh); +} + +static void rng_builtin_init(Object *obj) +{ + RngBuiltin *s =3D RNG_BUILTIN(obj); + + s->bh =3D qemu_bh_new(rng_builtin_receive_entropy_bh, s); +} + +static void rng_builtin_finalize(Object *obj) +{ + RngBuiltin *s =3D RNG_BUILTIN(obj); + + qemu_bh_delete(s->bh); +} + +static void rng_builtin_class_init(ObjectClass *klass, void *data) +{ + RngBackendClass *rbc =3D RNG_BACKEND_CLASS(klass); + + rbc->request_entropy =3D rng_builtin_request_entropy; +} + +static const TypeInfo rng_builtin_info =3D { + .name =3D TYPE_RNG_BUILTIN, + .parent =3D TYPE_RNG_BACKEND, + .instance_size =3D sizeof(RngBuiltin), + .instance_init =3D rng_builtin_init, + .instance_finalize =3D rng_builtin_finalize, + .class_init =3D rng_builtin_class_init, +}; + +static void register_types(void) +{ + type_register_static(&rng_builtin_info); +} + +type_init(register_types); diff --git a/qemu-options.hx b/qemu-options.hx index f6e9bd1d9c42..4e6a6828d7ce 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4322,6 +4322,13 @@ other options. =20 The @option{share} boolean option is @var{on} by default with memfd. =20 +@item -object rng-builtin,id=3D@var{id} + +Creates a random number generator backend which obtains entropy from +QEMU builtin functions. The @option{id} parameter is a unique ID that +will be used to reference this entropy backend from the @option{virtio-rng} +device. + @item -object rng-random,id=3D@var{id},filename=3D@var{/dev/random} =20 Creates a random number generator backend which obtains entropy from --=20 2.20.1 From nobody Wed May 8 07:10:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559140703; cv=none; d=zoho.com; s=zohoarc; b=RREZ0vaVIvSt7m5UaGoglTwoML3rO4aD9/JyA+qeSnq4jMiPK549sQ5V+CtEtUORItwikCgHqpUZijOb2zCViTK0V83PWsbTYpPVcaObSGPv+729efaIJQcyJ26GlMrnN20Azmh0YaYFVS2YF1evlf6z1xhWNiWh5J/c/UU9dXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559140703; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=V01fLFkyQA2DAuRmaqox8RESBUvbAsfsTDuxq37eCbs=; b=hAiauEhgYPijkp93BjqaKmg6DP8IrCS7bvDqiLCgpCRVqsmYGxiMD6t5G4RKo2okdIK4eUziVAS6oO122zmduwxYHGbOk0/HlMJ/QWX3C6gZDL7FiSAySe9Uy73/iSdxQwnSPh0joYZ3Y3fuXtNNBzhrIDeP83uFtmyo3ZfR9/E= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559140703755198.9372753935686; Wed, 29 May 2019 07:38:23 -0700 (PDT) Received: from localhost ([127.0.0.1]:55512 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVzib-0006vd-PR for importer@patchew.org; Wed, 29 May 2019 10:38:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVzcP-0002ud-Pv for qemu-devel@nongnu.org; Wed, 29 May 2019 10:31:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVzcO-0004ja-Ap for qemu-devel@nongnu.org; Wed, 29 May 2019 10:31:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40510) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVzcN-0004Qn-Qs for qemu-devel@nongnu.org; Wed, 29 May 2019 10:31:52 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6B37C81123; Wed, 29 May 2019 14:31:29 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-204-181.brq.redhat.com [10.40.204.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0369217CDF; Wed, 29 May 2019 14:31:25 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 29 May 2019 16:31:05 +0200 Message-Id: <20190529143106.11789-4-lvivier@redhat.com> In-Reply-To: <20190529143106.11789-1-lvivier@redhat.com> References: <20190529143106.11789-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 29 May 2019 14:31:29 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v7 3/4] virtio-rng: Keep the default backend out of VirtIORNGConf X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Kashyap Chamarthy , Amit Shah , Richard Henderson , "Richard W . M . Jones" , Markus Armbruster , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Markus Armbruster The default backend is only used within virtio_rng_device_realize(). Replace VirtIORNGConf member default_backend by a local variable. Adjust its type to reduce conversions. While there, pass &error_abort instead of NULL when failure would be a programming error. Signed-off-by: Markus Armbruster Signed-off-by: Laurent Vivier Reviewed-by: Michael S. Tsirkin --- hw/virtio/virtio-rng.c | 20 +++++++++----------- include/hw/virtio/virtio-rng.h | 2 -- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 30493a258622..73ffb476e030 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -16,6 +16,7 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-rng.h" #include "sysemu/rng.h" +#include "sysemu/rng-random.h" #include "qom/object_interfaces.h" #include "trace.h" =20 @@ -189,27 +190,24 @@ static void virtio_rng_device_realize(DeviceState *de= v, Error **errp) } =20 if (vrng->conf.rng =3D=3D NULL) { - vrng->conf.default_backend =3D RNG_RANDOM(object_new(TYPE_RNG_RAND= OM)); + Object *default_backend =3D object_new(TYPE_RNG_RANDOM); =20 - user_creatable_complete(USER_CREATABLE(vrng->conf.default_backend), + user_creatable_complete(USER_CREATABLE(default_backend), &local_err); if (local_err) { error_propagate(errp, local_err); - object_unref(OBJECT(vrng->conf.default_backend)); + object_unref(default_backend); return; } =20 - object_property_add_child(OBJECT(dev), - "default-backend", - OBJECT(vrng->conf.default_backend), - NULL); + object_property_add_child(OBJECT(dev), "default-backend", + default_backend, &error_abort); =20 /* The child property took a reference, we can safely drop ours no= w */ - object_unref(OBJECT(vrng->conf.default_backend)); + object_unref(default_backend); =20 - object_property_set_link(OBJECT(dev), - OBJECT(vrng->conf.default_backend), - "rng", NULL); + object_property_set_link(OBJECT(dev), default_backend, + "rng", &error_abort); } =20 vrng->rng =3D vrng->conf.rng; diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h index 922dce7caccf..28ff752c4096 100644 --- a/include/hw/virtio/virtio-rng.h +++ b/include/hw/virtio/virtio-rng.h @@ -13,7 +13,6 @@ #define QEMU_VIRTIO_RNG_H =20 #include "sysemu/rng.h" -#include "sysemu/rng-random.h" #include "standard-headers/linux/virtio_rng.h" =20 #define TYPE_VIRTIO_RNG "virtio-rng-device" @@ -26,7 +25,6 @@ struct VirtIORNGConf { RngBackend *rng; uint64_t max_bytes; uint32_t period_ms; - RngRandom *default_backend; }; =20 typedef struct VirtIORNG { --=20 2.20.1 From nobody Wed May 8 07:10:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559140522; cv=none; d=zoho.com; s=zohoarc; b=iztuooGzlbEqJNPN5zwsv+/AKHmDIH6n122yK1Ys56Z0VPSAsW07SQ6WoFDrAUsmy2cecslMT196jIOWHP5JzJBEdEBYNDXQsbnfy2aTVjTFNtbVxnqNocD8UA5TPPKE1UtNURjxhSxJYQyaPAmrlh2HiXxjKhXSqcknsfqAGFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559140522; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=XaWCdEmFf//78EmJ7t69x3cgI/x2tpHYENNOpuEVeq0=; b=hhoqPrAlDBp5TnVWfREfWh5ORRB76/piTJ6kUFru5EPDIS4SCiauxE/joKT0oWRseRdI51pS5OJi9IxYzgJ/fNfl/GHAbHOSNF9/EMSn+3tktPne4ulToW/fbSwATsPG0ILTI/k5Rpi73MLZyy047IU4NgfRf/iQrW1pL0Md+Z8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559140522653221.95551522732364; Wed, 29 May 2019 07:35:22 -0700 (PDT) Received: from localhost ([127.0.0.1]:55458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVzf8-0004Nd-CU for importer@patchew.org; Wed, 29 May 2019 10:34:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVzcE-0002bo-Qi for qemu-devel@nongnu.org; Wed, 29 May 2019 10:31:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVzcC-0004Xt-QO for qemu-devel@nongnu.org; Wed, 29 May 2019 10:31:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45018) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVzcC-0004Wc-KX for qemu-devel@nongnu.org; Wed, 29 May 2019 10:31:40 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 84BDCC0528B3; Wed, 29 May 2019 14:31:34 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-204-181.brq.redhat.com [10.40.204.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEA45611AD; Wed, 29 May 2019 14:31:29 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 29 May 2019 16:31:06 +0200 Message-Id: <20190529143106.11789-5-lvivier@redhat.com> In-Reply-To: <20190529143106.11789-1-lvivier@redhat.com> References: <20190529143106.11789-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 29 May 2019 14:31:39 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v7 4/4] virtio-rng: change default backend to rng-builtin X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Kashyap Chamarthy , Amit Shah , Richard Henderson , "Richard W . M . Jones" , Markus Armbruster , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Reviewed-by: Markus Armbruster Signed-off-by: Laurent Vivier Reviewed-by: Michael S. Tsirkin --- backends/rng-builtin.c | 1 - hw/virtio/virtio-rng.c | 3 +-- include/sysemu/rng.h | 2 ++ qemu-options.hx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backends/rng-builtin.c b/backends/rng-builtin.c index 3381d47174df..ba1b8d66b83e 100644 --- a/backends/rng-builtin.c +++ b/backends/rng-builtin.c @@ -10,7 +10,6 @@ #include "qemu/main-loop.h" #include "qemu/guest-random.h" =20 -#define TYPE_RNG_BUILTIN "rng-builtin" #define RNG_BUILTIN(obj) OBJECT_CHECK(RngBuiltin, (obj), TYPE_RNG_BUILTIN) =20 typedef struct RngBuiltin { diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 73ffb476e030..55745f75a1c9 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -16,7 +16,6 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-rng.h" #include "sysemu/rng.h" -#include "sysemu/rng-random.h" #include "qom/object_interfaces.h" #include "trace.h" =20 @@ -190,7 +189,7 @@ static void virtio_rng_device_realize(DeviceState *dev,= Error **errp) } =20 if (vrng->conf.rng =3D=3D NULL) { - Object *default_backend =3D object_new(TYPE_RNG_RANDOM); + Object *default_backend =3D object_new(TYPE_RNG_BUILTIN); =20 user_creatable_complete(USER_CREATABLE(default_backend), &local_err); diff --git a/include/sysemu/rng.h b/include/sysemu/rng.h index 27b37da05d2e..9dc5e0e90100 100644 --- a/include/sysemu/rng.h +++ b/include/sysemu/rng.h @@ -24,6 +24,8 @@ #define RNG_BACKEND_CLASS(klass) \ OBJECT_CLASS_CHECK(RngBackendClass, (klass), TYPE_RNG_BACKEND) =20 +#define TYPE_RNG_BUILTIN "rng-builtin" + typedef struct RngRequest RngRequest; typedef struct RngBackendClass RngBackendClass; typedef struct RngBackend RngBackend; diff --git a/qemu-options.hx b/qemu-options.hx index 4e6a6828d7ce..7746fe9bed6a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4327,7 +4327,7 @@ The @option{share} boolean option is @var{on} by defa= ult with memfd. Creates a random number generator backend which obtains entropy from QEMU builtin functions. The @option{id} parameter is a unique ID that will be used to reference this entropy backend from the @option{virtio-rng} -device. +device. By default, the @option{virtio-rng} device uses this RNG backend. =20 @item -object rng-random,id=3D@var{id},filename=3D@var{/dev/random} =20 --=20 2.20.1