qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, mst@redhat.com,
	maxime.coquelin@redhat.com, marcandre.lureau@redhat.com,
	peterx@redhat.com, quintela@redhat.com
Cc: aarcange@redhat.com
Subject: [Qemu-devel] [PATCH v6 28/29] libvhost-user: Claim support for postcopy
Date: Wed, 14 Mar 2018 11:56:17 +0000	[thread overview]
Message-ID: <20180314115618.28831-29-dgilbert@redhat.com> (raw)
In-Reply-To: <20180314115618.28831-1-dgilbert@redhat.com>

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Tell QEMU we understand the protocol features needed for postcopy.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 contrib/libvhost-user/libvhost-user.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c
index 504ff5ea59..beeed0c43f 100644
--- a/contrib/libvhost-user/libvhost-user.c
+++ b/contrib/libvhost-user/libvhost-user.c
@@ -185,6 +185,35 @@ vmsg_close_fds(VhostUserMsg *vmsg)
     }
 }
 
+/* A test to see if we have userfault available */
+static bool
+have_userfault(void)
+{
+#if defined(__linux__) && defined(__NR_userfaultfd) &&\
+        defined(UFFD_FEATURE_MISSING_SHMEM) &&\
+        defined(UFFD_FEATURE_MISSING_HUGETLBFS)
+    /* Now test the kernel we're running on really has the features */
+    int ufd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);
+    struct uffdio_api api_struct;
+    if (ufd < 0) {
+        return false;
+    }
+
+    api_struct.api = UFFD_API;
+    api_struct.features = UFFD_FEATURE_MISSING_SHMEM |
+                          UFFD_FEATURE_MISSING_HUGETLBFS;
+    if (ioctl(ufd, UFFDIO_API, &api_struct)) {
+        close(ufd);
+        return false;
+    }
+    close(ufd);
+    return true;
+
+#else
+    return false;
+#endif
+}
+
 static bool
 vu_message_read(VuDev *dev, int conn_fd, VhostUserMsg *vmsg)
 {
@@ -939,6 +968,10 @@ vu_get_protocol_features_exec(VuDev *dev, VhostUserMsg *vmsg)
     uint64_t features = 1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD |
                         1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ;
 
+    if (have_userfault()) {
+        features |= 1ULL << VHOST_USER_PROTOCOL_F_PAGEFAULT;
+    }
+
     if (dev->iface->get_protocol_features) {
         features |= dev->iface->get_protocol_features(dev);
     }
-- 
2.14.3

  parent reply	other threads:[~2018-03-14 11:57 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-14 11:55 [Qemu-devel] [PATCH v6 00/29] postcopy+vhost-user/shared ram Dr. David Alan Gilbert (git)
2018-03-14 11:55 ` [Qemu-devel] [PATCH v6 01/29] migrate: Update ram_block_discard_range for shared Dr. David Alan Gilbert (git)
2018-03-14 11:55 ` [Qemu-devel] [PATCH v6 02/29] qemu_ram_block_host_offset Dr. David Alan Gilbert (git)
2018-03-14 11:55 ` [Qemu-devel] [PATCH v6 03/29] postcopy: use UFFDIO_ZEROPAGE only when available Dr. David Alan Gilbert (git)
2018-03-14 11:55 ` [Qemu-devel] [PATCH v6 04/29] postcopy: Add notifier chain Dr. David Alan Gilbert (git)
2018-03-14 11:55 ` [Qemu-devel] [PATCH v6 05/29] postcopy: Add vhost-user flag for postcopy and check it Dr. David Alan Gilbert (git)
2018-03-14 11:55 ` [Qemu-devel] [PATCH v6 06/29] vhost-user: Add 'VHOST_USER_POSTCOPY_ADVISE' message Dr. David Alan Gilbert (git)
2018-03-14 11:55 ` [Qemu-devel] [PATCH v6 07/29] libvhost-user: Support sending fds back to qemu Dr. David Alan Gilbert (git)
2018-03-14 11:55 ` [Qemu-devel] [PATCH v6 08/29] libvhost-user: Open userfaultfd Dr. David Alan Gilbert (git)
2018-03-14 11:55 ` [Qemu-devel] [PATCH v6 09/29] postcopy: Allow registering of fd handler Dr. David Alan Gilbert (git)
2018-03-14 11:55 ` [Qemu-devel] [PATCH v6 10/29] vhost+postcopy: Register shared ufd with postcopy Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 11/29] vhost+postcopy: Transmit 'listen' to slave Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 12/29] postcopy+vhost-user: Split set_mem_table for postcopy Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 13/29] migration/ram: ramblock_recv_bitmap_test_byte_offset Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 14/29] libvhost-user+postcopy: Register new regions with the ufd Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 15/29] vhost+postcopy: Send address back to qemu Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 16/29] vhost+postcopy: Stash RAMBlock and offset Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 17/29] vhost+postcopy: Helper to send requests to source for shared pages Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 18/29] vhost+postcopy: Resolve client address Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 19/29] postcopy: helper for waking shared Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 20/29] postcopy: postcopy_notify_shared_wake Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 21/29] vhost+postcopy: Add vhost waker Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 22/29] vhost+postcopy: Call wakeups Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 23/29] libvhost-user: mprotect & madvises for postcopy Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 24/29] vhost-user: Add VHOST_USER_POSTCOPY_END message Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 25/29] vhost+postcopy: Wire up POSTCOPY_END notify Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 26/29] vhost: Huge page align and merge Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 27/29] postcopy: Allow shared memory Dr. David Alan Gilbert (git)
2018-03-14 11:56 ` Dr. David Alan Gilbert (git) [this message]
2018-03-14 11:56 ` [Qemu-devel] [PATCH v6 29/29] postcopy shared docs Dr. David Alan Gilbert (git)

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=20180314115618.28831-29-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=aarcange@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=maxime.coquelin@redhat.com \
    --cc=mst@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@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.
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).