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 v5 15/19] vhost: send userfault range addresses back to qemu
Date: Tue,  9 Oct 2018 22:54:22 +0200	[thread overview]
Message-ID: <20181009205426.21219-16-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20181009205426.21219-1-maxime.coquelin@redhat.com>

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 | 49 ++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 96290fdb4..170d258c4 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -79,6 +79,11 @@ static const char *vhost_message_str[VHOST_USER_MAX] = {
 	[VHOST_USER_POSTCOPY_LISTEN]  = "VHOST_USER_POSTCOPY_LISTEN",
 };
 
+static int
+send_vhost_reply(int sockfd, struct VhostUserMsg *msg);
+static int
+read_vhost_message(int sockfd, struct VhostUserMsg *msg);
+
 static uint64_t
 get_blk_size(int fd)
 {
@@ -823,7 +828,7 @@ vhost_memory_changed(struct VhostUserMemory *new,
 
 static int
 vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
-			int main_fd __rte_unused)
+			int main_fd)
 {
 	struct virtio_net *dev = *pdev;
 	struct VhostUserMemory *memory = &msg->payload.memory;
@@ -967,11 +972,49 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			mmap_offset);
 
 		if (dev->postcopy_listening) {
+			/*
+			 * We haven't a better way right now than sharing
+			 * DPDK's virtual address with Qemu, so that Qemu can
+			 * retrieve the region offset when handling userfaults.
+			 */
+			memory->regions[i].userspace_addr =
+				reg->host_user_addr;
+		}
+	}
+	if (dev->postcopy_listening) {
+		/* Send the addresses back to qemu */
+		msg->fd_num = 0;
+		send_vhost_reply(main_fd, msg);
+
+		/* Wait for qemu to acknolwedge it's got the addresses
+		 * we've got to wait before we're allowed to generate faults.
+		 */
+		VhostUserMsg ack_msg;
+		if (read_vhost_message(main_fd, &ack_msg) <= 0) {
+			RTE_LOG(ERR, VHOST_CONFIG,
+					"Failed to read qemu ack on postcopy set-mem-table\n");
+			goto err_mmap;
+		}
+		if (ack_msg.request.master != VHOST_USER_SET_MEM_TABLE) {
+			RTE_LOG(ERR, VHOST_CONFIG,
+					"Bad qemu ack on postcopy set-mem-table (%d)\n",
+					ack_msg.request.master);
+			goto err_mmap;
+		}
+
+		/* Now userfault register and we can use the memory */
+		for (i = 0; i < memory->nregions; i++) {
 #ifdef RTE_LIBRTE_VHOST_POSTCOPY
+			reg = &dev->mem->regions[i];
 			struct uffdio_register reg_struct;
 
-			reg_struct.range.start = (uint64_t)(uintptr_t)mmap_addr;
-			reg_struct.range.len = mmap_size;
+			/*
+			 * Let's register all the mmap'ed area to ensure
+			 * alignment on page boundary.
+			 */
+			reg_struct.range.start =
+				(uint64_t)(uintptr_t)reg->mmap_addr;
+			reg_struct.range.len = reg->mmap_size;
 			reg_struct.mode = UFFDIO_REGISTER_MODE_MISSING;
 
 			if (ioctl(dev->postcopy_ufd, UFFDIO_REGISTER,
-- 
2.17.1

  parent reply	other threads:[~2018-10-09 20:56 UTC|newest]

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