From: Kevin Traynor <ktraynor@redhat.com> To: Ferruh Yigit <ferruh.yigit@intel.com> Cc: Qi Zhang <qi.z.zhang@intel.com>, Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>, Igor Romanov <igor.romanov@oktetlabs.ru>, dpdk stable <stable@dpdk.org> Subject: [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' has been queued to LTS release 18.11.11 Date: Mon, 23 Nov 2020 17:12:09 +0000 Message-ID: <20201123171222.79398-17-ktraynor@redhat.com> (raw) In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> 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 <ferruh.yigit@intel.com> 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 <ferruh.yigit@intel.com> Reviewed-by: Qi Zhang <qi.z.zhang@intel.com> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> Tested-by: Igor Romanov <igor.romanov@oktetlabs.ru> --- 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)
next prev parent reply other threads:[~2020-11-23 17:13 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'devtools: fix directory filter in forbidden token check' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'examples/qos_sched: fix usage string' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'usertools: fix CPU layout script to be PEP8 compliant' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'config: enable packet prefetching with Meson' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'net/ring: fix typo in log message' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'examples/vhost_crypto: add new line character in usage' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix virtqueue initialization' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: add C++ include guard' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix releasing mbufs' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix performance drop after port reset' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: fix build for log format specifier' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/ixgbe: remove redundant MAC flag check' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix error path when setting memory tables' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in dirty logging setup' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in kick " Kevin Traynor 2020-11-23 17:12 ` Kevin Traynor [this message] 2020-11-23 18:35 ` [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' " David Marchand 2020-11-24 9:38 ` Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'app/eventdev: check timer adadpters number' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/kni: fix build with pkg-config' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l2fwd-crypto: " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/performance-thread: " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'doc: fix rule file parameters in l3fwd-acl guide' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx descriptor status' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: revert setting MTU explicitly after configure' " Kevin Traynor 2020-11-23 18:36 ` David Marchand 2020-11-23 17:12 ` [dpdk-stable] patch 'compress/isal: check allocation in queue setup' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l3fwd-power: check packet types after start' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix representor interrupts handler' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'malloc: fix style in free list index computation' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'usertools: fix pmdinfo parsing' " Kevin Traynor
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201123171222.79398-17-ktraynor@redhat.com \ --to=ktraynor@redhat.com \ --cc=andrew.rybchenko@oktetlabs.ru \ --cc=ferruh.yigit@intel.com \ --cc=igor.romanov@oktetlabs.ru \ --cc=qi.z.zhang@intel.com \ --cc=stable@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git