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-stable] [PATCH v2 09/17] vhost: introduce postcopy's advise message
Date: Tue, 2 Oct 2018 11:36:43 +0200 [thread overview]
Message-ID: <20181002093651.24795-10-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20181002093651.24795-1-maxime.coquelin@redhat.com>
This patch opens a userfaultfd and sends it back to Qemu's
VHOST_USER_POSTCOPY_ADVISE request.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/librte_vhost/vhost.h | 2 ++
lib/librte_vhost/vhost_user.c | 44 +++++++++++++++++++++++++++++++++++
lib/librte_vhost/vhost_user.h | 3 ++-
3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 25ffd7614..21722d8a8 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -363,6 +363,8 @@ struct virtio_net {
int slave_req_fd;
rte_spinlock_t slave_req_lock;
+ int postcopy_ufd;
+
/*
* Device id to identify a specific backend device.
* It's set to -1 for the default software implementation.
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 436ab7bf5..71721edc7 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -24,13 +24,19 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/syscall.h>
#include <assert.h>
#ifdef RTE_LIBRTE_VHOST_NUMA
#include <numaif.h>
#endif
+#ifdef RTE_LIBRTE_VHOST_POSTCOPY
+#include <linux/userfaultfd.h>
+#endif
#include <rte_common.h>
#include <rte_malloc.h>
@@ -69,6 +75,7 @@ static const char *vhost_message_str[VHOST_USER_MAX] = {
[VHOST_USER_IOTLB_MSG] = "VHOST_USER_IOTLB_MSG",
[VHOST_USER_CRYPTO_CREATE_SESS] = "VHOST_USER_CRYPTO_CREATE_SESS",
[VHOST_USER_CRYPTO_CLOSE_SESS] = "VHOST_USER_CRYPTO_CLOSE_SESS",
+ [VHOST_USER_POSTCOPY_ADVISE] = "VHOST_USER_POSTCOPY_ADVISE",
};
/* The possible results of a message handling function */
@@ -1505,6 +1512,42 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,
return VH_RESULT_OK;
}
+static int
+vhost_user_set_postcopy_advise(struct virtio_net **pdev,
+ struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
+{
+ struct virtio_net *dev = *pdev;
+#ifdef RTE_LIBRTE_VHOST_POSTCOPY
+ struct uffdio_api api_struct;
+
+ dev->postcopy_ufd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);
+
+ if (dev->postcopy_ufd == -1) {
+ RTE_LOG(ERR, VHOST_CONFIG, "Userfaultfd not available: %s\n",
+ strerror(errno));
+ return VH_RESULT_ERR;
+ }
+ api_struct.api = UFFD_API;
+ api_struct.features = 0;
+ if (ioctl(dev->postcopy_ufd, UFFDIO_API, &api_struct)) {
+ RTE_LOG(ERR, VHOST_CONFIG, "UFFDIO_API ioctl failure: %s\n",
+ strerror(errno));
+ close(dev->postcopy_ufd);
+ return VH_RESULT_ERR;
+ }
+ msg->fds[0] = dev->postcopy_ufd;
+ msg->fd_num = 1;
+
+ return VH_RESULT_REPLY;
+#else
+ dev->postcopy_ufd = -1;
+ msg->fd_num = 0;
+
+ return VH_RESULT_ERR;
+#endif
+}
+
typedef int (*vhost_message_handler_t)(struct virtio_net **pdev,
struct VhostUserMsg *msg,
int main_fd);
@@ -1532,6 +1575,7 @@ static vhost_message_handler_t vhost_message_handlers[VHOST_USER_MAX] = {
[VHOST_USER_NET_SET_MTU] = vhost_user_net_set_mtu,
[VHOST_USER_SET_SLAVE_REQ_FD] = vhost_user_set_req_fd,
[VHOST_USER_IOTLB_MSG] = vhost_user_iotlb_msg,
+ [VHOST_USER_POSTCOPY_ADVISE] = vhost_user_set_postcopy_advise,
};
diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
index dd0262f8f..2030b40a5 100644
--- a/lib/librte_vhost/vhost_user.h
+++ b/lib/librte_vhost/vhost_user.h
@@ -50,7 +50,8 @@ typedef enum VhostUserRequest {
VHOST_USER_IOTLB_MSG = 22,
VHOST_USER_CRYPTO_CREATE_SESS = 26,
VHOST_USER_CRYPTO_CLOSE_SESS = 27,
- VHOST_USER_MAX = 28
+ VHOST_USER_POSTCOPY_ADVISE = 28,
+ VHOST_USER_MAX = 29
} VhostUserRequest;
typedef enum VhostUserSlaveRequest {
--
2.17.1
next prev parent reply other threads:[~2018-10-02 9:37 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 9:36 [dpdk-stable] [PATCH v2 00/17] vhost: add postcopy live-migration support Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 01/17] vhost: fix messages error checks Maxime Coquelin
2018-10-02 14:15 ` Ilya Maximets
2018-10-03 7:50 ` Maxime Coquelin
2018-10-03 7:57 ` Ilya Maximets
2018-10-03 8:02 ` Maxime Coquelin
2018-10-03 8:32 ` Ilya Maximets
2018-10-03 9:07 ` Ilya Maximets
2018-10-03 14:39 ` Maxime Coquelin
2018-10-04 5:42 ` Ilya Maximets
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 02/17] vhost: fix return code of messages requiring replies Maxime Coquelin
2018-10-03 13:26 ` Ilya Maximets
2018-10-03 14:49 ` Maxime Coquelin
2018-10-04 5:49 ` Ilya Maximets
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 03/17] vhost: fix error handling when mem table gets updated Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 04/17] vhost: define postcopy protocol flag Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 05/17] vhost: add number of fds to vhost-user messages and use it Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 06/17] vhost: pass socket fd to message handling callbacks Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 07/17] vhost: enable fds passing when sending vhost-user messages Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 08/17] vhost: add config flag for postcopy feature Maxime Coquelin
2018-10-02 9:36 ` Maxime Coquelin [this message]
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 10/17] vhost: add support for postcopy's listen message Maxime Coquelin
2018-10-02 14:11 ` Ilya Maximets
2018-10-03 7:46 ` Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 11/17] vhost: register new regions with userfaultfd Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 12/17] vhost: avoid useless VhostUserMemory copy Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 13/17] vhost: send userfault range addresses back to qemu Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 14/17] vhost: add support to postcopy's end request Maxime Coquelin
2018-10-02 14:18 ` Ilya Maximets
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 15/17] vhost: enable postcopy protocol feature Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 16/17] vhost: add flag to enable postcopy live-migration Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 17/17] 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=20181002093651.24795-10-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).