remove unused ring includes
[dpdk.git] / examples / l3fwd / l3fwd_em.c
index 0adf8f4..89a68e6 100644 (file)
 #include <errno.h>
 #include <getopt.h>
 #include <stdbool.h>
+#include <netinet/in.h>
 
 #include <rte_debug.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_cycles.h>
 #include <rte_mbuf.h>
@@ -250,7 +250,7 @@ em_mask_key(void *key, xmm_t mask)
 
        return _mm_and_si128(data, mask);
 }
-#elif defined(__ARM_NEON)
+#elif defined(RTE_MACHINE_CPUFLAG_NEON)
 static inline xmm_t
 em_mask_key(void *key, xmm_t mask)
 {
@@ -258,6 +258,16 @@ em_mask_key(void *key, xmm_t mask)
 
        return vandq_s32(data, mask);
 }
+#elif defined(RTE_MACHINE_CPUFLAG_ALTIVEC)
+static inline xmm_t
+em_mask_key(void *key, xmm_t mask)
+{
+       xmm_t data = vec_ld(0, (xmm_t *)(key));
+
+       return vec_and(data, mask);
+}
+#else
+#error No vector engine (SSE, NEON, ALTIVEC) available, check your toolchain
 #endif
 
 static inline uint8_t
@@ -314,13 +324,8 @@ em_get_ipv6_dst_port(void *ipv6_hdr,  uint8_t portid, void *lookup_struct)
        return (uint8_t)((ret < 0) ? portid : ipv6_l3fwd_out_if[ret]);
 }
 
-
-/*
- * Include header file if SSE4_1 is enabled for
- * buffer optimization i.e. ENABLE_MULTI_BUFFER_OPTIMIZE=1.
- */
 #if defined(__SSE4_1__)
-#ifndef HASH_MULTI_LOOKUP
+#if defined(NO_HASH_MULTI_LOOKUP)
 #include "l3fwd_em_sse.h"
 #else
 #include "l3fwd_em_hlm_sse.h"
@@ -524,6 +529,114 @@ populate_ipv6_many_flow_into_table(const struct rte_hash *h,
        printf("Hash: Adding 0x%x keys\n", nr_flow);
 }
 
