From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DB2DCA09F6 for ; Fri, 18 Dec 2020 00:57:31 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B728FCA4C; Fri, 18 Dec 2020 00:57:30 +0100 (CET) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by dpdk.org (Postfix) with ESMTP id 987D6CA3E; Fri, 18 Dec 2020 00:57:26 +0100 (CET) Received: by mail-ed1-f41.google.com with SMTP id p22so494174edu.11; Thu, 17 Dec 2020 15:57:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tZHCfxg7/kyTYeuNfQcAlirA8iGebjW2qZBX7ZTvtFU=; b=IAgRkAG8+Gch0PMfeOWGfV2H3nwwDiGHA8Q9eN/aR/JtDwlt2XB2cxU3/84vht50qv VUdMqcjRxt9eydY4u8ELoe3z0eQfJgcLvcRrhXLgt9HkOvVYuZ/HpFoPvG/C61RuhqSh zoFUm84ki+fqTJs/mD6pZTaRQiuhrGeMrsuUQSUlxqMsIwr5tyLkyhhBzw6HenM0Tqhd yQxhIl0zKoTTSRoHru0FXQ2nxAQkm52i5IKw0REFNKqPuMMdUcd2pkKS++/zukloUm4X XAUejB7NSwS75AwXqMNWAIV9kRMZWm/xHNIcRzPaJOFbg7dQylpFtLysqiCqoP5MRThy SuYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tZHCfxg7/kyTYeuNfQcAlirA8iGebjW2qZBX7ZTvtFU=; b=Sd7fLg2Bv6wv4aPeJi2vageUuTUJQ0JjWVFxknwICCenXIMTB1+7TkpbUPdEP9mbid 3WXg9Zvj5RwaGNuJyOwToakSa31xcDguxrHcWeVL5RglOD9IVU/MuOePBMVHBbPd1HCo ye4nNhYlymwYZggOsKRcMY+OvDP46Sp0faodP2iOcucEczntgn8VBb9iZdsA0ioy9jXU l45ushlMuNcqJN9lTCEITlfnuXcW3mEugzuhoLhmrdVyKZsaXlkm9iTJ7OzI3DzEWxlk O4bZ+qp6U/SiegQA9kTrd4Ct8l3dW50vrP7LbQ3LgGM2QmzXuZRDfUWJta+yeoFB7IFo REGQ== X-Gm-Message-State: AOAM533fE0rBHxnJ7nDN7TIITA/cTVqivwld0cTfVWhInQzoMDxOm4Cx RZ8Q3iKK9yEyx+gYqLreSAYxQNJA3nvAkGrOT84= X-Google-Smtp-Source: ABdhPJzt5QUfAaIqVS/1DmEM0bFDr/x6E8E0CZTQc9pml2TvUECgONci80Q5c0g0n+ZbOiioZO1quybm3QhS5Rr3GjQ= X-Received: by 2002:a50:a684:: with SMTP id e4mr1870035edc.148.1608249445307; Thu, 17 Dec 2020 15:57:25 -0800 (PST) MIME-Version: 1.0 References: <20201216150618.1829951-1-lance604@gmail.com> In-Reply-To: <20201216150618.1829951-1-lance604@gmail.com> From: Ajit Khaparde Date: Thu, 17 Dec 2020 15:57:14 -0800 Message-ID: To: Lance Richardson Cc: Ajit Khaparde , Somnath Kotur , dev@dpdk.org, Lance Richardson , stable@dpdk.org Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] net/bnxt: fix fallback mbuf allocation logic X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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" On Wed, Dec 16, 2020 at 7:06 AM Lance Richardson wrote: > > From: Lance Richardson > > Fixes for fallback mbuf allocation logic. > - Preserve raw (unmasked) producer index. > - 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. > > Fixes: 6dc83230b43b ("net/bnxt: support port representor data path") > Fixes: d9dd0b29ed31 ("net/bnxt: fix Rx handling and buffer allocation logic") > Fixes: 8b8dc3f783ff ("net/bnxt: modify ring index logic") > Cc: stable@dpdk.org > Signed-off-by: Lance Richardson Updated the commit-id for one of the Fixes tag. Patch applied to dpdk-next-net-brcm. > --- > 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 ffdeeecc3a..288b403bf0 100644 > --- a/drivers/net/bnxt/bnxt_rxr.c > +++ b/drivers/net/bnxt/bnxt_rxr.c > @@ -839,6 +839,7 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, > uint16_t rx_raw_prod = rxr->rx_raw_prod; > uint16_t ag_raw_prod = rxr->ag_raw_prod; > 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; > @@ -885,12 +886,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, > @@ -929,23 +934,24 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, > bnxt_db_write(&rxr->ag_db, rxr->ag_raw_prod); > > /* Attempt to alloc Rx buf in case of a previous allocation failure. */ > - if (rc == -ENOMEM) { > - int i = RING_NEXT(rx_raw_prod); > - int cnt = nb_rx_pkts; > + if (alloc_failed) { > + uint16_t cnt; > > - for (; nb_rx_pkts; i = RING_NEXT(i), cnt--) { > + rx_raw_prod = RING_NEXT(rx_raw_prod); > + for (cnt = 0; cnt < nb_rx_pkts + nb_rep_rx_pkts; cnt++) { > struct rte_mbuf **rx_buf; > - uint16_t rx_raw_prod = RING_IDX(rxr->rx_ring_struct, i); > + uint16_t ndx; > > - rx_buf = &rxr->rx_buf_ring[rx_raw_prod]; > + ndx = RING_IDX(rxr->rx_ring_struct, rx_raw_prod + cnt); > + rx_buf = &rxr->rx_buf_ring[ndx]; > > /* 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_raw_prod = i; > + if (!bnxt_alloc_rx_data(rxq, rxr, rx_raw_prod + cnt)) { > + rxr->rx_raw_prod = rx_raw_prod + cnt; > bnxt_db_write(&rxr->rx_db, rxr->rx_raw_prod); > } else { > PMD_DRV_LOG(ERR, "Alloc mbuf failed\n"); > -- > 2.25.1 > -- Ajit Khaparde