From: Jason Wang <jasowang@redhat.com>
To: Kangjie Xu <kangjie.xu@linux.alibaba.com>, qemu-devel@nongnu.org
Cc: mst@redhat.com, eduardo@habkost.net, marcel.apfelbaum@gmail.com,
f4bug@amsat.org, wangyanan55@huawei.com,
hengqi@linux.alibaba.com, xuanzhuo@linux.alibaba.com
Subject: Re: [PATCH v3 06/15] virtio-pci: support queue reset
Date: Mon, 5 Sep 2022 15:59:23 +0800 [thread overview]
Message-ID: <4069b154-7d72-6e31-8904-94538f1874b3@redhat.com> (raw)
In-Reply-To: <0851d6ea5c84b71d0c661d91da973e4abf9155c1.1661414345.git.kangjie.xu@linux.alibaba.com>
在 2022/8/25 16:08, Kangjie Xu 写道:
> From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
>
> PCI devices support vq reset.
>
> Based on this function, the driver can adjust the size of the ring, and
> quickly recycle the buffer in the ring.
>
> The migration of the virtio devices will not happen during a reset
> operation. This is becuase the global iothread lock is held. Migration
> thread also needs the lock. As a result, when migration of virtio
> devices starts, the 'reset' status of VirtIOPCIQueue will always be 0.
> Thus, we do not need to add it in vmstate_virtio_pci_modern_queue_state.
>
> Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> Signed-off-by: Kangjie Xu <kangjie.xu@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> hw/virtio/virtio-pci.c | 15 +++++++++++++++
> include/hw/virtio/virtio-pci.h | 5 +++++
> 2 files changed, 20 insertions(+)
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index a50c5a57d7..79b9e641dd 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -1251,6 +1251,9 @@ static uint64_t virtio_pci_common_read(void *opaque, hwaddr addr,
> case VIRTIO_PCI_COMMON_Q_USEDHI:
> val = proxy->vqs[vdev->queue_sel].used[1];
> break;
> + case VIRTIO_PCI_COMMON_Q_RESET:
> + val = proxy->vqs[vdev->queue_sel].reset;
> + break;
> default:
> val = 0;
> }
> @@ -1338,6 +1341,7 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
> ((uint64_t)proxy->vqs[vdev->queue_sel].used[1]) << 32 |
> proxy->vqs[vdev->queue_sel].used[0]);
> proxy->vqs[vdev->queue_sel].enabled = 1;
> + proxy->vqs[vdev->queue_sel].reset = 0;
> } else {
> virtio_error(vdev, "wrong value for queue_enable %"PRIx64, val);
> }
> @@ -1360,6 +1364,16 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
> case VIRTIO_PCI_COMMON_Q_USEDHI:
> proxy->vqs[vdev->queue_sel].used[1] = val;
> break;
> + case VIRTIO_PCI_COMMON_Q_RESET:
> + if (val == 1) {
> + proxy->vqs[vdev->queue_sel].reset = 1;
> +
> + virtio_queue_reset(vdev, vdev->queue_sel);
> +
> + proxy->vqs[vdev->queue_sel].reset = 0;
> + proxy->vqs[vdev->queue_sel].enabled = 0;
> + }
> + break;
> default:
> break;
> }
> @@ -1954,6 +1968,7 @@ static void virtio_pci_reset(DeviceState *qdev)
>
> for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
> proxy->vqs[i].enabled = 0;
> + proxy->vqs[i].reset = 0;
> proxy->vqs[i].num = 0;
> proxy->vqs[i].desc[0] = proxy->vqs[i].desc[1] = 0;
> proxy->vqs[i].avail[0] = proxy->vqs[i].avail[1] = 0;
> diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h
> index 2446dcd9ae..938799e8f6 100644
> --- a/include/hw/virtio/virtio-pci.h
> +++ b/include/hw/virtio/virtio-pci.h
> @@ -117,6 +117,11 @@ typedef struct VirtIOPCIRegion {
> typedef struct VirtIOPCIQueue {
> uint16_t num;
> bool enabled;
> + /*
> + * No need to migrate the reset status, because it is always 0
> + * when the migration starts.
> + */
> + bool reset;
> uint32_t desc[2];
> uint32_t avail[2];
> uint32_t used[2];
next prev parent reply other threads:[~2022-09-05 8:02 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-25 8:08 [PATCH v3 00/15] Support VIRTIO_F_RING_RESET for virtio-net, vhost-net kernel in virtio pci-modern Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 01/15] virtio: sync relevant definitions with linux Kangjie Xu
2022-09-05 4:56 ` Jason Wang
2022-08-25 8:08 ` [PATCH v3 02/15] virtio: introduce __virtio_queue_reset() Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 03/15] virtio: introduce virtio_queue_reset() Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 04/15] virtio: introduce virtio_queue_enable() Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 05/15] virtio: core: vq reset feature negotation support Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 06/15] virtio-pci: support queue reset Kangjie Xu
2022-09-05 7:59 ` Jason Wang [this message]
2022-08-25 8:08 ` [PATCH v3 07/15] virtio-pci: support queue enable Kangjie Xu
2022-09-05 8:00 ` Jason Wang
2022-08-25 8:08 ` [PATCH v3 08/15] vhost: extract the logic of unmapping the vrings and desc Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 09/15] vhost: expose vhost_virtqueue_start() Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 10/15] vhost-net: vhost-kernel: introduce vhost_net_virtqueue_reset() Kangjie Xu
2022-09-05 8:03 ` Jason Wang
2022-09-05 10:15 ` Kangjie Xu
2022-09-06 5:24 ` Jason Wang
2022-08-25 8:08 ` [PATCH v3 11/15] vhost-net: vhost-kernel: introduce vhost_net_virtqueue_restart() Kangjie Xu
2022-09-05 8:24 ` Jason Wang
2022-09-05 10:21 ` Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 12/15] virtio-net: introduce flush_or_purge_queued_packets() Kangjie Xu
2022-09-05 8:25 ` Jason Wang
2022-08-25 8:08 ` [PATCH v3 13/15] virtio-net: support queue reset Kangjie Xu
2022-09-05 8:30 ` Jason Wang
2022-09-05 10:25 ` Kangjie Xu
2022-09-05 16:25 ` Kangjie Xu
2022-09-06 5:37 ` Jason Wang
2022-09-06 3:14 ` Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 14/15] virtio-net: support queue_enable Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 15/15] vhost: vhost-kernel: enable vq reset feature Kangjie Xu
2022-09-02 1:04 ` [PATCH v3 00/15] Support VIRTIO_F_RING_RESET for virtio-net, vhost-net kernel in virtio pci-modern Kangjie Xu
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=4069b154-7d72-6e31-8904-94538f1874b3@redhat.com \
--to=jasowang@redhat.com \
--cc=eduardo@habkost.net \
--cc=f4bug@amsat.org \
--cc=hengqi@linux.alibaba.com \
--cc=kangjie.xu@linux.alibaba.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wangyanan55@huawei.com \
--cc=xuanzhuo@linux.alibaba.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 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).