From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <mk@semihalf.com>
Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com
[209.85.215.66]) by dpdk.org (Postfix) with ESMTP id 33FB81B1B5
for <dev@dpdk.org>; Thu, 7 Jun 2018 11:43:51 +0200 (CEST)
Received: by mail-lf0-f66.google.com with SMTP id g21-v6so11669296lfb.4
for <dev@dpdk.org>; Thu, 07 Jun 2018 02:43:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=semihalf-com.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references;
bh=h4FDbEJZN8D4yMCkpiflSwbVdpTeH4Ekl9Sxdt3vgww=;
b=hv8iOKzuCaLVf6h8Y4oZl4koeURpdQZY4Td0RqlYtsGd2IgN5WSGMjGEqCB0n4KMIK
kFUFqYv+A2u+ML+oE7QYMhWURAPRFQicoOlLoBJJQDh+8Dh4K4EdDww3gCoVC47TSfbg
O6CVVDQWwI/cBpW7gFDjdz15uWg5ZkPX16R1kHQS1E0mFxboLqK5Rb+VvDwzr0JkYFlD
MJGUaa6pAW82e/L++IXO5a1J2QHgssrZtZWhvVjmCnBE9wvrjWv8pyjLpD2kwz7er87y
9mrYUzyeeKA3qj+mu+HhgQorBGe3jKJzR9WSsq6rSZ6MPmA8JItALs2oXO2Sz225ps+k
Bh/w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references;
bh=h4FDbEJZN8D4yMCkpiflSwbVdpTeH4Ekl9Sxdt3vgww=;
b=i0wd3lG8juNSfZg9I6d0/gdNHZFGOhHYFiEHgcm5gf/ZXn3fLWB13xFL7O4QZuZ+Gr
eLb56vATiCGTNPX3g1YxcALg7wOW6R4MmnEITTbTleUbwe5bg5xkRI0VWYHPX3AVCXvI
Uy6JICsoV1z+cxVJ6gaOa3gtMUvqopj8TGXPdE9i9bAFHfwk3/zfelTlTihQu+j8GXtt
JVg9+KlZA8fTdqB1jC12xAmCRNaQnpiOciiAXHx7Rrt2VIM7FY2PgdENP16qL/Zqgkrm
NV4CzzmeYVWnrIVI6/JQ9bXpsU4/c9Mnn9Nj7ERKsSAVDxz4gr4eki5QopaVIEp/pPfh
9ZRA==
X-Gm-Message-State: APt69E0La1Z3RTpprnOTI2aTwEWgMoOLI53uw+qeozpUd/qmweMq8pQS
KwFXdWE11VSXk3dhFaDTLsjj/g==
X-Google-Smtp-Source: ADUXVKI9MLo3YLDMlnJVPmissf7EWQNo0RFmxiPtXNvEgrFYmDDV8Jzchj94juMdJdF6cTeTvCYEkA==
X-Received: by 2002:a2e:9a44:: with SMTP id k4-v6mr961970ljj.17.1528364630867;
Thu, 07 Jun 2018 02:43:50 -0700 (PDT)
Received: from mkPC.semihalf.local (31-172-191-173.noc.fibertech.net.pl.
[31.172.191.173])
by smtp.gmail.com with ESMTPSA id p28-v6sm3612368lfh.24.2018.06.07.02.43.49
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Thu, 07 Jun 2018 02:43:49 -0700 (PDT)
From: Michal Krawczyk <mk@semihalf.com>
To: Marcin Wojtas <mw@semihalf.com>, Michal Krawczyk <mk@semihalf.com>,
Guy Tzalik <gtzalik@amazon.com>, Evgeny Schemeilin <evgenys@amazon.com>
Cc: dev@dpdk.org,
matua@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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jun 2018 09:43:51 -0000
This feature allows RX packets to be cleaned up out of order.
Signed-off-by: Michal Krawczyk <mk@semihalf.com>
---
drivers/net/ena/ena_ethdev.c | 48 ++++++++++++++++++++++++++++++++++++++++----
drivers/net/ena/ena_ethdev.h | 8 ++++++--
2 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 1a15c184a..f0e95ef58 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -368,6 +368,19 @@ static inline void ena_tx_mbuf_prepare(struct rte_mbuf *mbuf,
}
}
+static inline int validate_rx_req_id(struct ena_ring *rx_ring, uint16_t req_id)
+{
+ if (likely(req_id < rx_ring->ring_size))
+ return 0;
+
+ RTE_LOG(ERR, PMD, "Invalid rx req_id: %hu\n", req_id);
+
+ rx_ring->adapter->reset_reason = ENA_REGS_RESET_INV_RX_REQ_ID;
+ rx_ring->adapter->trigger_reset = true;
+
+ return -EFAULT;
+}
+
static void ena_config_host_info(struct ena_com_dev *ena_dev)
{
struct ena_admin_host_info *host_info;
@@ -724,6 +737,10 @@ static void ena_rx_queue_release(void *queue)
rte_free(ring->rx_buffer_info);
ring->rx_buffer_info = NULL;
+ if (ring->empty_rx_reqs)
+ rte_free(ring->empty_rx_reqs);
+ ring->empty_rx_reqs = NULL;
+
ring->configured = 0;
RTE_LOG(NOTICE, PMD, "RX Queue %d:%d released\n",
@@ -1176,7 +1193,7 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,
(struct ena_adapter *)(dev->data->dev_private);
struct ena_ring *rxq = NULL;
uint16_t ena_qid = 0;
- int rc = 0;
+ int i, rc = 0;
struct ena_com_dev *ena_dev = &adapter->ena_dev;
rxq = &adapter->rx_ring[queue_idx];
@@ -1242,6 +1259,19 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,
return -ENOMEM;
}
+ rxq->empty_rx_reqs = rte_zmalloc("rxq->empty_rx_reqs",
+ sizeof(uint16_t) * nb_desc,
+ RTE_CACHE_LINE_SIZE);
+ if (!rxq->empty_rx_reqs) {
+ RTE_LOG(ERR, PMD, "failed to alloc mem for empty rx reqs\n");
+ rte_free(rxq->rx_buffer_info);
+ rxq->rx_buffer_info = NULL;
+ return -ENOMEM;
+ }
+
+ for (i = 0; i < nb_desc; i++)
+ rxq->empty_tx_reqs[i] = i;
+
/* Store pointer to this queue in upper layer */
rxq->configured = 1;
dev->data->rx_queues[queue_idx] = rxq;
@@ -1256,7 +1286,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)
uint16_t ring_size = rxq->ring_size;
uint16_t ring_mask = ring_size - 1;
uint16_t next_to_use = rxq->next_to_use;
- uint16_t in_use;
+ uint16_t in_use, req_id;
struct rte_mbuf **mbufs = &rxq->rx_buffer_info[0];
if (unlikely(!count))
@@ -1284,12 +1314,14 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)
struct ena_com_buf ebuf;
rte_prefetch0(mbufs[((next_to_use + 4) & ring_mask)]);
+
+ req_id = rxq->empty_rx_reqs[next_to_use_masked];
/* prepare physical address for DMA transaction */
ebuf.paddr = mbuf->buf_iova + RTE_PKTMBUF_HEADROOM;
ebuf.len = mbuf->buf_len - RTE_PKTMBUF_HEADROOM;
/* pass resource to device */
rc = ena_com_add_single_rx_desc(rxq->ena_com_io_sq,
- &ebuf, next_to_use_masked);
+ &ebuf, req_id);
if (unlikely(rc)) {
rte_mempool_put_bulk(rxq->mb_pool, (void **)(&mbuf),
count - i);
@@ -1710,6 +1742,7 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
unsigned int ring_mask = ring_size - 1;
uint16_t next_to_clean = rx_ring->next_to_clean;
uint16_t desc_in_use = 0;
+ uint16_t req_id;
unsigned int recv_idx = 0;
struct rte_mbuf *mbuf = NULL;
struct rte_mbuf *mbuf_head = NULL;
@@ -1750,7 +1783,12 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
break;
while (segments < ena_rx_ctx.descs) {
- mbuf = rx_buff_info[next_to_clean & ring_mask];
+ req_id = ena_rx_ctx.ena_bufs[segments].req_id;
+ rc = validate_rx_req_id(rx_ring, req_id);
+ if (unlikely(rc))
+ break;
+
+ mbuf = rx_buff_info[req_id];
mbuf->data_len = ena_rx_ctx.ena_bufs[segments].len;
mbuf->data_off = RTE_PKTMBUF_HEADROOM;
mbuf->refcnt = 1;
@@ -1767,6 +1805,8 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
mbuf_head->pkt_len += mbuf->data_len;
mbuf_prev = mbuf;
+ rx_ring->empty_rx_reqs[next_to_clean & ring_mask] =
+ req_id;
segments++;
next_to_clean++;
}
diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h
index 594e643e2..bba5ad53a 100644
--- a/drivers/net/ena/ena_ethdev.h
+++ b/drivers/net/ena/ena_ethdev.h
@@ -75,8 +75,12 @@ struct ena_ring {
enum ena_ring_type type;
enum ena_admin_placement_policy_type tx_mem_queue_type;
- /* Holds the empty requests for TX OOO completions */
- uint16_t *empty_tx_reqs;
+ /* Holds the empty requests for TX/RX OOO completions */
+ union {
+ uint16_t *empty_tx_reqs;
+ uint16_t *empty_rx_reqs;
+ };
+
union {
struct ena_tx_buffer *tx_buffer_info; /* contex of tx packet */
struct rte_mbuf **rx_buffer_info; /* contex of rx packet */
--
2.14.1