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 0121543CAD for ; Thu, 14 Mar 2024 01:11:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E896D42E4B; Thu, 14 Mar 2024 01:11:28 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id CABFD4021E for ; Thu, 14 Mar 2024 01:11:26 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-413ebcf13a5so2333325e9.3 for ; Wed, 13 Mar 2024 17:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375086; x=1710979886; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xLP/PAyjRjP7qxFQQKe208VYcclGmehVh2vADzB0TfE=; b=Mq2CI5+M1atjW2aj1tLloydrRBbdqpGK8xZbQuboD9YIbcug8I4ZOTu9lZb4MSePdz Eurm4DuxZrxztV6jgdzr2DoHR2R6LRLjEnqQz/EhjbVyQvvrYbpNowldzr2i4EoZXg5N 4bjsFZOFcW+qc3jEvhv+JXEr+E4lInYrsOwJbXKhZfXOcyhY93VogqDTfesD4tvaUjuV vzjrfojGuEVbCuJqt8zFLuErE7HlbC43JgDisdvX62am1kjhGSegHJ9dQqjovrb4QeLC 6gphNVTqcKVJNmRhsKrJgEpjChGWaYUCwqqFD/R5zPKll8sjZElF3D8Kl9nSyynYmDd7 43PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375086; x=1710979886; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xLP/PAyjRjP7qxFQQKe208VYcclGmehVh2vADzB0TfE=; b=QfBT4wAgpBM4u3sDsbaT5Ay9Vk1Zi9SX5qMr4aPKWxMkwAvFw0KiRC4KsntVLI2JDa dXs0wbvhhWBYZ2PZKspdHHFLqYfYuxOOoXDBH1ly6NkT0QUmB3m4esyLaFIQ8a/N50KT eygcu6Ytfio/W3hzK9A2Fkb7KFiJw4W8KizS6iHB7YyjwQ1xJyDsodqcedxiNopscAp/ eeo1I0ws9+GM7P2YbSvfSi1lgN3R5nBxgbTOhdF1xQbZIqkTufvJkOg5YjLQlfBHWc2J beCg8gQsNuO6lU9hzXP0PpNHVXJl2PseI8SFN3QEQ+VsY66lg2fFHCvrNuDUNIyknFhs YraQ== X-Gm-Message-State: AOJu0YxGMNFRJRmdoaFdl6KpFltwEIKyKRK+BU+tfQggZHx5AeHBLTba Vg/QgKxOJ/lTXhYMhw5NTnrV/Xc/DShPexSgF/UKusmKnUMs1Z4kOuV2H4wO X-Google-Smtp-Source: AGHT+IEeY0hlhHZr6anZmyK+TYRRh2Oh2wFVRdwxoW8qbsISElEksNNiNFoiiRmPEvFSRuacUHsgSw== X-Received: by 2002:a05:600c:19c7:b0:413:f034:a4ae with SMTP id u7-20020a05600c19c700b00413f034a4aemr243001wmq.4.1710375086243; Wed, 13 Mar 2024 17:11:26 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id k15-20020adfb34f000000b0033e6ede34d3sm297837wrd.39.2024.03.13.17.11.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:11:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Nithin Dabilpuram Cc: dpdk stable Subject: patch 'net/cnxk: fix buffer size configuration' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:24 +0000 Message-Id: <20240314000957.2810803-28-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/16/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/36157ca75c0d6c5dca8af57243ac78cf1f4157ed Thanks. Luca Boccassi --- >From 36157ca75c0d6c5dca8af57243ac78cf1f4157ed Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Mon, 26 Feb 2024 19:05:28 +0530 Subject: [PATCH] net/cnxk: fix buffer size configuration [ upstream commit 3e12147f71ffb96595bf35a92f3f3741ae9d91bb ] 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") Signed-off-by: Nithin Dabilpuram --- 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 7a7478cda8..8008f5e4f3 100644 --- a/drivers/net/cnxk/cnxk_ethdev_ops.c +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c @@ -508,8 +508,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; @@ -525,8 +526,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. @@ -544,6 +561,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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:22.019427613 +0000 +++ 0028-net-cnxk-fix-buffer-size-configuration.patch 2024-03-14 00:09:20.609615142 +0000 @@ -1 +1 @@ -From 3e12147f71ffb96595bf35a92f3f3741ae9d91bb Mon Sep 17 00:00:00 2001 +From 36157ca75c0d6c5dca8af57243ac78cf1f4157ed Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3e12147f71ffb96595bf35a92f3f3741ae9d91bb ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index e9ab8da781..e816884d47 100644 +index 7a7478cda8..8008f5e4f3 100644 @@ -22 +23 @@ -@@ -544,8 +544,9 @@ cnxk_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu) +@@ -508,8 +508,9 @@ cnxk_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu) @@ -33 +34 @@ -@@ -561,8 +562,24 @@ cnxk_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu) +@@ -525,8 +526,24 @@ cnxk_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu) @@ -60 +61 @@ -@@ -580,6 +597,8 @@ cnxk_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu) +@@ -544,6 +561,8 @@ cnxk_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)