All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PULL 21/22] virtio: introduce virtqueue_discard()
Date: Thu, 24 Sep 2015 16:21:05 +0300	[thread overview]
Message-ID: <1443100738-14970-22-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1443100738-14970-1-git-send-email-mst@redhat.com>

From: Jason Wang <jasowang@redhat.com>

This patch introduces virtqueue_discard() to discard a descriptor and
unmap the sgs. This will be used by the patch that will discard
descriptor when packet is truncated.

Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/hw/virtio/virtio.h | 2 ++
 hw/virtio/virtio.c         | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 6201ee8..9d09115 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -146,6 +146,8 @@ void virtio_del_queue(VirtIODevice *vdev, int n);
 void virtqueue_push(VirtQueue *vq, const VirtQueueElement *elem,
                     unsigned int len);
 void virtqueue_flush(VirtQueue *vq, unsigned int count);
+void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem,
+                       unsigned int len);
 void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
                     unsigned int len, unsigned int idx);
 
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index d6a2bca..c9bf10c 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -266,6 +266,13 @@ static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem,
                                   0, elem->out_sg[i].iov_len);
 }
 
+void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem,
+                       unsigned int len)
+{
+    vq->last_avail_idx--;
+    virtqueue_unmap_sg(vq, elem, len);
+}
+
 void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
                     unsigned int len, unsigned int idx)
 {
-- 
MST

  parent reply	other threads:[~2015-09-24 13:21 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-24 13:20 [Qemu-devel] [PULL 00/22] virtio,pc features, fixes Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 01/22] virtio: right size for virtio_queue_get_avail_size Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 02/22] virtio-net: unbreak self announcement and guest offloads after migration Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 03/22] q35: Move options common to all classes to pc_q35_machine_options() Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 04/22] q35: Move options common to all classes to pc_i440fx_machine_options() Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 05/22] pc: Introduce pc-*-2.5 machine classes Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 06/22] virtio: ring sizes vs. reset Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 07/22] virtio-ccw: support ring size changes Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 08/22] virtio-ccw: feature bits > 31 handling Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 09/22] virtio-ccw: enable virtio-1 Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 10/22] vhost-user: use VHOST_USER_XXX macro for switch statement Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 11/22] vhost-user: add protocol feature negotiation Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 12/22] vhost: rename VHOST_RESET_OWNER to VHOST_RESET_DEVICE Michael S. Tsirkin
2015-10-02 16:18   ` Paolo Bonzini
2015-10-03 16:33     ` Michael S. Tsirkin
2015-10-08  5:24       ` Yuanhan Liu
2015-11-05 11:42       ` Peter Maydell
2015-11-06  1:34         ` Yuanhan Liu
2015-11-06 10:01           ` Peter Maydell
2015-11-09  3:56             ` Yuanhan Liu
2015-09-24 13:20 ` [Qemu-devel] [PULL 13/22] vhost-user: add VHOST_USER_GET_QUEUE_NUM message Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 14/22] vhost: introduce vhost_backend_get_vq_index method Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 15/22] vhost-user: add multiple queue support Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 16/22] vhost-user: add a new message to disable/enable a specific virt queue Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 17/22] intel_iommu: Add support for translation for devices behind bridges Michael S. Tsirkin
2015-09-25  6:43   ` Michael S. Tsirkin
2015-09-25  7:33     ` Knut Omang
2015-09-24 13:20 ` [Qemu-devel] [PULL 18/22] MAINTAINERS: add more devices to the PC section Michael S. Tsirkin
2015-09-24 13:20 ` [Qemu-devel] [PULL 19/22] MAINTAINERS: add more devices to the PCI section Michael S. Tsirkin
2015-09-24 13:21 ` [Qemu-devel] [PULL 20/22] virtio: introduce virtqueue_unmap_sg() Michael S. Tsirkin
2015-09-24 18:58   ` Michael S. Tsirkin
2015-09-25  3:26     ` Jason Wang
2015-09-24 13:21 ` Michael S. Tsirkin [this message]
2015-09-24 13:21 ` [Qemu-devel] [PULL 22/22] virtio-net: correctly drop truncated packets Michael S. Tsirkin
2015-09-24 13:30 ` [Qemu-devel] [PULL 00/22] virtio,pc features, fixes Michael S. Tsirkin
2015-09-24 18:36 ` Peter Maydell
2015-09-24 18:57   ` Michael S. Tsirkin

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=1443100738-14970-22-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --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.