eal: introduce macro for always inline

[dpdk.git] / examples / l3fwd / l3fwd_lpm_sse.h

diff --git a/examples/l3fwd/l3fwd_lpm_sse.h b/examples/l3fwd/l3fwd_lpm_sse.h
index 77326c1..fa1b902 100644 (file)
--- a/examples/l3fwd/l3fwd_lpm_sse.h
+++ b/examples/l3fwd/l3fwd_lpm_sse.h
@@ -36,11 +36,11 @@
 
 #include "l3fwd_sse.h"
 
-static inline __attribute__((always_inline)) uint16_t
+static __rte_always_inline uint16_t
 lpm_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
                uint8_t portid)
 {
-       uint8_t next_hop;
+       uint32_t next_hop;
        struct ipv6_hdr *ipv6_hdr;
        struct ipv4_hdr *ipv4_hdr;
        struct ether_hdr *eth_hdr;
@@ -50,8 +50,10 @@ lpm_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
                eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
                ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);
 
-               return (uint16_t) ((rte_lpm_lookup(qconf->ipv4_lookup_struct,
-                               rte_be_to_cpu_32(ipv4_hdr->dst_addr), &next_hop) == 0) ?
+               return (uint16_t) (
+                       (rte_lpm_lookup(qconf->ipv4_lookup_struct,
+                                       rte_be_to_cpu_32(ipv4_hdr->dst_addr),
+                                       &next_hop) == 0) ?
                                                next_hop : portid);
 
        } else if (RTE_ETH_IS_IPV6_HDR(pkt->packet_type)) {
@@ -60,7 +62,8 @@ lpm_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
                ipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1);
 
                return (uint16_t) ((rte_lpm6_lookup(qconf->ipv6_lookup_struct,
-                               ipv6_hdr->dst_addr, &next_hop) == 0) ? next_hop : portid);
+                               ipv6_hdr->dst_addr, &next_hop) == 0)
+                               ? next_hop : portid);
 
        }
 
@@ -72,11 +75,11 @@ lpm_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
  * precalculated. If packet is ipv6 dst_addr is taken directly from packet
  * header and dst_ipv4 value is not used.
  */
-static inline __attribute__((always_inline)) uint16_t
+static __rte_always_inline uint16_t
 lpm_get_dst_port_with_ipv4(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
        uint32_t dst_ipv4, uint8_t portid)
 {
-       uint8_t next_hop;
+       uint32_t next_hop;
        struct ipv6_hdr *ipv6_hdr;
        struct ether_hdr *eth_hdr;
 
@@ -90,7 +93,8 @@ lpm_get_dst_port_with_ipv4(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
                ipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1);
 
                return (uint16_t) ((rte_lpm6_lookup(qconf->ipv6_lookup_struct,
-                               ipv6_hdr->dst_addr, &next_hop) == 0) ? next_hop : portid);
+                               ipv6_hdr->dst_addr, &next_hop) == 0)
+                               ? next_hop : portid);
 
        }
 
@@ -154,7 +158,11 @@ processx4_step2(const struct lcore_conf *qconf,
 
        /* if all 4 packets are IPV4. */
        if (likely(ipv4_flag)) {
-               rte_lpm_lookupx4(qconf->ipv4_lookup_struct, dip, dprt, portid);
+               rte_lpm_lookupx4(qconf->ipv4_lookup_struct, dip, dst.u32,
+                       portid);
+               /* get rid of unused upper 16 bit for each dport. */
+               dst.x = _mm_packs_epi32(dst.x, dst.x);
+               *(uint64_t *)dprt = dst.u64[0];
        } else {
                dst.x = dip;
                dprt[0] = lpm_get_dst_port_with_ipv4(qconf, pkt[0], dst.u32[0], portid);
@@ -191,9 +199,11 @@ l3fwd_lpm_send_packets(int nb_rx, struct rte_mbuf **pkts_burst,
        case 3:
                dst_port[j] = lpm_get_dst_port(qconf, pkts_burst[j], portid);
                j++;
+               /* fall-through */
        case 2:
                dst_port[j] = lpm_get_dst_port(qconf, pkts_burst[j], portid);
                j++;
+               /* fall-through */
        case 1:
                dst_port[j] = lpm_get_dst_port(qconf, pkts_burst[j], portid);
                j++;