From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, tiwei.bie@intel.com, zhihong.wang@intel.com,
jfreimann@redhat.com
Cc: dgilbert@redhat.com, Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-dev] [RFC 08/10] vhost: send userfault range addresses back to qemu
Date: Thu, 23 Aug 2018 18:51:55 +0200 [thread overview]
Message-ID: <20180823165157.30001-9-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20180823165157.30001-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 | 48 ++++++++++++++++++++++++++++++++---
1 file changed, 44 insertions(+), 4 deletions(-)
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 0861feff1..29e3e2a07 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -77,6 +77,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)
{
@@ -784,7 +789,8 @@ vhost_memory_changed(struct VhostUserMemory *new,
}
static int
-vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *pmsg)
+vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *pmsg,
+ int main_fd)
{
struct virtio_net *dev = *pdev;
struct VhostUserMemory *memory = &pmsg->payload.memory;
@@ -928,10 +934,44 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *pmsg)
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
+ * retreive the region offset when handling userfaults.
+ */
+ memory->regions[i].userspace_addr =
+ (uint64_t)(uintptr_t)mmap_addr;
+ }
+ }
+ if (dev->postcopy_listening) {
+ /* Send the addresses back to qemu */
+ pmsg->fd_num = 0;
+ send_vhost_reply(main_fd, pmsg);
+
+ /* 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++) {
+ 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;
+ 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,
@@ -1744,7 +1784,7 @@ vhost_user_msg_handler(int vid, int fd)
break;
case VHOST_USER_SET_MEM_TABLE:
- ret = vhost_user_set_mem_table(&dev, &msg);
+ ret = vhost_user_set_mem_table(&dev, &msg, fd);
break;
case VHOST_USER_SET_LOG_BASE:
--
2.17.1
next prev parent reply other threads:[~2018-08-23 16:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-23 16:51 [dpdk-dev] [RFC 00/10] vhost: add postcopy live-migration support Maxime Coquelin
2018-08-23 16:51 ` [dpdk-dev] [RFC 01/10] vhost: define postcopy protocol flag Maxime Coquelin
2018-08-23 16:51 ` [dpdk-dev] [RFC 02/10] vhost: add number of fds to vhost-user messages and use it Maxime Coquelin
2018-08-23 16:51 ` [dpdk-dev] [RFC 03/10] vhost: enable fds passing when sending vhost-user messages Maxime Coquelin
2018-08-23 16:51 ` [dpdk-dev] [RFC 04/10] vhost: introduce postcopy's advise message Maxime Coquelin
2018-08-23 16:51 ` [dpdk-dev] [RFC 05/10] vhost: add support for postcopy's listen message Maxime Coquelin
2018-08-23 16:51 ` [dpdk-dev] [RFC 06/10] vhost: register new regions with userfaultfd Maxime Coquelin
2018-08-23 16:51 ` [dpdk-dev] [RFC 07/10] vhost: avoid useless VhostUserMemory copy Maxime Coquelin
2018-08-23 16:51 ` Maxime Coquelin [this message]
2018-08-23 16:51 ` [dpdk-dev] [RFC 09/10] vhost: add support to postcopy's end request Maxime Coquelin
2018-08-23 16:51 ` [dpdk-dev] [RFC 10/10] 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=20180823165157.30001-9-maxime.coquelin@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=dev@dpdk.org \
--cc=dgilbert@redhat.com \
--cc=jfreimann@redhat.com \
--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).