From: Marcin Wojtas <mw@semihalf.com>
To: dev@dpdk.org
Cc: jan.medala@outlook.com, jpalider@gmail.com, netanel@amazon.com,
evgenys@amazon.com, matua@amazon.com, gtzalik@amazon.com,
igorch@amazon.com, mw@semihalf.com, mk@semihalf.com
Subject: [dpdk-dev] [PATCH v2 1/4] net/ena: fix incorrect Rx descriptors allocation
Date: Mon, 10 Apr 2017 16:28:08 +0200 [thread overview]
Message-ID: <1491834491-13944-2-git-send-email-mw@semihalf.com> (raw)
In-Reply-To: <1491834491-13944-1-git-send-email-mw@semihalf.com>
From: Michal Krawczyk <mk@semihalf.com>
When application tried to allocate 1024 descriptors, device was not
initializing properly.
This patch solves it by avoiding allocation of all descriptors in the
ring in one attempt. At least one descriptor must remain unused in the
HW ring.
Fixes: 1173fca25af9 ("ena: add polling-mode driver")
Signed-off-by: Michal Krawczyk <mk@semihalf.com>
---
drivers/net/ena/ena_ethdev.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index b5e6db6..90cf2ad 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -919,7 +919,7 @@ static int ena_start(struct rte_eth_dev *dev)
static int ena_queue_restart(struct ena_ring *ring)
{
- int rc;
+ int rc, bufs_num;
ena_assert_msg(ring->configured == 1,
"Trying to restart unconfigured queue\n");
@@ -930,8 +930,9 @@ static int ena_queue_restart(struct ena_ring *ring)
if (ring->type == ENA_RING_TYPE_TX)
return 0;
- rc = ena_populate_rx_queue(ring, ring->ring_size);
- if ((unsigned int)rc != ring->ring_size) {
+ bufs_num = ring->ring_size - 1;
+ rc = ena_populate_rx_queue(ring, bufs_num);
+ if (rc != bufs_num) {
PMD_INIT_LOG(ERR, "Failed to populate rx ring !");
return (-1);
}
@@ -1143,7 +1144,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)
return 0;
in_use = rxq->next_to_use - rxq->next_to_clean;
- ena_assert_msg(((in_use + count) <= ring_size), "bad ring state");
+ ena_assert_msg(((in_use + count) < ring_size), "bad ring state");
count = RTE_MIN(count,
(uint16_t)(ring_size - (next_to_use & ring_mask)));
@@ -1574,6 +1575,7 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
recv_idx++;
}
+ desc_in_use += 1;
/* Burst refill to save doorbells, memory barriers, const interval */
if (ring_size - desc_in_use > ENA_RING_DESCS_RATIO(ring_size))
ena_populate_rx_queue(rx_ring, ring_size - desc_in_use);
--
1.8.3.1
next prev parent reply other threads:[~2017-04-10 14:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-10 14:28 [dpdk-dev] [PATCH v2 0/4] Ena PMD fixes Marcin Wojtas
2017-04-10 14:28 ` Marcin Wojtas [this message]
2017-04-10 14:28 ` [dpdk-dev] [PATCH v2 2/4] net/ena: fix delayed cleanup of Rx descriptors Marcin Wojtas
2017-04-10 14:28 ` [dpdk-dev] [PATCH v2 3/4] net/ena: cleanup if refilling of rx descriptors fails Marcin Wojtas
2017-04-10 14:28 ` [dpdk-dev] [PATCH v2 4/4] net/ena: calculate partial checksum if DF bit is disabled Marcin Wojtas
2017-04-10 22:20 ` [dpdk-dev] [PATCH v2 0/4] Ena PMD fixes Jakub Palider
2017-04-12 11:22 ` Ferruh Yigit
2017-04-11 8:29 ` Jan M?dala
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1491834491-13944-2-git-send-email-mw@semihalf.com \
--to=mw@semihalf.com \
--cc=dev@dpdk.org \
--cc=evgenys@amazon.com \
--cc=gtzalik@amazon.com \
--cc=igorch@amazon.com \
--cc=jan.medala@outlook.com \
--cc=jpalider@gmail.com \
--cc=matua@amazon.com \
--cc=mk@semihalf.com \
--cc=netanel@amazon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).