Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/45361/?format=api
https://patches.dpdk.org/api/patches/45361/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20180926072705.22641-9-maxime.coquelin@redhat.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20180926072705.22641-9-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180926072705.22641-9-maxime.coquelin@redhat.com", "date": "2018-09-26T07:27:01", "name": "[08/12] vhost: send userfault range addresses back to qemu", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b4b6874f097d9c01ce6b44dcaf3fd682ad0100d1", "submitter": { "id": 512, "url": "https://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "https://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20180926072705.22641-9-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 1510, "url": "https://patches.dpdk.org/api/series/1510/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=1510", "date": "2018-09-26T07:26:53", "name": "vhost: add postcopy live-migration support", "version": 1, "mbox": "https://patches.dpdk.org/series/1510/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/45361/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/45361/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 6C2741B143;\n\tWed, 26 Sep 2018 09:27:45 +0200 (CEST)", "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby dpdk.org (Postfix) with ESMTP id 77CFA1B144\n\tfor <dev@dpdk.org>; Wed, 26 Sep 2018 09:27:43 +0200 (CEST)", "from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id D396E1B7F;\n\tWed, 26 Sep 2018 07:27:42 +0000 (UTC)", "from localhost.localdomain (ovpn-112-32.ams2.redhat.com\n\t[10.36.112.32])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 6EE0B60BE1;\n\tWed, 26 Sep 2018 07:27:38 +0000 (UTC)" ], "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, tiwei.bie@intel.com, zhihong.wang@intel.com,\n\tjfreimann@redhat.com", "Cc": "dgilbert@redhat.com,\n\tMaxime Coquelin <maxime.coquelin@redhat.com>", "Date": "Wed, 26 Sep 2018 09:27:01 +0200", "Message-Id": "<20180926072705.22641-9-maxime.coquelin@redhat.com>", "In-Reply-To": "<20180926072705.22641-1-maxime.coquelin@redhat.com>", "References": "<20180926072705.22641-1-maxime.coquelin@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.12", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]); Wed, 26 Sep 2018 07:27:42 +0000 (UTC)", "Subject": "[dpdk-dev] [PATCH 08/12] vhost: send userfault range addresses back\n\tto qemu", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n lib/librte_vhost/vhost_user.c | 52 ++++++++++++++++++++++++++++++++---\n 1 file changed, 48 insertions(+), 4 deletions(-)", "diff": "diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c\nindex 37b5edcd7..766df7a58 100644\n--- a/lib/librte_vhost/vhost_user.c\n+++ b/lib/librte_vhost/vhost_user.c\n@@ -77,6 +77,11 @@ static const char *vhost_message_str[VHOST_USER_MAX] = {\n \t[VHOST_USER_POSTCOPY_LISTEN] = \"VHOST_USER_POSTCOPY_LISTEN\",\n };\n \n+static int\n+send_vhost_reply(int sockfd, struct VhostUserMsg *msg);\n+static int\n+read_vhost_message(int sockfd, struct VhostUserMsg *msg);\n+\n static uint64_t\n get_blk_size(int fd)\n {\n@@ -786,7 +791,8 @@ vhost_memory_changed(struct VhostUserMemory *new,\n }\n \n static int\n-vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *pmsg)\n+vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *pmsg,\n+\t\t\tint main_fd)\n {\n \tstruct virtio_net *dev = *pdev;\n \tstruct VhostUserMemory *memory = &pmsg->payload.memory;\n@@ -930,10 +936,48 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *pmsg)\n \t\t\tmmap_offset);\n \n \t\tif (dev->postcopy_listening) {\n+\t\t\t/*\n+\t\t\t * We haven't a better way right now than sharing\n+\t\t\t * DPDK's virtual address with Qemu, so that Qemu can\n+\t\t\t * retreive the region offset when handling userfaults.\n+\t\t\t */\n+\t\t\tmemory->regions[i].userspace_addr =\n+\t\t\t\treg->host_user_addr;\n+\t\t}\n+\t}\n+\tif (dev->postcopy_listening) {\n+\t\t/* Send the addresses back to qemu */\n+\t\tpmsg->fd_num = 0;\n+\t\tsend_vhost_reply(main_fd, pmsg);\n+\n+\t\t/* Wait for qemu to acknolwedge it's got the addresses\n+\t\t * we've got to wait before we're allowed to generate faults.\n+\t\t */\n+\t\tVhostUserMsg ack_msg;\n+\t\tif (read_vhost_message(main_fd, &ack_msg) <= 0) {\n+\t\t\tRTE_LOG(ERR, VHOST_CONFIG,\n+\t\t\t\t\t\"Failed to read qemu ack on postcopy set-mem-table\\n\");\n+\t\t\tgoto err_mmap;\n+\t\t}\n+\t\tif (ack_msg.request.master != VHOST_USER_SET_MEM_TABLE) {\n+\t\t\tRTE_LOG(ERR, VHOST_CONFIG,\n+\t\t\t\t\t\"Bad qemu ack on postcopy set-mem-table (%d)\\n\",\n+\t\t\t\t\tack_msg.request.master);\n+\t\t\tgoto err_mmap;\n+\t\t}\n+\n+\t\t/* Now userfault register and we can use the memory */\n+\t\tfor (i = 0; i < memory->nregions; i++) {\n+\t\t\treg = &dev->mem->regions[i];\n \t\t\tstruct uffdio_register reg_struct;\n \n-\t\t\treg_struct.range.start = (uint64_t)(uintptr_t)mmap_addr;\n-\t\t\treg_struct.range.len = mmap_size;\n+\t\t\t/*\n+\t\t\t * Let's register all the mmap'ed area to ensure\n+\t\t\t * alignement on page boundary.\n+\t\t\t */\n+\t\t\treg_struct.range.start =\n+\t\t\t\t(uint64_t)(uintptr_t)reg->mmap_addr;\n+\t\t\treg_struct.range.len = reg->mmap_size;\n \t\t\treg_struct.mode = UFFDIO_REGISTER_MODE_MISSING;\n \n \t\t\tif (ioctl(dev->postcopy_ufd, UFFDIO_REGISTER,\n@@ -1750,7 +1794,7 @@ vhost_user_msg_handler(int vid, int fd)\n \t\tbreak;\n \n \tcase VHOST_USER_SET_MEM_TABLE:\n-\t\tret = vhost_user_set_mem_table(&dev, &msg);\n+\t\tret = vhost_user_set_mem_table(&dev, &msg, fd);\n \t\tbreak;\n \n \tcase VHOST_USER_SET_LOG_BASE:\n", "prefixes": [ "08/12" ] }{ "id": 45361, "url": "