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 A9231A0542 for ; Fri, 11 Nov 2022 11:34:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A47E340150; Fri, 11 Nov 2022 11:34:30 +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 5441D4014F for ; Fri, 11 Nov 2022 11:34:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668162868; 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=KxPNGSW2jE8+T4CaHoBLTAt2G/ohIv+TgENc1B8YIqY=; b=PNdrzAgyhFEGOswPmLr1pWCAGoI8Zc+JBPRLWEhXlTgNgd23HNKhQSxeQiElxgrxq/cuAx i9gZGdqS2v9go9YPTPLBx0txLVd5R621wL2nI3H3nWoDyZirE3hVh7L+TsUceYuv49cDCK Q8uawWY0z8hzL//dQkkRe8cNqk9SwRM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-571-WZKpkusGOpqR8XIexiP2HA-1; Fri, 11 Nov 2022 05:34:25 -0500 X-MC-Unique: WZKpkusGOpqR8XIexiP2HA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 549D129DD985; Fri, 11 Nov 2022 10:34:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 681B2200E288; Fri, 11 Nov 2022 10:34:24 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: Andrew Rybchenko , dpdk stable 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 Message-Id: <20221111103337.307408-14-ktraynor@redhat.com> In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com> References: <20221111103337.307408-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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.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 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 Reviewed-by: Andrew Rybchenko --- 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.