Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/67994/?format=api
{ "id": 67994, "url": "http://patches.dpdk.org/api/patches/67994/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200408082921.31000-29-mk@semihalf.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": "<20200408082921.31000-29-mk@semihalf.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200408082921.31000-29-mk@semihalf.com", "date": "2020-04-08T08:29:19", "name": "[v3,28/30] net/ena: reuse 0 length Rx descriptor", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "64581620b8c3d8478785e636977bb300801d0dfe", "submitter": { "id": 786, "url": "http://patches.dpdk.org/api/people/786/?format=api", "name": "Michal Krawczyk", "email": "mk@semihalf.com" }, "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/20200408082921.31000-29-mk@semihalf.com/mbox/", "series": [ { "id": 9246, "url": "http://patches.dpdk.org/api/series/9246/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=9246", "date": "2020-04-08T08:28:51", "name": "Update ENA driver to v2.1.0", "version": 3, "mbox": "http://patches.dpdk.org/series/9246/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/67994/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/67994/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 04DEDA0597;\n\tWed, 8 Apr 2020 10:34:18 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 3C43B1C1F3;\n\tWed, 8 Apr 2020 10:30:08 +0200 (CEST)", "from mail-lf1-f65.google.com (mail-lf1-f65.google.com\n [209.85.167.65]) by dpdk.org (Postfix) with ESMTP id 665311C1DA\n for <dev@dpdk.org>; Wed, 8 Apr 2020 10:30:02 +0200 (CEST)", "by mail-lf1-f65.google.com with SMTP id m19so2461556lfq.13\n for <dev@dpdk.org>; Wed, 08 Apr 2020 01:30:02 -0700 (PDT)", "from mkPC.semihalf.local (193-106-246-138.noc.fibertech.net.pl.\n [193.106.246.138])\n by smtp.gmail.com with ESMTPSA id e8sm765685lja.3.2020.04.08.01.30.00\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 08 Apr 2020 01:30:00 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=semihalf-com.20150623.gappssmtp.com; s=20150623;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=9xTdl7+kzq7GVixH0Cj3wvXdk1gvFtVa0Ihq2VDzj/g=;\n b=R8Fjso+zjy4W8h1fbP8LxxODJkJcz0zHePr+PklBV1ocGPB0sluxWFK5EY/E+v4mZb\n +QgocZNItCulZfHb0WDdDF8suuSxq+PWIZxyt5vPpk863yVx2euFFZLQCz0qnFuI8hcT\n 0DhkhbKlQlDGzowVrcGXCMmQIZf730/ULbvOrmE+zJqIW5v+B0zKtLbErkMo2y1z28Kw\n ZX1moNBtcB7wQd8qDMrGq/YW196D4KWFB/W5kF+52qVdn6aA7sZqS29CKdpYq9UV+B92\n WFY+0xb3vc1P6GWMV8gboetOTe1BpglxRsLdll4BXPNkVZgYjvIcJHkpHFHYIzAEcCmD\n JBjA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=9xTdl7+kzq7GVixH0Cj3wvXdk1gvFtVa0Ihq2VDzj/g=;\n b=Fi0saZRx6Q2XTduHTemTeoE2SmZ+V/Ynj0AURBgnIOLtXBznpF0/HYc7snGzKChAkR\n S2DjQ3kLqfdwMpEl0nuGHfNC/TxeJfYHF7gYx8V4qk5U5CzEuxhTGHQSZiRLeXoEExpX\n vdOj+Jwt13JGeB4J/C0q3fBXPgOmxk4yiKF682YvZNAH98uObpYWR7x2vGq8U97fO49D\n lY0pFKeJ5OwwHdyuSl4K5ESJZqDVTyLDDVp+uph+2AIw0QtkhX2UhWsQ80G2/udPGNkc\n surAt8QVOrg7gZ0tnStviFXKhQPcNUXckVSrQWf/uJQerHYBr8yuc9yiuuB5gaIfZX5c\n WW2A==", "X-Gm-Message-State": "AGi0PuYMNkALthInPXnR04EJSWxwpfYNzih4s/s93qd33Wu+2T3e6aou\n FJoe5ZX+A4inMXdvPI/F+VgbrqXhezY=", "X-Google-Smtp-Source": "\n APiQypJB6qVPCsQVqzIpQmJCNjg7E73b96OwxLocxp6oHV4P3YzfUxkjtjYiig8mZCh/o7CffZp/vw==", "X-Received": "by 2002:a05:6512:3135:: with SMTP id\n p21mr2422085lfd.36.1586334601687;\n Wed, 08 Apr 2020 01:30:01 -0700 (PDT)", "From": "Michal Krawczyk <mk@semihalf.com>", "To": "dev@dpdk.org", "Cc": "mw@semihalf.com, mba@semihalf.com, gtzalik@amazon.com, evgenys@amazon.com,\n igorch@amazon.com, ferruh.yigit@intel.com, arybchenko@solarflare.com,\n Michal Krawczyk <mk@semihalf.com>", "Date": "Wed, 8 Apr 2020 10:29:19 +0200", "Message-Id": "<20200408082921.31000-29-mk@semihalf.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200408082921.31000-1-mk@semihalf.com>", "References": "<20200408082921.31000-1-mk@semihalf.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 28/30] net/ena: reuse 0 length Rx descriptor", "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 <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": "Some ENA devices can pass to the driver descriptor with length 0. To\navoid extra allocation, the descriptor can be reused by simply putting\nit back to the device.\n\nSigned-off-by: Michal Krawczyk <mk@semihalf.com>\nReviewed-by: Igor Chauskin <igorch@amazon.com>\nReviewed-by: Guy Tzalik <gtzalik@amazon.com>\n---\nv2:\n * Compare rc (error code) to 0 value explicitely\n\nv3:\n * Update release notes\n\n doc/guides/rel_notes/release_20_05.rst | 1 +\n drivers/net/ena/ena_ethdev.c | 75 ++++++++++++++++++++------\n 2 files changed, 61 insertions(+), 15 deletions(-)", "diff": "diff --git a/doc/guides/rel_notes/release_20_05.rst b/doc/guides/rel_notes/release_20_05.rst\nindex e6b2f1b972..89a48a1ff8 100644\n--- a/doc/guides/rel_notes/release_20_05.rst\n+++ b/doc/guides/rel_notes/release_20_05.rst\n@@ -85,6 +85,7 @@ New Features\n * Added support for large LLQ (Low-latency queue) headers.\n * Added Tx drops as new extended driver statistic.\n * Added support for accelerated LLQ mode.\n+ * Handling of the 0 length descriptors on the Rx path.\n \n \n Removed Items\ndiff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex 1a7cc686f5..156a3e441b 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -195,6 +195,8 @@ static struct rte_mbuf *ena_rx_mbuf(struct ena_ring *rx_ring,\n \t\t\t\t uint8_t offset);\n static uint16_t eth_ena_recv_pkts(void *rx_queue,\n \t\t\t\t struct rte_mbuf **rx_pkts, uint16_t nb_pkts);\n+static int ena_add_single_rx_desc(struct ena_com_io_sq *io_sq,\n+\t\t\t\t struct rte_mbuf *mbuf, uint16_t id);\n static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count);\n static void ena_init_rings(struct ena_adapter *adapter,\n \t\t\t bool disable_meta_caching);\n@@ -1414,6 +1416,24 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n+static int ena_add_single_rx_desc(struct ena_com_io_sq *io_sq,\n+\t\t\t\t struct rte_mbuf *mbuf, uint16_t id)\n+{\n+\tstruct ena_com_buf ebuf;\n+\tint rc;\n+\n+\t/* prepare physical address for DMA transaction */\n+\tebuf.paddr = mbuf->buf_iova + RTE_PKTMBUF_HEADROOM;\n+\tebuf.len = mbuf->buf_len - RTE_PKTMBUF_HEADROOM;\n+\n+\t/* pass resource to device */\n+\trc = ena_com_add_single_rx_desc(io_sq, &ebuf, id);\n+\tif (unlikely(rc != 0))\n+\t\tPMD_DRV_LOG(WARNING, \"failed adding rx desc\\n\");\n+\n+\treturn rc;\n+}\n+\n static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)\n {\n \tunsigned int i;\n@@ -1441,7 +1461,6 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)\n \n \tfor (i = 0; i < count; i++) {\n \t\tstruct rte_mbuf *mbuf = mbufs[i];\n-\t\tstruct ena_com_buf ebuf;\n \t\tstruct ena_rx_buffer *rx_info;\n \n \t\tif (likely((i + 4) < count))\n@@ -1454,16 +1473,10 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)\n \n \t\trx_info = &rxq->rx_buffer_info[req_id];\n \n-\t\t/* prepare physical address for DMA transaction */\n-\t\tebuf.paddr = mbuf->buf_iova + RTE_PKTMBUF_HEADROOM;\n-\t\tebuf.len = mbuf->buf_len - RTE_PKTMBUF_HEADROOM;\n-\t\t/* pass resource to device */\n-\t\trc = ena_com_add_single_rx_desc(rxq->ena_com_io_sq,\n-\t\t\t\t\t\t&ebuf, req_id);\n-\t\tif (unlikely(rc)) {\n-\t\t\tPMD_DRV_LOG(WARNING, \"failed adding rx desc\\n\");\n+\t\trc = ena_add_single_rx_desc(rxq->ena_com_io_sq, mbuf, req_id);\n+\t\tif (unlikely(rc != 0))\n \t\t\tbreak;\n-\t\t}\n+\n \t\trx_info->mbuf = mbuf;\n \t\tnext_to_use = ENA_IDX_NEXT_MASKED(next_to_use, rxq->size_mask);\n \t}\n@@ -2079,6 +2092,7 @@ static struct rte_mbuf *ena_rx_mbuf(struct ena_ring *rx_ring,\n \tstruct rte_mbuf *mbuf;\n \tstruct rte_mbuf *mbuf_head;\n \tstruct ena_rx_buffer *rx_info;\n+\tint rc;\n \tuint16_t ntc, len, req_id, buf = 0;\n \n \tif (unlikely(descs == 0))\n@@ -2121,13 +2135,44 @@ static struct rte_mbuf *ena_rx_mbuf(struct ena_ring *rx_ring,\n \t\trx_info = &rx_ring->rx_buffer_info[req_id];\n \t\tRTE_ASSERT(rx_info->mbuf != NULL);\n \n-\t\t/* Create an mbuf chain. */\n-\t\tmbuf->next = rx_info->mbuf;\n-\t\tmbuf = mbuf->next;\n+\t\tif (unlikely(len == 0)) {\n+\t\t\t/*\n+\t\t\t * Some devices can pass descriptor with the length 0.\n+\t\t\t * To avoid confusion, the PMD is simply putting the\n+\t\t\t * descriptor back, as it was never used. We'll avoid\n+\t\t\t * mbuf allocation that way.\n+\t\t\t */\n+\t\t\trc = ena_add_single_rx_desc(rx_ring->ena_com_io_sq,\n+\t\t\t\trx_info->mbuf, req_id);\n+\t\t\tif (unlikely(rc != 0)) {\n+\t\t\t\t/* Free the mbuf in case of an error. */\n+\t\t\t\trte_mbuf_raw_free(rx_info->mbuf);\n+\t\t\t} else {\n+\t\t\t\t/*\n+\t\t\t\t * If there was no error, just exit the loop as\n+\t\t\t\t * 0 length descriptor is always the last one.\n+\t\t\t\t */\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t} else {\n+\t\t\t/* Create an mbuf chain. */\n+\t\t\tmbuf->next = rx_info->mbuf;\n+\t\t\tmbuf = mbuf->next;\n \n-\t\tena_init_rx_mbuf(mbuf, len);\n-\t\tmbuf_head->pkt_len += len;\n+\t\t\tena_init_rx_mbuf(mbuf, len);\n+\t\t\tmbuf_head->pkt_len += len;\n+\t\t}\n \n+\t\t/*\n+\t\t * Mark the descriptor as depleted and perform necessary\n+\t\t * cleanup.\n+\t\t * This code will execute in two cases:\n+\t\t * 1. Descriptor len was greater than 0 - normal situation.\n+\t\t * 2. Descriptor len was 0 and we failed to add the descriptor\n+\t\t * to the device. In that situation, we should try to add\n+\t\t * the mbuf again in the populate routine and mark the\n+\t\t * descriptor as used up by the device.\n+\t\t */\n \t\trx_info->mbuf = NULL;\n \t\trx_ring->empty_rx_reqs[ntc] = req_id;\n \t\tntc = ENA_IDX_NEXT_MASKED(ntc, rx_ring->size_mask);\n", "prefixes": [ "v3", "28/30" ] }