git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/ifc: check VFIO query error
[dpdk.git] / app / test-pmd / csumonly.c
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 105c7f2..25091de 100644 (file)
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -35,7 +35,9 @@
 #include <rte_ip.h>
 #include <rte_tcp.h>
 #include <rte_udp.h>
+#include <rte_vxlan.h>
 #include <rte_sctp.h>
+#include <rte_gtp.h>
 #include <rte_prefetch.h>
 #include <rte_string_fns.h>
 #include <rte_flow.h>
@@ -45,9 +47,6 @@
 #include "testpmd.h"
 
 #define IP_DEFTTL  64   /* from RFC 1340. */
-#define IP_VERSION 0x40
-#define IP_HDRLEN  0x05 /* default IP header length == five 32-bits words. */
-#define IP_VHL_DEF (IP_VERSION | IP_HDRLEN)
 
 #define GRE_CHECKSUM_PRESENT   0x8000
 #define GRE_KEY_PRESENT                0x2000
@@ -92,9 +91,9 @@ struct simple_gre_hdr {
 static uint16_t
 get_udptcp_checksum(void *l3_hdr, void *l4_hdr, uint16_t ethertype)
 {
-       if (ethertype == _htons(RTE_ETHER_TYPE_IPv4))
+       if (ethertype == _htons(RTE_ETHER_TYPE_IPV4))
                return rte_ipv4_udptcp_cksum(l3_hdr, l4_hdr);
-       else /* assume ethertype == RTE_ETHER_TYPE_IPv6 */
+       else /* assume ethertype == RTE_ETHER_TYPE_IPV6 */
                return rte_ipv6_udptcp_cksum(l3_hdr, l4_hdr);
 }
 
@@ -161,12 +160,12 @@ parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)
        }
 
        switch (info->ethertype) {
-       case _htons(RTE_ETHER_TYPE_IPv4):
+       case _htons(RTE_ETHER_TYPE_IPV4):
                ipv4_hdr = (struct rte_ipv4_hdr *)
                        ((char *)eth_hdr + info->l2_len);
                parse_ipv4(ipv4_hdr, info);
                break;
-       case _htons(RTE_ETHER_TYPE_IPv6):
+       case _htons(RTE_ETHER_TYPE_IPV6):
                ipv6_hdr = (struct rte_ipv6_hdr *)
                        ((char *)eth_hdr + info->l2_len);
                parse_ipv6(ipv6_hdr, info);
@@ -179,6 +178,67 @@ parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)
        }
 }
 
