DPDK patches and discussions
 help / color / mirror / Atom feed
From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, chenbo.xia@intel.com, xuan.ding@intel.com
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-dev] [PATCH 21.02 2/3] vhost: refactor postcopy registration
Date: Mon, 16 Nov 2020 12:36:19 +0100
Message-ID: <20201116113620.587073-3-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20201116113620.587073-1-maxime.coquelin@redhat.com>

This patch moves the registration of postcopy to a
dedicated function, with the goal of simplifying
VHOST_USER_SET_MEM_TABLE request handling function.

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/librte_vhost/vhost_user.c | 98 +++++++++++++++++++++--------------
 1 file changed, 58 insertions(+), 40 deletions(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index b8a9e41a2d..2ee22ef76d 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1041,6 +1041,62 @@ vhost_user_postcopy_region_register(struct virtio_net *dev,
 }
 #endif
 
+static int
+vhost_user_postcopy_register(struct virtio_net *dev, int main_fd,
+		struct VhostUserMsg *msg)
+{
+	struct VhostUserMemory *memory;
+	struct rte_vhost_mem_region *reg;
+	VhostUserMsg ack_msg;
+	uint32_t i;
+
+	if (!dev->postcopy_listening)
+		return 0;
+
+	/*
+	 * 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 = &msg->payload.memory;
+	for (i = 0; i < memory->nregions; i++) {
+		reg = &dev->mem->regions[i];
+		memory->regions[i].userspace_addr = reg->host_user_addr;
+	}
+
+	/* 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.
+	 */
+	if (read_vhost_message(main_fd, &ack_msg) <= 0) {
+		VHOST_LOG_CONFIG(ERR,
+				"Failed to read qemu ack on postcopy set-mem-table\n");
+		return -1;
+	}
+
+	if (validate_msg_fds(&ack_msg, 0) != 0)
+		return -1;
+
+	if (ack_msg.request.master != VHOST_USER_SET_MEM_TABLE) {
+		VHOST_LOG_CONFIG(ERR,
+				"Bad qemu ack on postcopy set-mem-table (%d)\n",
+				ack_msg.request.master);
+		return -1;
+	}
+
+	/* Now userfault register and we can use the memory */
+	for (i = 0; i < memory->nregions; i++) {
+		reg = &dev->mem->regions[i];
+		if (vhost_user_postcopy_region_register(dev, reg) < 0)
+			return -1;
+	}
+
+	return 0;
+}
+
 static int
 vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			int main_fd)
@@ -1215,48 +1271,10 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			mmap_size,
 			alignment,
 			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) {
-			VHOST_LOG_CONFIG(ERR,
-				"Failed to read qemu ack on postcopy set-mem-table\n");
-			goto free_mem_table;
-		}
-
-		if (validate_msg_fds(&ack_msg, 0) != 0)
-			goto free_mem_table;
-
-		if (ack_msg.request.master != VHOST_USER_SET_MEM_TABLE) {
-			VHOST_LOG_CONFIG(ERR,
-				"Bad qemu ack on postcopy set-mem-table (%d)\n",
-				ack_msg.request.master);
-			goto free_mem_table;
-		}
 
-		/* Now userfault register and we can use the memory */
-		for (i = 0; i < memory->nregions; i++)
-			if (vhost_user_postcopy_region_register(dev,
-						&dev->mem->regions[i]) < 0)
-				goto free_mem_table;
-	}
+	if (vhost_user_postcopy_register(dev, main_fd, msg) < 0)
+		goto free_mem_table;
 
 	for (i = 0; i < dev->nr_vring; i++) {
 		struct vhost_virtqueue *vq = dev->virtqueue[i];
-- 
2.26.2


  parent reply	other threads:[~2020-11-16 11:37 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-16 11:36 [dpdk-dev] [PATCH 21.02 0/3] vhost: vhost_user_set_mem_table refactoring Maxime Coquelin
2020-11-16 11:36 ` [dpdk-dev] [PATCH 21.02 1/3] vhost: refactor postcopy region registration Maxime Coquelin
2020-12-09 14:16   ` Xia, Chenbo
2020-12-22 10:51     ` Maxime Coquelin
2020-11-16 11:36 ` Maxime Coquelin [this message]
2020-12-09 14:16   ` [dpdk-dev] [PATCH 21.02 2/3] vhost: refactor postcopy registration Xia, Chenbo
2020-11-16 11:36 ` [dpdk-dev] [PATCH 21.02 3/3] vhost: refactor memory regions mapping Maxime Coquelin
2020-12-09 14:16   ` Xia, Chenbo

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=20201116113620.587073-3-maxime.coquelin@redhat.com \
    --to=maxime.coquelin@redhat.com \
    --cc=chenbo.xia@intel.com \
    --cc=dev@dpdk.org \
    --cc=xuan.ding@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

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git