X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fkni%2Fmain.c;h=f7f99ed4a598bb545c4c776f251517c5ce3f32ae;hb=e60f71ebd68f8b841bda43f210861e010ad5eb61;hp=4a1a07a45409799948460c375558fb1b2f66ee51;hpb=b6df9fc8715f9a925136006b18fdd65f9c621757;p=dpdk.git diff --git a/examples/kni/main.c b/examples/kni/main.c index 4a1a07a454..f7f99ed4a5 100644 --- a/examples/kni/main.c +++ b/examples/kni/main.c @@ -79,9 +79,6 @@ /* Macros for printing using RTE_LOG */ #define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1 -/* NUMA socket to allocate mbuf pool on */ -#define SOCKET 0 - /* Max size of a single packet */ #define MAX_PACKET_SZ 2048 @@ -110,6 +107,9 @@ /* Total octets in the FCS */ #define KNI_ENET_FCS_SIZE 4 +#define KNI_US_PER_SECOND 1000000 +#define KNI_SECOND_PER_DAY 86400 + /* * RX and TX Prefetch, Host, and Write-back threshold values should be * carefully set for optimal performance. Consult the network @@ -152,7 +152,7 @@ static struct rte_eth_conf port_conf = { .hw_strip_crc = 0, /* CRC stripped by hardware */ }, .txmode = { - .mq_mode = ETH_DCB_NONE, + .mq_mode = ETH_MQ_TX_NONE, }, }; @@ -212,6 +212,8 @@ static struct rte_kni_ops kni_ops = { .config_network_if = kni_config_network_interface, }; +static rte_atomic32_t kni_stop = RTE_ATOMIC32_INIT(0); + /* Print out statistics on packets handled */ static void print_stats(void) @@ -238,7 +240,7 @@ print_stats(void) printf("====== ============== ============ ============ ============ ============\n"); } -/* Custom handling of signals to handle stats */ +/* Custom handling of signals to handle stats and kni processing */ static void signal_handler(int signum) { @@ -253,6 +255,14 @@ signal_handler(int signum) printf("\n**Statistics have been reset**\n"); return; } + + /* When we receive a RTMIN signal, stop kni processing */ + if (signum == SIGRTMIN) { + printf("SIGRTMIN is received, and the KNI processing is " + "going to stop\n"); + rte_atomic32_inc(&kni_stop); + return; + } } static void @@ -293,6 +303,7 @@ kni_ingress(struct rte_kni *kni) num = rte_kni_tx_burst(kni, pkts_burst, nb_rx); kni_stats[port_id].rx_packets += num; + rte_kni_handle_request(kni); if (unlikely(num < nb_rx)) { /* Free mbufs not tx to kni interface */ kni_burst_free_mbufs(&pkts_burst[num], nb_rx - num); @@ -332,18 +343,14 @@ kni_egress(struct rte_kni *kni) } /* Main processing loop */ -static __attribute__((noreturn)) int +static int main_loop(__rte_unused void *arg) { uint8_t pid; const unsigned lcore_id = rte_lcore_id(); struct rte_kni *kni = kni_lcore_to_kni(lcore_id); - if (kni == NULL) { - RTE_LOG(INFO, APP, "Lcore %u has nothing to do\n", lcore_id); - for (;;) - ; /* loop doing nothing */ - } else { + if (kni != NULL) { pid = rte_kni_get_port_id(kni); if (pid >= RTE_MAX_ETHPORTS) rte_exit(EXIT_FAILURE, "Failure: port id >= %d\n", @@ -356,8 +363,13 @@ main_loop(__rte_unused void *arg) fflush(stdout); /* rx loop */ - while (1) + while (1) { + int32_t flag = rte_atomic32_read(&kni_stop); + + if (flag) + break; kni_ingress(kni); + } } else if (kni_port_info[pid].lcore_id_egress == lcore_id) { /* Running on lcores for output packets */ RTE_LOG(INFO, APP, "Lcore %u is writing to port %d\n", @@ -365,15 +377,20 @@ main_loop(__rte_unused void *arg) fflush(stdout); /* tx loop */ - while (1) + while (1) { + int32_t flag = rte_atomic32_read(&kni_stop); + + if (flag) + break; kni_egress(kni); - } else { - RTE_LOG(INFO, APP, "Lcore %u has nothing to do\n", - lcore_id); - for (;;) - ; /* loop doing nothing */ + } } } + + /* fallthrough to here if we don't have any work */ + RTE_LOG(INFO, APP, "Lcore %u has nothing to do\n", lcore_id); + + return 0; } /* Display usage instructions */ @@ -382,10 +399,11 @@ print_usage(const char *prgname) { RTE_LOG(INFO, APP, "\nUsage: %s [EAL options] -- -p PORTMASK " "-i IN_CORES -o OUT_CORES\n" - " -p PORTMASK: hex bitmask of ports to use\n" - " -i IN_CORES: hex bitmask of cores which read " + " -p PORTMASK: hex bitmask of ports to use\n" + " -i IN_CORES: hex bitmask of cores which read " "from NIC\n" - " -o OUT_CORES: hex bitmask of cores which write to NIC\n", + " -o OUT_CORES: hex bitmask of cores which write " + "to NIC\n", prgname); } @@ -439,7 +457,7 @@ kni_setup_port_affinities(uint8_t nb_port) } if (in_lcore != 0) { - /* It is be for packet receiving */ + /* It is for packet receiving */ while ((rx_port < nb_port) && ((ports_mask & (1 << rx_port)) == 0)) rx_port++; @@ -550,13 +568,14 @@ init_port(uint8_t port) rte_exit(EXIT_FAILURE, "Could not configure port%u (%d)", (unsigned)port, ret); - ret = rte_eth_rx_queue_setup(port, 0, NB_RXD, SOCKET, &rx_conf, - pktmbuf_pool); + ret = rte_eth_rx_queue_setup(port, 0, NB_RXD, rte_eth_dev_socket_id(port), + &rx_conf, pktmbuf_pool); if (ret < 0) rte_exit(EXIT_FAILURE, "Could not setup up RX queue for " "port%u (%d)", (unsigned)port, ret); - ret = rte_eth_tx_queue_setup(port, 0, NB_TXD, SOCKET, &tx_conf); + ret = rte_eth_tx_queue_setup(port, 0, NB_TXD, rte_eth_dev_socket_id(port), + &tx_conf); if (ret < 0) rte_exit(EXIT_FAILURE, "Could not setup up TX queue for " "port%u (%d)", (unsigned)port, ret); @@ -704,6 +723,7 @@ main(int argc, char** argv) /* Associate signal_hanlder function with USR signals */ signal(SIGUSR1, signal_handler); signal(SIGUSR2, signal_handler); + signal(SIGRTMIN, signal_handler); /* Initialise EAL */ ret = rte_eal_init(argc, argv); @@ -720,7 +740,7 @@ main(int argc, char** argv) MEMPOOL_CACHE_SZ, sizeof(struct rte_pktmbuf_pool_private), rte_pktmbuf_pool_init, NULL, rte_pktmbuf_init, NULL, - SOCKET, 0); + rte_socket_id(), 0); if (pktmbuf_pool == NULL) { rte_exit(EXIT_FAILURE, "Could not initialise mbuf pool"); return -1; @@ -783,6 +803,13 @@ main(int argc, char** argv) return -1; } + for (port = 0; port < nb_sys_ports; port++) { + struct rte_kni *kni = kni_port_info[port].kni; + + if (kni != NULL) + rte_kni_release(kni); + } + return 0; }