git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
app/testpmd: add extended Rx queue setup
[dpdk.git] / app / test-pmd / csumonly.c
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 7ece398..3d7d244 100644 (file)
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -43,6 +43,7 @@
 #include <rte_flow.h>
 #include <rte_gro.h>
 #include <rte_gso.h>
+#include <rte_geneve.h>
 
 #include "testpmd.h"
 
@@ -62,7 +63,8 @@
 #define _htons(x) (x)
 #endif
 
-uint16_t vxlan_gpe_udp_port = 4790;
+uint16_t vxlan_gpe_udp_port = RTE_VXLAN_GPE_DEFAULT_PORT;
+uint16_t geneve_udp_port = RTE_GENEVE_DEFAULT_PORT;
 
 /* structure that caches offload info for the current packet */
 struct testpmd_offload_info {
@@ -103,7 +105,7 @@ parse_ipv4(struct rte_ipv4_hdr *ipv4_hdr, struct testpmd_offload_info *info)
 {
        struct rte_tcp_hdr *tcp_hdr;
 
-       info->l3_len = (ipv4_hdr->version_ihl & 0x0f) * 4;
+       info->l3_len = rte_ipv4_hdr_len(ipv4_hdr);
        info->l4_proto = ipv4_hdr->next_proto_id;
 
        /* only fill l4_len for TCP, it's useful for TSO */
@@ -179,6 +181,17 @@ parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)
        }
 }
 
