From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 01/25] virtio: Factor virtqueue_map_sg out
Date: Wed, 8 Sep 2010 15:29:18 +0200 [thread overview]
Message-ID: <1283952582-17498-2-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1283952582-17498-1-git-send-email-kwolf@redhat.com>
Separate the mapping of requests to host memory from the descriptor iteration.
The next patch will make use of it in a different context.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
hw/virtio.c | 38 ++++++++++++++++++++++++--------------
hw/virtio.h | 3 +++
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/hw/virtio.c b/hw/virtio.c
index 4475bb3..85312b3 100644
--- a/hw/virtio.c
+++ b/hw/virtio.c
@@ -360,11 +360,26 @@ int virtqueue_avail_bytes(VirtQueue *vq, int in_bytes, int out_bytes)
return 0;
}
+void virtqueue_map_sg(struct iovec *sg, target_phys_addr_t *addr,
+ size_t num_sg, int is_write)
+{
+ unsigned int i;
+ target_phys_addr_t len;
+
+ for (i = 0; i < num_sg; i++) {
+ len = sg[i].iov_len;
+ sg[i].iov_base = cpu_physical_memory_map(addr[i], &len, is_write);
+ if (sg[i].iov_base == NULL || len != sg[i].iov_len) {
+ fprintf(stderr, "virtio: trying to map MMIO memory\n");
+ exit(1);
+ }
+ }
+}
+
int virtqueue_pop(VirtQueue *vq, VirtQueueElement *elem)
{
unsigned int i, head, max;
target_phys_addr_t desc_pa = vq->vring.desc;
- target_phys_addr_t len;
if (!virtqueue_num_heads(vq, vq->last_avail_idx))
return 0;
@@ -388,28 +403,19 @@ int virtqueue_pop(VirtQueue *vq, VirtQueueElement *elem)
i = 0;
}
+ /* Collect all the descriptors */
do {
struct iovec *sg;
- int is_write = 0;
if (vring_desc_flags(desc_pa, i) & VRING_DESC_F_WRITE) {
elem->in_addr[elem->in_num] = vring_desc_addr(desc_pa, i);
sg = &elem->in_sg[elem->in_num++];
- is_write = 1;
- } else
+ } else {
+ elem->out_addr[elem->out_num] = vring_desc_addr(desc_pa, i);
sg = &elem->out_sg[elem->out_num++];
+ }
- /* Grab the first descriptor, and check it's OK. */
sg->iov_len = vring_desc_len(desc_pa, i);
- len = sg->iov_len;
-
- sg->iov_base = cpu_physical_memory_map(vring_desc_addr(desc_pa, i),
- &len, is_write);
-
- if (sg->iov_base == NULL || len != sg->iov_len) {
- fprintf(stderr, "virtio: trying to map MMIO memory\n");
- exit(1);
- }
/* If we've got too many, that implies a descriptor loop. */
if ((elem->in_num + elem->out_num) > max) {
@@ -418,6 +424,10 @@ int virtqueue_pop(VirtQueue *vq, VirtQueueElement *elem)
}
} while ((i = virtqueue_next_desc(desc_pa, i, max)) != max);
+ /* Now map what we have collected */
+ virtqueue_map_sg(elem->in_sg, elem->in_addr, elem->in_num, 1);
+ virtqueue_map_sg(elem->out_sg, elem->out_addr, elem->out_num, 0);
+
elem->index = head;
vq->inuse++;
diff --git a/hw/virtio.h b/hw/virtio.h
index 5836ab6..1deeb2c 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -81,6 +81,7 @@ typedef struct VirtQueueElement
unsigned int out_num;
unsigned int in_num;
target_phys_addr_t in_addr[VIRTQUEUE_MAX_SIZE];
+ target_phys_addr_t out_addr[VIRTQUEUE_MAX_SIZE];
struct iovec in_sg[VIRTQUEUE_MAX_SIZE];
struct iovec out_sg[VIRTQUEUE_MAX_SIZE];
} VirtQueueElement;
@@ -142,6 +143,8 @@ void virtqueue_flush(VirtQueue *vq, unsigned int count);
void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
unsigned int len, unsigned int idx);
+void virtqueue_map_sg(struct iovec *sg, target_phys_addr_t *addr,
+ size_t num_sg, int is_write);
int virtqueue_pop(VirtQueue *vq, VirtQueueElement *elem);
int virtqueue_avail_bytes(VirtQueue *vq, int in_bytes, int out_bytes);
--
1.7.2.2
next prev parent reply other threads:[~2010-09-08 13:50 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-08 13:29 [Qemu-devel] [PULL v2 00/25] Block patches Kevin Wolf
2010-09-08 13:29 ` Kevin Wolf [this message]
2010-09-08 13:29 ` [Qemu-devel] [PATCH 02/25] virtio-blk: Fix migration of queued requests Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 03/25] block: Fix image re-open in bdrv_commit Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 04/25] sheepdog: remove unnecessary includes Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 05/25] qemu-img rebase: Open new backing file read-only Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 06/25] vvfat: fat_chksum(): fix access above array bounds Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 07/25] nbd: Introduce NBD named exports Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 08/25] posix-aio-compat: Fix async_conmtext for ioctl Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 09/25] monitor: make 'info snapshots' show only fully available snapshots Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 10/25] savevm: Generate a name when run without one Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 11/25] scsi-disk: fix the mode data length field returned by the MODE SENSE command Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 12/25] scsi-disk: fix the mode data header returned by the MODE SENSE(10) command Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 13/25] scsi-disk: respect the page control (PC) field in the MODE SENSE command Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 14/25] scsi-disk: fix the block descriptor returned by " Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 15/25] scsi-disk: return CHECK CONDITION for unknown page codes in " Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 16/25] scsi-disk: fix the check of the DBD bit " Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 17/25] scsi: fix and improve debug prints Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 18/25] qemu-io: Make alloc output useful when nb_sectors=1 Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 19/25] raw-posix: Don't use file name for host_cdrom detection on Linux Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 20/25] Improve ATA IDENTIFY word 64 contents Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 21/25] scsi-disk: add some optional scsi commands Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 22/25] raw-posix: improve detection of scsi-generic devices Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 23/25] qemu-img convert: Use cache=unsafe for output image Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 24/25] block: Fix BDRV_O_CACHE_MASK Kevin Wolf
2010-09-08 13:29 ` [Qemu-devel] [PATCH 25/25] qcow2: Remove unnecessary flush after L2 write Kevin Wolf
2010-09-08 19:30 ` [Qemu-devel] [PULL v2 00/25] Block patches Anthony Liguori
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=1283952582-17498-2-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
/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.