+/*
+ * Parse a GTP protocol header.
+ * No optional fields and next extension header type.
+ */
+static void
+parse_gtp(struct rte_udp_hdr *udp_hdr,
+         struct testpmd_offload_info *info)
+{
+       struct rte_ipv4_hdr *ipv4_hdr;
+       struct rte_ipv6_hdr *ipv6_hdr;
+       struct rte_gtp_hdr *gtp_hdr;
+       uint8_t gtp_len = sizeof(*gtp_hdr);
+       uint8_t ip_ver;
+
+       /* Check udp destination port. */
+       if (udp_hdr->dst_port != _htons(RTE_GTPC_UDP_PORT) &&
+           udp_hdr->src_port != _htons(RTE_GTPC_UDP_PORT) &&
+           udp_hdr->dst_port != _htons(RTE_GTPU_UDP_PORT))
+               return;
+
+       info->is_tunnel = 1;
+       info->outer_ethertype = info->ethertype;
+       info->outer_l2_len = info->l2_len;
+       info->outer_l3_len = info->l3_len;
+       info->outer_l4_proto = info->l4_proto;
+       info->l2_len = 0;
+
+       gtp_hdr = (struct rte_gtp_hdr *)((char *)udp_hdr +
+                 sizeof(struct rte_udp_hdr));
+
+       /*
+        * Check message type. If message type is 0xff, it is
+        * a GTP data packet. If not, it is a GTP control packet
+        */
+       if (gtp_hdr->msg_type == 0xff) {
+               ip_ver = *(uint8_t *)((char *)udp_hdr +
+                        sizeof(struct rte_udp_hdr) +
+                        sizeof(struct rte_gtp_hdr));
+               ip_ver = (ip_ver) & 0xf0;
+
+               if (ip_ver == RTE_GTP_TYPE_IPV4) {
+                       ipv4_hdr = (struct rte_ipv4_hdr *)((char *)gtp_hdr +
+                                  gtp_len);
+                       info->ethertype = _htons(RTE_ETHER_TYPE_IPV4);
+                       parse_ipv4(ipv4_hdr, info);
+               } else if (ip_ver == RTE_GTP_TYPE_IPV6) {
+                       ipv6_hdr = (struct rte_ipv6_hdr *)((char *)gtp_hdr +
+                                  gtp_len);
+                       info->ethertype = _htons(RTE_ETHER_TYPE_IPV6);
+                       parse_ipv6(ipv6_hdr, info);
+               }
+       } else {
+               info->ethertype = 0;
+               info->l4_len = 0;
+               info->l3_len = 0;
+               info->l4_proto = 0;
+       }
+
+       info->l2_len += RTE_ETHER_GTP_HLEN;
+}
+
 /* Parse a vxlan header */
 static void
 parse_vxlan(struct rte_udp_hdr *udp_hdr,
@@ -238,7 +298,7 @@ parse_vxlan_gpe(struct rte_udp_hdr *udp_hdr,
                           vxlan_gpe_len);
 
                parse_ipv4(ipv4_hdr, info);
-               info->ethertype = _htons(RTE_ETHER_TYPE_IPv4);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPV4);
                info->l2_len = 0;
 
        } else if (vxlan_gpe_hdr->proto == RTE_VXLAN_GPE_TYPE_IPV6) {
@@ -251,7 +311,7 @@ parse_vxlan_gpe(struct rte_udp_hdr *udp_hdr,
                ipv6_hdr = (struct rte_ipv6_hdr *)((char *)vxlan_gpe_hdr +
                           vxlan_gpe_len);
 
-               info->ethertype = _htons(RTE_ETHER_TYPE_IPv6);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPV6);
                parse_ipv6(ipv6_hdr, info);
                info->l2_len = 0;
 
@@ -290,7 +350,7 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
        if (gre_hdr->flags & _htons(GRE_CHECKSUM_PRESENT))
                gre_len += GRE_EXT_LEN;
 
-       if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_IPv4)) {
+       if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_IPV4)) {
                info->is_tunnel = 1;
                info->outer_ethertype = info->ethertype;
                info->outer_l2_len = info->l2_len;
@@ -300,10 +360,10 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
                ipv4_hdr = (struct rte_ipv4_hdr *)((char *)gre_hdr + gre_len);
 
                parse_ipv4(ipv4_hdr, info);
-               info->ethertype = _htons(RTE_ETHER_TYPE_IPv4);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPV4);
                info->l2_len = 0;
 
-       } else if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_IPv6)) {
+       } else if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_IPV6)) {
                info->is_tunnel = 1;
                info->outer_ethertype = info->ethertype;
                info->outer_l2_len = info->l2_len;
@@ -312,7 +372,7 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
 
                ipv6_hdr = (struct rte_ipv6_hdr *)((char *)gre_hdr + gre_len);
 
-               info->ethertype = _htons(RTE_ETHER_TYPE_IPv6);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPV6);
                parse_ipv6(ipv6_hdr, info);
                info->l2_len = 0;
 
@@ -353,10 +413,10 @@ parse_encap_ip(void *encap_ip, struct testpmd_offload_info *info)
 
        if (ip_version == 4) {
                parse_ipv4(ipv4_hdr, info);
-               info->ethertype = _htons(RTE_ETHER_TYPE_IPv4);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPV4);
        } else {
                parse_ipv6(ipv6_hdr, info);
-               info->ethertype = _htons(RTE_ETHER_TYPE_IPv6);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPV6);
        }
        info->l2_len = 0;
 }
@@ -388,7 +448,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
                        tso_segsz = info->tunnel_tso_segsz;
        }
 
-       if (info->ethertype == _htons(RTE_ETHER_TYPE_IPv4)) {
+       if (info->ethertype == _htons(RTE_ETHER_TYPE_IPV4)) {
                ipv4_hdr = l3_hdr;
                ipv4_hdr->hdr_checksum = 0;
 
@@ -402,7 +462,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
                                ipv4_hdr->hdr_checksum =
                                        rte_ipv4_cksum(ipv4_hdr);
                }
-       } else if (info->ethertype == _htons(RTE_ETHER_TYPE_IPv6))
+       } else if (info->ethertype == _htons(RTE_ETHER_TYPE_IPV6))
                ol_flags |= PKT_TX_IPV6;
        else
                return 0; /* packet type not supported, nothing to do */
