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 8743E43345 for ; Thu, 16 Nov 2023 14:25:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 81A1740ED6; Thu, 16 Nov 2023 14:25:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id D4A0A40A89 for ; Thu, 16 Nov 2023 14:25:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JVYCIry1+J3bKduUQTPqUokvmNUZulirXmg5nlmx28o=; b=F7gXZYl30CGDnv8TuI1RabD4hiL3BhKwiz3hioaM4AiDCWHlYSHOkjU8C1LGh65m7nq3j3 fvWjr9S0rwkWLomoHaeEA5QpoTYJLu0t4fZbA/syKVR6ZenS+ZdmzD/rBybnIoaA3I4T8h Eiawayc0OToLqhcEVQm1/PmEQf1k4Ds= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-31-eEJFqaLnOhmrQQDuH3xkRg-1; Thu, 16 Nov 2023 08:25:09 -0500 X-MC-Unique: eEJFqaLnOhmrQQDuH3xkRg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CB65785A58B; Thu, 16 Nov 2023 13:25:08 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7638B2166B27; Thu, 16 Nov 2023 13:25:07 +0000 (UTC) From: Kevin Traynor To: Joshua Washington Cc: Rushil Gupta , Andrew Rybchenko , Ajit Khaparde , dpdk stable Subject: patch 'ethdev: account for smaller MTU when setting default' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:35 +0000 Message-ID: <20231116132348.557257-53-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/23. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/4308ee164213562432477a26eddc98d03ce98dcf Thanks. Kevin --- >From 4308ee164213562432477a26eddc98d03ce98dcf Mon Sep 17 00:00:00 2001 From: Joshua Washington Date: Tue, 7 Nov 2023 22:05:34 -0800 Subject: [PATCH] ethdev: account for smaller MTU when setting default [ upstream commit da266c6556d22b470679484b62e3f9db192e4032 ] Currently, if not specified in the user configuration, rte_eth_dev_configure() sets the MTU of the device to RTE_EHTER_MTU. This value could potentially be larger than the MTU that the device supports. This change updates the configured MTU to be the minimum of the maximum supported MTU and the default DPDK MTU. Fixes: 1bb4a528c41f ("ethdev: fix max Rx packet length") Signed-off-by: Joshua Washington Signed-off-by: Rushil Gupta Acked-by: Andrew Rybchenko Acked-by: Ajit Khaparde --- lib/ethdev/rte_ethdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 081d8bb297..9a8dd94e0a 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -1529,5 +1529,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, if (dev_conf->rxmode.mtu == 0) - dev->data->dev_conf.rxmode.mtu = RTE_ETHER_MTU; + dev->data->dev_conf.rxmode.mtu = + (dev_info.max_mtu == 0) ? RTE_ETHER_MTU : + RTE_MIN(dev_info.max_mtu, RTE_ETHER_MTU); ret = eth_dev_validate_mtu(port_id, &dev_info, -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.808754317 +0000 +++ 0053-ethdev-account-for-smaller-MTU-when-setting-default.patch 2023-11-16 13:21:52.531946611 +0000 @@ -1 +1 @@ -From da266c6556d22b470679484b62e3f9db192e4032 Mon Sep 17 00:00:00 2001 +From 4308ee164213562432477a26eddc98d03ce98dcf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit da266c6556d22b470679484b62e3f9db192e4032 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 9163ef47ea..3858983fcc 100644 +index 081d8bb297..9a8dd94e0a 100644 @@ -28 +29 @@ -@@ -1420,5 +1420,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, +@@ -1529,5 +1529,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,