From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id EBEB943B75
for <public@inbox.dpdk.org>; Thu, 22 Feb 2024 12:08:32 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id E041540E32;
Thu, 22 Feb 2024 12:08:32 +0100 (CET)
Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com
[67.231.148.174])
by mails.dpdk.org (Postfix) with ESMTP id A7CA840DD8;
Thu, 22 Feb 2024 12:08:29 +0100 (CET)
Received: from pps.filterd (m0045849.ppops.net [127.0.0.1])
by mx0a-0016f401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id
41M9BLax021847; Thu, 22 Feb 2024 03:08:28 -0800
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding:content-type; s=
pfpt0220; bh=zuD0cl3vtrbh/2Ty/hLFkov0+AXooedIooJyxCGwqew=; b=blr
FBwRiews4le7Rsi8ajiBYzg4k7qyR2r3mWdDed6Pv3szjS2v1IoZqvKvo5dzer2H
UNwicHG6Y8rQrI1QZK9XFzX4YjDTibCWdhw+pzvfiKB+kZSd0QBWoHZYI3UcbicC
izKCLNmAprQ943zsm5buyRiS3qHfqhnZwIv9Pp+zOWD7WIIMdxWDBQepnGoadLRS
reolE8UAFa5B2PkAm9UJ0aMZeBV3x7DVfbLF4NYAeJMeMkRADLL48uc5lSyaHv9k
Rm5zd0h/clurkBQ9PV7hreAIQe1uascAO9YlXI78mQEZ2CjBvVX4+KqEeHiYEUAx
BffReV6z+HSLs6ApBVw==
Received: from dc5-exch01.marvell.com ([199.233.59.181])
by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3we3dw8as2-2
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);
Thu, 22 Feb 2024 03:08:26 -0800 (PST)
Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com
(10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48;
Thu, 22 Feb 2024 03:02:53 -0800
Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com
(10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend
Transport; Thu, 22 Feb 2024 03:02:53 -0800
Received: from hyd1588t430.caveonetworks.com (unknown [10.29.52.204])
by maili.marvell.com (Postfix) with ESMTP id C8A7A3F71DD;
Thu, 22 Feb 2024 03:02:51 -0800 (PST)
From: Nithin Dabilpuram <ndabilpuram@marvell.com>
To: Nithin Dabilpuram <ndabilpuram@marvell.com>, Kiran Kumar K
<kirankumark@marvell.com>, Sunil Kumar Kori <skori@marvell.com>, Satha Rao
<skoteshwar@marvell.com>
CC: <dev@dpdk.org>, <stable@dpdk.org>
Subject: [PATCH v4 06/14] net/cnxk: fix issue with buff size compute
Date: Thu, 22 Feb 2024 16:32:24 +0530
Message-ID: <20240222110232.2342903-6-ndabilpuram@marvell.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20240222110232.2342903-1-ndabilpuram@marvell.com>
References: <20240208085956.1741174-1-ndabilpuram@marvell.com>
<20240222110232.2342903-1-ndabilpuram@marvell.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Proofpoint-GUID: 0ZDKGD3XzOh5CDgDfXuppBEK3kDvLpR_
X-Proofpoint-ORIG-GUID: 0ZDKGD3XzOh5CDgDfXuppBEK3kDvLpR_
X-Proofpoint-Virus-Version: vendor=baseguard
engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
definitions=2024-02-22_09,2024-02-22_01,2023-05-22_02
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
In case where cnxk_nix_mtu_set() is called before
data->min_rx_buf_size is set, use buf size from first RQ's
mempool.
Fixes: 34b46320f446 ("net/cnxk: perform early MTU setup for event mode")
Cc: stable@dpdk.org
Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
---
drivers/net/cnxk/cnxk_ethdev_ops.c | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c
index e9ab8da781..e816884d47 100644
--- a/drivers/net/cnxk/cnxk_ethdev_ops.c
+++ b/drivers/net/cnxk/cnxk_ethdev_ops.c
@@ -544,8 +544,9 @@ cnxk_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
struct rte_eth_dev_data *data = eth_dev->data;
struct roc_nix *nix = &dev->nix;
+ struct cnxk_eth_rxq_sp *rxq_sp;
+ uint32_t buffsz = 0;
int rc = -EINVAL;
- uint32_t buffsz;
frame_size += CNXK_NIX_TIMESYNC_RX_OFFSET * dev->ptp_en;
@@ -561,8 +562,24 @@ cnxk_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
goto exit;
}
- buffsz = data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM;
- old_frame_size = data->mtu + CNXK_NIX_L2_OVERHEAD;
+ if (!eth_dev->data->nb_rx_queues)
+ goto skip_buffsz_check;
+
+ /* Perform buff size check */
+ if (data->min_rx_buf_size) {
+ buffsz = data->min_rx_buf_size;
+ } else if (eth_dev->data->rx_queues && eth_dev->data->rx_queues[0]) {
+ rxq_sp = cnxk_eth_rxq_to_sp(data->rx_queues[0]);
+
+ if (rxq_sp->qconf.mp)
+ buffsz = rte_pktmbuf_data_room_size(rxq_sp->qconf.mp);
+ }
+
+ /* Skip validation if RQ's are not yet setup */
+ if (!buffsz)
+ goto skip_buffsz_check;
+
+ buffsz -= RTE_PKTMBUF_HEADROOM;
/* Refuse MTU that requires the support of scattered packets
* when this feature has not been enabled before.
@@ -580,6 +597,8 @@ cnxk_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
goto exit;
}
+skip_buffsz_check:
+ old_frame_size = data->mtu + CNXK_NIX_L2_OVERHEAD;
/* if new MTU was smaller than old one, then flush all SQs before MTU change */
if (old_frame_size > frame_size) {
if (data->dev_started) {
--
2.25.1