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 4A08D43345 for ; Thu, 16 Nov 2023 14:25:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 43940410E4; Thu, 16 Nov 2023 14:25:21 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 8E9CF40ED2 for ; Thu, 16 Nov 2023 14:25:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141119; 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=IG8ji2BtyN7gQkSs4Pl0I2vOatX7z0LKjcVHIUiGgrg=; b=cO3ApXBsW8bAngaq2+HL2f5uWifLQs2NDqpmRafsAEzljyQmPrFk5FF6QXomFMTZIE3KNd joggKseP/84QRRkKqecITFHPBFIWdJeRszb0/w4KWqrQfWJq9IOZFy8ctTsakWTWBiY3cO GBe/g3flQLYeeRVK6CRft91h1mxitZI= 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-164-TcWs1F7YPCuc2wTBzWdk4g-1; Thu, 16 Nov 2023 08:25:15 -0500 X-MC-Unique: TcWs1F7YPCuc2wTBzWdk4g-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 A0A3085A58C; Thu, 16 Nov 2023 13:25:14 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id B03E32166B27; Thu, 16 Nov 2023 13:25:13 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix tunnel TSO configuration' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:40 +0000 Message-ID: <20231116132348.557257-58-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/37d5553ccc6c561d6706c3ea76bf03275b82ba2f Thanks. Kevin --- >From 37d5553ccc6c561d6706c3ea76bf03275b82ba2f Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Sat, 11 Nov 2023 12:59:43 +0800 Subject: [PATCH] app/testpmd: fix tunnel TSO configuration [ upstream commit e43dc93803c4623840472c6109ef05e26286ec2f ] Currently, there are two conditions to set tunnel TSO, like "parse tunnel" and "outer IP checksum". If these conditions are not satisfied, testpmd should not change their configuration, like tx_offloads on port and per queue, and no need to request "reconfig device". Fixes: 597f9fafe13b ("app/testpmd: convert to new Tx offloads API") Signed-off-by: Huisong Li Reviewed-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index ac6531ba52..43857c8008 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -5120,10 +5120,4 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, return; } - check_tunnel_tso_nic_support(res->port_id, dev_info.tx_offload_capa); - - ports[res->port_id].dev_conf.txmode.offloads |= - (all_tunnel_tso & dev_info.tx_offload_capa); - printf("TSO segment size for tunneled packets is %d\n", - ports[res->port_id].tunnel_tso_segsz); /* Below conditions are needed to make it work: @@ -5138,12 +5132,21 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, * checksum in IP header anymore. */ - - if (!ports[res->port_id].parse_tunnel) + if (!ports[res->port_id].parse_tunnel) { fprintf(stderr, - "Warning: csum parse_tunnel must be set so that tunneled packets are recognized\n"); + "Error: csum parse_tunnel must be set so that tunneled packets are recognized\n"); + return; + } if (!(ports[res->port_id].dev_conf.txmode.offloads & - RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM)) + RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM)) { fprintf(stderr, - "Warning: csum set outer-ip must be set to hw if outer L3 is IPv4; not necessary for IPv6\n"); + "Error: csum set outer-ip must be set to hw if outer L3 is IPv4; not necessary for IPv6\n"); + return; + } + + check_tunnel_tso_nic_support(res->port_id, dev_info.tx_offload_capa); + ports[res->port_id].dev_conf.txmode.offloads |= + (all_tunnel_tso & dev_info.tx_offload_capa); + printf("TSO segment size for tunneled packets is %d\n", + ports[res->port_id].tunnel_tso_segsz); } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.929678372 +0000 +++ 0058-app-testpmd-fix-tunnel-TSO-configuration.patch 2023-11-16 13:21:52.570946725 +0000 @@ -1 +1 @@ -From e43dc93803c4623840472c6109ef05e26286ec2f Mon Sep 17 00:00:00 2001 +From 37d5553ccc6c561d6706c3ea76bf03275b82ba2f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e43dc93803c4623840472c6109ef05e26286ec2f ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 2e3365557a..a231d112b0 100644 +index ac6531ba52..43857c8008 100644 @@ -25 +26 @@ -@@ -5097,10 +5097,4 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, +@@ -5120,10 +5120,4 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, @@ -36 +37 @@ -@@ -5115,12 +5109,21 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, +@@ -5138,12 +5132,21 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,