Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/60758/?format=api
{ "id": 60758, "url": "http://patches.dpdk.org/api/patches/60758/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191009152515.21765-7-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": "<20191009152515.21765-7-jin.yu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191009152515.21765-7-jin.yu@intel.com", "date": "2019-10-09T15:25:12", "name": "[v10,6/9] vhost: add the APIs to operate inflight ring", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "4527941de82e8004e48a98a550ebf9988e8ea613", "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/20191009152515.21765-7-jin.yu@intel.com/mbox/", "series": [ { "id": 6755, "url": "http://patches.dpdk.org/api/series/6755/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6755", "date": "2019-10-09T15:25:06", "name": "vhost: support inflight share memory protocol feature", "version": 10, "mbox": "http://patches.dpdk.org/series/6755/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/60758/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/60758/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 617481D411;\n\tWed, 9 Oct 2019 09:42:33 +0200 (CEST)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby dpdk.org (Postfix) with ESMTP id 7A1A61D14E\n\tfor <dev@dpdk.org>; Wed, 9 Oct 2019 09:42:27 +0200 (CEST)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t09 Oct 2019 00:42:27 -0700", "from storage36.sh.intel.com ([10.67.110.177])\n\tby orsmga006.jf.intel.com with ESMTP; 09 Oct 2019 00:42:24 -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,273,1566889200\"; d=\"scan'208\";a=\"197939693\"", "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": "Wed, 9 Oct 2019 23:25:12 +0800", "Message-Id": "<20191009152515.21765-7-jin.yu@intel.com>", "X-Mailer": "git-send-email 2.17.2", "In-Reply-To": "<20191009152515.21765-1-jin.yu@intel.com>", "References": "<20191008153341.22228> <20191009152515.21765-1-jin.yu@intel.com>", "Subject": "[dpdk-dev] [PATCH v10 6/9] vhost: add the APIs to operate inflight\n\tring", "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 introduces three APIs to operate the inflight\nring. Three APIs are set, set last and clear. It includes\nsplit and packed ring.\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 | 116 +++++++++++\n lib/librte_vhost/rte_vhost_version.map | 6 +\n lib/librte_vhost/vhost.c | 273 +++++++++++++++++++++++++\n 3 files changed, 395 insertions(+)", "diff": "diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h\nindex 95e4d720e..15d7e67cd 100644\n--- a/lib/librte_vhost/rte_vhost.h\n+++ b/lib/librte_vhost/rte_vhost.h\n@@ -693,6 +693,122 @@ int rte_vhost_get_mem_table(int vid, struct rte_vhost_memory **mem);\n int rte_vhost_get_vhost_vring(int vid, uint16_t vring_idx,\n \t\t\t struct rte_vhost_vring *vring);\n \n+/**\n+ * Set split inflight descriptor.\n+ *\n+ * This function save descriptors that has been comsumed in available\n+ * ring\n+ *\n+ * @param vid\n+ * vhost device ID\n+ * @param vring_idx\n+ * vring index\n+ * @param idx\n+ * inflight entry index\n+ * @return\n+ * 0 on success, -1 on failure\n+ */\n+__rte_experimental\n+int\n+rte_vhost_set_inflight_desc_split(int vid, uint16_t vring_idx,\n+\tuint16_t idx);\n+\n+/**\n+ * Set packed inflight descriptor and get corresponding inflight entry\n+ *\n+ * This function save descriptors that has been comsumed\n+ *\n+ * @param vid\n+ * vhost device ID\n+ * @param vring_idx\n+ * vring index\n+ * @param head\n+ * head of descriptors\n+ * @param last\n+ * last of descriptors\n+ * @param inflight_entry\n+ * corresponding inflight entry\n+ * @return\n+ * 0 on success, -1 on failure\n+ */\n+__rte_experimental\n+int\n+rte_vhost_set_inflight_desc_packed(int vid, uint16_t vring_idx,\n+\tuint16_t head, uint16_t last, uint16_t *inflight_entry);\n+\n+/**\n+ * Save the head of list that the last batch of used descriptors.\n+ *\n+ * @param vid\n+ * vhost device ID\n+ * @param vring_idx\n+ * vring index\n+ * @param idx\n+ * descriptor entry index\n+ * @return\n+ * 0 on success, -1 on failure\n+ */\n+__rte_experimental\n+int\n+rte_vhost_set_last_inflight_io_split(int vid,\n+\tuint16_t vring_idx, uint16_t idx);\n+\n+/**\n+ * Update the inflight free_head, used_idx and used_wrap_counter.\n+ *\n+ * This function will update status first before updating descriptors\n+ * to used\n+ *\n+ * @param vid\n+ * vhost device ID\n+ * @param vring_idx\n+ * vring index\n+ * @param head\n+ * head of descriptors\n+ * @return\n+ * 0 on success, -1 on failure\n+ */\n+__rte_experimental\n+int\n+rte_vhost_set_last_inflight_io_packed(int vid,\n+\tuint16_t vring_idx, uint16_t head);\n+\n+/**\n+ * Clear the split inflight status.\n+ *\n+ * @param vid\n+ * vhost device ID\n+ * @param vring_idx\n+ * vring index\n+ * @param last_used_idx\n+ * last used idx of used ring\n+ * @param idx\n+ * inflight entry index\n+ * @return\n+ * 0 on success, -1 on failure\n+ */\n+__rte_experimental\n+int\n+rte_vhost_clr_inflight_desc_split(int vid, uint16_t vring_idx,\n+\tuint16_t last_used_idx, uint16_t idx);\n+\n+/**\n+ * Clear the packed inflight status.\n+ *\n+ * @param vid\n+ * vhost device ID\n+ * @param vring_idx\n+ * vring index\n+ * @param head\n+ * inflight entry index\n+ * @return\n+ * 0 on success, -1 on failure\n+ */\n+__rte_experimental\n+int\n+rte_vhost_clr_inflight_desc_packed(int vid, uint16_t vring_idx,\n+\tuint16_t head);\n+\n /**\n * Notify the guest that used descriptors have been added to the vring. This\n * function acts as a memory barrier.\ndiff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map\nindex 5f1d4a75c..bc70bfaa5 100644\n--- a/lib/librte_vhost/rte_vhost_version.map\n+++ b/lib/librte_vhost/rte_vhost_version.map\n@@ -87,4 +87,10 @@ EXPERIMENTAL {\n \trte_vdpa_relay_vring_used;\n \trte_vhost_extern_callback_register;\n \trte_vhost_driver_set_protocol_features;\n+\trte_vhost_set_inflight_desc_split;\n+\trte_vhost_set_inflight_desc_packed;\n+\trte_vhost_set_last_inflight_io_split;\n+\trte_vhost_set_last_inflight_io_packed;\n+\trte_vhost_clr_inflight_desc_split;\n+\trte_vhost_clr_inflight_desc_packed;\n };\ndiff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c\nindex f8660edbf..b8c14a6ea 100644\n--- a/lib/librte_vhost/vhost.c\n+++ b/lib/librte_vhost/vhost.c\n@@ -783,6 +783,279 @@ rte_vhost_get_vhost_vring(int vid, uint16_t vring_idx,\n \treturn 0;\n }\n \n+int\n+rte_vhost_set_inflight_desc_split(int vid, uint16_t vring_idx,\n+\t\t\t\t uint16_t idx)\n+{\n+\tstruct vhost_virtqueue *vq;\n+\tstruct virtio_net *dev;\n+\n+\tdev = get_device(vid);\n+\tif (unlikely(!dev))\n+\t\treturn -1;\n+\n+\tif (unlikely(!(dev->protocol_features &\n+\t (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))\n+\t\treturn 0;\n+\n+\tif (unlikely(vq_is_packed(dev)))\n+\t\treturn -1;\n+\n+\tif (unlikely(vring_idx >= VHOST_MAX_VRING))\n+\t\treturn -1;\n+\n+\tvq = dev->virtqueue[vring_idx];\n+\tif (unlikely(!vq))\n+\t\treturn -1;\n+\n+\tif (unlikely(!vq->inflight_split))\n+\t\treturn -1;\n+\n+\tif (unlikely(idx >= vq->size))\n+\t\treturn -1;\n+\n+\tvq->inflight_split->desc[idx].counter = vq->global_counter++;\n+\tvq->inflight_split->desc[idx].inflight = 1;\n+\treturn 0;\n+}\n+\n+int\n+rte_vhost_set_inflight_desc_packed(int vid, uint16_t vring_idx,\n+\t\t\t\t uint16_t head, uint16_t last,\n+\t\t\t\t uint16_t *inflight_entry)\n+{\n+\tstruct rte_vhost_inflight_info_packed *inflight_info;\n+\tstruct virtio_net *dev;\n+\tstruct vhost_virtqueue *vq;\n+\tstruct vring_packed_desc *desc;\n+\tuint16_t old_free_head, free_head;\n+\n+\tdev = get_device(vid);\n+\tif (unlikely(!dev))\n+\t\treturn -1;\n+\n+\tif (unlikely(!(dev->protocol_features &\n+\t (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))\n+\t\treturn 0;\n+\n+\tif (unlikely(!vq_is_packed(dev)))\n+\t\treturn -1;\n+\n+\tif (unlikely(vring_idx >= VHOST_MAX_VRING))\n+\t\treturn -1;\n+\n+\tvq = dev->virtqueue[vring_idx];\n+\tif (unlikely(!vq))\n+\t\treturn -1;\n+\n+\tinflight_info = vq->inflight_packed;\n+\tif (unlikely(!inflight_info))\n+\t\treturn -1;\n+\n+\tif (unlikely(head >= vq->size))\n+\t\treturn -1;\n+\n+\tdesc = vq->desc_packed;\n+\told_free_head = inflight_info->old_free_head;\n+\tif (unlikely(old_free_head >= vq->size))\n+\t\treturn -1;\n+\n+\tfree_head = old_free_head;\n+\n+\t/* init header descriptor */\n+\tinflight_info->desc[old_free_head].num = 0;\n+\tinflight_info->desc[old_free_head].counter = vq->global_counter++;\n+\tinflight_info->desc[old_free_head].inflight = 1;\n+\n+\t/* save desc entry in flight entry */\n+\twhile (head != ((last + 1) % vq->size)) {\n+\t\tinflight_info->desc[old_free_head].num++;\n+\t\tinflight_info->desc[free_head].addr = desc[head].addr;\n+\t\tinflight_info->desc[free_head].len = desc[head].len;\n+\t\tinflight_info->desc[free_head].flags = desc[head].flags;\n+\t\tinflight_info->desc[free_head].id = desc[head].id;\n+\n+\t\tinflight_info->desc[old_free_head].last = free_head;\n+\t\tfree_head = inflight_info->desc[free_head].next;\n+\t\tinflight_info->free_head = free_head;\n+\t\thead = (head + 1) % vq->size;\n+\t}\n+\n+\tinflight_info->old_free_head = free_head;\n+\t*inflight_entry = old_free_head;\n+\n+\treturn 0;\n+}\n+\n+int\n+rte_vhost_clr_inflight_desc_split(int vid, uint16_t vring_idx,\n+\t\t\t\t uint16_t last_used_idx, uint16_t idx)\n+{\n+\tstruct virtio_net *dev;\n+\tstruct vhost_virtqueue *vq;\n+\n+\tdev = get_device(vid);\n+\tif (unlikely(!dev))\n+\t\treturn -1;\n+\n+\tif (unlikely(!(dev->protocol_features &\n+\t (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))\n+\t\treturn 0;\n+\n+\tif (unlikely(vq_is_packed(dev)))\n+\t\treturn -1;\n+\n+\tif (unlikely(vring_idx >= VHOST_MAX_VRING))\n+\t\treturn -1;\n+\n+\tvq = dev->virtqueue[vring_idx];\n+\tif (unlikely(!vq))\n+\t\treturn -1;\n+\n+\tif (unlikely(!vq->inflight_split))\n+\t\treturn -1;\n+\n+\tif (unlikely(idx >= vq->size))\n+\t\treturn -1;\n+\n+\trte_smp_mb();\n+\n+\tvq->inflight_split->desc[idx].inflight = 0;\n+\n+\trte_smp_mb();\n+\n+\tvq->inflight_split->used_idx = last_used_idx;\n+\treturn 0;\n+}\n+\n+int\n+rte_vhost_clr_inflight_desc_packed(int vid, uint16_t vring_idx,\n+\t\t\t\t uint16_t head)\n+{\n+\tstruct rte_vhost_inflight_info_packed *inflight_info;\n+\tstruct virtio_net *dev;\n+\tstruct vhost_virtqueue *vq;\n+\n+\tdev = get_device(vid);\n+\tif (unlikely(!dev))\n+\t\treturn -1;\n+\n+\tif (unlikely(!(dev->protocol_features &\n+\t (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))\n+\t\treturn 0;\n+\n+\tif (unlikely(!vq_is_packed(dev)))\n+\t\treturn -1;\n+\n+\tif (unlikely(vring_idx >= VHOST_MAX_VRING))\n+\t\treturn -1;\n+\n+\tvq = dev->virtqueue[vring_idx];\n+\tif (unlikely(!vq))\n+\t\treturn -1;\n+\n+\tinflight_info = vq->inflight_packed;\n+\tif (unlikely(!inflight_info))\n+\t\treturn -1;\n+\n+\tif (unlikely(head >= vq->size))\n+\t\treturn -1;\n+\n+\trte_smp_mb();\n+\n+\tinflight_info->desc[head].inflight = 0;\n+\n+\trte_smp_mb();\n+\n+\tinflight_info->old_free_head = inflight_info->free_head;\n+\tinflight_info->old_used_idx = inflight_info->used_idx;\n+\tinflight_info->old_used_wrap_counter = inflight_info->used_wrap_counter;\n+\n+\treturn 0;\n+}\n+\n+int\n+rte_vhost_set_last_inflight_io_split(int vid, uint16_t vring_idx,\n+\t\t\t\t uint16_t idx)\n+{\n+\tstruct virtio_net *dev;\n+\tstruct vhost_virtqueue *vq;\n+\n+\tdev = get_device(vid);\n+\tif (unlikely(!dev))\n+\t\treturn -1;\n+\n+\tif (unlikely(!(dev->protocol_features &\n+\t (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))\n+\t\treturn 0;\n+\n+\tif (unlikely(vq_is_packed(dev)))\n+\t\treturn -1;\n+\n+\tif (unlikely(vring_idx >= VHOST_MAX_VRING))\n+\t\treturn -1;\n+\n+\tvq = dev->virtqueue[vring_idx];\n+\tif (unlikely(!vq))\n+\t\treturn -1;\n+\n+\tif (unlikely(!vq->inflight_split))\n+\t\treturn -1;\n+\n+\tvq->inflight_split->last_inflight_io = idx;\n+\treturn 0;\n+}\n+\n+int\n+rte_vhost_set_last_inflight_io_packed(int vid, uint16_t vring_idx,\n+\t\t\t\t uint16_t head)\n+{\n+\tstruct rte_vhost_inflight_info_packed *inflight_info;\n+\tstruct virtio_net *dev;\n+\tstruct vhost_virtqueue *vq;\n+\tuint16_t last;\n+\n+\tdev = get_device(vid);\n+\tif (unlikely(!dev))\n+\t\treturn -1;\n+\n+\tif (unlikely(!(dev->protocol_features &\n+\t (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))\n+\t\treturn 0;\n+\n+\tif (unlikely(!vq_is_packed(dev)))\n+\t\treturn -1;\n+\n+\tif (unlikely(vring_idx >= VHOST_MAX_VRING))\n+\t\treturn -1;\n+\n+\tvq = dev->virtqueue[vring_idx];\n+\tif (unlikely(!vq))\n+\t\treturn -1;\n+\n+\tinflight_info = vq->inflight_packed;\n+\tif (unlikely(!inflight_info))\n+\t\treturn -1;\n+\n+\tif (unlikely(head >= vq->size))\n+\t\treturn -1;\n+\n+\tlast = inflight_info->desc[head].last;\n+\tif (unlikely(last >= vq->size))\n+\t\treturn -1;\n+\n+\tinflight_info->desc[last].next = inflight_info->free_head;\n+\tinflight_info->free_head = head;\n+\tinflight_info->used_idx += inflight_info->desc[head].num;\n+\tif (inflight_info->used_idx >= inflight_info->desc_num) {\n+\t\tinflight_info->used_idx -= inflight_info->desc_num;\n+\t\tinflight_info->used_wrap_counter =\n+\t\t\t!inflight_info->used_wrap_counter;\n+\t}\n+\n+\treturn 0;\n+}\n+\n int\n rte_vhost_vring_call(int vid, uint16_t vring_idx)\n {\n", "prefixes": [ "v10", "6/9" ] }