All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: linuxppc-dev@lists.ozlabs.org
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>,
	Thomas Huth <thuth@linux.vnet.ibm.com>,
	Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Subject: [PATCH slof] virtio: Fix vring allocation
Date: Fri, 13 Mar 2015 19:40:20 +1100	[thread overview]
Message-ID: <1426236020-10278-1-git-send-email-aik@ozlabs.ru> (raw)

The value returned by virtio_vring_size() is used to allocate memory
for vring. The used descriptor list (array of vring_used_elem) is
counted by the header - vring_used struct - is not.

This fixes virtio_vring_size() to return the correct size.
At the moment rings are quite small (256) and allocated with
4096 alignment, this is why we have not been having issues with
this so far.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 lib/libvirtio/virtio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/libvirtio/virtio.c b/lib/libvirtio/virtio.c
index b010796..22615c4 100644
--- a/lib/libvirtio/virtio.c
+++ b/lib/libvirtio/virtio.c
@@ -33,7 +33,8 @@
 unsigned long virtio_vring_size(unsigned int qsize)
 {
 	return VQ_ALIGN(sizeof(struct vring_desc) * qsize + 2 * (2 + qsize))
-		+ VQ_ALIGN(sizeof(struct vring_used_elem) * qsize);
+               + VQ_ALIGN(sizeof(struct vring_used) +
+                          sizeof(struct vring_used_elem) * qsize);
 }
 
 
-- 
2.0.0

             reply	other threads:[~2015-03-13  8:41 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-13  8:40 Alexey Kardashevskiy [this message]
2015-03-13  9:19 ` [PATCH slof] virtio: Fix vring allocation Nikunj A Dadhania
2015-03-13  9:42   ` [PATCH slof v2] " Alexey Kardashevskiy
2015-03-13 10:14     ` Nikunj A Dadhania
2015-03-13 10:25     ` Thomas Huth

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=1426236020-10278-1-git-send-email-aik@ozlabs.ru \
    --to=aik@ozlabs.ru \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=nikunj@linux.vnet.ibm.com \
    --cc=thuth@linux.vnet.ibm.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.