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 38CBFA04A7; Mon, 24 Jan 2022 13:40:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DA34427CD; Mon, 24 Jan 2022 13:40:12 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id A47D940E0F for ; Mon, 24 Jan 2022 13:40:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643028010; x=1674564010; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=j/LWurQSTHTIpAXVAYlrc2rmi09JMDB3of/41uRHc70=; b=KI8gkuI6qp56OSt9Fv2jdW/rbAtu18z7pAuzQnr0PgfyqunaoFagj7Qj Z/TqLsk8q9vcrmrc33ZXitkMOWEQznhPdF1IYKFUAsaJ0yMkroKCS5fyV C+UDZs638wjvC99q0LaBNJK1ngzycsIzoVeUU+L/qazwQuWU7ocB/iUKo FqMMzeg34wj2p38JKwAckEGyLdSxJfYVcqwda91Ez3/lzX+tg/RAMJvXx 1+sAqDZZWZF2qfnA7JtWvuKLa71xSnMCOWmvfientBbazbIDoxz4MpTKv XoY1qthRDnDCgf2A08/B/j84JWWR/Q/Mmt8CuMT9NiG7A7eL4g4Dszee/ g==; X-IronPort-AV: E=McAfee;i="6200,9189,10236"; a="309354982" X-IronPort-AV: E=Sophos;i="5.88,311,1635231600"; d="scan'208";a="309354982" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2022 04:39:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,311,1635231600"; d="scan'208";a="695408435" Received: from dpdk-xiaoyun3.sh.intel.com ([10.67.119.214]) by orsmga005.jf.intel.com with ESMTP; 24 Jan 2022 04:39:52 -0800 From: Xiaoyun Li To: ktraynor@redhat.com, Aman.Deep.Singh@intel.com, ferruh.yigit@intel.com, olivier.matz@6wind.com, mb@smartsharesystems.com, konstantin.ananyev@intel.com, stephen@networkplumber.org, vladimir.medvedkin@intel.com Cc: dev@dpdk.org, Xiaoyun Li , Sunil Pai G Subject: [PATCH v6 2/2] app/testpmd: enable L4 SW csum over multi segments Date: Mon, 24 Jan 2022 20:28:57 +0800 Message-Id: <20220124122857.1104668-3-xiaoyun.li@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220124122857.1104668-1-xiaoyun.li@intel.com> References: <20211015051306.320328-1-xiaoyun.li@intel.com> <20220124122857.1104668-1-xiaoyun.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Csum forwarding mode only supports software UDP/TCP csum calculation for single segment packets when hardware offload is not enabled. This patch enables software UDP/TCP csum calculation over multiple segments. Signed-off-by: Xiaoyun Li Tested-by: Sunil Pai G --- app/test-pmd/csumonly.c | 41 ++++++++++++++++---------- doc/guides/rel_notes/release_22_03.rst | 2 ++ 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 2aeea243b6..0fbe1f1be7 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -96,12 +96,13 @@ struct simple_gre_hdr { } __rte_packed; static uint16_t -get_udptcp_checksum(void *l3_hdr, void *l4_hdr, uint16_t ethertype) +get_udptcp_checksum(struct rte_mbuf *m, void *l3_hdr, uint16_t l4_off, + uint16_t ethertype) { if (ethertype == _htons(RTE_ETHER_TYPE_IPV4)) - return rte_ipv4_udptcp_cksum(l3_hdr, l4_hdr); + return rte_ipv4_udptcp_cksum_mbuf(m, l3_hdr, l4_off); else /* assume ethertype == RTE_ETHER_TYPE_IPV6 */ - return rte_ipv6_udptcp_cksum(l3_hdr, l4_hdr); + return rte_ipv6_udptcp_cksum_mbuf(m, l3_hdr, l4_off); } /* Parse an IPv4 header to fill l3_len, l4_len, and l4_proto */ @@ -460,7 +461,7 @@ parse_encap_ip(void *encap_ip, struct testpmd_offload_info *info) * depending on the testpmd command line configuration */ static uint64_t process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, - uint64_t tx_offloads) + uint64_t tx_offloads, struct rte_mbuf *m) { struct rte_ipv4_hdr *ipv4_hdr = l3_hdr; struct rte_udp_hdr *udp_hdr; @@ -468,6 +469,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, struct rte_sctp_hdr *sctp_hdr; uint64_t ol_flags = 0; uint32_t max_pkt_len, tso_segsz = 0; + uint16_t l4_off; /* ensure packet is large enough to require tso */ if (!info->is_tunnel) { @@ -510,9 +512,15 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, if (tx_offloads & RTE_ETH_TX_OFFLOAD_UDP_CKSUM) { ol_flags |= RTE_MBUF_F_TX_UDP_CKSUM; } else { + if (info->is_tunnel) + l4_off = info->l2_len + + info->outer_l3_len + + info->l2_len + info->l3_len; + else + l4_off = info->l2_len + info->l3_len; udp_hdr->dgram_cksum = 0; udp_hdr->dgram_cksum = - get_udptcp_checksum(l3_hdr, udp_hdr, + get_udptcp_checksum(m, l3_hdr, l4_off, info->ethertype); } } @@ -527,9 +535,14 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, else if (tx_offloads & RTE_ETH_TX_OFFLOAD_TCP_CKSUM) { ol_flags |= RTE_MBUF_F_TX_TCP_CKSUM; } else { + if (info->is_tunnel) + l4_off = info->l2_len + info->outer_l3_len + + info->l2_len + info->l3_len; + else + l4_off = info->l2_len + info->l3_len; tcp_hdr->cksum = 0; tcp_hdr->cksum = - get_udptcp_checksum(l3_hdr, tcp_hdr, + get_udptcp_checksum(m, l3_hdr, l4_off, info->ethertype); } #ifdef RTE_LIB_GSO @@ -557,7 +570,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, /* Calculate the checksum of outer header */ static uint64_t process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info, - uint64_t tx_offloads, int tso_enabled) + uint64_t tx_offloads, int tso_enabled, struct rte_mbuf *m) { struct rte_ipv4_hdr *ipv4_hdr = outer_l3_hdr; struct rte_ipv6_hdr *ipv6_hdr = outer_l3_hdr; @@ -611,12 +624,9 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info, /* do not recalculate udp cksum if it was 0 */ if (udp_hdr->dgram_cksum != 0) { udp_hdr->dgram_cksum = 0; - if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4)) - udp_hdr->dgram_cksum = - rte_ipv4_udptcp_cksum(ipv4_hdr, udp_hdr); - else - udp_hdr->dgram_cksum = - rte_ipv6_udptcp_cksum(ipv6_hdr, udp_hdr); + udp_hdr->dgram_cksum = get_udptcp_checksum(m, outer_l3_hdr, + info->l2_len + info->outer_l3_len, + info->outer_ethertype); } return ol_flags; @@ -957,7 +967,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) /* process checksums of inner headers first */ tx_ol_flags |= process_inner_cksums(l3_hdr, &info, - tx_offloads); + tx_offloads, m); /* Then process outer headers if any. Note that the software * checksum will be wrong if one of the inner checksums is @@ -965,7 +975,8 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) if (info.is_tunnel == 1) { tx_ol_flags |= process_outer_cksums(outer_l3_hdr, &info, tx_offloads, - !!(tx_ol_flags & RTE_MBUF_F_TX_TCP_SEG)); + !!(tx_ol_flags & RTE_MBUF_F_TX_TCP_SEG), + m); } /* step 3: fill the mbuf meta data (flags and header lengths) */ diff --git a/doc/guides/rel_notes/release_22_03.rst b/doc/guides/rel_notes/release_22_03.rst index 785fd22001..3c57555535 100644 --- a/doc/guides/rel_notes/release_22_03.rst +++ b/doc/guides/rel_notes/release_22_03.rst @@ -63,6 +63,8 @@ New Features - ``rte_ipv4_udptcp_cksum_mbuf_verify()`` - ``rte_ipv6_udptcp_cksum_mbuf()`` - ``rte_ipv6_udptcp_cksum_mbuf_verify()`` + * Called ``rte_ipv4/6_udptcp_cksum_mbuf()`` functions in testpmd csum mode + to support software UDP/TCP checksum over multiple segments. Removed Items ------------- -- 2.25.1