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 9BC25A0A0B for ; Sun, 31 Jan 2021 02:27:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 680154067B; Sun, 31 Jan 2021 02:27:31 +0100 (CET) Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by mails.dpdk.org (Postfix) with ESMTP id 3BECA4067B for ; Sun, 31 Jan 2021 02:27:29 +0100 (CET) Received: by mail-qt1-f176.google.com with SMTP id l23so9682573qtq.13 for ; Sat, 30 Jan 2021 17:27:29 -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=QgBtMmMvS5TepwXV8Roy1I2eOGCbZ/G32cp3wP3HLgo=; b=eQKGZajip4Eu6wzQhidqcQmG1z+afdd6VkXaf20/8aayiQTwHQTY/OLHhL7ghxLgjS wixj5TDZYLYr3LUX4gKibf/8y7RGr/YciEfpNdMwnZUd4Yl6dHuHv7hXJejKq9cnxnFJ p0hJSwd+M7stiwTUflKGzuI2sZ2S5vAgwHnWM= 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=QgBtMmMvS5TepwXV8Roy1I2eOGCbZ/G32cp3wP3HLgo=; b=PL3RSKhuYHvliwjMM0QdAR9i9lRTGtUQhyOsNSuBp2SAnBYath/SoaELo/JEySZ6Lv 3Oj+tQSy0VyJOJIEQp9XZaZD9I2PRyKi0SiMQi2E/Jv6dxzM1xWifv3CcW4VJ3FtfZuJ FyDYKDUq5+evmTheYZhgBvPBX3bNEz+WPEBOGrzuszMtYQ09GT87Mjg6VO/BHYlnoVjm QidwD0xDkfHMOUJHRZdmK5wisvGrS93lGsOd+oabVQ0YVXqmL3eNBFbdCP+n8SRpbtu5 sRHo8E48vLlHx/B473OwbHvpPcZfcUPklNKXjOliSJN3tIEUMaI8eu7OjKvlp2/je5Lf l6FQ== X-Gm-Message-State: AOAM532+FlKk615oXp8b3zx0+7gOZc7BGaL9LpzdnbiVhHEH6BZEAzZm m+gVyEh7yR9V2tipj8mY1kasAcuhZOsa6sZ6gWhfnA== X-Google-Smtp-Source: ABdhPJzeEMAdB+WQmsZglrqezEyfcZXsZn9AVetnRHwYS1xNHMgfNryZihTm+GBA7ttitRwJr1fMvPNb/nd7mIJTvlc= X-Received: by 2002:ac8:5894:: with SMTP id t20mr10108332qta.194.1612056448257; Sat, 30 Jan 2021 17:27:28 -0800 (PST) MIME-Version: 1.0 References: <20210129180709.101772-1-lance.richardson@broadcom.com> In-Reply-To: <20210129180709.101772-1-lance.richardson@broadcom.com> From: Ajit Khaparde Date: Sat, 30 Jan 2021 17:27:11 -0800 Message-ID: To: Lance Richardson Cc: Somnath Kotur , dpdk-dev , dpdk stable Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="000000000000fd044e05ba28239e" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [dpdk-stable] [PATCH v2] net/bnxt: fix cp ring size calculation 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" --000000000000fd044e05ba28239e Content-Type: text/plain; charset="UTF-8" On Fri, Jan 29, 2021 at 10:07 AM Lance Richardson wrote: > > The size of the receive completion ring should be recalculated > when MTU is increased to a size that requires scattered receive > or when LRO is enabled. Move logic for this calculation from > the ring configuration path to the device start path. > - Made size calculation dependent only on scattered_rx > status. > - Moved calculation of scattered_rx up in the initialization > sequence. > - Made LRO offload status part of scattered_rx calculation. > > When the completion ring size is too small, completion overflows > can occur causing the ring to be disabled in hardware. > > Fixes: 04067844a3e9 ("net/bnxt: reduce CQ queue size without aggregation ring") > Cc: stable@dpdk.org > Signed-off-by: Lance Richardson > Reviewed-by: Ajit Kumar Khaparde Patch applied to dpdk-next-net-brcm/for-next-net. Thanks > --- > v2: Fixed conflict resolution mistake (two missing hunks). > > drivers/net/bnxt/bnxt_ethdev.c | 6 +++++- > drivers/net/bnxt/bnxt_ring.c | 22 ++++++++++++++++++++++ > drivers/net/bnxt/bnxt_rxr.c | 15 +-------------- > 3 files changed, 28 insertions(+), 15 deletions(-) > > diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c > index ec88cb0046..ca779726ec 100644 > --- a/drivers/net/bnxt/bnxt_ethdev.c > +++ b/drivers/net/bnxt/bnxt_ethdev.c > @@ -1143,6 +1143,9 @@ static int bnxt_scattered_rx(struct rte_eth_dev *eth_dev) > if (eth_dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) > return 1; > > + if (eth_dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_TCP_LRO) > + return 1; > + > for (i = 0; i < eth_dev->data->nb_rx_queues; i++) { > struct bnxt_rx_queue *rxq = eth_dev->data->rx_queues[i]; > > @@ -1418,11 +1421,12 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) > > bnxt_enable_int(bp); > > + eth_dev->data->scattered_rx = bnxt_scattered_rx(eth_dev); > + > rc = bnxt_start_nic(bp); > if (rc) > goto error; > > - eth_dev->data->scattered_rx = bnxt_scattered_rx(eth_dev); > eth_dev->data->dev_started = 1; > > bnxt_link_update_op(eth_dev, 1); > diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c > index 4e513244a6..ba23c1fa03 100644 > --- a/drivers/net/bnxt/bnxt_ring.c > +++ b/drivers/net/bnxt/bnxt_ring.c > @@ -583,6 +583,17 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index) > struct bnxt_rx_ring_info *rxr = rxq->rx_ring; > int rc; > > + /* > + * Storage for the cp ring is allocated based on worst-case > + * usage, the actual size to be used by hw is computed here. > + */ > + cp_ring->ring_size = rxr->rx_ring_struct->ring_size * 2; > + > + if (bp->eth_dev->data->scattered_rx) > + cp_ring->ring_size *= AGG_RING_SIZE_FACTOR; > + > + cp_ring->ring_mask = cp_ring->ring_size - 1; > + > rc = bnxt_alloc_cmpl_ring(bp, queue_index, cpr); > if (rc) > goto err_out; > @@ -693,6 +704,17 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp) > struct bnxt_ring *cp_ring = cpr->cp_ring_struct; > struct bnxt_rx_ring_info *rxr = rxq->rx_ring; > > + /* > + * Storage for the cp ring is allocated based on worst-case > + * usage, the actual size to be used by hw is computed here. > + */ > + cp_ring->ring_size = rxr->rx_ring_struct->ring_size * 2; > + > + if (bp->eth_dev->data->scattered_rx) > + cp_ring->ring_size *= AGG_RING_SIZE_FACTOR; > + > + cp_ring->ring_mask = cp_ring->ring_size - 1; > + > if (bnxt_alloc_cmpl_ring(bp, i, cpr)) > goto err_out; > > diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c > index 8c2781c968..4674f7cea2 100644 > --- a/drivers/net/bnxt/bnxt_rxr.c > +++ b/drivers/net/bnxt/bnxt_rxr.c > @@ -1116,12 +1116,9 @@ void bnxt_free_rx_rings(struct bnxt *bp) > > int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) > { > - struct rte_eth_dev *eth_dev = rxq->bp->eth_dev; > - struct rte_eth_rxmode *rxmode; > struct bnxt_cp_ring_info *cpr; > struct bnxt_rx_ring_info *rxr; > struct bnxt_ring *ring; > - bool use_agg_ring; > > rxq->rx_buf_size = BNXT_MAX_PKT_LEN + sizeof(struct rte_mbuf); > > @@ -1164,19 +1161,9 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) > return -ENOMEM; > cpr->cp_ring_struct = ring; > > - rxmode = ð_dev->data->dev_conf.rxmode; > - use_agg_ring = (rxmode->offloads & DEV_RX_OFFLOAD_SCATTER) || > - (rxmode->offloads & DEV_RX_OFFLOAD_TCP_LRO) || > - (rxmode->max_rx_pkt_len > > - (uint32_t)(rte_pktmbuf_data_room_size(rxq->mb_pool) - > - RTE_PKTMBUF_HEADROOM)); > - > /* Allocate two completion slots per entry in desc ring. */ > ring->ring_size = rxr->rx_ring_struct->ring_size * 2; > - > - /* Allocate additional slots if aggregation ring is in use. */ > - if (use_agg_ring) > - ring->ring_size *= AGG_RING_SIZE_FACTOR; > + ring->ring_size *= AGG_RING_SIZE_FACTOR; > > ring->ring_size = rte_align32pow2(ring->ring_size); > ring->ring_mask = ring->ring_size - 1; > -- > 2.25.1 > --000000000000fd044e05ba28239e--