From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id ED922A0547 for ; Mon, 8 Feb 2021 17:31:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DF40C1606F1; Mon, 8 Feb 2021 17:31:05 +0100 (CET) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mails.dpdk.org (Postfix) with ESMTP id 35B181606F1 for ; Mon, 8 Feb 2021 17:31:04 +0100 (CET) Received: by mail-pl1-f171.google.com with SMTP id e9so8101882plh.3 for ; Mon, 08 Feb 2021 08:31:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:mime-version; bh=NYGJ680bjs+aC6OLfWE1y8Y4E277b/A5tLtKK9dEH+U=; b=VtTrhQN+QBOre2SQYBJwr3tdcwCilEb4oqE7mkzRPLg7pMnAOUK+HM8/y5wP+c6Uhu qlNqbo0abclhlQ/aSq4vELfPxtyo8BXcPA3tNnJrNQd2z0cl8Fc7Wb4MPPcxjf+jJ6ua hswlR3OyBEAxAV6Ws5ciN3FMpnGTDPzsBWoFI= 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:mime-version; bh=NYGJ680bjs+aC6OLfWE1y8Y4E277b/A5tLtKK9dEH+U=; b=Q8RTkbk46luFybTlYasc/aPn0qrHm5DMqcqjHoGW1Dvz+b6PLsGBVp1kNFvUlUVZfl F/D6tz1rNTf7cNNlM3xnSgW0FMXK7d1oDjV9mVvzfUwnfWf1ponBB7r03kXo+GuSpzZ1 UMkpy4gtLe8tcrTLGM/ybeP2d3qcQeEQiagmG7SZEyGWJf+5BoTUBVe+l5lumZTNADs4 BrHMMeOJolM6G1OJ4U6P4XdLsfIWAqH2k7tfbChUVjpIsHF9tXJZ0NYlBDnUxJlW4aQY uvMgaWN3lZCyvmVeDFCkRxK5JO7CyfnZKTb2XBdy+7hIT6I68MD7s/H5ZaKHxv+aBbnm 5bHg== X-Gm-Message-State: AOAM532ztYCIxFCUy0Oo85bhRtOslf/jo0jp/McmiBAoYkwLQEB7DN57 gCn2soc2OlgzAbmAauj0JgffOg== X-Google-Smtp-Source: ABdhPJxIa+AaETYXAK8VSqbsaUcgRs0CsA5AWuHx6UYeGTc4PJRPOJ0vzCG+TVvPDrK3G+Y8O6YINA== X-Received: by 2002:a17:90a:f682:: with SMTP id cl2mr17069654pjb.150.1612801863270; Mon, 08 Feb 2021 08:31:03 -0800 (PST) Received: from localhost.localdomain ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id z2sm8406935pfj.100.2021.02.08.08.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 08:31:02 -0800 (PST) From: Lance Richardson To: Ajit Khaparde , Somnath Kotur , Venkat Duvvuru Cc: stable@dpdk.org Date: Mon, 8 Feb 2021 11:30:57 -0500 Message-Id: <20210208163057.88650-1-lance.richardson@broadcom.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="0000000000002dcf9d05bad5b246" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [dpdk-stable] [PATCH 19.11] net/bnxt: fix fallback mbuf allocation logic X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" --0000000000002dcf9d05bad5b246 Content-Transfer-Encoding: 8bit Fixes for fallback mbuf allocation logic. - Iterate over all processed descriptors (representor and non-representor) when checking allocation status. - Invoke fallback allocation logic when an allocation failure has occurred for any received packet, not just the last. Based on upstream commit c86e930165c3 ("net/bnxt: fix fallback mbuf allocation logic"), with changes to resolve conflicts caused by the absence of upstream commit c7de4195cc4c ("net/bnxt: modify ring index logic") Fixes: 6dc83230b43b ("net/bnxt: support port representor data path") Fixes: d9dd0b29ed31 ("net/bnxt: fix Rx handling and buffer allocation logic") Cc: stable@dpdk.org Signed-off-by: Lance Richardson --- drivers/net/bnxt/bnxt_rxr.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 0a8861c5a0..c6d95c835f 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -604,6 +604,7 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, struct bnxt_cp_ring_info *cpr = rxq->cp_ring; struct bnxt_rx_ring_info *rxr = rxq->rx_ring; uint32_t raw_cons = cpr->cp_raw_cons; + bool alloc_failed = false; uint32_t cons; int nb_rx_pkts = 0; struct rx_pkt_cmpl *rxcmp; @@ -633,10 +634,14 @@ 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) || rc == -ENOMEM) + if (!rc) nb_rx_pkts++; - if (rc == -EBUSY) /* partial completion */ + else if (rc == -EBUSY) /* partial completion */ break; + else if (rc == -ENOMEM) { + nb_rx_pkts++; + alloc_failed = true; + } } else if (!BNXT_NUM_ASYNC_CPR(rxq->bp)) { evt = bnxt_event_hwrm_resp_handler(rxq->bp, @@ -675,21 +680,22 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, bnxt_db_write(&rxr->ag_db, rxr->ag_prod); /* Attempt to alloc Rx buf in case of a previous allocation failure. */ - if (rc == -ENOMEM) { - int i = RING_NEXT(rxr->rx_ring_struct, prod); - int cnt = nb_rx_pkts; + if (alloc_failed) { + uint16_t cnt; + + for (cnt = 0; cnt < nb_rx_pkts; cnt++) { + struct bnxt_sw_rx_bd *rx_buf; - for (; cnt; - i = RING_NEXT(rxr->rx_ring_struct, i), cnt--) { - struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[i]; + prod = RING_NEXT(rxr->rx_ring_struct, prod); + rx_buf = &rxr->rx_buf_ring[prod]; /* 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; + if (!bnxt_alloc_rx_data(rxq, rxr, prod)) { + rxr->rx_prod = prod; bnxt_db_write(&rxr->rx_db, rxr->rx_prod); } else { PMD_DRV_LOG(ERR, "Alloc mbuf failed\n"); -- 2.25.1 --0000000000002dcf9d05bad5b246--