patches for DPDK stable branches
 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-stable] [PATCH v2 11/17] vhost: register new regions with userfaultfd
Date: Tue,  2 Oct 2018 11:36:45 +0200	[thread overview]
Message-ID: <20181002093651.24795-12-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20181002093651.24795-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 | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index bd468ca12..2f681d291 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -968,6 +968,32 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			mmap_size,
 			alignment,
 			mmap_offset);
+
+		if (dev->postcopy_listening) {
+#ifdef RTE_LIBRTE_VHOST_POSTCOPY
+			struct uffdio_register reg_struct;
+
+			reg_struct.range.start = (uint64_t)(uintptr_t)mmap_addr;
+			reg_struct.range.len = mmap_size;
+			reg_struct.mode = UFFDIO_REGISTER_MODE_MISSING;
+
+			if (ioctl(dev->postcopy_ufd, UFFDIO_REGISTER,
+						&reg_struct)) {
+				RTE_LOG(ERR, VHOST_CONFIG,
+						"Failed to register ufd for region %d: (ufd = %d) %s\n",
+						i, dev->postcopy_ufd,
+						strerror(errno));
+				goto err_ufd;
+			}
+			RTE_LOG(INFO, VHOST_CONFIG,
+					"\t userfaultfd registered for range : %llx - %llx\n",
+					reg_struct.range.start,
+					reg_struct.range.start +
+					reg_struct.range.len - 1);
+#else
+			goto err_ufd;
+#endif
+		}
 	}
 
 	for (i = 0; i < dev->nr_vring; i++) {
@@ -983,7 +1009,7 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 
 			dev = translate_ring_addresses(dev, i);
 			if (!dev)
-				goto err_mmap;
+				goto err_ufd;
 
 
 			*pdev = dev;
@@ -994,6 +1020,11 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 
 	return VH_RESULT_OK;
 
+err_ufd:
+	if (dev->postcopy_ufd >= 0) {
+		close(dev->postcopy_ufd);
+		dev->postcopy_ufd = -1;
+	}
 err_mmap:
 	free_mem_region(dev);
 	rte_free(dev->mem);
-- 
2.17.1

  parent reply	other threads:[~2018-10-02  9:38 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 ` [dpdk-stable] [PATCH v2 09/17] vhost: introduce postcopy's advise message Maxime Coquelin
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 ` Maxime Coquelin [this message]
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-12-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).