net/mlx5: fix getting metadata register for E-Switch domain

[dpdk.git] / examples / l3fwd / l3fwd_lpm.c

diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 60a0063..349de27 100644 (file)
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -41,16 +41,16 @@ struct ipv6_l3fwd_lpm_route {
        uint8_t  if_out;
 };
 
-/* 192.18.0.0/16 are set aside for RFC2544 benchmarking. */
+/* 198.18.0.0/16 are set aside for RFC2544 benchmarking (RFC5735). */
 static struct ipv4_l3fwd_lpm_route ipv4_l3fwd_lpm_route_array[] = {
-       {IPv4(192, 18, 0, 0), 24, 0},
-       {IPv4(192, 18, 1, 0), 24, 1},
-       {IPv4(192, 18, 2, 0), 24, 2},
-       {IPv4(192, 18, 3, 0), 24, 3},
-       {IPv4(192, 18, 4, 0), 24, 4},
-       {IPv4(192, 18, 5, 0), 24, 5},
-       {IPv4(192, 18, 6, 0), 24, 6},
-       {IPv4(192, 18, 7, 0), 24, 7},
+       {RTE_IPV4(198, 18, 0, 0), 24, 0},
+       {RTE_IPV4(198, 18, 1, 0), 24, 1},
+       {RTE_IPV4(198, 18, 2, 0), 24, 2},
+       {RTE_IPV4(198, 18, 3, 0), 24, 3},
+       {RTE_IPV4(198, 18, 4, 0), 24, 4},
+       {RTE_IPV4(198, 18, 5, 0), 24, 5},
+       {RTE_IPV4(198, 18, 6, 0), 24, 6},
+       {RTE_IPV4(198, 18, 7, 0), 24, 7},
 };
 
 /* 2001:0200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180) */
@@ -86,7 +86,7 @@ lpm_get_ipv4_dst_port(void *ipv4_hdr, uint16_t portid, void *lookup_struct)
                (struct rte_lpm *)lookup_struct;
 
        return (uint16_t) ((rte_lpm_lookup(ipv4_l3fwd_lookup_struct,
-               rte_be_to_cpu_32(((struct ipv4_hdr *)ipv4_hdr)->dst_addr),
+               rte_be_to_cpu_32(((struct rte_ipv4_hdr *)ipv4_hdr)->dst_addr),
                &next_hop) == 0) ? next_hop : portid);
 }
 
@@ -98,7 +98,7 @@ lpm_get_ipv6_dst_port(void *ipv6_hdr, uint16_t portid, void *lookup_struct)
                (struct rte_lpm6 *)lookup_struct;
 
        return (uint16_t) ((rte_lpm6_lookup(ipv6_l3fwd_lookup_struct,
-                       ((struct ipv6_hdr *)ipv6_hdr)->dst_addr,
+                       ((struct rte_ipv6_hdr *)ipv6_hdr)->dst_addr,
                        &next_hop) == 0) ?  next_hop : portid);
 }
 
@@ -106,21 +106,21 @@ static __rte_always_inline uint16_t
 lpm_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
                uint16_t portid)
 {
-       struct ipv6_hdr *ipv6_hdr;
-       struct ipv4_hdr *ipv4_hdr;
-       struct ether_hdr *eth_hdr;
+       struct rte_ipv6_hdr *ipv6_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr;
+       struct rte_ether_hdr *eth_hdr;
 
        if (RTE_ETH_IS_IPV4_HDR(pkt->packet_type)) {
 
-               eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
-               ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);
+               eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
+               ipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);
 
                return lpm_get_ipv4_dst_port(ipv4_hdr, portid,
                                             qconf->ipv4_lookup_struct);
        } else if (RTE_ETH_IS_IPV6_HDR(pkt->packet_type)) {
 
-               eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
-               ipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1);
+               eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
+               ipv6_hdr = (struct rte_ipv6_hdr *)(eth_hdr + 1);
 
                return lpm_get_ipv6_dst_port(ipv6_hdr, portid,
                                             qconf->ipv6_lookup_struct);
@@ -139,8 +139,8 @@ lpm_get_dst_port_with_ipv4(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
        uint32_t dst_ipv4, uint16_t portid)
 {
        uint32_t next_hop;
-       struct ipv6_hdr *ipv6_hdr;
-       struct ether_hdr *eth_hdr;
+       struct rte_ipv6_hdr *ipv6_hdr;
+       struct rte_ether_hdr *eth_hdr;
 
        if (RTE_ETH_IS_IPV4_HDR(pkt->packet_type)) {
                return (uint16_t) ((rte_lpm_lookup(qconf->ipv4_lookup_struct,
@@ -149,8 +149,8 @@ lpm_get_dst_port_with_ipv4(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
 
        } else if (RTE_ETH_IS_IPV6_HDR(pkt->packet_type)) {
 
-               eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
-               ipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1);
+               eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
+               ipv6_hdr = (struct rte_ipv6_hdr *)(eth_hdr + 1);
 
                return (uint16_t) ((rte_lpm6_lookup(qconf->ipv6_lookup_struct,
                                ipv6_hdr->dst_addr, &next_hop) == 0)
@@ -380,15 +380,15 @@ lpm_check_ptype(int portid)
 static inline void
 lpm_parse_ptype(struct rte_mbuf *m)
 {
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
        uint32_t packet_type = RTE_PTYPE_UNKNOWN;
        uint16_t ether_type;
 
-       eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
+       eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
        ether_type = eth_hdr->ether_type;
-       if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv4))
+       if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4))
                packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
-       else if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv6))
+       else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6))
                packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
 
        m->packet_type = packet_type;
@@ -400,10 +400,17 @@ lpm_cb_parse_ptype(uint16_t port __rte_unused, uint16_t queue __rte_unused,
                   uint16_t max_pkts __rte_unused,
                   void *user_param __rte_unused)
 {
-       unsigned i;
-
-       for (i = 0; i < nb_pkts; ++i)
+       unsigned int i;
+
+       if (unlikely(nb_pkts == 0))
+               return nb_pkts;
+       rte_prefetch0(rte_pktmbuf_mtod(pkts[0], struct ether_hdr *));
+       for (i = 0; i < (unsigned int) (nb_pkts - 1); ++i) {
+               rte_prefetch0(rte_pktmbuf_mtod(pkts[i+1],
+                       struct ether_hdr *));
                lpm_parse_ptype(pkts[i]);
+       }
+       lpm_parse_ptype(pkts[i]);
 
        return nb_pkts;
 }