+/* Fill in outer layers length */
+static void
+update_tunnel_outer(struct testpmd_offload_info *info)
+{
+       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;
+}
+
 /*
  * Parse a GTP protocol header.
  * No optional fields and next extension header type.
@@ -199,11 +212,7 @@ parse_gtp(struct rte_udp_hdr *udp_hdr,
            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;
+       update_tunnel_outer(info);
        info->l2_len = 0;
 
        gtp_hdr = (struct rte_gtp_hdr *)((char *)udp_hdr +
@@ -248,18 +257,15 @@ parse_vxlan(struct rte_udp_hdr *udp_hdr,
 {
        struct rte_ether_hdr *eth_hdr;
 
-       /* check udp destination port, 4789 is the default vxlan port
-        * (rfc7348) or that the rx offload flag is set (i40e only
-        * currently) */
-       if (udp_hdr->dst_port != _htons(4789) &&
+       /* check udp destination port, RTE_VXLAN_DEFAULT_PORT (4789) is the
+        * default vxlan port (rfc7348) or that the rx offload flag is set
+        * (i40e only currently)
+        */
+       if (udp_hdr->dst_port != _htons(RTE_VXLAN_DEFAULT_PORT) &&
                RTE_ETH_IS_TUNNEL_PKT(pkt_type) == 0)
                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;
+       update_tunnel_outer(info);
 
        eth_hdr = (struct rte_ether_hdr *)((char *)udp_hdr +
                sizeof(struct rte_udp_hdr) +
@@ -289,11 +295,7 @@ parse_vxlan_gpe(struct rte_udp_hdr *udp_hdr,
 
        if (!vxlan_gpe_hdr->proto || vxlan_gpe_hdr->proto ==
            RTE_VXLAN_GPE_TYPE_IPV4) {
-               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;
+               update_tunnel_outer(info);
 
                ipv4_hdr = (struct rte_ipv4_hdr *)((char *)vxlan_gpe_hdr +
                           vxlan_gpe_len);
@@ -303,11 +305,7 @@ parse_vxlan_gpe(struct rte_udp_hdr *udp_hdr,
                info->l2_len = 0;
 
        } else if (vxlan_gpe_hdr->proto == RTE_VXLAN_GPE_TYPE_IPV6) {
-               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;
+               update_tunnel_outer(info);
 
                ipv6_hdr = (struct rte_ipv6_hdr *)((char *)vxlan_gpe_hdr +
                           vxlan_gpe_len);
@@ -317,11 +315,7 @@ parse_vxlan_gpe(struct rte_udp_hdr *udp_hdr,
                info->l2_len = 0;
 
        } else if (vxlan_gpe_hdr->proto == RTE_VXLAN_GPE_TYPE_ETH) {
-               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;
+               update_tunnel_outer(info);
 
                eth_hdr = (struct rte_ether_hdr *)((char *)vxlan_gpe_hdr +
                          vxlan_gpe_len);
@@ -333,6 +327,53 @@ parse_vxlan_gpe(struct rte_udp_hdr *udp_hdr,
        info->l2_len += RTE_ETHER_VXLAN_GPE_HLEN;
 }
 
+/* Parse a geneve header */
+static void
+parse_geneve(struct rte_udp_hdr *udp_hdr,
+           struct testpmd_offload_info *info)
+{
+       struct rte_ether_hdr *eth_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr;
+       struct rte_ipv6_hdr *ipv6_hdr;
+       struct rte_geneve_hdr *geneve_hdr;
+       uint16_t geneve_len;
+
+       /* Check udp destination port. */
+       if (udp_hdr->dst_port != _htons(geneve_udp_port))
+               return;
+
+       geneve_hdr = (struct rte_geneve_hdr *)((char *)udp_hdr +
+                               sizeof(struct rte_udp_hdr));
+       geneve_len = sizeof(struct rte_geneve_hdr) + geneve_hdr->opt_len * 4;
+       if (!geneve_hdr->proto || geneve_hdr->proto ==
+           _htons(RTE_ETHER_TYPE_IPV4)) {
+               update_tunnel_outer(info);
+               ipv4_hdr = (struct rte_ipv4_hdr *)((char *)geneve_hdr +
+                          geneve_len);
+               parse_ipv4(ipv4_hdr, info);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPV4);
+               info->l2_len = 0;
+       } else if (geneve_hdr->proto == _htons(RTE_ETHER_TYPE_IPV6)) {
+               update_tunnel_outer(info);
+               ipv6_hdr = (struct rte_ipv6_hdr *)((char *)geneve_hdr +
+                          geneve_len);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPV6);
+               parse_ipv6(ipv6_hdr, info);
+               info->l2_len = 0;
+
+       } else if (geneve_hdr->proto == _htons(RTE_GENEVE_TYPE_ETH)) {
+               update_tunnel_outer(info);
+               eth_hdr = (struct rte_ether_hdr *)((char *)geneve_hdr +
+                         geneve_len);
+               parse_ethernet(eth_hdr, info);
+       } else
+               return;
+
+       info->l2_len +=
+               (sizeof(struct rte_udp_hdr) + sizeof(struct rte_geneve_hdr) +
+               ((struct rte_geneve_hdr *)geneve_hdr)->opt_len * 4);
+}
+
 /* Parse a gre header */
 static void
 parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
@@ -352,11 +393,7 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
                gre_len += GRE_EXT_LEN;
 
        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;
-               info->outer_l3_len = info->l3_len;
-               info->outer_l4_proto = info->l4_proto;
+               update_tunnel_outer(info);
 
                ipv4_hdr = (struct rte_ipv4_hdr *)((char *)gre_hdr + gre_len);
 
@@ -365,11 +402,7 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
                info->l2_len = 0;
 
        } 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;
-               info->outer_l3_len = info->l3_len;
-               info->outer_l4_proto = info->l4_proto;
+               update_tunnel_outer(info);
 
                ipv6_hdr = (struct rte_ipv6_hdr *)((char *)gre_hdr + gre_len);
 
@@ -378,11 +411,7 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
                info->l2_len = 0;
 
        } else if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_TEB)) {
-               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;
+               update_tunnel_outer(info);
 
                eth_hdr = (struct rte_ether_hdr *)((char *)gre_hdr + gre_len);
 
@@ -865,9 +894,17 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
                                }
                                parse_vxlan(udp_hdr, &info,
                                            m->packet_type);
-                               if (info.is_tunnel)
+                               if (info.is_tunnel) {
                                        tx_ol_flags |=
                                                PKT_TX_TUNNEL_VXLAN;
+                                       goto tunnel_update;
+                               }
+                               parse_geneve(udp_hdr, &info);
+                               if (info.is_tunnel) {
+                                       tx_ol_flags |=
+                                               PKT_TX_TUNNEL_GENEVE;
+                                       goto tunnel_update;
+                               }
                        } else if (info.l4_proto == IPPROTO_GRE) {
                                struct simple_gre_hdr *gre_hdr;
 
DPDK repo used for reviews