From: Kevin Traynor <ktraynor@redhat.com>
To: Chengwen Feng <fengchengwen@huawei.com>
Cc: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,
dpdk stable <stable@dpdk.org>
Subject: patch 'app/testpmd: remove jumbo offload' has been queued to stable release 21.11.3
Date: Fri, 11 Nov 2022 10:33:04 +0000 [thread overview]
Message-ID: <20221111103337.307408-14-ktraynor@redhat.com> (raw)
In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com>
Hi,
FYI, your patch has been queued to stable release 21.11.3
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/14/22. 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/298ba5a47b3350ac81fe9eae0d0a92f81f93a1b4
Thanks.
Kevin
---
From 298ba5a47b3350ac81fe9eae0d0a92f81f93a1b4 Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen@huawei.com>
Date: Mon, 17 Oct 2022 09:05:50 +0000
Subject: [PATCH] app/testpmd: remove jumbo offload
[ upstream commit 020dbb4c2ab66f1a287e839def137dd434c0019f ]
The jumbo offload was removed from patch [1], but testpmd still exist
jumbo offload related code, this patch removes it, and also updates
the rst file.
[1] ethdev: remove jumbo offload flag
Fixes: b563c1421282 ("ethdev: remove jumbo offload flag")
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
app/test-pmd/cmdline.c | 12 ++++++------
app/test-pmd/testpmd.h | 1 -
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 ++--
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index d9bf0eb3b3..82386c02ee 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -857,5 +857,5 @@ static void cmd_help_long_parsed(void *parsed_result,
"ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
"outer_ipv4_cksum|macsec_strip|header_split|"
- "vlan_filter|vlan_extend|jumbo_frame|scatter|"
+ "vlan_filter|vlan_extend|scatter|"
"buffer_split|timestamp|security|keep_crc on|off\n"
" Enable or disable a per port Rx offloading"
@@ -865,5 +865,5 @@ static void cmd_help_long_parsed(void *parsed_result,
"ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
"outer_ipv4_cksum|macsec_strip|header_split|"
- "vlan_filter|vlan_extend|jumbo_frame|scatter|"
+ "vlan_filter|vlan_extend|scatter|"
"buffer_split|timestamp|security|keep_crc on|off\n"
" Enable or disable a per queue Rx offloading"
@@ -16143,5 +16143,5 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_offload =
offload, "vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
"qinq_strip#outer_ipv4_cksum#macsec_strip#"
- "header_split#vlan_filter#vlan_extend#jumbo_frame#"
+ "header_split#vlan_filter#vlan_extend#"
"scatter#buffer_split#timestamp#security#"
"keep_crc#rss_hash");
@@ -16226,5 +16226,5 @@ cmdline_parse_inst_t cmd_config_per_port_rx_offload = {
"udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
"macsec_strip|header_split|vlan_filter|vlan_extend|"
- "jumbo_frame|scatter|buffer_split|timestamp|security|"
+ "scatter|buffer_split|timestamp|security|"
"keep_crc|rss_hash on|off",
.tokens = {
@@ -16275,5 +16275,5 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_offload =
offload, "vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
"qinq_strip#outer_ipv4_cksum#macsec_strip#"
- "header_split#vlan_filter#vlan_extend#jumbo_frame#"
+ "header_split#vlan_filter#vlan_extend#"
"scatter#buffer_split#timestamp#security#keep_crc");
cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_on_off =
@@ -16334,5 +16334,5 @@ cmdline_parse_inst_t cmd_config_per_queue_rx_offload = {
"udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
"macsec_strip|header_split|vlan_filter|vlan_extend|"
- "jumbo_frame|scatter|buffer_split|timestamp|security|"
+ "scatter|buffer_split|timestamp|security|"
"keep_crc on|off",
.tokens = {
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 18abee907c..8f3a89e9be 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -1115,5 +1115,4 @@ void add_tx_dynf_callback(portid_t portid);
void remove_tx_dynf_callback(portid_t portid);
int update_mtu_from_frame_size(portid_t portid, uint32_t max_rx_pktlen);
-int update_jumbo_frame_offload(portid_t portid);
void flex_item_create(portid_t port_id, uint16_t flex_id, const char *filename);
void flex_item_destroy(portid_t port_id, uint16_t flex_id);
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 94792d88cc..d44424da67 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1768,5 +1768,5 @@ Enable or disable a per port Rx offloading on all Rx queues of a port::
vlan_strip, ipv4_cksum, udp_cksum, tcp_cksum, tcp_lro,
qinq_strip, outer_ipv4_cksum, macsec_strip,
- header_split, vlan_filter, vlan_extend, jumbo_frame,
+ header_split, vlan_filter, vlan_extend,
scatter, timestamp, security, keep_crc, rss_hash
@@ -1783,5 +1783,5 @@ Enable or disable a per queue Rx offloading only on a specific Rx queue::
vlan_strip, ipv4_cksum, udp_cksum, tcp_cksum, tcp_lro,
qinq_strip, outer_ipv4_cksum, macsec_strip,
- header_split, vlan_filter, vlan_extend, jumbo_frame,
+ header_split, vlan_filter, vlan_extend,
scatter, timestamp, security, keep_crc
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-11 10:32:17.420036779 +0000
+++ 0014-app-testpmd-remove-jumbo-offload.patch 2022-11-11 10:32:17.033300603 +0000
@@ -1 +1 @@
-From 020dbb4c2ab66f1a287e839def137dd434c0019f Mon Sep 17 00:00:00 2001
+From 298ba5a47b3350ac81fe9eae0d0a92f81f93a1b4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 020dbb4c2ab66f1a287e839def137dd434c0019f ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -20,2 +21,2 @@
- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8 ++++----
- 3 files changed, 10 insertions(+), 11 deletions(-)
+ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 ++--
+ 3 files changed, 8 insertions(+), 9 deletions(-)
@@ -24 +25 @@
-index 29e4b2329b..8dc60e9388 100644
+index d9bf0eb3b3..82386c02ee 100644
@@ -27 +28 @@
-@@ -715,5 +715,5 @@ static void cmd_help_long_parsed(void *parsed_result,
+@@ -857,5 +857,5 @@ static void cmd_help_long_parsed(void *parsed_result,
@@ -29 +30 @@
- "outer_ipv4_cksum|macsec_strip|"
+ "outer_ipv4_cksum|macsec_strip|header_split|"
@@ -34 +35 @@
-@@ -723,5 +723,5 @@ static void cmd_help_long_parsed(void *parsed_result,
+@@ -865,5 +865,5 @@ static void cmd_help_long_parsed(void *parsed_result,
@@ -36 +37 @@
- "outer_ipv4_cksum|macsec_strip|"
+ "outer_ipv4_cksum|macsec_strip|header_split|"
@@ -41 +42 @@
-@@ -10959,5 +10959,5 @@ static cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_offloa
+@@ -16143,5 +16143,5 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_offload =
@@ -44,2 +45,2 @@
-- "vlan_filter#vlan_extend#jumbo_frame#"
-+ "vlan_filter#vlan_extend#"
+- "header_split#vlan_filter#vlan_extend#jumbo_frame#"
++ "header_split#vlan_filter#vlan_extend#"
@@ -48 +49 @@
-@@ -11042,5 +11042,5 @@ static cmdline_parse_inst_t cmd_config_per_port_rx_offload = {
+@@ -16226,5 +16226,5 @@ cmdline_parse_inst_t cmd_config_per_port_rx_offload = {
@@ -50 +51 @@
- "macsec_strip|vlan_filter|vlan_extend|"
+ "macsec_strip|header_split|vlan_filter|vlan_extend|"
@@ -55 +56 @@
-@@ -11091,5 +11091,5 @@ static cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_offlo
+@@ -16275,5 +16275,5 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_offload =
@@ -58,2 +59,2 @@
-- "vlan_filter#vlan_extend#jumbo_frame#"
-+ "vlan_filter#vlan_extend#"
+- "header_split#vlan_filter#vlan_extend#jumbo_frame#"
++ "header_split#vlan_filter#vlan_extend#"
@@ -61,2 +62,2 @@
- static cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_on_off =
-@@ -11150,5 +11150,5 @@ static cmdline_parse_inst_t cmd_config_per_queue_rx_offload = {
+ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_on_off =
+@@ -16334,5 +16334,5 @@ cmdline_parse_inst_t cmd_config_per_queue_rx_offload = {
@@ -64 +65 @@
- "macsec_strip|vlan_filter|vlan_extend|"
+ "macsec_strip|header_split|vlan_filter|vlan_extend|"
@@ -70 +71 @@
-index 0b99339df8..4c6dcba191 100644
+index 18abee907c..8f3a89e9be 100644
@@ -73 +74 @@
-@@ -1151,5 +1151,4 @@ void add_tx_dynf_callback(portid_t portid);
+@@ -1115,5 +1115,4 @@ void add_tx_dynf_callback(portid_t portid);
@@ -80 +81 @@
-index b3f31df69a..d0fe73dff6 100644
+index 94792d88cc..d44424da67 100644
@@ -83 +84 @@
-@@ -1554,6 +1554,6 @@ Enable or disable a per port Rx offloading on all Rx queues of a port::
+@@ -1768,5 +1768,5 @@ Enable or disable a per port Rx offloading on all Rx queues of a port::
@@ -86,4 +87,3 @@
-- vlan_filter, vlan_extend, jumbo_frame,
-- scatter, timestamp, security, keep_crc, rss_hash
-+ vlan_filter, vlan_extend, scatter, timestamp, security,
-+ keep_crc, rss_hash
+- header_split, vlan_filter, vlan_extend, jumbo_frame,
++ header_split, vlan_filter, vlan_extend,
+ scatter, timestamp, security, keep_crc, rss_hash
@@ -91,2 +91 @@
- This command should be run when the port is stopped, or else it will fail.
-@@ -1569,6 +1569,6 @@ Enable or disable a per queue Rx offloading only on a specific Rx queue::
+@@ -1783,5 +1783,5 @@ Enable or disable a per queue Rx offloading only on a specific Rx queue::
@@ -95,4 +94,3 @@
-- vlan_filter, vlan_extend, jumbo_frame,
-- scatter, timestamp, security, keep_crc
-+ vlan_filter, vlan_extend, scatter, timestamp, security,
-+ keep_crc
+- header_split, vlan_filter, vlan_extend, jumbo_frame,
++ header_split, vlan_filter, vlan_extend,
+ scatter, timestamp, security, keep_crc
@@ -100 +97,0 @@
- This command should be run when the port is stopped, or else it will fail.
next prev parent reply other threads:[~2022-11-11 10:34 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-11 10:32 patch 'event/sw: fix flow ID init in self test' " Kevin Traynor
2022-11-11 10:32 ` patch 'event/sw: fix log " Kevin Traynor
2022-11-11 10:32 ` patch 'eventdev/crypto: fix multi-process' " Kevin Traynor
2022-11-11 10:32 ` patch 'eventdev/eth_tx: fix queue delete' " Kevin Traynor
2022-11-11 10:32 ` patch 'gro: check payload length after trim' " Kevin Traynor
2022-11-11 10:32 ` patch 'doc: fix support table for Ethernet/VLAN flow items' " Kevin Traynor
2022-11-11 10:32 ` patch 'app/testpmd: skip port reset in secondary process' " Kevin Traynor
2022-11-11 10:32 ` patch 'net/bonding: fix descriptor limit reporting' " Kevin Traynor
2022-11-11 10:32 ` patch 'net/ionic: fix endianness for Rx and Tx' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/ionic: fix endianness for RSS' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/ionic: fix adapter name for logging' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/ionic: fix Rx filter save' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/ionic: fix reported error stats' " Kevin Traynor
2022-11-11 10:33 ` Kevin Traynor [this message]
2022-11-11 10:33 ` patch 'net/nfp: fix internal buffer size and MTU check' " Kevin Traynor
2022-11-11 10:33 ` patch 'vhost: add non-blocking API for posting interrupt' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/mlx5: fix thread workspace memory leak' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/mlx5: fix RSS expansion buffer size' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/mlx5: fix tunnel header with IPIP offload' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/mlx5: fix null check in devargs parsing' " Kevin Traynor
2022-11-11 10:33 ` patch 'sched: fix subport profile configuration' " Kevin Traynor
2022-11-11 10:33 ` patch 'examples/qos_sched: fix number of subport profiles' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/ixgbe: fix broadcast Rx on VF after promisc removal' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/ixgbe: fix unexpected VLAN Rx in promisc mode on VF' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/ice: fix null function pointer call' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/iavf: fix IPsec flow create error check' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/iavf: fix SPI " Kevin Traynor
2022-11-11 10:33 ` patch 'net/iavf: add thread for event callbacks' " Kevin Traynor
2022-11-18 12:32 ` Kevin Traynor
2022-11-21 4:48 ` Zhou, YidingX
2022-11-11 10:33 ` patch 'net/iavf: fix queue stop for large VF' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/ice: support VXLAN-GPE tunnel offload' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/iavf: fix handling of IPsec events' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/cnxk: fix later skip to include mbuf private data' " Kevin Traynor
2022-11-11 10:33 ` patch 'common/cnxk: fix schedule weight update' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/mlx5: fix thread termination check on Windows' " Kevin Traynor
2022-11-11 10:33 ` patch 'examples/l2fwd-crypto: fix typo in error message' " Kevin Traynor
2022-11-11 10:33 ` patch 'test/crypto: fix wireless auth digest segment' " Kevin Traynor
2022-11-11 10:33 ` patch 'baseband/acc100: fix memory leak' " Kevin Traynor
2022-11-11 10:33 ` patch 'baseband/acc100: check turbo dec/enc input' " Kevin Traynor
2022-11-11 10:33 ` patch 'baseband/acc100: add null checks' " Kevin Traynor
2022-11-11 10:33 ` patch 'baseband/acc100: fix input length for CRC24B' " Kevin Traynor
2022-11-11 10:33 ` patch 'baseband/acc100: fix clearing PF IR outside handler' " Kevin Traynor
2022-11-11 10:33 ` patch 'baseband/acc100: fix device minimum alignment' " Kevin Traynor
2022-11-11 10:33 ` patch 'baseband/acc100: fix close cleanup' " Kevin Traynor
2022-11-11 10:33 ` patch 'test/crypto: fix PDCP vectors' " Kevin Traynor
2022-11-11 10:33 ` patch 'examples/ipsec-secgw: fix Tx checksum offload flag' " Kevin Traynor
2022-11-11 10:33 ` patch 'crypto/qat: fix null hash algorithm digest size' " Kevin Traynor
2022-11-11 10:33 ` patch 'net/mlx5: fix build with recent compilers' " 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=20221111103337.307408-14-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=fengchengwen@huawei.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).