public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v14 09/14] vhost_user: Make source quit after reporting migration state
Date: Mon, 10 Feb 2025 20:18:00 +1100	[thread overview]
Message-ID: <20250210091805.2261228-10-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20250210091805.2261228-1-david@gibson.dropbear.id.au>

From: Stefano Brivio <sbrivio@redhat.com>

This will close all the sockets we currently have open in repair mode,
and completes our migration tasks as source. If the hypervisor wants
to have us back at this point, somebody needs to restart us.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Message-ID: <20250209222005.1640077-5-sbrivio@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 vhost_user.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/vhost_user.c b/vhost_user.c
index 256c8ab6..9115fb50 100644
--- a/vhost_user.c
+++ b/vhost_user.c
@@ -998,6 +998,9 @@ static bool vu_send_rarp_exec(struct vu_dev *vdev,
 	return false;
 }
 
+/* If set, quit when we get a VHOST_USER_CHECK_DEVICE_STATE, after replying */
+static bool quit_on_device_state = false;
+
 /**
  * vu_set_device_state_fd_exec() - Set the device state migration channel
  * @vdev:	vhost-user device
@@ -1025,6 +1028,9 @@ static bool vu_set_device_state_fd_exec(struct vu_dev *vdev,
 	migrate_request(vdev->context, msg->fds[0],
 			direction == VHOST_USER_TRANSFER_STATE_DIRECTION_LOAD);
 
+	if (direction == VHOST_USER_TRANSFER_STATE_DIRECTION_SAVE)
+		quit_on_device_state = true;
+
 	/* We don't provide a new fd for the data transfer */
 	vmsg_set_reply_u64(msg, VHOST_USER_VRING_NOFD_MASK);
 
@@ -1203,4 +1209,10 @@ void vu_control_handler(struct vu_dev *vdev, int fd, uint32_t events)
 
 	if (reply_requested)
 		vu_send_reply(fd, &msg);
+
+	if (quit_on_device_state &&
+	    msg.hdr.request == VHOST_USER_CHECK_DEVICE_STATE) {
+		info("Migration complete, exiting");
+		_exit(EXIT_SUCCESS);
+	}
 }
-- 
@@ -998,6 +998,9 @@ static bool vu_send_rarp_exec(struct vu_dev *vdev,
 	return false;
 }
 
+/* If set, quit when we get a VHOST_USER_CHECK_DEVICE_STATE, after replying */
+static bool quit_on_device_state = false;
+
 /**
  * vu_set_device_state_fd_exec() - Set the device state migration channel
  * @vdev:	vhost-user device
@@ -1025,6 +1028,9 @@ static bool vu_set_device_state_fd_exec(struct vu_dev *vdev,
 	migrate_request(vdev->context, msg->fds[0],
 			direction == VHOST_USER_TRANSFER_STATE_DIRECTION_LOAD);
 
+	if (direction == VHOST_USER_TRANSFER_STATE_DIRECTION_SAVE)
+		quit_on_device_state = true;
+
 	/* We don't provide a new fd for the data transfer */
 	vmsg_set_reply_u64(msg, VHOST_USER_VRING_NOFD_MASK);
 
@@ -1203,4 +1209,10 @@ void vu_control_handler(struct vu_dev *vdev, int fd, uint32_t events)
 
 	if (reply_requested)
 		vu_send_reply(fd, &msg);
+
+	if (quit_on_device_state &&
+	    msg.hdr.request == VHOST_USER_CHECK_DEVICE_STATE) {
+		info("Migration complete, exiting");
+		_exit(EXIT_SUCCESS);
+	}
 }
-- 
2.48.1


  parent reply	other threads:[~2025-02-10  9:18 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-10  9:17 [PATCH v14 00/14] State migration David Gibson
2025-02-10  9:17 ` [PATCH v14 01/14] migrate: Skeleton of live migration logic David Gibson
2025-02-10  9:17 ` [PATCH v14 02/14] fixup: Remove unused iov field in struct migrate_stage David Gibson
2025-02-10  9:17 ` [PATCH v14 03/14] migrate: Migrate guest observed addresses David Gibson
2025-02-10  9:17 ` [PATCH v14 04/14] Add interfaces and configuration bits for passt-repair David Gibson
2025-02-10  9:17 ` [PATCH v14 05/14] fixup: Reorder conf options David Gibson
2025-02-10  9:17 ` [PATCH v14 06/14] fixup: Correctly type repair_cmd global David Gibson
2025-02-10  9:17 ` [PATCH v14 07/14] fixup: Sanity check passt-repair reply message David Gibson
2025-02-10  9:17 ` [PATCH v14 08/14] fixup: Don't close repair socket after first migration attempt David Gibson
2025-02-10  9:18 ` David Gibson [this message]
2025-02-10  9:18 ` [PATCH v14 10/14] fixup: Adjust conditions under which we quite after completing migration David Gibson
2025-02-10  9:18 ` [PATCH v14 11/14] migrate: Migrate TCP flows David Gibson
2025-02-10  9:18 ` [PATCH v14 12/14] fixup: Check for errors on repair mode rollback David Gibson
2025-02-10  9:18 ` [PATCH v14 13/14] test: Add migration tests David Gibson
2025-02-10  9:18 ` [PATCH v14 14/14] WIP: migrate, tcp: Shrink windows before migration David Gibson

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=20250210091805.2261228-10-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    --cc=sbrivio@redhat.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.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

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 IMAP folder(s).