@@ -464,7 +524,7 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,
        struct rte_udp_hdr *udp_hdr;
        uint64_t ol_flags = 0;
 
-       if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPv4)) {
+       if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4)) {
                ipv4_hdr->hdr_checksum = 0;
                ol_flags |= PKT_TX_OUTER_IPV4;
 
@@ -478,15 +538,25 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,
        if (info->outer_l4_proto != IPPROTO_UDP)
                return ol_flags;
 
+       udp_hdr = (struct rte_udp_hdr *)
+               ((char *)outer_l3_hdr + info->outer_l3_len);
+
+       if (tso_enabled)
+               ol_flags |= PKT_TX_TCP_SEG;
+
        /* Skip SW outer UDP checksum generation if HW supports it */
        if (tx_offloads & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) {
+               if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4))
+                       udp_hdr->dgram_cksum
+                               = rte_ipv4_phdr_cksum(ipv4_hdr, ol_flags);
+               else
+                       udp_hdr->dgram_cksum
+                               = rte_ipv6_phdr_cksum(ipv6_hdr, ol_flags);
+
                ol_flags |= PKT_TX_OUTER_UDP_CKSUM;
                return ol_flags;
        }
 
-       udp_hdr = (struct rte_udp_hdr *)
-               ((char *)outer_l3_hdr + info->outer_l3_len);
-
        /* outer UDP checksum is done in software. In the other side, for
         * UDP tunneling, like VXLAN or Geneve, outer UDP checksum can be
         * set to zero.
@@ -501,7 +571,7 @@ 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))
+               if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4))
                        udp_hdr->dgram_cksum =
                                rte_ipv4_udptcp_cksum(ipv4_hdr, udp_hdr);
                else
@@ -679,6 +749,7 @@ pkt_copy_split(const struct rte_mbuf *pkt)
  *           UDP|TCP|SCTP
  *   Ether / (vlan) / outer IP|IP6 / outer UDP / VXLAN-GPE / IP|IP6 /
  *           UDP|TCP|SCTP
+ *   Ether / (vlan) / outer IP / outer UDP / GTP / IP|IP6 / UDP|TCP|SCTP
  *   Ether / (vlan) / outer IP|IP6 / GRE / Ether / IP|IP6 / UDP|TCP|SCTP
  *   Ether / (vlan) / outer IP|IP6 / GRE / IP|IP6 / UDP|TCP|SCTP
  *   Ether / (vlan) / outer IP|IP6 / IP|IP6 / UDP|TCP|SCTP
@@ -787,16 +858,22 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
 
                                udp_hdr = (struct rte_udp_hdr *)
                                        ((char *)l3_hdr + info.l3_len);
+                               parse_gtp(udp_hdr, &info);
+                               if (info.is_tunnel) {
+                                       tx_ol_flags |= PKT_TX_TUNNEL_GTP;
+                                       goto tunnel_update;
+                               }
                                parse_vxlan_gpe(udp_hdr, &info);
                                if (info.is_tunnel) {
-                                       tx_ol_flags |= PKT_TX_TUNNEL_VXLAN_GPE;
-                               } else {
-                                       parse_vxlan(udp_hdr, &info,
-                                                   m->packet_type);
-                                       if (info.is_tunnel)
-                                               tx_ol_flags |=
-                                                       PKT_TX_TUNNEL_VXLAN;
+                                       tx_ol_flags |=
+                                               PKT_TX_TUNNEL_VXLAN_GPE;
+                                       goto tunnel_update;
                                }
+                               parse_vxlan(udp_hdr, &info,
+                                           m->packet_type);
+                               if (info.is_tunnel)
+                                       tx_ol_flags |=
+                                               PKT_TX_TUNNEL_VXLAN;
                        } else if (info.l4_proto == IPPROTO_GRE) {
                                struct simple_gre_hdr *gre_hdr;
 
@@ -815,6 +892,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
                        }
                }
 
+tunnel_update:
                /* update l3_hdr and outer_l3_hdr if a tunnel was parsed */
                if (info.is_tunnel) {
                        outer_l3_hdr = l3_hdr;
DPDK repo used for reviews