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 82D0843337 for ; Wed, 15 Nov 2023 12:45:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7BEDA40294; Wed, 15 Nov 2023 12:45:57 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 20EBE40285 for ; Wed, 15 Nov 2023 12:45:56 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-407da05f05aso49718695e9.3 for ; Wed, 15 Nov 2023 03:45:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700048756; x=1700653556; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZS1v672xSZSd3SSL1EJeNI50vYuZ501Q0OJQrrUmbJA=; b=cTNyEDfWlHRJQnavxnDJJMOhKy6jYdHAvbH6EQEiEtCalhlwTTrOuE137p40YvplZj FFn4D8aVfTX6oQMPGIQp+qRUWGw8LBQIf55rYFvghvoSzJ0YOC/vpaFnpmHkN92n39ve Idh9nET8WBtJLwV7fKJ+q4MGzPztjWltOPwgBI7SfJsX07iWagMtM03zCD6vwmkNPDeK t3fsLZC1eQqTJHaSv8UcUiVh1+drASIVhwxCHObQ7XYA7GUdmTQe+Ty4FjDMARZISLDA 09MRA16Se6+A6B8OMJhG1kydFgyKoSR95WHbW8s5LZG9bFlYifhxVFMgPzae1mRUoamE feXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700048756; x=1700653556; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZS1v672xSZSd3SSL1EJeNI50vYuZ501Q0OJQrrUmbJA=; b=Zo8LjKYZ6Wuv7ec2AZkEfNSg7ErVJM82hBPR/ArbfkSI53gjx+ehGRysBbUbZZ3MNC MXJyZdD0rlqg9/X6rPGOowQHazhpxafY5+M9U/jShthAZm5OC67hUqJtiN17uFTSdvVk exB0s3+Ay0th1/MBKL4AM4NBY2QIvYsBt9T7AunzcakkTWJIw+aqMjIpshAGvDKmub4i wcKAb6/vQKDNxse2Mky2Avziolqo3DAkm9Cj6aUoQ3QlJn9DPj+h8+2fzSNMlCYWJUfI BdHOj0JGR1dOU18pdlAXhXfxlaaBUh7PgUQG35kjAW27dDKnB1u7k4y0gZAe6LeZihXe r9fg== X-Gm-Message-State: AOJu0YzUjZC06exOW/8SqAz5/YIE02KmAn3ahbaDmT+KoWxZ6rPXJYa0 RFHhTUKyhqhbAeLIkOLWqCa69JsCvkCNrg== X-Google-Smtp-Source: AGHT+IHoyxpP132NBNFiYFsKMIHMq4xUdLVIuAdF/OraK9/iMagfOViEi4zmS+QxAu9ywQJBiABEjg== X-Received: by 2002:a05:600c:1c1a:b0:405:4776:735a with SMTP id j26-20020a05600c1c1a00b004054776735amr10209768wms.2.1700048755783; Wed, 15 Nov 2023 03:45:55 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id j21-20020a05600c1c1500b003fee567235bsm17325137wms.1.2023.11.15.03.45.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 03:45:54 -0800 (PST) From: luca.boccassi@gmail.com To: Huisong Li Cc: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix tunnel TSO configuration' has been queued to stable release 20.11.10 Date: Wed, 15 Nov 2023 11:45:10 +0000 Message-Id: <20231115114515.2355140-11-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115114515.2355140-1-luca.boccassi@gmail.com> References: <20231108192535.922238-37-luca.boccassi@gmail.com> <20231115114515.2355140-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.10 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/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/0325a1c1c49bf070e90e189a5a45ce561f8e231c Thanks. Luca Boccassi --- >From 0325a1c1c49bf070e90e189a5a45ce561f8e231c 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 | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index e9d8d375f5..7c3136cc2e 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -4999,12 +4999,6 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, res->port_id); 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: * (1) tunnel TSO is supported by the NIC; @@ -5017,14 +5011,23 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, * is not necessary for IPv6 tunneled pkts because there's no * checksum in IP header anymore. */ - - if (!ports[res->port_id].parse_tunnel) - printf("Warning: csum parse_tunnel must be set " - "so that tunneled packets are recognized\n"); + if (!ports[res->port_id].parse_tunnel) { + fprintf(stderr, + "Error: csum parse_tunnel must be set so that tunneled packets are recognized\n"); + return; + } if (!(ports[res->port_id].dev_conf.txmode.offloads & - DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)) - printf("Warning: csum set outer-ip must be set to hw " - "if outer L3 is IPv4; not necessary for IPv6\n"); + DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)) { + fprintf(stderr, + "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); } cmd_config_queue_tx_offloads(&ports[res->port_id]); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-15 11:44:14.076722341 +0000 +++ 0011-app-testpmd-fix-tunnel-TSO-configuration.patch 2023-11-15 11:44:13.598388102 +0000 @@ -1 +1 @@ -From e43dc93803c4623840472c6109ef05e26286ec2f Mon Sep 17 00:00:00 2001 +From 0325a1c1c49bf070e90e189a5a45ce561f8e231c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e43dc93803c4623840472c6109ef05e26286ec2f ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18,2 +19,2 @@ - app/test-pmd/cmdline.c | 25 ++++++++++++++----------- - 1 file changed, 14 insertions(+), 11 deletions(-) + app/test-pmd/cmdline.c | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) @@ -22 +23 @@ -index 2e3365557a..a231d112b0 100644 +index e9d8d375f5..7c3136cc2e 100644 @@ -25 +26 @@ -@@ -5096,12 +5096,6 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, +@@ -4999,12 +4999,6 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, @@ -38 +39 @@ -@@ -5114,14 +5108,23 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, +@@ -5017,14 +5011,23 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, @@ -43,0 +45,2 @@ +- printf("Warning: csum parse_tunnel must be set " +- "so that tunneled packets are recognized\n"); @@ -45,2 +48 @@ - fprintf(stderr, -- "Warning: csum parse_tunnel must be set so that tunneled packets are recognized\n"); ++ fprintf(stderr, @@ -51,4 +53,5 @@ -- 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"); +- DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)) +- printf("Warning: csum set outer-ip must be set to hw " +- "if outer L3 is IPv4; not necessary for IPv6\n"); ++ DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)) { ++ fprintf(stderr,