linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pankaj Gupta <pagupta@redhat.com>
To: amit@kernel.org, mst@redhat.com
Cc: arnd@arndb.de, gregkh@linuxfoundation.org,
	virtualization@lists.linux-foundation.org, jasowang@redhat.com,
	linux-kernel@vger.kernel.org, pagupta@redhat.com
Subject: [PATCH v2 2/2] virtio_ring: packed ring: fix virtqueue_detach_unused_buf
Date: Thu,  8 Aug 2019 17:06:06 +0530	[thread overview]
Message-ID: <20190808113606.19504-3-pagupta@redhat.com> (raw)
In-Reply-To: <20190808113606.19504-1-pagupta@redhat.com>

This patch makes packed ring code compatible with split ring in function
'virtqueue_detach_unused_buf_*'.

Signed-off-by: Pankaj Gupta <pagupta@redhat.com>
---
 drivers/virtio/virtio_ring.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index c8be1c4f5b55..1b98a6777b7e 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -1534,6 +1534,11 @@ static void *virtqueue_detach_unused_buf_packed(struct virtqueue *_vq)
 	for (i = 0; i < vq->packed.vring.num; i++) {
 		if (!vq->packed.desc_state[i].data)
 			continue;
+		vq->packed.next_avail_idx--;
+		if (vq->packed.next_avail_idx < 0) {
+			vq->packed.next_avail_idx = vq->packed.vring.num - 1;
+			vq->packed.avail_wrap_counter ^= 1;
+		}
 		/* detach_buf clears data, so grab it now. */
 		buf = vq->packed.desc_state[i].data;
 		detach_buf_packed(vq, i, NULL);
-- 
2.21.0


  parent reply	other threads:[~2019-08-08 11:36 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-08 11:36 [PATCH v2 0/2] virtio_console: fix replug of virtio console port Pankaj Gupta
2019-08-08 11:36 ` [PATCH v2 1/2] virtio_console: free unused buffers with port delete Pankaj Gupta
2019-08-08 11:55   ` Greg KH
2019-08-08 12:19     ` Pankaj Gupta
2019-08-08 11:36 ` Pankaj Gupta [this message]
2019-08-08 11:56   ` [PATCH v2 2/2] virtio_ring: packed ring: fix virtqueue_detach_unused_buf Greg KH
2019-08-08 12:28     ` Pankaj Gupta
2019-08-08 12:42       ` Greg KH
2019-08-08 12:44         ` Pankaj Gupta

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=20190808113606.19504-3-pagupta@redhat.com \
    --to=pagupta@redhat.com \
    --cc=amit@kernel.org \
    --cc=arnd@arndb.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=jasowang@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=virtualization@lists.linux-foundation.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 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).