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 C5720A055D for ; Mon, 1 Mar 2021 01:38:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D66064014E; Mon, 1 Mar 2021 01:38:06 +0100 (CET) Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by mails.dpdk.org (Postfix) with ESMTP id 9879A4014E for ; Mon, 1 Mar 2021 01:38:05 +0100 (CET) Received: by mail-qv1-f47.google.com with SMTP id gi9so7381211qvb.10 for ; Sun, 28 Feb 2021 16:38:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tH/qaATrsBA1DfbBol3wOTWltxsvIfTGLuohlA/MwUQ=; b=X3LSs/P/ELqrMrk2TCZUVQ7evGvcdz7XeFaO5PCJ9ASMKe6K2PZ2Kjy9WKoCbpM/9E 9cf/q57gSvsGTR3P+ePDyYWp3HhDfK4WSFBuoc69YC+D64jda/JeF5A1xmLe+XmlIqo4 RhP/2NMKavecMlhW5yQBUU07z1bIHjNW4p24c= 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=tH/qaATrsBA1DfbBol3wOTWltxsvIfTGLuohlA/MwUQ=; b=JZQWt0L9g5DR0wnV9VY+8IEO7P7s+yQZ1v8CDJpYPV0PrQs5M3ZkTZOZ2wNwt13cfu CQBCjSx/6n2EyZbs/xc57IG/2rnHgYTkB/WN4th4SRninbl14FzHKmpZT13ol0YH5x42 DZKGJE+5xCNxCbOVA1VrxvLK9HuQQvylqwhqiogmTnfUF5SQ/18vNQUHyP5bnZ3a9jqg t44IUq6zl94DA97fldie2DPcQM+tkCxjvshyjEAH71bqa5/m2DypfrMZBrXMo/YhWgS7 KvbT7xgIlPnFEZaeybl1ib7bz3MVOyos9jD7GsSbfkt6ovmwBzlJ9YFkfS1xMFSz6rXE oJUw== X-Gm-Message-State: AOAM533YNsp1YpWxRE1FLymVcutiGAnY/QkDCFDsX1PKCjOPDJjjNFxK vHvdftoSWt+0Omb4Unz8Lo0bBDPSnKNNZeNUGQYyuw== X-Google-Smtp-Source: ABdhPJx+m/eByMxPL4ri8F0q8qny+Inlh+h0Puf0Rv6KkrPbR1V5zAy+xno1+IoVUX2NV9O1itqREwygVscrMePEXzk= X-Received: by 2002:a05:6214:80d:: with SMTP id df13mr6379613qvb.55.1614559084790; Sun, 28 Feb 2021 16:38:04 -0800 (PST) MIME-Version: 1.0 References: <20210218181920.223463-1-lance.richardson@broadcom.com> In-Reply-To: <20210218181920.223463-1-lance.richardson@broadcom.com> From: Ajit Khaparde Date: Sun, 28 Feb 2021 16:37:48 -0800 Message-ID: To: Lance Richardson Cc: Somnath Kotur , Rahul Gupta , dpdk-dev , dpdk stable Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="000000000000bd11c405bc6ed42a" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [dpdk-stable] [PATCH] net/bnxt: fix Rx queue count implementation 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" --000000000000bd11c405bc6ed42a Content-Type: text/plain; charset="UTF-8" On Thu, Feb 18, 2021 at 10:19 AM Lance Richardson wrote: > > bnxt_rx_queue_count_op() incorrectly returns the number of > filled but unprocessed completion queue entries instead of > the number of filled but unprocessed received packet > completions. Fix by properly accounting for the number of > completion ring entries used by the various received packet > completion types. > > Fixes: 34c0ba839bae ("net/bnxt: fix Rx queue count") > Signed-off-by: Lance Richardson > Reviewed-by: Somnath Kotur > Cc: stable@dpdk.org Patch applied to dpdk-next-net-brcm. > --- > drivers/net/bnxt/bnxt_cpr.h | 4 ++++ > drivers/net/bnxt/bnxt_ethdev.c | 38 +++++++++++++++++++++++++++++----- > drivers/net/bnxt/bnxt_rxr.c | 3 +-- > drivers/net/bnxt/bnxt_rxr.h | 4 ++++ > 4 files changed, 42 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/bnxt/bnxt_cpr.h b/drivers/net/bnxt/bnxt_cpr.h > index d7e0d4621a..28c0a9049c 100644 > --- a/drivers/net/bnxt/bnxt_cpr.h > +++ b/drivers/net/bnxt/bnxt_cpr.h > @@ -26,6 +26,10 @@ struct bnxt_db_info; > #define CMP_TYPE(cmp) \ > (((struct cmpl_base *)cmp)->type & CMPL_BASE_TYPE_MASK) > > +/* Get completion length from completion type, in 16-byte units. */ > +#define CMP_LEN(cmp_type) (((cmp_type) & 1) + 1) > + > + > #define ADV_RAW_CMP(idx, n) ((idx) + (n)) > #define NEXT_RAW_CMP(idx) ADV_RAW_CMP(idx, 1) > #define RING_CMP(ring, idx) ((idx) & (ring)->ring_mask) > diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c > index 22c880c5c3..9824cdb6d8 100644 > --- a/drivers/net/bnxt/bnxt_ethdev.c > +++ b/drivers/net/bnxt/bnxt_ethdev.c > @@ -2942,8 +2942,8 @@ static uint32_t > bnxt_rx_queue_count_op(struct rte_eth_dev *dev, uint16_t rx_queue_id) > { > struct bnxt *bp = (struct bnxt *)dev->data->dev_private; > - uint32_t desc = 0, raw_cons = 0, cons; > struct bnxt_cp_ring_info *cpr; > + uint32_t desc = 0, raw_cons; > struct bnxt_rx_queue *rxq; > struct rx_pkt_cmpl *rxcmp; > int rc; > @@ -2957,15 +2957,43 @@ bnxt_rx_queue_count_op(struct rte_eth_dev *dev, uint16_t rx_queue_id) > raw_cons = cpr->cp_raw_cons; > > while (1) { > + uint32_t agg_cnt, cons, cmpl_type; > + > cons = RING_CMP(cpr->cp_ring_struct, raw_cons); > - rte_prefetch0(&cpr->cp_desc_ring[cons]); > rxcmp = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[cons]; > > - if (!CMP_VALID(rxcmp, raw_cons, cpr->cp_ring_struct)) { > + if (!CMP_VALID(rxcmp, raw_cons, cpr->cp_ring_struct)) > break; > - } else { > - raw_cons++; > + > + cmpl_type = CMP_TYPE(rxcmp); > + > + switch (cmpl_type) { > + case CMPL_BASE_TYPE_RX_L2: > + case CMPL_BASE_TYPE_RX_L2_V2: > + agg_cnt = BNXT_RX_L2_AGG_BUFS(rxcmp); > + raw_cons = raw_cons + CMP_LEN(cmpl_type) + agg_cnt; > + desc++; > + break; > + > + case CMPL_BASE_TYPE_RX_TPA_END: > + if (BNXT_CHIP_P5(rxq->bp)) { > + struct rx_tpa_v2_end_cmpl_hi *p5_tpa_end; > + > + p5_tpa_end = (void *)rxcmp; > + agg_cnt = BNXT_TPA_END_AGG_BUFS_TH(p5_tpa_end); > + } else { > + struct rx_tpa_end_cmpl *tpa_end; > + > + tpa_end = (void *)rxcmp; > + agg_cnt = BNXT_TPA_END_AGG_BUFS(tpa_end); > + } > + > + raw_cons = raw_cons + CMP_LEN(cmpl_type) + agg_cnt; > desc++; > + break; > + > + default: > + raw_cons += CMP_LEN(cmpl_type); > } > } > > diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c > index 4674f7cea2..e8f174fc57 100644 > --- a/drivers/net/bnxt/bnxt_rxr.c > +++ b/drivers/net/bnxt/bnxt_rxr.c > @@ -827,8 +827,7 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt, > goto next_rx; > } > > - agg_buf = (rxcmp->agg_bufs_v1 & RX_PKT_CMPL_AGG_BUFS_MASK) > - >> RX_PKT_CMPL_AGG_BUFS_SFT; > + agg_buf = BNXT_RX_L2_AGG_BUFS(rxcmp); > if (agg_buf && !bnxt_agg_bufs_valid(cpr, agg_buf, tmp_raw_cons)) > return -EBUSY; > > diff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h > index 0e31b37cad..06d10848da 100644 > --- a/drivers/net/bnxt/bnxt_rxr.h > +++ b/drivers/net/bnxt/bnxt_rxr.h > @@ -37,6 +37,10 @@ static inline uint16_t bnxt_tpa_start_agg_id(struct bnxt *bp, > #define BNXT_TPA_END_AGG_ID_TH(cmp) \ > rte_le_to_cpu_16((cmp)->agg_id) > > +#define BNXT_RX_L2_AGG_BUFS(cmp) \ > + (((cmp)->agg_bufs_v1 & RX_PKT_CMPL_AGG_BUFS_MASK) >> \ > + RX_PKT_CMPL_AGG_BUFS_SFT) > + > #define BNXT_RX_POST_THRESH 32 > > /* Number of descriptors to process per inner loop in vector mode. */ > -- > 2.25.1 > --000000000000bd11c405bc6ed42a--