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 6789EA0547 for ; Mon, 8 Feb 2021 16:15:08 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C35640147; Mon, 8 Feb 2021 16:15:08 +0100 (CET) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mails.dpdk.org (Postfix) with ESMTP id B867B40147 for ; Mon, 8 Feb 2021 16:15:06 +0100 (CET) Received: by mail-pl1-f174.google.com with SMTP id g3so7989734plp.2 for ; Mon, 08 Feb 2021 07:15:06 -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=wQ0vJHzp5tG798vZARAADuAzgmgOOoyUq+jskyfU6Oo=; b=D5WAW4qGiifAIf25N8++AF9lJZmqhHM6+i6qbzcg/7OqO9HUApIhvwA/G8gxNTB+vn L/4YJfIRWvcmwEyuAnIEIckmYKP/s51z5+cAqwcwtykbb3jXUp3eDsaxsY22u3AGlI5u StaQYwkYx716aiE+tZ846J4wkDu/qlDEhsaIw= 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=wQ0vJHzp5tG798vZARAADuAzgmgOOoyUq+jskyfU6Oo=; b=mSB7DqQihMP06oeAiXarwPQMq3+S9KEgbULHpxF2plKotMRqzzryNDB0FcWONgL4SH cBUfr99dUKPu/pC19NNJVjuC/VieHdtTrdigEyk2Ly08aV7bHW1wcBy2aSSX4m2LoYGJ slePoJRKguxNhMyEUpMei8tlYxqDK51VG+x5aeRlWQwQKbSuUldUffG+j0w1Bur0x0Si nxXgNqoC/L/9NiAvCZC9hxxlocoE71UqMtrJubZmGDE0GTyWqeujCOf8UfSLo9Ca0KnK StgpGES8Rs8bCkYl8g6YU6xwoxPb0l3UfjLb2usbQ/ExVk+QKlaDMds9a1tvMqBjTe2Q RDPg== X-Gm-Message-State: AOAM530FJSl2dqINibrRIStckTLoysbw98P46jIrGuTqbXiAoyChpYgp 04vyTFK7NKJ9RUswQZlfCWwmxA== X-Google-Smtp-Source: ABdhPJx6q2WYlz9eMcgwLisdBvCn5SjyAMCkLMwI+ui4cMzurp+noHMuvCXxd9KzjCKwYijITNXBOw== X-Received: by 2002:a17:90a:7bc2:: with SMTP id d2mr18260476pjl.68.1612797304871; Mon, 08 Feb 2021 07:15:04 -0800 (PST) Received: from localhost.localdomain ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id v3sm17912779pff.217.2021.02.08.07.15.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 07:15:02 -0800 (PST) From: Lance Richardson To: Ajit Khaparde , Somnath Kotur , Venkat Duvvuru Cc: stable@dpdk.org Date: Mon, 8 Feb 2021 10:14:51 -0500 Message-Id: <20210208151451.87164-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="00000000000085396f05bad4a206" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [dpdk-stable] [PATCH 20.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" --00000000000085396f05bad4a206 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 | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index fdbe6f71ea..fed1e67739 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -827,6 +827,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; int nb_rep_rx_pkts = 0; @@ -875,12 +876,16 @@ 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; - if (rc == -ENODEV) /* completion for representor */ + else if (rc == -ENODEV) /* completion for representor */ nb_rep_rx_pkts++; + 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, @@ -917,21 +922,22 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, bnxt_db_cq(cpr); /* 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 + nb_rep_rx_pkts; cnt++) { + struct rte_mbuf **rx_buf; - for (; cnt; - i = RING_NEXT(rxr->rx_ring_struct, i), cnt--) { - struct rte_mbuf **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 != NULL && *rx_buf != &rxq->fake_mbuf) 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 --00000000000085396f05bad4a206--