From: "Michael S. Tsirkin" <mst@redhat.com>
To: Xueming Li <xuemingl@nvidia.com>
Cc: Yuwei Zhang <zhangyuwei.9149@bytedance.com>,
qemu-devel@nongnu.org, qemu-stable@nongnu.org
Subject: Re: [PATCH v5 2/2] vhost-user: remove VirtQ notifier restore
Date: Tue, 19 Oct 2021 06:55:49 -0400 [thread overview]
Message-ID: <20211019065517-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20211019075743.2162432-3-xuemingl@nvidia.com>
On Tue, Oct 19, 2021 at 03:57:43PM +0800, Xueming Li wrote:
> When vhost-user vdpa client restart, VQ notifier mmap address and MR
> become invalid, restore MR only is wrong.
wrong how? as opposed to what?
> vdpa client will set VQ
> notifier after reconnect.
>
> This patch removes VQ notifier restore and related flags.
with the result that ...
>
> Fixes: 44866521bd6e ("vhost-user: support registering external host notifiers")
> Cc: qemu-stable@nongnu.org
> Cc: Yuwei Zhang <zhangyuwei.9149@bytedance.com>
> Signed-off-by: Xueming Li <xuemingl@nvidia.com>
> ---
> hw/virtio/vhost-user.c | 19 +------------------
> include/hw/virtio/vhost-user.h | 1 -
> 2 files changed, 1 insertion(+), 19 deletions(-)
>
> diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
> index cfca1b9adc..cc33f4b042 100644
> --- a/hw/virtio/vhost-user.c
> +++ b/hw/virtio/vhost-user.c
> @@ -1144,19 +1144,6 @@ static int vhost_user_set_vring_num(struct vhost_dev *dev,
> return vhost_set_vring(dev, VHOST_USER_SET_VRING_NUM, ring);
> }
>
> -static void vhost_user_host_notifier_restore(struct vhost_dev *dev,
> - int queue_idx)
> -{
> - struct vhost_user *u = dev->opaque;
> - VhostUserHostNotifier *n = &u->user->notifier[queue_idx];
> - VirtIODevice *vdev = dev->vdev;
> -
> - if (n->addr && !n->set) {
> - virtio_queue_set_host_notifier_mr(vdev, queue_idx, &n->mr, true);
> - n->set = true;
> - }
> -}
> -
> static void vhost_user_host_notifier_remove(struct vhost_dev *dev,
> int queue_idx)
> {
> @@ -1164,7 +1151,7 @@ static void vhost_user_host_notifier_remove(struct vhost_dev *dev,
> VhostUserHostNotifier *n = &u->user->notifier[queue_idx];
> VirtIODevice *vdev = dev->vdev;
>
> - if (n->addr && n->set) {
> + if (n->addr) {
> virtio_queue_set_host_notifier_mr(vdev, queue_idx, &n->mr, false);
> if (!qemu_in_vcpu_thread()) { /* Avoid vCPU dead lock. */
> /* Wait for VM threads accessing old flatview which contains notifier. */
> @@ -1172,15 +1159,12 @@ static void vhost_user_host_notifier_remove(struct vhost_dev *dev,
> }
> munmap(n->addr, qemu_real_host_page_size);
> n->addr = NULL;
> - n->set = false;
> }
> }
>
> static int vhost_user_set_vring_base(struct vhost_dev *dev,
> struct vhost_vring_state *ring)
> {
> - vhost_user_host_notifier_restore(dev, ring->index);
> -
> return vhost_set_vring(dev, VHOST_USER_SET_VRING_BASE, ring);
> }
>
> @@ -1540,7 +1524,6 @@ static int vhost_user_slave_handle_vring_host_notifier(struct vhost_dev *dev,
> }
>
> n->addr = addr;
> - n->set = true;
>
> return 0;
> }
> diff --git a/include/hw/virtio/vhost-user.h b/include/hw/virtio/vhost-user.h
> index a9abca3288..f6012b2078 100644
> --- a/include/hw/virtio/vhost-user.h
> +++ b/include/hw/virtio/vhost-user.h
> @@ -14,7 +14,6 @@
> typedef struct VhostUserHostNotifier {
> MemoryRegion mr;
> void *addr;
> - bool set;
> } VhostUserHostNotifier;
>
> typedef struct VhostUserState {
> --
> 2.33.0
prev parent reply other threads:[~2021-10-19 10:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-19 7:57 [PATCH v5 0/2] Improve vhost-user VQ notifier unmap Xueming Li
2021-10-19 7:57 ` [PATCH v5 1/2] vhost-user: fix VirtQ notifier cleanup Xueming Li
2021-10-19 10:52 ` Michael S. Tsirkin
2021-10-28 12:57 ` Xueming(Steven) Li
2021-10-19 7:57 ` [PATCH v5 2/2] vhost-user: remove VirtQ notifier restore Xueming Li
2021-10-19 10:55 ` Michael S. Tsirkin [this message]
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=20211019065517-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=xuemingl@nvidia.com \
--cc=zhangyuwei.9149@bytedance.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).