From: Ajit Khaparde <ajit.khaparde@broadcom.com>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com
Subject: [dpdk-dev] [PATCH v2 06/19] net/bnxt: fix rx handling and buffer allocation logic
Date: Mon, 18 Sep 2017 10:17:42 -0500 [thread overview]
Message-ID: <20170918151755.86605-7-ajit.khaparde@broadcom.com> (raw)
In-Reply-To: <20170918151755.86605-1-ajit.khaparde@broadcom.com>
Even when rx buffer allocation fails, we are wrongly updating
the producer index. This patch fixes that.
Also in case of a buffer allocation failure, reattempt buffer
allocation before the rx handler exits.
Fixes: 2eb53b134a ("net/bnxt: add initial Rx code")
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
drivers/net/bnxt/bnxt_rxr.c | 32 +++++++++++++++++++++++++++++---
1 file changed, 29 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index bee67d3..bf9f78a 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -391,7 +391,7 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
rte_prefetch0(mbuf);
if (mbuf == NULL)
- return -ENOMEM;
+ return -EBUSY;
mbuf->nb_segs = 1;
mbuf->next = NULL;
@@ -448,13 +448,14 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
if (bnxt_alloc_rx_data(rxq, rxr, prod)) {
RTE_LOG(ERR, PMD, "mbuf alloc failed with prod=0x%x\n", prod);
rc = -ENOMEM;
+ goto rx;
}
rxr->rx_prod = prod;
/*
* All MBUFs are allocated with the same size under DPDK,
* no optimization for rx_copy_thresh
*/
-
+rx:
*rx_pkt = mbuf;
next_rx:
@@ -476,6 +477,7 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
struct rx_pkt_cmpl *rxcmp;
uint16_t prod = rxr->rx_prod;
uint16_t ag_prod = rxr->ag_prod;
+ int rc = 0;
/* Handle RX burst request */
while (1) {
@@ -491,7 +493,7 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
/* TODO: Avoid magic numbers... */
if ((CMP_TYPE(rxcmp) & 0x30) == 0x10) {
rc = bnxt_rx_pkt(&rx_pkts[nb_rx_pkts], rxq, &raw_cons);
- if (likely(!rc))
+ if (likely(!rc) || rc == -ENOMEM)
nb_rx_pkts++;
if (rc == -EBUSY) /* partial completion */
break;
@@ -514,6 +516,30 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
B_RX_DB(rxr->rx_doorbell, rxr->rx_prod);
/* Ring the AGG ring DB */
B_RX_DB(rxr->ag_doorbell, rxr->ag_prod);
+
+ /* Attempt to alloc Rx buf in case of a previous allocation failure. */
+ if (rc == -ENOMEM) {
+ int i;
+
+ for (i = prod; i <= nb_rx_pkts;
+ i = RING_NEXT(rxr->rx_ring_struct, i)) {
+ struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[i];
+
+ /* Buffer already allocated for this index. */
+ if (rx_buf->mbuf != NULL)
+ continue;
+
+ /* This slot is empty. Alloc buffer for Rx */
+ if (!bnxt_alloc_rx_data(rxq, rxr, i)) {
+ rxr->rx_prod = i;
+ B_RX_DB(rxr->rx_doorbell, rxr->rx_prod);
+ } else {
+ RTE_LOG(ERR, PMD, "Alloc mbuf failed\n");
+ break;
+ }
+ }
+ }
+
return nb_rx_pkts;
}
--
2.10.1 (Apple Git-78)
next prev parent reply other threads:[~2017-09-18 15:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-18 15:17 [dpdk-dev] [PATCH v2 00/19] bnxt patch set Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 01/19] net/bnxt: fix HWRM_*() macros and locking Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 02/19] net/bnxt: use 64-bits of address for vlan_table Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 03/19] net/bnxt: fix an issue with group id calculation Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 04/19] net/bnxt: fix calculation of number of pools Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 05/19] net/bnxt: handle multi queue mode properly Ajit Khaparde
2017-09-18 15:17 ` Ajit Khaparde [this message]
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 07/19] net/bnxt: fix an issue with broadcast traffic Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 08/19] net/bnxt: fix usage of ETH_VMDQ_* flags Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 09/19] net/bnxt: set checksum offload flags correctly Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 10/19] net/bnxt: update status of Rx IP/L4 CKSUM Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 11/19] net/bnxt: add support for xstats get by id Ajit Khaparde
2017-09-19 12:39 ` Ferruh Yigit
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 12/19] net/bnxt: fix config rss update Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 13/19] net/bnxt: set the hash_key_size Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 14/19] net/bnxt: add support for rx_queue_count Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 15/19] net/bnxt: add support for rx_descriptor_status Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 16/19] net/bnxt: add support for tx_descriptor_status Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 17/19] net/bnxt: add new HWRM structs to support flow filtering Ajit Khaparde
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 18/19] net/bnxt: add support for flow filter ops Ajit Khaparde
2017-09-19 12:38 ` Ferruh Yigit
2017-09-18 15:17 ` [dpdk-dev] [PATCH v2 19/19] doc: update release notes Ajit Khaparde
2017-09-18 18:46 ` Mcnamara, John
2017-09-19 12:39 ` Ferruh Yigit
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=20170918151755.86605-7-ajit.khaparde@broadcom.com \
--to=ajit.khaparde@broadcom.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.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).