qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Si-Wei Liu <si-wei.liu@oracle.com>
To: eperezma@redhat.com, jasowang@redhat.com, mst@redhat.com,
	dtatulea@nvidia.com, leiyang@redhat.com, yin31149@gmail.com
Cc: qemu-devel@nongnu.org
Subject: [PATCH 12/12] vdpa: fix network breakage after cancelling migration
Date: Wed, 14 Feb 2024 03:28:02 -0800	[thread overview]
Message-ID: <1707910082-10243-13-git-send-email-si-wei.liu@oracle.com> (raw)
In-Reply-To: <1707910082-10243-1-git-send-email-si-wei.liu@oracle.com>

Fix an issue where cancellation of ongoing migration ends up
with no network connectivity.

When canceling migration, SVQ will be switched back to the
passthrough mode, but the right call fd is not programed to
the device and the svq's own call fd is still used. At the
point of this transitioning period, the shadow_vqs_enabled
hadn't been set back to false yet, causing the installation
of call fd inadvertently bypassed.

Fixes: a8ac88585da1 ("vhost: Add Shadow VirtQueue call forwarding capabilities")
Cc: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com>
---
 hw/virtio/vhost-vdpa.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 004110f..dfeca8b 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -1468,7 +1468,15 @@ static int vhost_vdpa_set_vring_call(struct vhost_dev *dev,
 
     /* Remember last call fd because we can switch to SVQ anytime. */
     vhost_svq_set_svq_call_fd(svq, file->fd);
-    if (v->shadow_vqs_enabled) {
+    /*
+     * When SVQ is transitioning to off, shadow_vqs_enabled has
+     * not been set back to false yet, but the underlying call fd
+     * will have to switch back to the guest notifier to signal the
+     * passthrough virtqueues. In other situations, SVQ's own call
+     * fd shall be used to signal the device model.
+     */
+    if (v->shadow_vqs_enabled &&
+        v->shared->svq_switching != SVQ_TSTATE_DISABLING) {
         return 0;
     }
 
-- 
1.8.3.1



  parent reply	other threads:[~2024-02-14 12:40 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-14 11:27 [PATCH 00/12] Preparatory patches for live migration downtime improvement Si-Wei Liu
2024-02-14 11:27 ` [PATCH 01/12] vdpa: add back vhost_vdpa_net_first_nc_vdpa Si-Wei Liu
2024-02-14 11:27 ` [PATCH 02/12] vdpa: no repeat setting shadow_data Si-Wei Liu
2024-02-14 11:27 ` [PATCH 03/12] vdpa: factor out vhost_vdpa_last_dev Si-Wei Liu
2024-02-14 11:27 ` [PATCH 04/12] vdpa: factor out vhost_vdpa_net_get_nc_vdpa Si-Wei Liu
2024-02-14 18:54   ` Eugenio Perez Martin
2024-02-14 20:58     ` Si-Wei Liu
2024-02-15  6:33       ` Eugenio Perez Martin
2024-02-14 11:27 ` [PATCH 05/12] vdpa: add vhost_vdpa_set_address_space_id trace Si-Wei Liu
2024-02-14 11:27 ` [PATCH 06/12] vdpa: add vhost_vdpa_get_vring_base trace for svq mode Si-Wei Liu
2024-02-14 11:27 ` [PATCH 07/12] vdpa: add vhost_vdpa_set_dev_vring_base " Si-Wei Liu
2024-02-14 11:27 ` [PATCH 08/12] vdpa: add trace events for vhost_vdpa_net_load_cmd Si-Wei Liu
2024-02-14 11:27 ` [PATCH 09/12] vdpa: add trace event for vhost_vdpa_net_load_mq Si-Wei Liu
2024-02-14 11:28 ` [PATCH 10/12] vdpa: define SVQ transitioning state for mode switching Si-Wei Liu
2024-02-14 11:28 ` [PATCH 11/12] vdpa: indicate transitional state for SVQ switching Si-Wei Liu
2024-02-14 11:28 ` Si-Wei Liu [this message]
2024-02-15 16:15   ` [PATCH 12/12] vdpa: fix network breakage after cancelling migration Eugenio Perez Martin
2024-02-15 17:10     ` Eugenio Perez Martin
2024-03-13 18:12   ` Michael Tokarev
2024-03-13 18:52     ` Michael Tokarev
2024-03-13 19:10     ` Si-Wei Liu
2024-03-13 20:41       ` Michael Tokarev

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=1707910082-10243-13-git-send-email-si-wei.liu@oracle.com \
    --to=si-wei.liu@oracle.com \
    --cc=dtatulea@nvidia.com \
    --cc=eperezma@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=leiyang@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=yin31149@gmail.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).