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 5C233A0A02 for ; Mon, 17 May 2021 18:11:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5579F410F1; Mon, 17 May 2021 18:11:03 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 0D663410EA for ; Mon, 17 May 2021 18:11:00 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifpa-0007X4-RE; Mon, 17 May 2021 16:10:58 +0000 From: Christian Ehrhardt To: Andrew Rybchenko Cc: Gaetan Rivet , dpdk stable Date: Mon, 17 May 2021 18:07:17 +0200 Message-Id: <20210517161039.3132619-8-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/failsafe: report minimum and maximum MTU' has been queued to stable release 19.11.9 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" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/65f95125f78b34e560ebf0ac299d69447d7c9b66 Thanks. Christian Ehrhardt --- >From 65f95125f78b34e560ebf0ac299d69447d7c9b66 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Tue, 22 Dec 2020 11:51:49 +0300 Subject: [PATCH] net/failsafe: report minimum and maximum MTU [ upstream commit c0396a48b526eb3d38c941a7e7d63d360a789d16 ] Take minimum and maximum MTU values for subdevices and report maximum of minimums and minimum of maximums. Fixes: ad97ceece12c ("ethdev: add min/max MTU to device info") Signed-off-by: Andrew Rybchenko Acked-by: Gaetan Rivet --- drivers/net/failsafe/failsafe_ops.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c index 4bc8b90e96..f63be9b11d 100644 --- a/drivers/net/failsafe/failsafe_ops.c +++ b/drivers/net/failsafe/failsafe_ops.c @@ -1051,6 +1051,8 @@ static void fs_dev_merge_info(struct rte_eth_dev_info *info, const struct rte_eth_dev_info *sinfo) { + info->min_mtu = RTE_MAX(info->min_mtu, sinfo->min_mtu); + info->max_mtu = RTE_MIN(info->max_mtu, sinfo->max_mtu); info->max_rx_pktlen = RTE_MIN(info->max_rx_pktlen, sinfo->max_rx_pktlen); info->max_rx_queues = RTE_MIN(info->max_rx_queues, sinfo->max_rx_queues); info->max_tx_queues = RTE_MIN(info->max_tx_queues, sinfo->max_tx_queues); @@ -1119,6 +1121,8 @@ fs_dev_infos_get(struct rte_eth_dev *dev, int ret; /* Use maximum upper bounds by default */ + infos->min_mtu = RTE_ETHER_MIN_MTU; + infos->max_mtu = UINT16_MAX; infos->max_rx_pktlen = UINT32_MAX; infos->max_rx_queues = RTE_MAX_QUEUES_PER_PORT; infos->max_tx_queues = RTE_MAX_QUEUES_PER_PORT; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:29.893467217 +0200 +++ 0008-net-failsafe-report-minimum-and-maximum-MTU.patch 2021-05-17 17:40:29.095808877 +0200 @@ -1 +1 @@ -From c0396a48b526eb3d38c941a7e7d63d360a789d16 Mon Sep 17 00:00:00 2001 +From 65f95125f78b34e560ebf0ac299d69447d7c9b66 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c0396a48b526eb3d38c941a7e7d63d360a789d16 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 966cfd2dba..1343777d61 100644 +index 4bc8b90e96..f63be9b11d 100644 @@ -22 +23 @@ -@@ -1095,6 +1095,8 @@ static void +@@ -1051,6 +1051,8 @@ static void @@ -31 +32 @@ -@@ -1163,6 +1165,8 @@ fs_dev_infos_get(struct rte_eth_dev *dev, +@@ -1119,6 +1121,8 @@ fs_dev_infos_get(struct rte_eth_dev *dev,