Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/43711/?format=api
{ "id": 43711, "url": "http://patches.dpdk.org/api/patches/43711/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180814164525.10703-1-stephen@networkplumber.org/", "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": "<20180814164525.10703-1-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20180814164525.10703-1-stephen@networkplumber.org", "date": "2018-08-14T16:45:25", "name": "[v3] netvsc: resize event buffer as needed", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "2a17cc1ab1ea55198fd7b77375df2c025eb4c5e9", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20180814164525.10703-1-stephen@networkplumber.org/mbox/", "series": [ { "id": 982, "url": "http://patches.dpdk.org/api/series/982/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=982", "date": "2018-08-14T16:45:25", "name": "[v3] netvsc: resize event buffer as needed", "version": 3, "mbox": "http://patches.dpdk.org/series/982/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/43711/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/43711/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 E14264F98;\n\tTue, 14 Aug 2018 18:45:30 +0200 (CEST)", "from mail-pg1-f194.google.com (mail-pg1-f194.google.com\n\t[209.85.215.194]) by dpdk.org (Postfix) with ESMTP id B6FFB4F93\n\tfor <dev@dpdk.org>; Tue, 14 Aug 2018 18:45:29 +0200 (CEST)", "by mail-pg1-f194.google.com with SMTP id z8-v6so9343610pgu.8\n\tfor <dev@dpdk.org>; Tue, 14 Aug 2018 09:45:29 -0700 (PDT)", "from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n\tby smtp.gmail.com with ESMTPSA id\n\t1-v6sm50409328pfm.145.2018.08.14.09.45.27\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 14 Aug 2018 09:45:27 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id;\n\tbh=+k1K7zn2qKyDj9SRxWz/Enc7TYWV81d0VYfP8R675q4=;\n\tb=jSgrkrpclu9fZobvYjwojkZXbJer2yAb8oYFH313K1P6WdjjOtVSJiDFYULhHfVNvr\n\tWkBpljjyVP/lzcqmWe45fYaVZSz4Li3Y5y2gcOI5XVWnPleDXCr8kD2zFh4dbwpZCDku\n\tqWPL67F4rOCOAN8VBXfUZmArwjZJ2ZzW6GcIRRMU6cjgH6lScL9hv6sm0dy6NL++UCDI\n\tCG+LQ+9Y1oiZOrGnCWGZx5Ff9CnDVkLbAAI8Ffaz09yaA5bxqYoUoADy89XQ/hG37JAu\n\t7RiL39x61bq0PjvnKbvk/qvV42Ek9CjdAiwOlz5GEF2mWgSFPJOpVAyt5zjEM60EFlWU\n\tRRiw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=+k1K7zn2qKyDj9SRxWz/Enc7TYWV81d0VYfP8R675q4=;\n\tb=sRkoZ81tFa6F3ZTvu05PAJn6dGCVC+mWEIqwhIdy4VEl9RewO1CDq1QnNLD00Kg1v5\n\tYDdZHeAwxWHhZ4XLcz2S2tvTOKY2VD0Wf9QKJ5MVrc8LnY6bvGQyU0qNdlCNdjYfMej7\n\tigwiDvdC3D+m7pwTz+zqfQeJSlIo56RihQRGWFDOtWCda+nPlwnJpYT/lcFvh4iouvox\n\txk61v7iFc94/pvafWdh7Bf4TsWKsXSqcp8uPxUtZBaYn1bGz2JqME3xgMUcD83JeV4lb\n\tWs7AvxzM6KAjhgig4BSxSe5vao1fz/hQK8xyJwlTDKnmpFQ9kQim+PO9x6nyXFNfnS6i\n\tpUcQ==", "X-Gm-Message-State": "AOUpUlE4DMW2ZC7bSYJI/0jtGP8HfGyxrsJ+0jIMHS9npyAePDtNuCY4\n\ttfYXhEyWDgEprz7mvKjPprE7xEnfQel/Dg==", "X-Google-Smtp-Source": "AA+uWPzPz2368QTqsz4+vcOJoEpcgchVkgMlb+FYrIC8E6J0Fag5iwXlS+smvBjhw8RMFDSwvwcx5g==", "X-Received": "by 2002:aa7:83cd:: with SMTP id\n\tj13-v6mr24298858pfn.236.1534265128588; \n\tTue, 14 Aug 2018 09:45:28 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n\tStephen Hemminger <sthemmin@microsoft.com>", "Date": "Tue, 14 Aug 2018 09:45:25 -0700", "Message-Id": "<20180814164525.10703-1-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.18.0", "Subject": "[dpdk-dev] [PATCH v3] netvsc: resize event buffer as needed", "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": "The event buffer was changed to be a fixed size value,\nhad a couple of issues. The big one is that rte_free was still\nbeing called for a pointer that was not setup with rte_malloc().\n\nThe event buffer was also too small to handle heavy receive\ntraffic; and running the event buffer out would crash\nthe application.\n\nFix by going back to a dynamically resized event buffer.\nAnd grow it by 25% to avoid lots of realloc's.\n\nFixes: 530af95a7849 (\"bus/vmbus: avoid signalling host on read\")\nSigned-off-by: Stephen Hemminger <sthemmin@microsoft.com>\n---\nv3 - use rte_malloc since event_buf needs to be shared with\n secondary process (if queue is shared between primary/secondary)\n\n drivers/net/netvsc/hn_rxtx.c | 50 ++++++++++++++++++++++++++----------\n drivers/net/netvsc/hn_var.h | 2 +-\n 2 files changed, 38 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c\nindex 02ef27e363cc..9b394d261b37 100644\n--- a/drivers/net/netvsc/hn_rxtx.c\n+++ b/drivers/net/netvsc/hn_rxtx.c\n@@ -10,6 +10,7 @@\n #include <errno.h>\n #include <unistd.h>\n #include <strings.h>\n+#include <malloc.h>\n \n #include <rte_ethdev.h>\n #include <rte_memcpy.h>\n@@ -718,16 +719,24 @@ struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv,\n {\n \tstruct hn_rx_queue *rxq;\n \n-\trxq = rte_zmalloc_socket(\"HN_RXQ\",\n-\t\t\t\t sizeof(*rxq) + HN_RXQ_EVENT_DEFAULT,\n+\trxq = rte_zmalloc_socket(\"HN_RXQ\", sizeof(*rxq),\n \t\t\t\t RTE_CACHE_LINE_SIZE, socket_id);\n-\tif (rxq) {\n-\t\trxq->hv = hv;\n-\t\trxq->chan = hv->channels[queue_id];\n-\t\trte_spinlock_init(&rxq->ring_lock);\n-\t\trxq->port_id = hv->port_id;\n-\t\trxq->queue_id = queue_id;\n+\tif (!rxq)\n+\t\treturn NULL;\n+\n+\trxq->hv = hv;\n+\trxq->chan = hv->channels[queue_id];\n+\trte_spinlock_init(&rxq->ring_lock);\n+\trxq->port_id = hv->port_id;\n+\trxq->queue_id = queue_id;\n+\trxq->event_sz = HN_RXQ_EVENT_DEFAULT;\n+\trxq->event_buf = rte_malloc_socket(\"HN_EVENTS\", HN_RXQ_EVENT_DEFAULT,\n+\t\t\t\t\t RTE_CACHE_LINE_SIZE, socket_id);\n+\tif (!rxq->event_buf) {\n+\t\trte_free(rxq);\n+\t\treturn NULL;\n \t}\n+\n \treturn rxq;\n }\n \n@@ -853,19 +862,34 @@ void hn_process_events(struct hn_data *hv, uint16_t queue_id)\n \n \tfor (;;) {\n \t\tconst struct vmbus_chanpkt_hdr *pkt;\n-\t\tuint32_t len = HN_RXQ_EVENT_DEFAULT;\n+\t\tuint32_t len = rxq->event_sz;\n \t\tconst void *data;\n \n+retry:\n \t\tret = rte_vmbus_chan_recv_raw(rxq->chan, rxq->event_buf, &len);\n \t\tif (ret == -EAGAIN)\n \t\t\tbreak;\t/* ring is empty */\n \n-\t\telse if (ret == -ENOBUFS)\n-\t\t\trte_exit(EXIT_FAILURE, \"event buffer not big enough (%u < %u)\",\n-\t\t\t\t HN_RXQ_EVENT_DEFAULT, len);\n-\t\telse if (ret <= 0)\n+\t\tif (unlikely(ret == -ENOBUFS)) {\n+\t\t\t/* event buffer not large enough to read ring */\n+\n+\t\t\tPMD_DRV_LOG(DEBUG,\n+\t\t\t\t \"event buffer expansion (need %u)\", len);\n+\t\t\trxq->event_sz = len + len / 4;\n+\t\t\trxq->event_buf = rte_realloc(rxq->event_buf, rxq->event_sz,\n+\t\t\t\t\t\t RTE_CACHE_LINE_SIZE);\n+\t\t\tif (rxq->event_buf)\n+\t\t\t\tgoto retry;\n+\t\t\t/* out of memory, no more events now */\n+\t\t\trxq->event_sz = 0;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tif (unlikely(ret <= 0)) {\n+\t\t\t/* This indicates a failure to communicate (or worse) */\n \t\t\trte_exit(EXIT_FAILURE,\n \t\t\t\t \"vmbus ring buffer error: %d\", ret);\n+\t\t}\n \n \t\tbytes_read += ret;\n \t\tpkt = (const struct vmbus_chanpkt_hdr *)rxq->event_buf;\ndiff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h\nindex f7ff8585bc1c..0430f450cf37 100644\n--- a/drivers/net/netvsc/hn_var.h\n+++ b/drivers/net/netvsc/hn_var.h\n@@ -77,7 +77,7 @@ struct hn_rx_queue {\n \tstruct hn_stats stats;\n \tuint64_t ring_full;\n \n-\tuint8_t\tevent_buf[];\n+\tvoid *event_buf;\n };\n \n \n", "prefixes": [ "v3" ] }