app/testpmd: add SW L4 checksum in multi-segments

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 <xiaoyun.li@intel.com>
Tested-by: Sunil Pai G <sunil.pai.g@intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 0177284d9cb416bc4d9b7cbec13636dd4c539560..02bc3929c73fad3266b89be65b2886b33a720d01 100644 (file)
--- 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 @@ tunnel_update:
 
                /* 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 @@ tunnel_update:
                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 9eb41226d14e8622345f338121acf1304736db37..f5093f6d5ffe5e052842f1e32b26a5c9bcf5bdcc 100644 (file)
--- a/doc/guides/rel_notes/release_22_03.rst
+++ b/doc/guides/rel_notes/release_22_03.rst
@@ -94,6 +94,11 @@ New Features
 
   The new API ``rte_event_eth_rx_adapter_event_port_get()`` was added.
 
+* **Updated testpmd.**
+
+  * Called ``rte_ipv4/6_udptcp_cksum_mbuf()`` functions in testpmd csum mode
+    to support software UDP/TCP checksum over multiple segments.
+
 
 Removed Items
 -------------