Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 60676,
    "url": "http://patches.dpdk.org/api/patches/60676/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191008153341.22228-6-jin.yu@intel.com/",
    "project": {
        "id": 1,
        "url": "http://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": "<20191008153341.22228-6-jin.yu@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20191008153341.22228-6-jin.yu@intel.com",
    "date": "2019-10-08T15:33:36",
    "name": "[v9,05/10] vhost: checkout the resubmit inflight information",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "d168898e856bf45987a7e1c967e0d0774ccf88ae",
    "submitter": {
        "id": 1265,
        "url": "http://patches.dpdk.org/api/people/1265/?format=api",
        "name": "Jin Yu",
        "email": "jin.yu@intel.com"
    },
    "delegate": {
        "id": 2642,
        "url": "http://patches.dpdk.org/api/users/2642/?format=api",
        "username": "mcoquelin",
        "first_name": "Maxime",
        "last_name": "Coquelin",
        "email": "maxime.coquelin@redhat.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20191008153341.22228-6-jin.yu@intel.com/mbox/",
    "series": [
        {
            "id": 6735,
            "url": "http://patches.dpdk.org/api/series/6735/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6735",
            "date": "2019-10-08T15:33:31",
            "name": "vhost: support inflight share memory protocol feature",
            "version": 9,
            "mbox": "http://patches.dpdk.org/series/6735/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/60676/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/60676/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 E99FA1C19B;\n\tTue,  8 Oct 2019 09:51:10 +0200 (CEST)",
            "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id 5D4D71C037\n\tfor <dev@dpdk.org>; Tue,  8 Oct 2019 09:51:07 +0200 (CEST)",
            "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t08 Oct 2019 00:51:07 -0700",
            "from storage36.sh.intel.com ([10.67.110.177])\n\tby orsmga006.jf.intel.com with ESMTP; 08 Oct 2019 00:51:04 -0700"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.67,270,1566889200\"; d=\"scan'208\";a=\"197625993\"",
        "From": "Jin Yu <jin.yu@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "changpeng.liu@intel.com, maxime.coquelin@redhat.com, tiwei.bie@intel.com,\n\tzhihong.wang@intel.com, Jin Yu <jin.yu@intel.com>,\n\tLin Li <lilin24@baidu.com>, Xun Ni <nixun@baidu.com>,\n\tYu Zhang <zhangyu31@baidu.com>",
        "Date": "Tue,  8 Oct 2019 23:33:36 +0800",
        "Message-Id": "<20191008153341.22228-6-jin.yu@intel.com>",
        "X-Mailer": "git-send-email 2.17.2",
        "In-Reply-To": "<20191008153341.22228-1-jin.yu@intel.com>",
        "References": "<20190927105624.16313> <20191008153341.22228-1-jin.yu@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v9 05/10] vhost: checkout the resubmit inflight\n\tinformation",
        "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": "This patch shows how to checkout the inflight ring and construct\nthe resubmit information also include destroying resubmit info.\n\nSigned-off-by: Lin Li <lilin24@baidu.com>\nSigned-off-by: Xun Ni <nixun@baidu.com>\nSigned-off-by: Yu Zhang <zhangyu31@baidu.com>\nSigned-off-by: Jin Yu <jin.yu@intel.com>\n---\n lib/librte_vhost/rte_vhost.h  |  19 +++\n lib/librte_vhost/vhost.c      |  29 ++++-\n lib/librte_vhost/vhost.h      |   9 ++\n lib/librte_vhost/vhost_user.c | 217 +++++++++++++++++++++++++++++++++-\n 4 files changed, 272 insertions(+), 2 deletions(-)",
    "diff": "diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h\nindex 644b3e0d7..6ac738730 100644\n--- a/lib/librte_vhost/rte_vhost.h\n+++ b/lib/librte_vhost/rte_vhost.h\n@@ -145,6 +145,25 @@ struct rte_vhost_inflight_info_packed {\n \tstruct rte_vhost_inflight_desc_packed desc[0];\n };\n \n+struct rte_vhost_resubmit_desc {\n+\tuint16_t index;\n+\tuint64_t counter;\n+};\n+\n+struct rte_vhost_resubmit_info {\n+\tstruct rte_vhost_resubmit_desc *resubmit_list;\n+\tuint16_t resubmit_num;\n+};\n+\n+struct rte_vhost_ring_inflight {\n+\tunion {\n+\t\tstruct rte_vhost_inflight_info_split *inflight_split;\n+\t\tstruct rte_vhost_inflight_info_packed *inflight_packed;\n+\t};\n+\n+\tstruct rte_vhost_resubmit_info *resubmit_inflight;\n+};\n+\n struct rte_vhost_vring {\n \tunion {\n \t\tstruct vring_desc *desc;\ndiff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c\nindex 981837b5d..660ac2a07 100644\n--- a/lib/librte_vhost/vhost.c\n+++ b/lib/librte_vhost/vhost.c\n@@ -242,6 +242,31 @@ cleanup_vq(struct vhost_virtqueue *vq, int destroy)\n \t\tclose(vq->kickfd);\n }\n \n+void\n+cleanup_vq_inflight(struct virtio_net *dev, struct vhost_virtqueue *vq)\n+{\n+\tif (!(dev->protocol_features &\n+\t\t(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))\n+\t\treturn;\n+\n+\tif (vq_is_packed(dev)) {\n+\t\tif (vq->inflight_packed)\n+\t\t\tvq->inflight_packed = NULL;\n+\t} else {\n+\t\tif (vq->inflight_split)\n+\t\t\tvq->inflight_split = NULL;\n+\t}\n+\n+\tif (vq->resubmit_inflight) {\n+\t\tif (vq->resubmit_inflight->resubmit_list) {\n+\t\t\tfree(vq->resubmit_inflight->resubmit_list);\n+\t\t\tvq->resubmit_inflight->resubmit_list = NULL;\n+\t\t}\n+\t\tfree(vq->resubmit_inflight);\n+\t\tvq->resubmit_inflight = NULL;\n+\t}\n+}\n+\n /*\n  * Unmap any memory, close any file descriptors and\n  * free any memory owned by a device.\n@@ -253,8 +278,10 @@ cleanup_device(struct virtio_net *dev, int destroy)\n \n \tvhost_backend_cleanup(dev);\n \n-\tfor (i = 0; i < dev->nr_vring; i++)\n+\tfor (i = 0; i < dev->nr_vring; i++) {\n \t\tcleanup_vq(dev->virtqueue[i], destroy);\n+\t\tcleanup_vq_inflight(dev, dev->virtqueue[i]);\n+\t}\n }\n \n void\ndiff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h\nindex d67ba849a..ab95999c4 100644\n--- a/lib/librte_vhost/vhost.h\n+++ b/lib/librte_vhost/vhost.h\n@@ -128,6 +128,14 @@ struct vhost_virtqueue {\n \t/* Physical address of used ring, for logging */\n \tuint64_t\t\tlog_guest_addr;\n \n+\t/* inflight share memory info */\n+\tunion {\n+\t\tstruct rte_vhost_inflight_info_split *inflight_split;\n+\t\tstruct rte_vhost_inflight_info_packed *inflight_packed;\n+\t};\n+\tstruct rte_vhost_resubmit_info *resubmit_inflight;\n+\tuint64_t\t\tglobal_counter;\n+\n \tuint16_t\t\tnr_zmbuf;\n \tuint16_t\t\tzmbuf_size;\n \tuint16_t\t\tlast_zmbuf_idx;\n@@ -474,6 +482,7 @@ void vhost_destroy_device(int);\n void vhost_destroy_device_notify(struct virtio_net *dev);\n \n void cleanup_vq(struct vhost_virtqueue *vq, int destroy);\n+void cleanup_vq_inflight(struct virtio_net *dev, struct vhost_virtqueue *vq);\n void free_vq(struct virtio_net *dev, struct vhost_virtqueue *vq);\n \n int alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx);\ndiff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c\nindex 4d54ec6f0..cea67ce54 100644\n--- a/lib/librte_vhost/vhost_user.c\n+++ b/lib/librte_vhost/vhost_user.c\n@@ -334,6 +334,7 @@ vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg,\n \n \t\t\tdev->virtqueue[dev->nr_vring] = NULL;\n \t\t\tcleanup_vq(vq, 1);\n+\t\t\tcleanup_vq_inflight(dev, vq);\n \t\t\tfree_vq(dev, vq);\n \t\t}\n \t}\n@@ -1338,11 +1339,12 @@ static int\n vhost_user_set_inflight_fd(struct virtio_net **pdev, VhostUserMsg *msg,\n \t\tint main_fd __rte_unused)\n {\n-\tint fd;\n+\tint fd, i;\n \tuint64_t mmap_size, mmap_offset;\n \tuint16_t num_queues, queue_size;\n \tuint32_t pervq_inflight_size;\n \tvoid *addr;\n+\tstruct vhost_virtqueue *vq;\n \tstruct virtio_net *dev = *pdev;\n \n \tfd = msg->fds[0];\n@@ -1404,6 +1406,18 @@ vhost_user_set_inflight_fd(struct virtio_net **pdev, VhostUserMsg *msg,\n \tdev->inflight_info->addr = addr;\n \tdev->inflight_info->size = mmap_size;\n \n+\tfor (i = 0; i < num_queues; i++) {\n+\t\tvq = dev->virtqueue[i];\n+\t\tif (vq_is_packed(dev)) {\n+\t\t\tvq->inflight_packed = addr;\n+\t\t\tvq->inflight_packed->desc_num = queue_size;\n+\t\t} else {\n+\t\t\tvq->inflight_split = addr;\n+\t\t\tvq->inflight_split->desc_num = queue_size;\n+\t\t}\n+\t\taddr = (void *)((char *)addr + pervq_inflight_size);\n+\t}\n+\n \treturn RTE_VHOST_MSG_RESULT_OK;\n }\n \n@@ -1443,6 +1457,193 @@ static int vhost_user_set_vring_err(struct virtio_net **pdev __rte_unused,\n \treturn RTE_VHOST_MSG_RESULT_OK;\n }\n \n+static int\n+resubmit_desc_compare(const void *a, const void *b)\n+{\n+\tconst struct rte_vhost_resubmit_desc *desc0 =\n+\t\t(const struct rte_vhost_resubmit_desc *)a;\n+\tconst struct rte_vhost_resubmit_desc *desc1 =\n+\t\t(const struct rte_vhost_resubmit_desc *)b;\n+\n+\tif (desc1->counter > desc0->counter)\n+\t\treturn 1;\n+\n+\treturn -1;\n+}\n+\n+static int\n+vhost_check_queue_inflights_split(struct virtio_net *dev,\n+\tstruct vhost_virtqueue *vq)\n+{\n+\tuint16_t i = 0;\n+\tuint16_t resubmit_num = 0, last_io, num;\n+\tstruct vring_used *used = vq->used;\n+\tstruct rte_vhost_resubmit_info *resubmit = NULL;\n+\tstruct rte_vhost_inflight_info_split *inflight_split;\n+\n+\tif (!(dev->protocol_features &\n+\t\t(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))\n+\t\treturn RTE_VHOST_MSG_RESULT_OK;\n+\n+\tif ((!vq->inflight_split))\n+\t\treturn RTE_VHOST_MSG_RESULT_ERR;\n+\n+\tif (!vq->inflight_split->version) {\n+\t\tvq->inflight_split->version = INFLIGHT_VERSION;\n+\t\treturn RTE_VHOST_MSG_RESULT_OK;\n+\t}\n+\n+\tif (vq->resubmit_inflight)\n+\t\treturn RTE_VHOST_MSG_RESULT_OK;\n+\n+\tinflight_split = vq->inflight_split;\n+\tvq->global_counter = 0;\n+\tlast_io = inflight_split->last_inflight_io;\n+\n+\tif (inflight_split->used_idx != used->idx) {\n+\t\tinflight_split->desc[last_io].inflight = 0;\n+\t\trte_compiler_barrier();\n+\t\tinflight_split->used_idx = used->idx;\n+\t}\n+\n+\tfor (i = 0; i < inflight_split->desc_num; i++) {\n+\t\tif (inflight_split->desc[i].inflight == 1)\n+\t\t\tresubmit_num++;\n+\t}\n+\n+\tvq->last_avail_idx += resubmit_num;\n+\n+\tif (resubmit_num) {\n+\t\tresubmit  = calloc(1, sizeof(struct rte_vhost_resubmit_info));\n+\t\tif (!resubmit) {\n+\t\t\tRTE_LOG(ERR, VHOST_CONFIG,\n+\t\t\t \"Failed to allocate memory for resubmit info.\\n\");\n+\t\t\treturn RTE_VHOST_MSG_RESULT_ERR;\n+\t\t}\n+\n+\t\tresubmit->resubmit_list = calloc(resubmit_num,\n+\t\t\tsizeof(struct rte_vhost_resubmit_desc));\n+\t\tif (!resubmit->resubmit_list) {\n+\t\t\tRTE_LOG(ERR, VHOST_CONFIG,\n+\t\t\t \"Failed to allocate memory for inflight desc.\\n\");\n+\t\t\tfree(resubmit);\n+\t\t\treturn RTE_VHOST_MSG_RESULT_ERR;\n+\t\t}\n+\n+\t\tnum = 0;\n+\t\tfor (i = 0; i < vq->inflight_split->desc_num; i++) {\n+\t\t\tif (vq->inflight_split->desc[i].inflight == 1) {\n+\t\t\t\tresubmit->resubmit_list[num].index = i;\n+\t\t\t\tresubmit->resubmit_list[num].counter =\n+\t\t\t\t\tinflight_split->desc[i].counter;\n+\t\t\t\tnum++;\n+\t\t\t}\n+\t\t}\n+\t\tresubmit->resubmit_num = num;\n+\n+\t\tif (resubmit->resubmit_num > 1)\n+\t\t\tqsort(resubmit->resubmit_list, resubmit->resubmit_num,\n+\t\t\t\tsizeof(struct rte_vhost_resubmit_desc),\n+\t\t\t\tresubmit_desc_compare);\n+\n+\t\tvq->global_counter = resubmit->resubmit_list[0].counter + 1;\n+\t\tvq->resubmit_inflight = resubmit;\n+\t}\n+\n+\treturn RTE_VHOST_MSG_RESULT_OK;\n+}\n+\n+static int\n+vhost_check_queue_inflights_packed(struct virtio_net *dev,\n+\t\t\t\t\t\t struct vhost_virtqueue *vq)\n+{\n+\tuint16_t i = 0;\n+\tuint16_t resubmit_num = 0, old_used_idx, num;\n+\tstruct rte_vhost_resubmit_info *resubmit = NULL;\n+\tstruct rte_vhost_inflight_info_packed *inflight_packed;\n+\n+\tif (!(dev->protocol_features &\n+\t\t(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))\n+\t\treturn RTE_VHOST_MSG_RESULT_OK;\n+\n+\tif ((!vq->inflight_packed))\n+\t\treturn RTE_VHOST_MSG_RESULT_ERR;\n+\n+\tif (!vq->inflight_packed->version) {\n+\t\tvq->inflight_packed->version = INFLIGHT_VERSION;\n+\t\treturn RTE_VHOST_MSG_RESULT_OK;\n+\t}\n+\n+\tif (vq->resubmit_inflight)\n+\t\treturn RTE_VHOST_MSG_RESULT_OK;\n+\n+\tinflight_packed = vq->inflight_packed;\n+\tvq->global_counter = 0;\n+\told_used_idx = inflight_packed->old_used_idx;\n+\n+\tif (inflight_packed->used_idx != old_used_idx) {\n+\t\tif (inflight_packed->desc[old_used_idx].inflight == 0) {\n+\t\t\tinflight_packed->old_used_idx =\n+\t\t\t\tinflight_packed->used_idx;\n+\t\t\tinflight_packed->old_used_wrap_counter =\n+\t\t\t\tinflight_packed->used_wrap_counter;\n+\t\t\tinflight_packed->old_free_head =\n+\t\t\t\tinflight_packed->free_head;\n+\t\t} else {\n+\t\t\tinflight_packed->used_idx =\n+\t\t\t\tinflight_packed->old_used_idx;\n+\t\t\tinflight_packed->used_wrap_counter =\n+\t\t\t\tinflight_packed->old_used_wrap_counter;\n+\t\t\tinflight_packed->free_head =\n+\t\t\t\tinflight_packed->old_free_head;\n+\t\t}\n+\t}\n+\n+\tfor (i = 0; i < inflight_packed->desc_num; i++) {\n+\t\tif (inflight_packed->desc[i].inflight == 1)\n+\t\t\tresubmit_num++;\n+\t}\n+\n+\tif (resubmit_num) {\n+\t\tresubmit = calloc(1, sizeof(struct rte_vhost_resubmit_info));\n+\t\tif (resubmit == NULL) {\n+\t\t\tRTE_LOG(ERR, VHOST_CONFIG,\n+\t\t\t \"Failed to allocate memory for resubmit info.\\n\");\n+\t\t\treturn RTE_VHOST_MSG_RESULT_ERR;\n+\t\t}\n+\n+\t\tresubmit->resubmit_list = calloc(resubmit_num,\n+\t\t\tsizeof(struct rte_vhost_resubmit_desc));\n+\t\tif (resubmit->resubmit_list == NULL) {\n+\t\t\tRTE_LOG(ERR, VHOST_CONFIG,\n+\t\t\t \"Failed to allocate memory for resubmit desc.\\n\");\n+\t\t\tfree(resubmit);\n+\t\t\treturn RTE_VHOST_MSG_RESULT_ERR;\n+\t\t}\n+\n+\t\tnum = 0;\n+\t\tfor (i = 0; i < inflight_packed->desc_num; i++) {\n+\t\t\tif (vq->inflight_packed->desc[i].inflight == 1) {\n+\t\t\t\tresubmit->resubmit_list[num].index = i;\n+\t\t\t\tresubmit->resubmit_list[num].counter =\n+\t\t\t\t\tinflight_packed->desc[i].counter;\n+\t\t\t\tnum++;\n+\t\t\t}\n+\t\t}\n+\t\tresubmit->resubmit_num = num;\n+\n+\t\tif (resubmit->resubmit_num > 1)\n+\t\t\tqsort(resubmit->resubmit_list, resubmit->resubmit_num,\n+\t\t\t\tsizeof(struct rte_vhost_resubmit_desc),\n+\t\t\t\tresubmit_desc_compare);\n+\n+\t\tvq->global_counter = resubmit->resubmit_list[0].counter + 1;\n+\t\tvq->resubmit_inflight = resubmit;\n+\t}\n+\n+\treturn RTE_VHOST_MSG_RESULT_OK;\n+}\n+\n static int\n vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg,\n \t\t\tint main_fd __rte_unused)\n@@ -1484,6 +1685,20 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg,\n \t\tclose(vq->kickfd);\n \tvq->kickfd = file.fd;\n \n+\tif (vq_is_packed(dev)) {\n+\t\tif (vhost_check_queue_inflights_packed(dev, vq)) {\n+\t\t\tRTE_LOG(ERR, VHOST_CONFIG,\n+\t\t\t\t\"Failed to inflights for vq: %d\\n\", file.index);\n+\t\t\treturn RTE_VHOST_MSG_RESULT_ERR;\n+\t\t}\n+\t} else {\n+\t\tif (vhost_check_queue_inflights_split(dev, vq)) {\n+\t\t\tRTE_LOG(ERR, VHOST_CONFIG,\n+\t\t\t\t\"Failed to inflights for vq: %d\\n\", file.index);\n+\t\t\treturn RTE_VHOST_MSG_RESULT_ERR;\n+\t\t}\n+\t}\n+\n \treturn RTE_VHOST_MSG_RESULT_OK;\n }\n \n",
    "prefixes": [
        "v9",
        "05/10"
    ]
}