From: Ian Molton <ian.molton@collabora.co.uk>
To: unlisted-recipients:; (no To-header on input)
Cc: rusty@rustcorp.com.au, linux-kernel@vger.kernel.org,
mpm@selenic.com, Ian Molton <ian.molton@collabora.co.uk>
Subject: [PATCH 2/2] virtio: Convert virtio-rng to the new API
Date: Thu, 26 Nov 2009 00:25:27 +0000 [thread overview]
Message-ID: <1259195127-20086-3-git-send-email-ian.molton@collabora.co.uk> (raw)
In-Reply-To: <1259195127-20086-2-git-send-email-ian.molton@collabora.co.uk>
This patch converts virtio-rng to the new hw_rng API.
In the process it fixes a previously untriggered buffering bug where the
buffer is not drained correctly if it has a non-multiple-of-4 length.
Performance has improved under qemu-kvm testing also.
Signed-off-by: Ian Molton <ian.molton@collabora.co.uk>
---
drivers/char/hw_random/virtio-rng.c | 79 ++++++++++++----------------------
1 files changed, 28 insertions(+), 51 deletions(-)
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
index 915157f..76d00c4 100644
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -16,6 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#include <linux/err.h>
#include <linux/hw_random.h>
#include <linux/scatterlist.h>
@@ -23,78 +24,65 @@
#include <linux/virtio.h>
#include <linux/virtio_rng.h>
-/* The host will fill any buffer we give it with sweet, sweet randomness. We
- * give it 64 bytes at a time, and the hwrng framework takes it 4 bytes at a
- * time. */
-#define RANDOM_DATA_SIZE 64
-
static struct virtqueue *vq;
-static u32 *random_data;
-static unsigned int data_left;
+static unsigned int data_avail;
static DECLARE_COMPLETION(have_data);
+static int busy;
+
+/* The host will fill any buffer we give it with sweet, sweet randomness. */
static void random_recv_done(struct virtqueue *vq)
{
- unsigned int len;
-
/* We can get spurious callbacks, e.g. shared IRQs + virtio_pci. */
- if (!vq->vq_ops->get_buf(vq, &len))
+ if (!vq->vq_ops->get_buf(vq, &data_avail))
return;
- data_left += len;
complete(&have_data);
}
-static void register_buffer(void)
+static void register_buffer(u8 *buf, size_t size)
{
struct scatterlist sg;
- sg_init_one(&sg, random_data+data_left, RANDOM_DATA_SIZE-data_left);
+ sg_init_one(&sg, buf, size);
+
/* There should always be room for one buffer. */
- if (vq->vq_ops->add_buf(vq, &sg, 0, 1, random_data) < 0)
+ if (vq->vq_ops->add_buf(vq, &sg, 0, 1, buf) < 0)
BUG();
+
vq->vq_ops->kick(vq);
}
-/* At least we don't udelay() in a loop like some other drivers. */
-static int virtio_data_present(struct hwrng *rng, int wait)
+static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
{
- if (data_left >= sizeof(u32))
- return 1;
-again:
+ if (!busy) {
+ busy = 1;
+ init_completion(&have_data);
+ register_buffer(buf, size);
+ }
+
if (!wait)
return 0;
wait_for_completion(&have_data);
- /* Not enough? Re-register. */
- if (unlikely(data_left < sizeof(u32))) {
- register_buffer();
- goto again;
- }
+ busy = 0;
- return 1;
+ return data_avail;
}
-/* virtio_data_present() must have succeeded before this is called. */
-static int virtio_data_read(struct hwrng *rng, u32 *data)
+static void virtio_cleanup(struct hwrng *rng)
{
- BUG_ON(data_left < sizeof(u32));
- data_left -= sizeof(u32);
- *data = random_data[data_left / 4];
-
- if (data_left < sizeof(u32)) {
- init_completion(&have_data);
- register_buffer();
- }
- return sizeof(*data);
+ if (busy)
+ wait_for_completion(&have_data);
}
+
static struct hwrng virtio_hwrng = {
- .name = "virtio",
- .data_present = virtio_data_present,
- .data_read = virtio_data_read,
+ .name = "virtio",
+ .cleanup = virtio_cleanup,
+ .read = virtio_read,
};
static int virtrng_probe(struct virtio_device *vdev)
@@ -112,7 +100,6 @@ static int virtrng_probe(struct virtio_device *vdev)
return err;
}
- register_buffer();
return 0;
}
@@ -138,21 +125,11 @@ static struct virtio_driver virtio_rng = {
static int __init init(void)
{
- int err;
-
- random_data = kmalloc(RANDOM_DATA_SIZE, GFP_KERNEL);
- if (!random_data)
- return -ENOMEM;
-
- err = register_virtio_driver(&virtio_rng);
- if (err)
- kfree(random_data);
- return err;
+ return register_virtio_driver(&virtio_rng);
}
static void __exit fini(void)
{
- kfree(random_data);
unregister_virtio_driver(&virtio_rng);
}
module_init(init);
--
1.6.5
next prev parent reply other threads:[~2009-11-26 0:26 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4B080621.5000109@collabora.co.uk>
[not found] ` <4B0C18B0.2000206@collabora.co.uk>
[not found] ` <1259084901.17871.624.camel@calx>
[not found] ` <200911251135.41871.rusty@rustcorp.com.au>
[not found] ` <4B0D03FC.40406@collabora.co.uk>
2009-11-25 19:27 ` hw_random fixes Matt Mackall
2009-11-25 20:43 ` Ian Molton
2009-11-26 0:25 ` Ian Molton
2009-11-26 0:25 ` [PATCH 1/2] hw_random: core updates to allow more efficient drivers Ian Molton
2009-11-26 0:25 ` Ian Molton [this message]
2009-11-28 10:00 ` [PATCH 2/2] virtio: Convert virtio-rng to the new API Rusty Russell
2009-11-30 9:55 ` Ian Molton
2009-11-26 1:03 ` [PATCH 1/2] hw_random: core updates to allow more efficient drivers Matt Mackall
2009-11-26 10:49 ` Ian Molton
2009-11-26 10:49 ` [PATCH 1/2] hw_random: core updates to allow more efficient drivers Ian Molton
2009-11-26 11:38 ` Matt Mackall
2009-11-26 11:48 ` Re: Ian Molton
2009-11-27 22:54 ` Re: Matt Mackall
2009-11-28 0:51 ` rng updates Ian Molton
2009-11-28 10:05 ` [PATCH 1/2] hw_random: core updates to allow more efficient drivers Rusty Russell
2009-11-30 10:28 ` Ian Molton
2009-11-30 18:44 ` Matt Mackall
2009-12-01 3:08 ` Rusty Russell
2009-12-01 9:23 ` Ian Molton
2009-12-01 9:18 ` Ian Molton
2009-11-26 3:12 ` Jeff Garzik
2009-11-26 0:44 ` Ian Molton
2009-11-26 0:44 ` [PATCH 1/2] hw_random: core updates to allow more efficient drivers Ian Molton
2009-11-26 0:44 ` [PATCH 2/2] virtio: Convert virtio-rng to the new API Ian Molton
2009-11-30 10:38 ` hw_random update Ian Molton
2009-11-30 10:38 ` [PATCH 1/2] hw_random: core updates to allow more efficient drivers Ian Molton
2009-11-30 10:38 ` [PATCH 2/2] virtio: Convert virtio-rng to the new API Ian Molton
2009-12-01 7:27 ` Herbert Xu
2009-12-01 9:29 ` Ian Molton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1259195127-20086-3-git-send-email-ian.molton@collabora.co.uk \
--to=ian.molton@collabora.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=mpm@selenic.com \
--cc=rusty@rustcorp.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).