X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fl3fwd%2Fmain.c;h=c35926d923c7dcaf1d1282155e498083c6b79392;hb=693f715da45c48ec1ec0fe4ba2f3b5ffd11ba53e;hp=fe5a25783e5616c2369ae770d063cee2a585c80c;hpb=6f1c1e28d98e11c679538ea5eebd0401adba8f55;p=dpdk.git diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index fe5a25783e..c35926d923 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -41,6 +41,8 @@ #include #include #include +#include +#include #include #include @@ -75,6 +77,8 @@ #include #include +static volatile bool force_quit; + #define APP_LOOKUP_EXACT_MATCH 0 #define APP_LOOKUP_LPM 1 #define DO_RFC_1812_CHECKS @@ -373,7 +377,7 @@ ipv4_hash_crc(const void *data, __rte_unused uint32_t data_len, init_val = rte_jhash_1word(k->ip_dst, init_val); init_val = rte_jhash_1word(*p, init_val); #endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */ - return (init_val); + return init_val; } static inline uint32_t @@ -416,7 +420,7 @@ ipv6_hash_crc(const void *data, __rte_unused uint32_t data_len, uint32_t init_va init_val = rte_jhash(k->ip_dst, sizeof(uint8_t) * IPV6_ADDR_LEN, init_val); init_val = rte_jhash_1word(*p, init_val); #endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */ - return (init_val); + return init_val; } #define IPV4_L3FWD_NUM_ROUTES \ @@ -1005,7 +1009,7 @@ simple_ipv6_fwd_8pkts(struct rte_mbuf *m[8], uint8_t portid, struct lcore_conf * const void *key_array[8] = {&key[0], &key[1], &key[2], &key[3], &key[4], &key[5], &key[6], &key[7]}; - rte_hash_lookup_multi(qconf->ipv6_lookup_struct, &key_array[0], 4, ret); + rte_hash_lookup_multi(qconf->ipv6_lookup_struct, &key_array[0], 8, ret); dst_port[0] = (uint8_t) ((ret[0] < 0) ? portid:ipv6_l3fwd_out_if[ret[0]]); dst_port[1] = (uint8_t) ((ret[1] < 0) ? portid:ipv6_l3fwd_out_if[ret[1]]); dst_port[2] = (uint8_t) ((ret[2] < 0) ? portid:ipv6_l3fwd_out_if[ret[2]]); @@ -1073,11 +1077,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); -#ifdef RTE_NEXT_ABI if (RTE_ETH_IS_IPV4_HDR(m->packet_type)) { -#else - if (m->ol_flags & PKT_RX_IPV4_HDR) { -#endif /* Handle IPv4 headers.*/ ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, sizeof(struct ether_hdr)); @@ -1108,11 +1108,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon ether_addr_copy(&ports_eth_addr[dst_port], ð_hdr->s_addr); send_single_packet(m, dst_port); -#ifdef RTE_NEXT_ABI } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) { -#else - } else { -#endif /* Handle IPv6 headers.*/ struct ipv6_hdr *ipv6_hdr; @@ -1131,13 +1127,9 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon ether_addr_copy(&ports_eth_addr[dst_port], ð_hdr->s_addr); send_single_packet(m, dst_port); -#ifdef RTE_NEXT_ABI } else /* Free the mbuf that contains non-IPV4/IPV6 packet */ rte_pktmbuf_free(m); -#else - } -#endif } #if ((APP_LOOKUP_METHOD == APP_LOOKUP_LPM) && \ @@ -1163,19 +1155,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon * to BAD_PORT value. */ static inline __attribute__((always_inline)) void -#ifdef RTE_NEXT_ABI rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t ptype) -#else -rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t flags) -#endif { uint8_t ihl; -#ifdef RTE_NEXT_ABI if (RTE_ETH_IS_IPV4_HDR(ptype)) { -#else - if ((flags & PKT_RX_IPV4_HDR) != 0) { -#endif ihl = ipv4_hdr->version_ihl - IPV4_MIN_VER_IHL; ipv4_hdr->time_to_live--; @@ -1206,19 +1190,11 @@ get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt, struct ipv6_hdr *ipv6_hdr; struct ether_hdr *eth_hdr; -#ifdef RTE_NEXT_ABI if (RTE_ETH_IS_IPV4_HDR(pkt->packet_type)) { -#else - if (pkt->ol_flags & PKT_RX_IPV4_HDR) { -#endif if (rte_lpm_lookup(qconf->ipv4_lookup_struct, dst_ipv4, &next_hop) != 0) next_hop = portid; -#ifdef RTE_NEXT_ABI } else if (RTE_ETH_IS_IPV6_HDR(pkt->packet_type)) { -#else - } else if (pkt->ol_flags & PKT_RX_IPV6_HDR) { -#endif eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *); ipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1); if (rte_lpm6_lookup(qconf->ipv6_lookup_struct, @@ -1248,21 +1224,16 @@ process_packet(struct lcore_conf *qconf, struct rte_mbuf *pkt, dst_ipv4 = rte_be_to_cpu_32(dst_ipv4); dp = get_dst_port(qconf, pkt, dst_ipv4, portid); - te = _mm_load_si128((__m128i *)eth_hdr); + te = _mm_loadu_si128((__m128i *)eth_hdr); ve = val_eth[dp]; dst_port[0] = dp; -#ifdef RTE_NEXT_ABI rfc1812_process(ipv4_hdr, dst_port, pkt->packet_type); -#else - rfc1812_process(ipv4_hdr, dst_port, pkt->ol_flags); -#endif te = _mm_blend_epi16(te, ve, MASK_ETH); - _mm_store_si128((__m128i *)eth_hdr, te); + _mm_storeu_si128((__m128i *)eth_hdr, te); } -#ifdef RTE_NEXT_ABI /* * Read packet_type and destination IPV4 addresses from 4 mbufs. */ @@ -1297,57 +1268,18 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP], dip[0] = _mm_set_epi32(x3, x2, x1, x0); } -#else /* RTE_NEXT_ABI */ -/* - * Read ol_flags and destination IPV4 addresses from 4 mbufs. - */ -static inline void -processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag) -{ - struct ipv4_hdr *ipv4_hdr; - struct ether_hdr *eth_hdr; - uint32_t x0, x1, x2, x3; - - eth_hdr = rte_pktmbuf_mtod(pkt[0], struct ether_hdr *); - ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1); - x0 = ipv4_hdr->dst_addr; - flag[0] = pkt[0]->ol_flags & PKT_RX_IPV4_HDR; - - eth_hdr = rte_pktmbuf_mtod(pkt[1], struct ether_hdr *); - ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1); - x1 = ipv4_hdr->dst_addr; - flag[0] &= pkt[1]->ol_flags; - - eth_hdr = rte_pktmbuf_mtod(pkt[2], struct ether_hdr *); - ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1); - x2 = ipv4_hdr->dst_addr; - flag[0] &= pkt[2]->ol_flags; - - eth_hdr = rte_pktmbuf_mtod(pkt[3], struct ether_hdr *); - ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1); - x3 = ipv4_hdr->dst_addr; - flag[0] &= pkt[3]->ol_flags; - - dip[0] = _mm_set_epi32(x3, x2, x1, x0); -} -#endif /* RTE_NEXT_ABI */ /* * Lookup into LPM for destination port. * If lookup fails, use incoming port (portid) as destination port. */ static inline void -#ifdef RTE_NEXT_ABI processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t ipv4_flag, uint8_t portid, struct rte_mbuf *pkt[FWDSTEP], uint16_t dprt[FWDSTEP]) -#else -processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t flag, - uint8_t portid, struct rte_mbuf *pkt[FWDSTEP], uint16_t dprt[FWDSTEP]) -#endif /* RTE_NEXT_ABI */ { rte_xmm_t dst; const __m128i bswap_mask = _mm_set_epi8(12, 13, 14, 15, 8, 9, 10, 11, @@ -1357,11 +1289,7 @@ processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t flag, dip = _mm_shuffle_epi8(dip, bswap_mask); /* if all 4 packets are IPV4. */ -#ifdef RTE_NEXT_ABI if (likely(ipv4_flag)) { -#else - if (likely(flag != 0)) { -#endif rte_lpm_lookupx4(qconf->ipv4_lookup_struct, dip, dprt, portid); } else { dst.x = dip; @@ -1389,16 +1317,16 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP]) p[3] = rte_pktmbuf_mtod(pkt[3], __m128i *); ve[0] = val_eth[dst_port[0]]; - te[0] = _mm_load_si128(p[0]); + te[0] = _mm_loadu_si128(p[0]); ve[1] = val_eth[dst_port[1]]; - te[1] = _mm_load_si128(p[1]); + te[1] = _mm_loadu_si128(p[1]); ve[2] = val_eth[dst_port[2]]; - te[2] = _mm_load_si128(p[2]); + te[2] = _mm_loadu_si128(p[2]); ve[3] = val_eth[dst_port[3]]; - te[3] = _mm_load_si128(p[3]); + te[3] = _mm_loadu_si128(p[3]); /* Update first 12 bytes, keep rest bytes intact. */ te[0] = _mm_blend_epi16(te[0], ve[0], MASK_ETH); @@ -1406,12 +1334,11 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP]) te[2] = _mm_blend_epi16(te[2], ve[2], MASK_ETH); te[3] = _mm_blend_epi16(te[3], ve[3], MASK_ETH); - _mm_store_si128(p[0], te[0]); - _mm_store_si128(p[1], te[1]); - _mm_store_si128(p[2], te[2]); - _mm_store_si128(p[3], te[3]); + _mm_storeu_si128(p[0], te[0]); + _mm_storeu_si128(p[1], te[1]); + _mm_storeu_si128(p[2], te[2]); + _mm_storeu_si128(p[3], te[3]); -#ifdef RTE_NEXT_ABI rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[0] + 1), &dst_port[0], pkt[0]->packet_type); rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[1] + 1), @@ -1420,16 +1347,6 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP]) &dst_port[2], pkt[2]->packet_type); rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[3] + 1), &dst_port[3], pkt[3]->packet_type); -#else /* RTE_NEXT_ABI */ - rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[0] + 1), - &dst_port[0], pkt[0]->ol_flags); - rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[1] + 1), - &dst_port[1], pkt[1]->ol_flags); - rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[2] + 1), - &dst_port[2], pkt[2]->ol_flags); - rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[3] + 1), - &dst_port[3], pkt[3]->ol_flags); -#endif /* RTE_NEXT_ABI */ } /* @@ -1616,11 +1533,7 @@ main_loop(__attribute__((unused)) void *dummy) uint16_t *lp; uint16_t dst_port[MAX_PKT_BURST]; __m128i dip[MAX_PKT_BURST / FWDSTEP]; -#ifdef RTE_NEXT_ABI uint32_t ipv4_flag[MAX_PKT_BURST / FWDSTEP]; -#else - uint32_t flag[MAX_PKT_BURST / FWDSTEP]; -#endif uint16_t pnum[MAX_PKT_BURST + 1]; #endif @@ -1644,7 +1557,7 @@ main_loop(__attribute__((unused)) void *dummy) portid, queueid); } - while (1) { + while (!force_quit) { cur_tsc = rte_rdtsc(); @@ -1690,7 +1603,6 @@ main_loop(__attribute__((unused)) void *dummy) */ int32_t n = RTE_ALIGN_FLOOR(nb_rx, 8); for (j = 0; j < n; j += 8) { -#ifdef RTE_NEXT_ABI uint32_t pkt_type = pkts_burst[j]->packet_type & pkts_burst[j+1]->packet_type & @@ -1705,20 +1617,6 @@ main_loop(__attribute__((unused)) void *dummy) &pkts_burst[j], portid, qconf); } else if (pkt_type & RTE_PTYPE_L3_IPV6) { -#else /* RTE_NEXT_ABI */ - uint32_t ol_flag = pkts_burst[j]->ol_flags - & pkts_burst[j+1]->ol_flags - & pkts_burst[j+2]->ol_flags - & pkts_burst[j+3]->ol_flags - & pkts_burst[j+4]->ol_flags - & pkts_burst[j+5]->ol_flags - & pkts_burst[j+6]->ol_flags - & pkts_burst[j+7]->ol_flags; - if (ol_flag & PKT_RX_IPV4_HDR ) { - simple_ipv4_fwd_8pkts(&pkts_burst[j], - portid, qconf); - } else if (ol_flag & PKT_RX_IPV6_HDR) { -#endif /* RTE_NEXT_ABI */ simple_ipv6_fwd_8pkts(&pkts_burst[j], portid, qconf); } else { @@ -1751,21 +1649,13 @@ main_loop(__attribute__((unused)) void *dummy) for (j = 0; j != k; j += FWDSTEP) { processx4_step1(&pkts_burst[j], &dip[j / FWDSTEP], -#ifdef RTE_NEXT_ABI &ipv4_flag[j / FWDSTEP]); -#else - &flag[j / FWDSTEP]); -#endif } k = RTE_ALIGN_FLOOR(nb_rx, FWDSTEP); for (j = 0; j != k; j += FWDSTEP) { processx4_step2(qconf, dip[j / FWDSTEP], -#ifdef RTE_NEXT_ABI ipv4_flag[j / FWDSTEP], portid, -#else - flag[j / FWDSTEP], portid, -#endif &pkts_burst[j], &dst_port[j]); } @@ -1895,6 +1785,8 @@ main_loop(__attribute__((unused)) void *dummy) } } + + return 0; } static int @@ -2188,7 +2080,7 @@ parse_args(int argc, char **argv) } if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_ETH_DEST, - sizeof(CMD_LINE_OPT_CONFIG))) { + sizeof(CMD_LINE_OPT_ETH_DEST))) { parse_eth_dest(optarg); } @@ -2630,8 +2522,12 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) printf("\nChecking link status"); fflush(stdout); for (count = 0; count <= MAX_CHECK_TIME; count++) { + if (force_quit) + return; all_ports_up = 1; for (portid = 0; portid < port_num; portid++) { + if (force_quit) + return; if ((port_mask & (1 << portid)) == 0) continue; memset(&link, 0, sizeof(link)); @@ -2673,6 +2569,16 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) } } +static void +signal_handler(int signum) +{ + if (signum == SIGINT || signum == SIGTERM) { + printf("\n\nSignal %d received, preparing to exit...\n", + signum); + force_quit = true; + } +} + int main(int argc, char **argv) { @@ -2693,6 +2599,10 @@ main(int argc, char **argv) argc -= ret; argv += ret; + force_quit = false; + signal(SIGINT, signal_handler); + signal(SIGTERM, signal_handler); + /* pre-init dst MACs for all ports to 02:00:00:00:00:xx */ for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) { dest_eth_addr[portid] = ETHER_LOCAL_ADMIN_ADDR + ((uint64_t)portid << 40); @@ -2847,12 +2757,26 @@ main(int argc, char **argv) check_all_ports_link_status((uint8_t)nb_ports, enabled_port_mask); + ret = 0; /* launch per-lcore init on every lcore */ rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER); RTE_LCORE_FOREACH_SLAVE(lcore_id) { - if (rte_eal_wait_lcore(lcore_id) < 0) - return -1; + if (rte_eal_wait_lcore(lcore_id) < 0) { + ret = -1; + break; + } } - return 0; + /* stop ports */ + for (portid = 0; portid < nb_ports; portid++) { + if ((enabled_port_mask & (1 << portid)) == 0) + continue; + printf("Closing port %d...", portid); + rte_eth_dev_stop(portid); + rte_eth_dev_close(portid); + printf(" Done\n"); + } + printf("Bye...\n"); + + return ret; }