Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/40727/?format=api
{ "id": 40727, "url": "https://patches.dpdk.org/api/patches/40727/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20180607094322.14312-14-mk@semihalf.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": "<20180607094322.14312-14-mk@semihalf.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180607094322.14312-14-mk@semihalf.com", "date": "2018-06-07T09:43:09", "name": "[dpdk-dev,v3,14/27] net/ena: add RX out of order completion", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "726a6e8cfff864a1937c215d150a8e6430d18863", "submitter": { "id": 786, "url": "https://patches.dpdk.org/api/people/786/?format=api", "name": "Michal Krawczyk", "email": "mk@semihalf.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20180607094322.14312-14-mk@semihalf.com/mbox/", "series": [ { "id": 26, "url": "https://patches.dpdk.org/api/series/26/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=26", "date": "2018-06-07T09:43:00", "name": "net/ena: new features and fixes", "version": 3, "mbox": "https://patches.dpdk.org/series/26/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/40727/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/40727/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 F31E51B3D1;\n\tThu, 7 Jun 2018 11:43:54 +0200 (CEST)", "from mail-lf0-f66.google.com (mail-lf0-f66.google.com\n\t[209.85.215.66]) by dpdk.org (Postfix) with ESMTP id 33FB81B1B5\n\tfor <dev@dpdk.org>; Thu, 7 Jun 2018 11:43:51 +0200 (CEST)", "by mail-lf0-f66.google.com with SMTP id g21-v6so11669296lfb.4\n\tfor <dev@dpdk.org>; Thu, 07 Jun 2018 02:43:51 -0700 (PDT)", "from mkPC.semihalf.local (31-172-191-173.noc.fibertech.net.pl.\n\t[31.172.191.173]) by smtp.gmail.com with ESMTPSA id\n\tp28-v6sm3612368lfh.24.2018.06.07.02.43.49\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 07 Jun 2018 02:43:49 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=semihalf-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=h4FDbEJZN8D4yMCkpiflSwbVdpTeH4Ekl9Sxdt3vgww=;\n\tb=hv8iOKzuCaLVf6h8Y4oZl4koeURpdQZY4Td0RqlYtsGd2IgN5WSGMjGEqCB0n4KMIK\n\tkFUFqYv+A2u+ML+oE7QYMhWURAPRFQicoOlLoBJJQDh+8Dh4K4EdDww3gCoVC47TSfbg\n\tO6CVVDQWwI/cBpW7gFDjdz15uWg5ZkPX16R1kHQS1E0mFxboLqK5Rb+VvDwzr0JkYFlD\n\tMJGUaa6pAW82e/L++IXO5a1J2QHgssrZtZWhvVjmCnBE9wvrjWv8pyjLpD2kwz7er87y\n\t9mrYUzyeeKA3qj+mu+HhgQorBGe3jKJzR9WSsq6rSZ6MPmA8JItALs2oXO2Sz225ps+k\n\tBh/w==", "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:in-reply-to\n\t:references;\n\tbh=h4FDbEJZN8D4yMCkpiflSwbVdpTeH4Ekl9Sxdt3vgww=;\n\tb=i0wd3lG8juNSfZg9I6d0/gdNHZFGOhHYFiEHgcm5gf/ZXn3fLWB13xFL7O4QZuZ+Gr\n\teLb56vATiCGTNPX3g1YxcALg7wOW6R4MmnEITTbTleUbwe5bg5xkRI0VWYHPX3AVCXvI\n\tUy6JICsoV1z+cxVJ6gaOa3gtMUvqopj8TGXPdE9i9bAFHfwk3/zfelTlTihQu+j8GXtt\n\tJVg9+KlZA8fTdqB1jC12xAmCRNaQnpiOciiAXHx7Rrt2VIM7FY2PgdENP16qL/Zqgkrm\n\tNV4CzzmeYVWnrIVI6/JQ9bXpsU4/c9Mnn9Nj7ERKsSAVDxz4gr4eki5QopaVIEp/pPfh\n\t9ZRA==", "X-Gm-Message-State": "APt69E0La1Z3RTpprnOTI2aTwEWgMoOLI53uw+qeozpUd/qmweMq8pQS\n\tKwFXdWE11VSXk3dhFaDTLsjj/g==", "X-Google-Smtp-Source": "ADUXVKI9MLo3YLDMlnJVPmissf7EWQNo0RFmxiPtXNvEgrFYmDDV8Jzchj94juMdJdF6cTeTvCYEkA==", "X-Received": "by 2002:a2e:9a44:: with SMTP id\n\tk4-v6mr961970ljj.17.1528364630867; \n\tThu, 07 Jun 2018 02:43:50 -0700 (PDT)", "From": "Michal Krawczyk <mk@semihalf.com>", "To": "Marcin Wojtas <mw@semihalf.com>, Michal Krawczyk <mk@semihalf.com>,\n\tGuy Tzalik <gtzalik@amazon.com>, Evgeny Schemeilin <evgenys@amazon.com>", "Cc": "dev@dpdk.org,\n\tmatua@amazon.com", "Date": "Thu, 7 Jun 2018 11:43:09 +0200", "Message-Id": "<20180607094322.14312-14-mk@semihalf.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20180607094322.14312-1-mk@semihalf.com>", "References": "<20180607094322.14312-1-mk@semihalf.com>", "Subject": "[dpdk-dev] [PATCH v3 14/27] net/ena: add RX out of order completion", "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://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://dpdk.org/ml/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 feature allows RX packets to be cleaned up out of order.\n\nSigned-off-by: Michal Krawczyk <mk@semihalf.com>\n---\n drivers/net/ena/ena_ethdev.c | 48 ++++++++++++++++++++++++++++++++++++++++----\n drivers/net/ena/ena_ethdev.h | 8 ++++++--\n 2 files changed, 50 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex 1a15c184a..f0e95ef58 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -368,6 +368,19 @@ static inline void ena_tx_mbuf_prepare(struct rte_mbuf *mbuf,\n \t}\n }\n \n+static inline int validate_rx_req_id(struct ena_ring *rx_ring, uint16_t req_id)\n+{\n+\tif (likely(req_id < rx_ring->ring_size))\n+\t\treturn 0;\n+\n+\tRTE_LOG(ERR, PMD, \"Invalid rx req_id: %hu\\n\", req_id);\n+\n+\trx_ring->adapter->reset_reason = ENA_REGS_RESET_INV_RX_REQ_ID;\n+\trx_ring->adapter->trigger_reset = true;\n+\n+\treturn -EFAULT;\n+}\n+\n static void ena_config_host_info(struct ena_com_dev *ena_dev)\n {\n \tstruct ena_admin_host_info *host_info;\n@@ -724,6 +737,10 @@ static void ena_rx_queue_release(void *queue)\n \t\trte_free(ring->rx_buffer_info);\n \tring->rx_buffer_info = NULL;\n \n+\tif (ring->empty_rx_reqs)\n+\t\trte_free(ring->empty_rx_reqs);\n+\tring->empty_rx_reqs = NULL;\n+\n \tring->configured = 0;\n \n \tRTE_LOG(NOTICE, PMD, \"RX Queue %d:%d released\\n\",\n@@ -1176,7 +1193,7 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t(struct ena_adapter *)(dev->data->dev_private);\n \tstruct ena_ring *rxq = NULL;\n \tuint16_t ena_qid = 0;\n-\tint rc = 0;\n+\tint i, rc = 0;\n \tstruct ena_com_dev *ena_dev = &adapter->ena_dev;\n \n \trxq = &adapter->rx_ring[queue_idx];\n@@ -1242,6 +1259,19 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,\n \t\treturn -ENOMEM;\n \t}\n \n+\trxq->empty_rx_reqs = rte_zmalloc(\"rxq->empty_rx_reqs\",\n+\t\t\t\t\t sizeof(uint16_t) * nb_desc,\n+\t\t\t\t\t RTE_CACHE_LINE_SIZE);\n+\tif (!rxq->empty_rx_reqs) {\n+\t\tRTE_LOG(ERR, PMD, \"failed to alloc mem for empty rx reqs\\n\");\n+\t\trte_free(rxq->rx_buffer_info);\n+\t\trxq->rx_buffer_info = NULL;\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tfor (i = 0; i < nb_desc; i++)\n+\t\trxq->empty_tx_reqs[i] = i;\n+\n \t/* Store pointer to this queue in upper layer */\n \trxq->configured = 1;\n \tdev->data->rx_queues[queue_idx] = rxq;\n@@ -1256,7 +1286,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)\n \tuint16_t ring_size = rxq->ring_size;\n \tuint16_t ring_mask = ring_size - 1;\n \tuint16_t next_to_use = rxq->next_to_use;\n-\tuint16_t in_use;\n+\tuint16_t in_use, req_id;\n \tstruct rte_mbuf **mbufs = &rxq->rx_buffer_info[0];\n \n \tif (unlikely(!count))\n@@ -1284,12 +1314,14 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)\n \t\tstruct ena_com_buf ebuf;\n \n \t\trte_prefetch0(mbufs[((next_to_use + 4) & ring_mask)]);\n+\n+\t\treq_id = rxq->empty_rx_reqs[next_to_use_masked];\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, next_to_use_masked);\n+\t\t\t\t\t\t&ebuf, req_id);\n \t\tif (unlikely(rc)) {\n \t\t\trte_mempool_put_bulk(rxq->mb_pool, (void **)(&mbuf),\n \t\t\t\t\t count - i);\n@@ -1710,6 +1742,7 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \tunsigned int ring_mask = ring_size - 1;\n \tuint16_t next_to_clean = rx_ring->next_to_clean;\n \tuint16_t desc_in_use = 0;\n+\tuint16_t req_id;\n \tunsigned int recv_idx = 0;\n \tstruct rte_mbuf *mbuf = NULL;\n \tstruct rte_mbuf *mbuf_head = NULL;\n@@ -1750,7 +1783,12 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\tbreak;\n \n \t\twhile (segments < ena_rx_ctx.descs) {\n-\t\t\tmbuf = rx_buff_info[next_to_clean & ring_mask];\n+\t\t\treq_id = ena_rx_ctx.ena_bufs[segments].req_id;\n+\t\t\trc = validate_rx_req_id(rx_ring, req_id);\n+\t\t\tif (unlikely(rc))\n+\t\t\t\tbreak;\n+\n+\t\t\tmbuf = rx_buff_info[req_id];\n \t\t\tmbuf->data_len = ena_rx_ctx.ena_bufs[segments].len;\n \t\t\tmbuf->data_off = RTE_PKTMBUF_HEADROOM;\n \t\t\tmbuf->refcnt = 1;\n@@ -1767,6 +1805,8 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\tmbuf_head->pkt_len += mbuf->data_len;\n \n \t\t\tmbuf_prev = mbuf;\n+\t\t\trx_ring->empty_rx_reqs[next_to_clean & ring_mask] =\n+\t\t\t\treq_id;\n \t\t\tsegments++;\n \t\t\tnext_to_clean++;\n \t\t}\ndiff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h\nindex 594e643e2..bba5ad53a 100644\n--- a/drivers/net/ena/ena_ethdev.h\n+++ b/drivers/net/ena/ena_ethdev.h\n@@ -75,8 +75,12 @@ struct ena_ring {\n \n \tenum ena_ring_type type;\n \tenum ena_admin_placement_policy_type tx_mem_queue_type;\n-\t/* Holds the empty requests for TX OOO completions */\n-\tuint16_t *empty_tx_reqs;\n+\t/* Holds the empty requests for TX/RX OOO completions */\n+\tunion {\n+\t\tuint16_t *empty_tx_reqs;\n+\t\tuint16_t *empty_rx_reqs;\n+\t};\n+\n \tunion {\n \t\tstruct ena_tx_buffer *tx_buffer_info; /* contex of tx packet */\n \t\tstruct rte_mbuf **rx_buffer_info; /* contex of rx packet */\n", "prefixes": [ "dpdk-dev", "v3", "14/27" ] }