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 B8070431B5; Fri, 20 Oct 2023 05:38:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A749D402B8; Fri, 20 Oct 2023 05:38:24 +0200 (CEST) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by mails.dpdk.org (Postfix) with ESMTP id 7E586402B7 for ; Fri, 20 Oct 2023 05:38:22 +0200 (CEST) Received: from kwepemm000004.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4SBVbQ6m1vz15NWd; Fri, 20 Oct 2023 11:35:30 +0800 (CST) Received: from [10.67.121.59] (10.67.121.59) by kwepemm000004.china.huawei.com (7.193.23.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Fri, 20 Oct 2023 11:38:15 +0800 Message-ID: <29abe708-e42b-a775-e742-87ecf1cd05d5@huawei.com> Date: Fri, 20 Oct 2023 11:38:14 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH v2] app/testpmd: fix UDP cksum error for UFO enable To: CC: , , , , References: <20230728021310.15970-1-lihuisong@huawei.com> <20230802025520.8000-1-lihuisong@huawei.com> From: "lihuisong (C)" In-Reply-To: <20230802025520.8000-1-lihuisong@huawei.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.67.121.59] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm000004.china.huawei.com (7.193.23.18) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org kindly ping. 在 2023/8/2 10:55, Huisong Li 写道: > The command "tso set " is used to enable UFO, please > see commit ce8e6e742807 ("app/testpmd: support UFO in checksum engine") > > The above patch configures the RTE_MBUF_F_TX_UDP_SEG to enable UFO only if > tso_segsz is set. Then tx_prepare() may call rte_net_intel_cksum_prepare() > to compute pseudo header checksum (because some PMDs may supports TSO). > As a result, if the peer sends UDP packets, all packets with UDP checksum > error are received for the PMDs only supported TSO. > > So enabling UFO also depends on if driver has RTE_ETH_TX_OFFLOAD_UDP_TSO > capability. Similarly, TSO also need to do like this. > > In addition, this patch also fixes cmd_tso_set_parsed() for UFO to make > it better to support TSO and UFO. > > Fixes: ce8e6e742807 ("app/testpmd: support UFO in checksum engine") > > Signed-off-by: Huisong Li > --- > v2: add handle for tunnel TSO offload in process_inner_cksums > > --- > app/test-pmd/cmdline.c | 47 +++++++++++++++++++++-------------------- > app/test-pmd/csumonly.c | 11 ++++++++-- > 2 files changed, 33 insertions(+), 25 deletions(-) > > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c > index 0d0723f659..8be593d405 100644 > --- a/app/test-pmd/cmdline.c > +++ b/app/test-pmd/cmdline.c > @@ -4906,6 +4906,7 @@ cmd_tso_set_parsed(void *parsed_result, > { > struct cmd_tso_set_result *res = parsed_result; > struct rte_eth_dev_info dev_info; > + uint64_t offloads; > int ret; > > if (port_id_is_invalid(res->port_id, ENABLED_WARN)) > @@ -4922,37 +4923,37 @@ cmd_tso_set_parsed(void *parsed_result, > if (ret != 0) > return; > > - if ((ports[res->port_id].tso_segsz != 0) && > - (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_TCP_TSO) == 0) { > - fprintf(stderr, "Error: TSO is not supported by port %d\n", > - res->port_id); > - return; > + if (ports[res->port_id].tso_segsz != 0) { > + if ((dev_info.tx_offload_capa & (RTE_ETH_TX_OFFLOAD_TCP_TSO | > + RTE_ETH_TX_OFFLOAD_UDP_TSO)) == 0) { > + fprintf(stderr, "Error: both TSO and UFO are not supported by port %d\n", > + res->port_id); > + return; > + } > + /* display warnings if configuration is not supported by the NIC */ > + if ((dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_TCP_TSO) == 0) > + fprintf(stderr, "Warning: port %d doesn't support TSO\n", > + res->port_id); > + if ((dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_UDP_TSO) == 0) > + fprintf(stderr, "Warning: port %d doesn't support UFO\n", > + res->port_id); > } > > if (ports[res->port_id].tso_segsz == 0) { > ports[res->port_id].dev_conf.txmode.offloads &= > - ~RTE_ETH_TX_OFFLOAD_TCP_TSO; > - printf("TSO for non-tunneled packets is disabled\n"); > + ~(RTE_ETH_TX_OFFLOAD_TCP_TSO | RTE_ETH_TX_OFFLOAD_UDP_TSO); > + printf("TSO and UFO for non-tunneled packets is disabled\n"); > } else { > - ports[res->port_id].dev_conf.txmode.offloads |= > - RTE_ETH_TX_OFFLOAD_TCP_TSO; > - printf("TSO segment size for non-tunneled packets is %d\n", > + offloads = (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_TCP_TSO) ? > + RTE_ETH_TX_OFFLOAD_TCP_TSO : 0; > + offloads |= (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_UDP_TSO) ? > + RTE_ETH_TX_OFFLOAD_UDP_TSO : 0; > + ports[res->port_id].dev_conf.txmode.offloads |= offloads; > + printf("segment size for non-tunneled packets is %d\n", > ports[res->port_id].tso_segsz); > } > - cmd_config_queue_tx_offloads(&ports[res->port_id]); > - > - /* display warnings if configuration is not supported by the NIC */ > - ret = eth_dev_info_get_print_err(res->port_id, &dev_info); > - if (ret != 0) > - return; > - > - if ((ports[res->port_id].tso_segsz != 0) && > - (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_TCP_TSO) == 0) { > - fprintf(stderr, > - "Warning: TSO enabled but not supported by port %d\n", > - res->port_id); > - } > > + cmd_config_queue_tx_offloads(&ports[res->port_id]); > cmd_reconfig_device_queue(res->port_id, 1, 1); > } > > diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c > index c103e54111..21210aff43 100644 > --- a/app/test-pmd/csumonly.c > +++ b/app/test-pmd/csumonly.c > @@ -466,6 +466,12 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, > uint64_t ol_flags = 0; > uint32_t max_pkt_len, tso_segsz = 0; > uint16_t l4_off; > + uint64_t all_tunnel_tso = RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO | > + RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO | > + RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO | > + RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO | > + RTE_ETH_TX_OFFLOAD_IP_TNL_TSO | > + RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO; > > /* ensure packet is large enough to require tso */ > if (!info->is_tunnel) { > @@ -505,7 +511,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, > udp_hdr = (struct rte_udp_hdr *)((char *)l3_hdr + info->l3_len); > /* do not recalculate udp cksum if it was 0 */ > if (udp_hdr->dgram_cksum != 0) { > - if (tso_segsz) > + if (tso_segsz && (tx_offloads & RTE_ETH_TX_OFFLOAD_UDP_TSO)) > ol_flags |= RTE_MBUF_F_TX_UDP_SEG; > else if (tx_offloads & RTE_ETH_TX_OFFLOAD_UDP_CKSUM) { > ol_flags |= RTE_MBUF_F_TX_UDP_CKSUM; > @@ -528,7 +534,8 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, > #endif > } else if (info->l4_proto == IPPROTO_TCP) { > tcp_hdr = (struct rte_tcp_hdr *)((char *)l3_hdr + info->l3_len); > - if (tso_segsz) > + if (tso_segsz && > + (tx_offloads & (RTE_ETH_TX_OFFLOAD_TCP_TSO | all_tunnel_tso))) > ol_flags |= RTE_MBUF_F_TX_TCP_SEG; > else if (tx_offloads & RTE_ETH_TX_OFFLOAD_TCP_CKSUM) { > ol_flags |= RTE_MBUF_F_TX_TCP_CKSUM;