From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BBFABA04B1 for ; Mon, 23 Nov 2020 18:13:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B1E89C910; Mon, 23 Nov 2020 18:13:22 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 3EB82C8E4 for ; Mon, 23 Nov 2020 18:13:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151598; 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=3+tXuNLfnbPKTPAf44jDqXNsy4e9sIn7c+rwPE/8kOI=; b=KjuHUgFXEcxgDzM7rchPfoElB+F7Eb94fhBSOlJuAhMJvaY4ek64vhhhfYzel5ZOCnv+I2 cTXhjqF5f8AAD4p2hjDbdx0tW2KZxddXyq7UkmoZS2CifCb2guQaSnyIMLyGIcoK0Jje14 GddJ0fJOczKzMEZ8v7KSmBZCTxEgnUo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-494-8cSxMAoYMb-b2-D68-gN8A-1; Mon, 23 Nov 2020 12:13:13 -0500 X-MC-Unique: 8cSxMAoYMb-b2-D68-gN8A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9B69B100A653; Mon, 23 Nov 2020 17:13:12 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DB2C60C04; Mon, 23 Nov 2020 17:13:11 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Qi Zhang , Andrew Rybchenko , Igor Romanov , dpdk stable Date: Mon, 23 Nov 2020 17:12:09 +0000 Message-Id: <20201123171222.79398-17-ktraynor@redhat.com> In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> References: <20201123171222.79398-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.11 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/27/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/922feed76bd5d8fe06b95a56afabd3a95987b047 Thanks. Kevin. --- >From 922feed76bd5d8fe06b95a56afabd3a95987b047 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 13 Nov 2020 11:44:00 +0000 Subject: [PATCH] app/testpmd: fix MTU after device configure [ upstream commit 1c21ee95cf5298fe7b6a8b7d8a997ff3c402a08f ] In 'rte_eth_dev_configure()', if 'DEV_RX_OFFLOAD_JUMBO_FRAME' is not set the max frame size is limited to 'RTE_ETHER_MAX_LEN' (1518). This is mistake because for the PMDs that has frame size bigger than "RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN" (18 bytes), the MTU becomes less than 1500, causing a valid frame with 1500 bytes payload to be dropped. Since 'rte_eth_dev_set_mtu()' works as expected, it is called after 'rte_eth_dev_configure()' to fix the MTU. It may look redundant to set MTU after 'rte_eth_dev_configure()', both with default values, but it is not, the resulting MTU config can be different in the device based on frame overhead of the PMD. And instead of setting the MTU to default value, it is first get via 'rte_eth_dev_get_mtu()' and set again, this is to cover cases MTU changed from testpmd command line. 'rte_eth_dev_set_mtu()', '-ENOTSUP' error is ignored to prevent irrelevant warning messages for the virtual PMDs. Fixes: af75078fece3 ("first public release") Signed-off-by: Ferruh Yigit Reviewed-by: Qi Zhang Acked-by: Andrew Rybchenko Tested-by: Igor Romanov --- app/test-pmd/testpmd.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 018bd32ec6..21eb315983 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1969,4 +1969,6 @@ start_port(portid_t pid) if (port->need_reconfig > 0) { + uint16_t mtu = RTE_ETHER_MTU; + port->need_reconfig = 0; @@ -1995,4 +1997,21 @@ start_port(portid_t pid) return -1; } + + /* + * Workaround for rte_eth_dev_configure(), max_rx_pkt_len + * set MTU wrong for the PMDs that have frame overhead + * bigger than RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN. + * For a PMD that has 26 bytes overhead, rte_eth_dev_configure() + * can set MTU to max 1492, not to expected 1500 bytes. + * Using rte_eth_dev_set_mtu() to be able to set MTU correctly, + * default MTU value is 1500. + */ + diag = rte_eth_dev_get_mtu(pi, &mtu); + if (diag) + printf("Failed to get MTU for port %d\n", pi); + diag = rte_eth_dev_set_mtu(pi, mtu); + if (diag != 0 && diag != -ENOTSUP) + printf("Failed to set MTU to %u for port %d\n", + mtu, pi); } if (port->need_reconfig_queues > 0) { -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.398320110 +0000 +++ 0017-app-testpmd-fix-MTU-after-device-configure.patch 2020-11-23 17:10:14.000061593 +0000 @@ -1 +1 @@ -From 1c21ee95cf5298fe7b6a8b7d8a997ff3c402a08f Mon Sep 17 00:00:00 2001 +From 922feed76bd5d8fe06b95a56afabd3a95987b047 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1c21ee95cf5298fe7b6a8b7d8a997ff3c402a08f ] + @@ -27 +28,0 @@ -Cc: stable@dpdk.org @@ -38 +39 @@ -index 33fc0fddf5..48e9647fc7 100644 +index 018bd32ec6..21eb315983 100644 @@ -41 +42 @@ -@@ -2538,4 +2538,6 @@ start_port(portid_t pid) +@@ -1969,4 +1969,6 @@ start_port(portid_t pid) @@ -48 +49 @@ -@@ -2571,4 +2573,21 @@ start_port(portid_t pid) +@@ -1995,4 +1997,21 @@ start_port(portid_t pid)