examples/l3fwd: rearrange LPM code

Some common code can be used by other ARCHs, move to l3fwd_lpm.c

Signed-off-by: Jianbo Liu <jianbo.liu@linaro.org>

diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 7f30d65..13cd968 100644 (file)
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -104,6 +104,89 @@ static struct ipv6_l3fwd_lpm_route ipv6_l3fwd_lpm_route_array[] = {
 struct rte_lpm *ipv4_l3fwd_lpm_lookup_struct[NB_SOCKETS];
 struct rte_lpm6 *ipv6_l3fwd_lpm_lookup_struct[NB_SOCKETS];
 
+static inline uint16_t
+lpm_get_ipv4_dst_port(void *ipv4_hdr,  uint8_t portid, void *lookup_struct)
+{
+       uint32_t next_hop;
+       struct rte_lpm *ipv4_l3fwd_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),
+               &next_hop) == 0) ? next_hop : portid);
+}
+
+static inline uint16_t
+lpm_get_ipv6_dst_port(void *ipv6_hdr,  uint8_t portid, void *lookup_struct)
+{
+       uint32_t next_hop;
+       struct rte_lpm6 *ipv6_l3fwd_lookup_struct =
+               (struct rte_lpm6 *)lookup_struct;
+
+       return (uint16_t) ((rte_lpm6_lookup(ipv6_l3fwd_lookup_struct,
+                       ((struct ipv6_hdr *)ipv6_hdr)->dst_addr,
+                       &next_hop) == 0) ?  next_hop : portid);
+}
+
+static __rte_always_inline uint16_t
+lpm_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
+               uint8_t portid)
+{
+       struct ipv6_hdr *ipv6_hdr;
+       struct ipv4_hdr *ipv4_hdr;
+       struct 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);
+
+               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);
+
+               return lpm_get_ipv6_dst_port(ipv6_hdr, portid,
+                                            qconf->ipv6_lookup_struct);
+       }
+
+       return portid;
+}
+
+/*
+ * lpm_get_dst_port optimized routine for packets where dst_ipv4 is already
+ * precalculated. If packet is ipv6 dst_addr is taken directly from packet
+ * header and dst_ipv4 value is not used.
+ */
+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)
+{
+       uint32_t next_hop;
+       struct ipv6_hdr *ipv6_hdr;
+       struct ether_hdr *eth_hdr;
+
+       if (RTE_ETH_IS_IPV4_HDR(pkt->packet_type)) {
+               return (uint16_t) ((rte_lpm_lookup(qconf->ipv4_lookup_struct,
+                                                  dst_ipv4, &next_hop) == 0)
+                                  ? next_hop : portid);
+
+       } 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);
+
+               return (uint16_t) ((rte_lpm6_lookup(qconf->ipv6_lookup_struct,
+                               ipv6_hdr->dst_addr, &next_hop) == 0)
+                               ? next_hop : portid);
+
+       }
+
+       return portid;
+}
+
 #if defined(RTE_ARCH_X86)
 #include "l3fwd_lpm_sse.h"
 #else

diff --git a/examples/l3fwd/l3fwd_lpm.h b/examples/l3fwd/l3fwd_lpm.h
index 4d77b58..55c3e83 100644 (file)
--- a/examples/l3fwd/l3fwd_lpm.h
+++ b/examples/l3fwd/l3fwd_lpm.h
@@ -34,37 +34,13 @@
 #ifndef __L3FWD_LPM_H__
 #define __L3FWD_LPM_H__
 
-static inline uint8_t
-lpm_get_ipv4_dst_port(void *ipv4_hdr,  uint8_t portid, void *lookup_struct)
-{
-       uint32_t next_hop;
-       struct rte_lpm *ipv4_l3fwd_lookup_struct =
-               (struct rte_lpm *)lookup_struct;
-
-       return (uint8_t) ((rte_lpm_lookup(ipv4_l3fwd_lookup_struct,
-               rte_be_to_cpu_32(((struct ipv4_hdr *)ipv4_hdr)->dst_addr),
-               &next_hop) == 0) ? next_hop : portid);
-}
-
-static inline uint8_t
-lpm_get_ipv6_dst_port(void *ipv6_hdr,  uint8_t portid, void *lookup_struct)
-{
-       uint32_t next_hop;
-       struct rte_lpm6 *ipv6_l3fwd_lookup_struct =
-               (struct rte_lpm6 *)lookup_struct;
-
-       return (uint8_t) ((rte_lpm6_lookup(ipv6_l3fwd_lookup_struct,
-                       ((struct ipv6_hdr *)ipv6_hdr)->dst_addr,
-                       &next_hop) == 0) ?  next_hop : portid);
-}
-
 static __rte_always_inline void
 l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint8_t portid,
                struct lcore_conf *qconf)
 {
        struct ether_hdr *eth_hdr;
        struct ipv4_hdr *ipv4_hdr;
-       uint8_t dst_port;
+       uint16_t dst_port;
 
        eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
 

diff --git a/examples/l3fwd/l3fwd_lpm_sse.h b/examples/l3fwd/l3fwd_lpm_sse.h
index fa1b902..4e294c8 100644 (file)
--- a/examples/l3fwd/l3fwd_lpm_sse.h
+++ b/examples/l3fwd/l3fwd_lpm_sse.h
@@ -36,72 +36,6 @@
 
 #include "l3fwd_sse.h"
 
-static __rte_always_inline uint16_t
-lpm_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
-               uint8_t portid)
-{
-       uint32_t next_hop;
-       struct ipv6_hdr *ipv6_hdr;
-       struct ipv4_hdr *ipv4_hdr;
-       struct 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);
-
-               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)) {
-
-               eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
-               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);
-
-       }
-
-       return portid;
-}
-
-/*
- * lpm_get_dst_port optimized routine for packets where dst_ipv4 is already
- * precalculated. If packet is ipv6 dst_addr is taken directly from packet
- * header and dst_ipv4 value is not used.
- */
-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)
-{
-       uint32_t next_hop;
-       struct ipv6_hdr *ipv6_hdr;
-       struct ether_hdr *eth_hdr;
-
-       if (RTE_ETH_IS_IPV4_HDR(pkt->packet_type)) {
-               return (uint16_t) ((rte_lpm_lookup(qconf->ipv4_lookup_struct, dst_ipv4,
-                       &next_hop) == 0) ? next_hop : portid);
-
-       } 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);
-
-               return (uint16_t) ((rte_lpm6_lookup(qconf->ipv6_lookup_struct,
-                               ipv6_hdr->dst_addr, &next_hop) == 0)
-                               ? next_hop : portid);
-
-       }
-
-       return portid;
-
-}
-
 /*
  * Read packet_type and destination IPV4 addresses from 4 mbufs.
  */