From nobody Sat Apr 20 01:57:13 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=1557820692; cv=none; d=zoho.com; s=zohoarc; b=TX1LIUX0Xft1e63lLxEhvdcuQ2CrmthpFbgurZGdhdo+bJ8V7T4NRdSA8yKD0YJXWPu1GHvqUmxzX8rjssG5+MTDogvNUSyGrR3jFrai7sZscrvHSLNRj5HtrjqpC0G50dDhQHXVgNv72U0rOMH8aAFWnf64r4kP8W6UGkdzv5I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557820692; 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=+8KANsdkC+aIp50Bl1rdjXUgMvkMLkycGG0nJCfM0CE=; b=kzoh/8kQxILaszgP/Ggoj1OxeCAsE9MoFHbj2BzgLmRiX4bZSA/sSg2qxQbi4xXLfH1pJlsaT4p1gAyGuJAxgglc6qdQ44sFLwozO30MFe/yJEGZ9y845t9KW/amN8K5DDRkr9ob5fNxF+vzP9h5H0n64GVz8eqUfXKbW/Ez420= 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 1557820692673855.049250127976; Tue, 14 May 2019 00:58:12 -0700 (PDT) Received: from localhost ([127.0.0.1]:41424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQSKB-0002Zj-J1 for importer@patchew.org; Tue, 14 May 2019 03:58:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQSIK-0001Fz-4s for qemu-devel@nongnu.org; Tue, 14 May 2019 03:56:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQSII-00047v-PE for qemu-devel@nongnu.org; Tue, 14 May 2019 03:56:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55710) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQSII-00046z-Ht for qemu-devel@nongnu.org; Tue, 14 May 2019 03:56:14 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D8F913082E8F; Tue, 14 May 2019 07:56:13 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.40.205.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id B051963B86; Tue, 14 May 2019 07:56:08 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 14 May 2019 09:56:00 +0200 Message-Id: <20190514075602.7674-2-lvivier@redhat.com> In-Reply-To: <20190514075602.7674-1-lvivier@redhat.com> References: <20190514075602.7674-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 14 May 2019 07:56:13 +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 v4 1/3] 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 , "Michael S. Tsirkin" , Richard Henderson , Markus Armbruster , Amit Shah , "Richard W . M . Jones" , 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: 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 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 0191ef8b1eb7..4df0ea3aed5c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4286,7 +4286,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 Sat Apr 20 01:57:13 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=1557820700; cv=none; d=zoho.com; s=zohoarc; b=FlM5lWTLJ+2OtCBTqRKdExk065FZ95tjTDN3JXP9KiCEFQj+ZpDqYJGL9OEmXDTqn3lse2qecAOc4zOVmT1HZ7cSYUgxyBHtrKd4Edsh7MmE0h0NndovkVeThyZAlUC6BnqNUZcxjaHfh694Q/qkqCcRrZS9xjsSvo07H6mQmw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557820700; 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=HchPnYmvTtjf+F59765/C1frkENJx3/a7I6KU5r5Xdo=; b=iSNwdtC/QyrwLzcZfZVZy6cc9SG5hg/eta2H510voGyg0hK23vK1zLeduBxGQtIsTv4dSValJ1LTSmKN5cpc7YBIEq2iuXr75/p9opfqb1W70SXeQanmOshFpHxBhH/hhAnAtQbILtA4vwMdsCEdAKRTFNkFRXz9Ls3JFNObZWU= 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 155782070051757.61519907251488; Tue, 14 May 2019 00:58:20 -0700 (PDT) Received: from localhost ([127.0.0.1]:41426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQSKG-0002dx-DA for importer@patchew.org; Tue, 14 May 2019 03:58:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQSIO-0001Im-6p for qemu-devel@nongnu.org; Tue, 14 May 2019 03:56:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQSIN-0004BW-2H for qemu-devel@nongnu.org; Tue, 14 May 2019 03:56:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57508) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQSIM-0004As-R9 for qemu-devel@nongnu.org; Tue, 14 May 2019 03:56:19 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2F13AC1306E5; Tue, 14 May 2019 07:56:18 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.40.205.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 485E360167; Tue, 14 May 2019 07:56:14 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 14 May 2019 09:56:01 +0200 Message-Id: <20190514075602.7674-3-lvivier@redhat.com> In-Reply-To: <20190514075602.7674-1-lvivier@redhat.com> References: <20190514075602.7674-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 14 May 2019 07:56:18 +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 v4 2/3] 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 , "Michael S. Tsirkin" , Richard Henderson , Markus Armbruster , Amit Shah , "Richard W . M . Jones" 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 ... Reviewed-by: Richard Henderson Signed-off-by: Laurent Vivier Reviewed-by: Markus Armbruster --- backends/Makefile.objs | 2 +- backends/rng-builtin.c | 56 ++++++++++++++++++++++++++++++++++++++++++ qemu-options.hx | 10 +++++++- 3 files changed, 66 insertions(+), 2 deletions(-) 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..b1264b745407 --- /dev/null +++ b/backends/rng-builtin.c @@ -0,0 +1,56 @@ +/* + * 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 "qapi/error.h" +#include "qapi/qmp/qerror.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; +} RngBuiltin; + +static void rng_builtin_request_entropy(RngBackend *b, RngRequest *req) +{ + RngBuiltin *s =3D RNG_BUILTIN(b); + + 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_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), + .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 4df0ea3aed5c..6ab920f12be4 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4280,13 +4280,21 @@ 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 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/urandom}. +entropy from and if omitted defaults to @option{/dev/urandom}. By default, +the @option{virtio-rng} device uses this RNG backend. =20 @item -object rng-egd,id=3D@var{id},chardev=3D@var{chardevid} =20 --=20 2.20.1 From nobody Sat Apr 20 01:57:13 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=1557820707; cv=none; d=zoho.com; s=zohoarc; b=YgaPMe3JoK12GqtaFR4+YKcB7fn4iMsCembwm870wlqz/S4c2DSE9ffDcp9VvwUF8mpdyXfVoFaT6YSm1YckZsuXFYRzi7M6E8jR7EkkXR6c/mkv+ZayUi9VBn+mpsV/aCbCtg9uJRLDogGgCMzlsjuFqm2xeuSyJvrvF8egxIE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557820707; 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=iKiofmwOcgrtKruqnKc2CfAd+nMi3l0FQja/d7FJhWM=; b=fAWj5Pv7YaHzxLu7ZQIBg0ZU6tbSkxo4eolI5qVXqwJVppKSgp3bRJoMuxEtuj+1iSx4JqIqBTQtrCMAv5KTaNNYAG4m5XSE5z1NHh/bjpRgU/LLJTXPzv68rFfgGza/5NCFfkMPUBWceWX0k15l4tartWPFRrPb3ew/mAiBxNo= 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 1557820707526509.5528487603749; Tue, 14 May 2019 00:58:27 -0700 (PDT) Received: from localhost ([127.0.0.1]:41428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQSKQ-0002lk-4w for importer@patchew.org; Tue, 14 May 2019 03:58:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQSIU-0001NV-00 for qemu-devel@nongnu.org; Tue, 14 May 2019 03:56:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQSIS-0004G0-RU for qemu-devel@nongnu.org; Tue, 14 May 2019 03:56:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36030) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQSIS-0004FX-KO for qemu-devel@nongnu.org; Tue, 14 May 2019 03:56:24 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E836A308AA12; Tue, 14 May 2019 07:56:23 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.40.205.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 900C364448; Tue, 14 May 2019 07:56:18 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 14 May 2019 09:56:02 +0200 Message-Id: <20190514075602.7674-4-lvivier@redhat.com> In-Reply-To: <20190514075602.7674-1-lvivier@redhat.com> References: <20190514075602.7674-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 14 May 2019 07:56:23 +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 v4 3/3] 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 , "Michael S. Tsirkin" , Richard Henderson , Markus Armbruster , Amit Shah , "Richard W . M . Jones" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Laurent Vivier Reviewed-by: Markus Armbruster --- backends/rng-builtin.c | 8 +++----- hw/virtio/virtio-rng.c | 2 +- include/hw/virtio/virtio-rng.h | 4 ++-- include/sysemu/rng-builtin.h | 17 +++++++++++++++++ qemu-options.hx | 5 ++--- 5 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 include/sysemu/rng-builtin.h diff --git a/backends/rng-builtin.c b/backends/rng-builtin.c index b1264b745407..27675301933b 100644 --- a/backends/rng-builtin.c +++ b/backends/rng-builtin.c @@ -7,17 +7,15 @@ =20 #include "qemu/osdep.h" #include "sysemu/rng.h" +#include "sysemu/rng-builtin.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" #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) - -typedef struct RngBuiltin { +struct RngBuiltin { RngBackend parent; -} RngBuiltin; +}; =20 static void rng_builtin_request_entropy(RngBackend *b, RngRequest *req) { diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 30493a258622..67209f63ddbc 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -189,7 +189,7 @@ static void virtio_rng_device_realize(DeviceState *dev,= Error **errp) } =20 if (vrng->conf.rng =3D=3D NULL) { - vrng->conf.default_backend =3D RNG_RANDOM(object_new(TYPE_RNG_RAND= OM)); + vrng->conf.default_backend =3D RNG_BUILTIN(object_new(TYPE_RNG_BUI= LTIN)); =20 user_creatable_complete(USER_CREATABLE(vrng->conf.default_backend), &local_err); diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h index 922dce7caccf..f9b6339b19a4 100644 --- a/include/hw/virtio/virtio-rng.h +++ b/include/hw/virtio/virtio-rng.h @@ -13,7 +13,7 @@ #define QEMU_VIRTIO_RNG_H =20 #include "sysemu/rng.h" -#include "sysemu/rng-random.h" +#include "sysemu/rng-builtin.h" #include "standard-headers/linux/virtio_rng.h" =20 #define TYPE_VIRTIO_RNG "virtio-rng-device" @@ -26,7 +26,7 @@ struct VirtIORNGConf { RngBackend *rng; uint64_t max_bytes; uint32_t period_ms; - RngRandom *default_backend; + RngBuiltin *default_backend; }; =20 typedef struct VirtIORNG { diff --git a/include/sysemu/rng-builtin.h b/include/sysemu/rng-builtin.h new file mode 100644 index 000000000000..a0f75f97dde8 --- /dev/null +++ b/include/sysemu/rng-builtin.h @@ -0,0 +1,17 @@ +/* + * 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. + */ +#ifndef QEMU_RNG_BUILTIN_H +#define QEMU_RNG_BUILTIN_H + +#include "qom/object.h" + +#define TYPE_RNG_BUILTIN "rng-builtin" +#define RNG_BUILTIN(obj) OBJECT_CHECK(RngBuiltin, (obj), TYPE_RNG_BUILTIN) + +typedef struct RngBuiltin RngBuiltin; + +#endif diff --git a/qemu-options.hx b/qemu-options.hx index 6ab920f12be4..c9784be83cb5 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4285,7 +4285,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 @@ -4293,8 +4293,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/urandom}. By default, -the @option{virtio-rng} device uses this RNG backend. +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 Sat Apr 20 01:57:13 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=1557847351; cv=none; d=zoho.com; s=zohoarc; b=DDcat0KaK+XLs4f2tgWRfA+tW8t8hhrW4P7vcuYf/fQ0eH9GIktiD/0gjz4B3udxFuHnM//Ywhlha6my5jaoP4FGCau23Colmbp69MRTC9279bUEJHMn+uptg5bK1TosM3KmhvcUK6o0Ky0hI9G0XiPmpyTFVM084DBDj2N+HI0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557847351; h=Content-Type: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=WTgfxZJMEFHzMKgIezAqs6fWQq5BVO4HvFMEDaKTLMk=; b=U/paoX2eOg46HRjnUqiEH0U7JnazOSZmOdNSF9r0MxB98H99qfLv6JnBn8nWC10ICOty3caIlPxVpWGlpoVHg9U3h7LzxQFUoase30IM65Ca1y4n3e+CtD+EJvJPgQQ2mFEIAllWTxvjS+kjXqRKdXDuj0KFGk8gzBkgz3Krpg0= 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 1557847351694948.4872282954103; Tue, 14 May 2019 08:22:31 -0700 (PDT) Received: from localhost ([127.0.0.1]:49795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQZFj-0001OE-U9 for importer@patchew.org; Tue, 14 May 2019 11:22:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQZDb-0000ON-RO for qemu-devel@nongnu.org; Tue, 14 May 2019 11:19:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQZDa-0001DT-Rx for qemu-devel@nongnu.org; Tue, 14 May 2019 11:19:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47446) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQZDa-0001Cs-KZ for qemu-devel@nongnu.org; Tue, 14 May 2019 11:19:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9D953301EA8F; Tue, 14 May 2019 15:19:49 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-28.ams2.redhat.com [10.36.116.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E4A75100203C; Tue, 14 May 2019 15:19:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 83B3211385E4; Tue, 14 May 2019 17:19:42 +0200 (CEST) From: Markus Armbruster To: Laurent Vivier References: <20190514075602.7674-1-lvivier@redhat.com> Date: Tue, 14 May 2019 17:19:42 +0200 In-Reply-To: <20190514075602.7674-1-lvivier@redhat.com> (Laurent Vivier's message of "Tue, 14 May 2019 09:55:59 +0200") Message-ID: <8736lhdpwx.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 14 May 2019 15:19:49 +0000 (UTC) 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 3.5/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: "Daniel P . =?utf-8?Q?Berrang=C3=A9?=" , "Michael S. Tsirkin" , Amit Shah , Richard Henderson , qemu-devel@nongnu.org, "Richard W . M . Jones" , Kashyap Chamarthy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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 30493a2586..73ffb476e0 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 922dce7cac..28ff752c40 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.17.2