+/* Requirements:
+ * 1. IP packets without extension;
+ * 2. L4 payload should be either TCP or UDP.
+ */
+int
+em_check_ptype(int portid)
+{
+       int i, ret;
+       int ptype_l3_ipv4_ext = 0;
+       int ptype_l3_ipv6_ext = 0;
+       int ptype_l4_tcp = 0;
+       int ptype_l4_udp = 0;
+       uint32_t ptype_mask = RTE_PTYPE_L3_MASK | RTE_PTYPE_L4_MASK;
+
+       ret = rte_eth_dev_get_supported_ptypes(portid, ptype_mask, NULL, 0);
+       if (ret <= 0)
+               return 0;
+
+       uint32_t ptypes[ret];
+
+       ret = rte_eth_dev_get_supported_ptypes(portid, ptype_mask, ptypes, ret);
+       for (i = 0; i < ret; ++i) {
+               switch (ptypes[i]) {
+               case RTE_PTYPE_L3_IPV4_EXT:
+                       ptype_l3_ipv4_ext = 1;
+                       break;
+               case RTE_PTYPE_L3_IPV6_EXT:
+                       ptype_l3_ipv6_ext = 1;
+                       break;
+               case RTE_PTYPE_L4_TCP:
+                       ptype_l4_tcp = 1;
+                       break;
+               case RTE_PTYPE_L4_UDP:
+                       ptype_l4_udp = 1;
+                       break;
+               }
+       }
+
+       if (ptype_l3_ipv4_ext == 0)
+               printf("port %d cannot parse RTE_PTYPE_L3_IPV4_EXT\n", portid);
+       if (ptype_l3_ipv6_ext == 0)
+               printf("port %d cannot parse RTE_PTYPE_L3_IPV6_EXT\n", portid);
+       if (!ptype_l3_ipv4_ext || !ptype_l3_ipv6_ext)
+               return 0;
+
+       if (ptype_l4_tcp == 0)
+               printf("port %d cannot parse RTE_PTYPE_L4_TCP\n", portid);
+       if (ptype_l4_udp == 0)
+               printf("port %d cannot parse RTE_PTYPE_L4_UDP\n", portid);
+       if (ptype_l4_tcp && ptype_l4_udp)
+               return 1;
+
+       return 0;
+}
+
+static inline void
+em_parse_ptype(struct rte_mbuf *m)
+{
+       struct ether_hdr *eth_hdr;
+       uint32_t packet_type = RTE_PTYPE_UNKNOWN;
+       uint16_t ether_type;
+       void *l3;
+       int hdr_len;
+       struct ipv4_hdr *ipv4_hdr;
+       struct ipv6_hdr *ipv6_hdr;
+
+       eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
+       ether_type = eth_hdr->ether_type;
+       l3 = (uint8_t *)eth_hdr + sizeof(struct ether_hdr);
+       if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv4)) {
+               ipv4_hdr = (struct ipv4_hdr *)l3;
+               hdr_len = (ipv4_hdr->version_ihl & IPV4_HDR_IHL_MASK) *
+                         IPV4_IHL_MULTIPLIER;
+               if (hdr_len == sizeof(struct ipv4_hdr)) {
+                       packet_type |= RTE_PTYPE_L3_IPV4;
+                       if (ipv4_hdr->next_proto_id == IPPROTO_TCP)
+                               packet_type |= RTE_PTYPE_L4_TCP;
+                       else if (ipv4_hdr->next_proto_id == IPPROTO_UDP)
+                               packet_type |= RTE_PTYPE_L4_UDP;
+               } else
+                       packet_type |= RTE_PTYPE_L3_IPV4_EXT;
+       } else if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv4)) {
+               ipv6_hdr = (struct ipv6_hdr *)l3;
+               if (ipv6_hdr->proto == IPPROTO_TCP)
+                       packet_type |= RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_TCP;
+               else if (ipv6_hdr->proto == IPPROTO_UDP)
+                       packet_type |= RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_UDP;
+               else
+                       packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
+       }
+
+       m->packet_type = packet_type;
+}
+
+uint16_t
+em_cb_parse_ptype(uint8_t port __rte_unused, uint16_t queue __rte_unused,
+                 struct rte_mbuf *pkts[], uint16_t nb_pkts,
+                 uint16_t max_pkts __rte_unused,
+                 void *user_param __rte_unused)
+{
+       unsigned i;
+
+       for (i = 0; i < nb_pkts; ++i)
+               em_parse_ptype(pkts[i]);
+
+       return nb_pkts;
+}
+
 /* main processing loop */
 int
 em_main_loop(__attribute__((unused)) void *dummy)
@@ -568,8 +681,8 @@ em_main_loop(__attribute__((unused)) void *dummy)
                diff_tsc = cur_tsc - prev_tsc;
                if (unlikely(diff_tsc > drain_tsc)) {
 
-                       for (i = 0; i < qconf->n_rx_queue; i++) {
-                               portid = qconf->rx_queue_list[i].port_id;
+                       for (i = 0; i < qconf->n_tx_port; ++i) {
+                               portid = qconf->tx_port_id[i];
                                if (qconf->tx_mbufs[portid].len == 0)
                                        continue;
                                send_burst(qconf,
@@ -592,10 +705,6 @@ em_main_loop(__attribute__((unused)) void *dummy)
                        if (nb_rx == 0)
                                continue;
 
-                       /*
-                        * For SSE4_1 use ENABLE_MULTI_BUFFER_OPTIMIZE=1
-                        * code.
-                        */
 #if defined(__SSE4_1__)
                        l3fwd_em_send_packets(nb_rx, pkts_burst,
                                                        portid, qconf);