From patchwork Mon Jan 7 18:40:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 210064 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 27FD32C0086 for ; Tue, 8 Jan 2013 06:29:17 +1100 (EST) Received: from localhost ([::1]:50770 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHfe-0006Y5-0G for incoming@patchwork.ozlabs.org; Mon, 07 Jan 2013 13:43:38 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHee-0005S9-Fs for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:42:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsHed-0005yC-6E for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:42:36 -0500 Received: from greensocs.com ([87.106.252.221]:53006 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHec-0005y4-QR for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:42:35 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 4716C439E4D; Mon, 7 Jan 2013 18:42:34 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E7dam6DFA1Lv; Mon, 7 Jan 2013 19:42:31 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 8E8E7439E43; Mon, 7 Jan 2013 19:42:24 +0100 (CET) Received: from compaq.katmai.xl.cx.katmai.xl.cx (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id E92D8400091; Mon, 7 Jan 2013 19:42:22 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Mon, 7 Jan 2013 19:40:53 +0100 Message-Id: <1357584074-10852-41-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1357584074-10852-1-git-send-email-fred.konrad@greensocs.com> References: <1357584074-10852-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: kwolf@redhat.com, peter.maydell@linaro.org, e.voevodin@samsung.com, mst@redhat.com, mark.burton@greensocs.com, agraf@suse.de, amit.shah@redhat.com, aneesh.kumar@linux.vnet.ibm.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH 40/61] virtio-rng : add virtio-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 From: KONRAD Frederic Create virtio-rng which extends virtio-device, so it can be connected on virtio-bus. Signed-off-by: KONRAD Frederic --- hw/virtio-pci.c | 13 +++---- hw/virtio-rng.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- hw/virtio-rng.h | 16 ++++++++ 3 files changed, 133 insertions(+), 14 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 6dc7732..4e35e04 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -892,13 +892,7 @@ static void virtio_rng_initfn(Object *obj) static Property virtio_rng_properties[] = { DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features), - /* Set a default rate limit of 2^47 bytes per minute or roughly 2TB/s. If - you have an entropy source capable of generating more entropy than this - and you can pass it through via virtio-rng, then hats off to you. Until - then, this is unlimited for all practical purposes. - */ - DEFINE_PROP_UINT64("max-bytes", VirtIOPCIProxy, rng.max_bytes, INT64_MAX), - DEFINE_PROP_UINT32("period", VirtIOPCIProxy, rng.period_ms, 1 << 16), + DEFINE_VIRTIO_RNG_PROPERTIES(VirtIOPCIProxy, rng), DEFINE_PROP_END_OF_LIST(), }; @@ -959,6 +953,11 @@ static void virtio_pci_device_plugged(DeviceState *d) PCI_DEVICE_ID_VIRTIO_BALLOON); pci_config_set_class(proxy->pci_dev.config, PCI_CLASS_OTHERS); break; + case VIRTIO_ID_RNG: + pci_config_set_device_id(proxy->pci_dev.config, + PCI_DEVICE_ID_VIRTIO_RNG); + pci_config_set_class(proxy->pci_dev.config, PCI_CLASS_OTHERS); + break; default: error_report("unknown device id\n"); break; diff --git a/hw/virtio-rng.c b/hw/virtio-rng.c index e672c40..98adef1 100644 --- a/hw/virtio-rng.c +++ b/hw/virtio-rng.c @@ -129,17 +129,33 @@ static void check_rate_limit(void *opaque) qemu_get_clock_ms(vm_clock) + s->conf.period_ms); } +void virtio_rng_set_conf(DeviceState *dev, VirtIORNGConf *conf) +{ + VirtIORNG *vrng = VIRTIO_RNG(dev); + memcpy(&(vrng->conf), conf, sizeof(struct VirtIORNGConf)); +} -VirtIODevice *virtio_rng_init(DeviceState *dev, VirtIORNGConf *conf) +static VirtIODevice *virtio_rng_common_init(DeviceState *dev, + VirtIORNGConf *conf, + VirtIORNG **pvrng) { - VirtIORNG *vrng; + VirtIORNG *vrng = *pvrng; VirtIODevice *vdev; Error *local_err = NULL; - vdev = virtio_common_init("virtio-rng", VIRTIO_ID_RNG, 0, - sizeof(VirtIORNG)); - - vrng = DO_UPCAST(VirtIORNG, vdev, vdev); + /* + * We have two cases here : the old virtio-rng-x device, and the + * refactored virtio-rng. + * This will disappear later in the serie. + */ + if (vrng == NULL) { + vdev = virtio_common_init("virtio-rng", VIRTIO_ID_RNG, 0, + sizeof(VirtIORNG)); + vrng = DO_UPCAST(VirtIORNG, vdev, vdev); + } else { + vdev = VIRTIO_DEVICE(vrng); + virtio_init(vdev, "virtio-rng", VIRTIO_ID_RNG, 0); + } vrng->rng = conf->rng; if (vrng->rng == NULL) { @@ -155,8 +171,12 @@ VirtIODevice *virtio_rng_init(DeviceState *dev, VirtIORNGConf *conf) } vrng->vq = virtio_add_queue(vdev, 8, handle_input); + /* + * This will disappear later in the serie. + * We will use VirtioDeviceClass instead. + */ vrng->vdev.get_features = get_features; - + /**/ vrng->qdev = dev; memcpy(&(vrng->conf), conf, sizeof(struct VirtIORNGConf)); @@ -175,6 +195,15 @@ VirtIODevice *virtio_rng_init(DeviceState *dev, VirtIORNGConf *conf) return vdev; } +/* + * This two functions will be removed later in the serie. + */ +VirtIODevice *virtio_rng_init(DeviceState *dev, VirtIORNGConf *conf) +{ + VirtIORNG *vdev = NULL; + return virtio_rng_common_init(dev, conf, &vdev); +} + void virtio_rng_exit(VirtIODevice *vdev) { VirtIORNG *vrng = DO_UPCAST(VirtIORNG, vdev, vdev); @@ -184,3 +213,78 @@ void virtio_rng_exit(VirtIODevice *vdev) unregister_savevm(vrng->qdev, "virtio-rng", vrng); virtio_cleanup(vdev); } +/**/ + +static int virtio_rng_device_init(VirtIODevice *vdev) +{ + DeviceState *qdev = DEVICE(vdev); + VirtIORNG *vrng = VIRTIO_RNG(vdev); + + if (vrng->conf.rng == NULL) { + vrng->conf.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM)); + + object_property_add_child(OBJECT(qdev), + "default-backend", + OBJECT(vrng->conf.default_backend), + NULL); + + object_property_set_link(OBJECT(qdev), + OBJECT(vrng->conf.default_backend), + "rng", NULL); + } + + if (virtio_rng_common_init(qdev, &(vrng->conf), &vrng) == NULL) { + return -1; + } + return 0; +} + +static int virtio_rng_device_exit(DeviceState *qdev) +{ + VirtIORNG *vrng = VIRTIO_RNG(qdev); + VirtIODevice *vdev = VIRTIO_DEVICE(qdev); + + qemu_del_timer(vrng->rate_limit_timer); + qemu_free_timer(vrng->rate_limit_timer); + unregister_savevm(qdev, "virtio-rng", vrng); + virtio_common_cleanup(vdev); + return 0; +} + +static Property virtio_rng_properties[] = { + DEFINE_VIRTIO_RNG_PROPERTIES(VirtIORNG, conf), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtio_rng_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); + dc->exit = virtio_rng_device_exit; + dc->props = virtio_rng_properties; + vdc->init = virtio_rng_device_init; + vdc->get_features = get_features; +} + +static void virtio_rng_initfn(Object *obj) +{ + VirtIORNG *vrng = VIRTIO_RNG(obj); + + object_property_add_link(obj, "rng", TYPE_RNG_BACKEND, + (Object **)&vrng->conf.rng, NULL); +} + +static const TypeInfo virtio_rng_info = { + .name = TYPE_VIRTIO_RNG, + .parent = TYPE_VIRTIO_DEVICE, + .instance_size = sizeof(VirtIORNG), + .instance_init = virtio_rng_initfn, + .class_init = virtio_rng_class_init, +}; + +static void virtio_register_types(void) +{ + type_register_static(&virtio_rng_info); +} + +type_init(virtio_register_types) diff --git a/hw/virtio-rng.h b/hw/virtio-rng.h index 3deb283..fd6d01f 100644 --- a/hw/virtio-rng.h +++ b/hw/virtio-rng.h @@ -15,6 +15,10 @@ #include "qemu/rng.h" #include "qemu/rng-random.h" +#define TYPE_VIRTIO_RNG "virtio-rng" +#define VIRTIO_RNG(obj) \ + OBJECT_CHECK(VirtIORNG, (obj), TYPE_VIRTIO_RNG) + /* The Virtio ID for the virtio rng device */ #define VIRTIO_ID_RNG 4 @@ -44,4 +48,16 @@ typedef struct VirtIORNG { int64_t quota_remaining; } VirtIORNG; +/* Set a default rate limit of 2^47 bytes per minute or roughly 2TB/s. If + you have an entropy source capable of generating more entropy than this + and you can pass it through via virtio-rng, then hats off to you. Until + then, this is unlimited for all practical purposes. +*/ +#define DEFINE_VIRTIO_RNG_PROPERTIES(_state, _conf_field) \ + DEFINE_PROP_UINT64("max-bytes", _state, _conf_field.max_bytes, \ + INT64_MAX), \ + DEFINE_PROP_UINT32("period", _state, _conf_field.period_ms, 1 << 16) + +void virtio_rng_set_conf(DeviceState *dev, VirtIORNGConf *conf); + #endif