Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/94201/?format=api
{ "id": 94201, "url": "https://patches.dpdk.org/api/patches/94201/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210615084241.139097-7-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": "<20210615084241.139097-7-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210615084241.139097-7-maxime.coquelin@redhat.com", "date": "2021-06-15T08:42:41", "name": "[v2,6/6] vhost: convert inflight data to DPDK allocation API", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "75db60d5c777cb49aef882d581dce740468340fe", "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/20210615084241.139097-7-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 17329, "url": "https://patches.dpdk.org/api/series/17329/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=17329", "date": "2021-06-15T08:42:35", "name": "vhost: Fix and improve NUMA reallocation", "version": 2, "mbox": "https://patches.dpdk.org/series/17329/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/94201/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/94201/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 0FDDBA0C49;\n\tTue, 15 Jun 2021 10:43:32 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 1B96741148;\n\tTue, 15 Jun 2021 10:43:07 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by mails.dpdk.org (Postfix) with ESMTP id C594F41148\n for <dev@dpdk.org>; Tue, 15 Jun 2021 10:43:03 +0200 (CEST)", "from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id\n us-mta-34-9s1I8GY6MmWetzdYxG8qMw-1; Tue, 15 Jun 2021 04:43:01 -0400", "from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com\n [10.5.11.13])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C9F4CEC1A6;\n Tue, 15 Jun 2021 08:43:00 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.45])\n by smtp.corp.redhat.com (Postfix) with ESMTP id B8ABF60C03;\n Tue, 15 Jun 2021 08:42:59 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1623746583;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=/l+8f2ND5bSOhBfndfyu3plZGidgg3eOqFG+WbdNogU=;\n b=ASAdapKluc6Ty9Z9wtvZTJc0cfpOjJTE+wSk7mm+MMsIOQFcIfO9bazWUoUVfTpcu0sMce\n xEknz81ThO+yy2D8icBnD+/l9hYVbv8rPoYSGESs9njw+q5UL9iu5JSAdHuHj4I8PFAhM6\n GbEAeJhMjKQ25WO65ld0GDOKZeFjvNM=", "X-MC-Unique": "9s1I8GY6MmWetzdYxG8qMw-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org,\n\tdavid.marchand@redhat.com,\n\tchenbo.xia@intel.com", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Date": "Tue, 15 Jun 2021 10:42:41 +0200", "Message-Id": "<20210615084241.139097-7-maxime.coquelin@redhat.com>", "In-Reply-To": "<20210615084241.139097-1-maxime.coquelin@redhat.com>", "References": "<20210615084241.139097-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.13", "Authentication-Results": "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"", "Subject": "[dpdk-dev] [PATCH v2 6/6] vhost: convert inflight data to DPDK\n allocation API", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <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 <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Inflight metadata are allocated using glibc's calloc.\nThis patch converts them to rte_zmalloc_socket to take\ncare of the NUMA affinity.\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n lib/vhost/vhost.c | 4 +--\n lib/vhost/vhost_user.c | 67 +++++++++++++++++++++++++++++++++++-------\n 2 files changed, 58 insertions(+), 13 deletions(-)", "diff": "diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c\nindex 0000cd3297..53a470f547 100644\n--- a/lib/vhost/vhost.c\n+++ b/lib/vhost/vhost.c\n@@ -312,10 +312,10 @@ cleanup_vq_inflight(struct virtio_net *dev, struct vhost_virtqueue *vq)\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\trte_free(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\trte_free(vq->resubmit_inflight);\n \t\tvq->resubmit_inflight = NULL;\n \t}\n }\ndiff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c\nindex 72879a36c8..ba5dbd14d3 100644\n--- a/lib/vhost/vhost_user.c\n+++ b/lib/vhost/vhost_user.c\n@@ -188,7 +188,7 @@ vhost_backend_cleanup(struct virtio_net *dev)\n \t\t\tdev->inflight_info->fd = -1;\n \t\t}\n \n-\t\tfree(dev->inflight_info);\n+\t\trte_free(dev->inflight_info);\n \t\tdev->inflight_info = NULL;\n \t}\n \n@@ -559,6 +559,31 @@ numa_realloc(struct virtio_net *dev, int index)\n \t\tvq->log_cache = lc;\n \t}\n \n+\tif (vq->resubmit_inflight) {\n+\t\tstruct rte_vhost_resubmit_info *ri;\n+\n+\t\tri = rte_realloc_socket(vq->resubmit_inflight, sizeof(*ri), 0, node);\n+\t\tif (!ri) {\n+\t\t\tVHOST_LOG_CONFIG(ERR, \"Failed to realloc resubmit inflight on node %d\\n\",\n+\t\t\t\t\tnode);\n+\t\t\treturn dev;\n+\t\t}\n+\t\tvq->resubmit_inflight = ri;\n+\n+\t\tif (vq->resubmit_inflight) {\n+\t\t\tstruct rte_vhost_resubmit_desc *rd;\n+\n+\t\t\trd = rte_realloc_socket(ri->resubmit_list, sizeof(*rd) * ri->resubmit_num,\n+\t\t\t\t\t0, node);\n+\t\t\tif (!ri) {\n+\t\t\t\tVHOST_LOG_CONFIG(ERR, \"Failed to realloc resubmit list on node %d\\n\",\n+\t\t\t\t\t\tnode);\n+\t\t\t\treturn dev;\n+\t\t\t}\n+\t\t\tri->resubmit_list = rd;\n+\t\t}\n+\t}\n+\n \tvq->numa_node = node;\n \n out_dev_realloc:\n@@ -1476,6 +1501,7 @@ vhost_user_get_inflight_fd(struct virtio_net **pdev,\n \tuint16_t num_queues, queue_size;\n \tstruct virtio_net *dev = *pdev;\n \tint fd, i, j;\n+\tint numa_node = SOCKET_ID_ANY;\n \tvoid *addr;\n \n \tif (msg->size != sizeof(msg->payload.inflight)) {\n@@ -1485,9 +1511,16 @@ vhost_user_get_inflight_fd(struct virtio_net **pdev,\n \t\treturn RTE_VHOST_MSG_RESULT_ERR;\n \t}\n \n+\t/*\n+\t * If VQ 0 has already been allocated, try to allocate on the same\n+\t * NUMA node. It can be reallocated later in numa_realloc().\n+\t */\n+\tif (dev->nr_vring > 0)\n+\t\tnuma_node = dev->virtqueue[0]->numa_node;\n+\n \tif (dev->inflight_info == NULL) {\n-\t\tdev->inflight_info = calloc(1,\n-\t\t\t\t\t sizeof(struct inflight_mem_info));\n+\t\tdev->inflight_info = rte_zmalloc_socket(\"inflight_info\",\n+\t\t\t\tsizeof(struct inflight_mem_info), 0, numa_node);\n \t\tif (!dev->inflight_info) {\n \t\t\tVHOST_LOG_CONFIG(ERR,\n \t\t\t\t\"failed to alloc dev inflight area\\n\");\n@@ -1570,6 +1603,7 @@ vhost_user_set_inflight_fd(struct virtio_net **pdev, VhostUserMsg *msg,\n \tstruct vhost_virtqueue *vq;\n \tvoid *addr;\n \tint fd, i;\n+\tint numa_node = SOCKET_ID_ANY;\n \n \tfd = msg->fds[0];\n \tif (msg->size != sizeof(msg->payload.inflight) || fd < 0) {\n@@ -1603,9 +1637,16 @@ vhost_user_set_inflight_fd(struct virtio_net **pdev, VhostUserMsg *msg,\n \t\t\"set_inflight_fd pervq_inflight_size: %d\\n\",\n \t\tpervq_inflight_size);\n \n+\t/*\n+\t * If VQ 0 has already been allocated, try to allocate on the same\n+\t * NUMA node. It can be reallocated later in numa_realloc().\n+\t */\n+\tif (dev->nr_vring > 0)\n+\t\tnuma_node = dev->virtqueue[0]->numa_node;\n+\n \tif (!dev->inflight_info) {\n-\t\tdev->inflight_info = calloc(1,\n-\t\t\t\t\t sizeof(struct inflight_mem_info));\n+\t\tdev->inflight_info = rte_zmalloc_socket(\"inflight_info\",\n+\t\t\t\tsizeof(struct inflight_mem_info), 0, numa_node);\n \t\tif (dev->inflight_info == NULL) {\n \t\t\tVHOST_LOG_CONFIG(ERR,\n \t\t\t\t\"failed to alloc dev inflight area\\n\");\n@@ -1764,15 +1805,17 @@ vhost_check_queue_inflights_split(struct virtio_net *dev,\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\tresubmit = rte_zmalloc_socket(\"resubmit\", sizeof(struct rte_vhost_resubmit_info),\n+\t\t\t\t0, vq->numa_node);\n \t\tif (!resubmit) {\n \t\t\tVHOST_LOG_CONFIG(ERR,\n \t\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\tresubmit->resubmit_list = rte_zmalloc_socket(\"resubmit_list\",\n+\t\t\t\tresubmit_num * sizeof(struct rte_vhost_resubmit_desc),\n+\t\t\t\t0, vq->numa_node);\n \t\tif (!resubmit->resubmit_list) {\n \t\t\tVHOST_LOG_CONFIG(ERR,\n \t\t\t\t\"failed to allocate memory for inflight desc.\\n\");\n@@ -1858,15 +1901,17 @@ vhost_check_queue_inflights_packed(struct virtio_net *dev,\n \t}\n \n \tif (resubmit_num) {\n-\t\tresubmit = calloc(1, sizeof(struct rte_vhost_resubmit_info));\n+\t\tresubmit = rte_zmalloc_socket(\"resubmit\", sizeof(struct rte_vhost_resubmit_info),\n+\t\t\t\t0, vq->numa_node);\n \t\tif (resubmit == NULL) {\n \t\t\tVHOST_LOG_CONFIG(ERR,\n \t\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\tresubmit->resubmit_list = rte_zmalloc_socket(\"resubmit_list\",\n+\t\t\t\tresubmit_num * sizeof(struct rte_vhost_resubmit_desc),\n+\t\t\t\t0, vq->numa_node);\n \t\tif (resubmit->resubmit_list == NULL) {\n \t\t\tVHOST_LOG_CONFIG(ERR,\n \t\t\t\t\"failed to allocate memory for resubmit desc.\\n\");\n", "prefixes": [ "v2", "6/6" ] }