DPDK patches and discussions
 help / color / mirror / Atom feed
From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, tiwei.bie@intel.com, zhihong.wang@intel.com,
	jfreimann@redhat.com, nicknickolaev@gmail.com,
	i.maximets@samsung.com, bruce.richardson@intel.com,
	alejandro.lucero@netronome.com
Cc: dgilbert@redhat.com, stable@dpdk.org,
	Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-dev] [PATCH v4 16/19] vhost: add support to postcopy's end request
Date: Mon,  8 Oct 2018 17:25:54 +0200	[thread overview]
Message-ID: <20181008152557.14275-17-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20181008152557.14275-1-maxime.coquelin@redhat.com>

The master sends this message before stopping handling
userfaults, so that the backend closes the userfaultfd.

The master waits for the slave to acknowledge the request
with an empty 64bits payload for synchronization purpose.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/librte_vhost/vhost_user.c | 21 +++++++++++++++++++++
 lib/librte_vhost/vhost_user.h |  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 75e555515..7c588ad54 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -77,6 +77,7 @@ static const char *vhost_message_str[VHOST_USER_MAX] = {
 	[VHOST_USER_CRYPTO_CLOSE_SESS] = "VHOST_USER_CRYPTO_CLOSE_SESS",
 	[VHOST_USER_POSTCOPY_ADVISE]  = "VHOST_USER_POSTCOPY_ADVISE",
 	[VHOST_USER_POSTCOPY_LISTEN]  = "VHOST_USER_POSTCOPY_LISTEN",
+	[VHOST_USER_POSTCOPY_END]  = "VHOST_USER_POSTCOPY_END",
 };
 
 /* The possible results of a message handling function */
@@ -1645,6 +1646,25 @@ vhost_user_set_postcopy_listen(struct virtio_net **pdev,
 	return VH_RESULT_OK;
 }
 
+static int
+vhost_user_postcopy_end(struct virtio_net **pdev, struct VhostUserMsg *msg,
+			int main_fd __rte_unused)
+{
+	struct virtio_net *dev = *pdev;
+
+	dev->postcopy_listening = 0;
+	if (dev->postcopy_ufd >= 0) {
+		close(dev->postcopy_ufd);
+		dev->postcopy_ufd = -1;
+	}
+
+	msg->payload.u64 = 0;
+	msg->size = sizeof(msg->payload.u64);
+	msg->fd_num = 0;
+
+	return VH_RESULT_REPLY;
+}
+
 typedef int (*vhost_message_handler_t)(struct virtio_net **pdev,
 					struct VhostUserMsg *msg,
 					int main_fd);
@@ -1674,6 +1694,7 @@ static vhost_message_handler_t vhost_message_handlers[VHOST_USER_MAX] = {
 	[VHOST_USER_IOTLB_MSG] = vhost_user_iotlb_msg,
 	[VHOST_USER_POSTCOPY_ADVISE] = vhost_user_set_postcopy_advise,
 	[VHOST_USER_POSTCOPY_LISTEN] = vhost_user_set_postcopy_listen,
+	[VHOST_USER_POSTCOPY_END] = vhost_user_postcopy_end,
 };
 
 
diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
index 55d8659ba..73b1fe2b9 100644
--- a/lib/librte_vhost/vhost_user.h
+++ b/lib/librte_vhost/vhost_user.h
@@ -52,7 +52,8 @@ typedef enum VhostUserRequest {
 	VHOST_USER_CRYPTO_CLOSE_SESS = 27,
 	VHOST_USER_POSTCOPY_ADVISE = 28,
 	VHOST_USER_POSTCOPY_LISTEN = 29,
-	VHOST_USER_MAX = 30
+	VHOST_USER_POSTCOPY_END = 30,
+	VHOST_USER_MAX = 31
 } VhostUserRequest;
 
 typedef enum VhostUserSlaveRequest {
-- 
2.17.1

  parent reply	other threads:[~2018-10-08 15:27 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-08 15:25 [dpdk-dev] [PATCH v4 00/19] vhost: add postcopy live-migration support Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 01/19] vhost: fix messages error checks Maxime Coquelin
2018-10-09  8:03   ` Tiwei Bie
2018-10-09 12:20     ` Maxime Coquelin
2018-10-09 12:54       ` Tiwei Bie
2018-10-09 17:53         ` Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 02/19] vhost: fix return code of messages requiring replies Maxime Coquelin
2018-10-09  8:05   ` Tiwei Bie
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 03/19] vhost: clarify reply-ack in case a reply was already sent Maxime Coquelin
2018-10-09  8:12   ` Tiwei Bie
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 04/19] vhost: fix payload size of reply Maxime Coquelin
2018-10-09 10:21   ` Tiwei Bie
2018-10-09 10:30     ` Maxime Coquelin
2018-10-09 10:34       ` Maxime Coquelin
2018-10-09 11:02         ` Tiwei Bie
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 05/19] vhost: fix error handling when mem table gets updated Maxime Coquelin
2018-10-09 11:35   ` Tiwei Bie
2018-10-09 11:47     ` Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 06/19] vhost: define postcopy protocol flag Maxime Coquelin
2018-10-09 11:41   ` Tiwei Bie
2018-10-09 11:47     ` Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 07/19] vhost: add number of fds to vhost-user messages and use it Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 08/19] vhost: pass socket fd to message handling callbacks Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 09/19] vhost: enable fds passing when sending vhost-user messages Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 10/19] vhost: add config flag for postcopy feature Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 11/19] vhost: introduce postcopy's advise message Maxime Coquelin
2018-10-08 16:22   ` Ilya Maximets
2018-10-09  7:59     ` Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 12/19] vhost: add support for postcopy's listen message Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 13/19] vhost: register new regions with userfaultfd Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 14/19] vhost: avoid useless VhostUserMemory copy Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 15/19] vhost: send userfault range addresses back to qemu Maxime Coquelin
2018-10-08 15:25 ` Maxime Coquelin [this message]
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 17/19] vhost: enable postcopy protocol feature Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 18/19] vhost: add flag to enable postcopy live-migration Maxime Coquelin
2018-10-08 15:25 ` [dpdk-dev] [PATCH v4 19/19] net/vhost: add parameter to enable postcopy support Maxime Coquelin

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=20181008152557.14275-17-maxime.coquelin@redhat.com \
    --to=maxime.coquelin@redhat.com \
    --cc=alejandro.lucero@netronome.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=dgilbert@redhat.com \
    --cc=i.maximets@samsung.com \
    --cc=jfreimann@redhat.com \
    --cc=nicknickolaev@gmail.com \
    --cc=stable@dpdk.org \
    --cc=tiwei.bie@intel.com \
    --cc=zhihong.wang@intel.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).