X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fkni%2Frte_eth_kni.c;h=1696787a9b361e31d3b124323f9a53376bec7f4b;hb=19784141692e;hp=5e022242360e165ee32ef1e4037e0161c6722a16;hpb=ff1e35fb5f8330f89d13f58c9fb767b5bd188940;p=dpdk.git diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c index 5e02224236..1696787a9b 100644 --- a/drivers/net/kni/rte_eth_kni.c +++ b/drivers/net/kni/rte_eth_kni.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -19,7 +20,7 @@ #define MAX_KNI_PORTS 8 #define KNI_ETHER_MTU(mbuf_size) \ - ((mbuf_size) - ETHER_HDR_LEN) /**< Ethernet MTU. */ + ((mbuf_size) - RTE_ETHER_HDR_LEN) /**< Ethernet MTU. */ #define ETH_KNI_NO_REQUEST_THREAD_ARG "no_request_thread" static const char * const valid_arguments[] = { @@ -34,7 +35,6 @@ struct eth_kni_args { struct pmd_queue_stats { uint64_t pkts; uint64_t bytes; - uint64_t err_pkts; }; struct pmd_queue { @@ -47,13 +47,14 @@ struct pmd_queue { struct pmd_internals { struct rte_kni *kni; + uint16_t port_id; int is_kni_started; pthread_t thread; int stop_thread; int no_request_thread; - struct ether_addr eth_addr; + struct rte_ether_addr eth_addr; struct pmd_queue rx_queues[KNI_MAX_QUEUE_PER_PORT]; struct pmd_queue tx_queues[KNI_MAX_QUEUE_PER_PORT]; @@ -67,7 +68,7 @@ static const struct rte_eth_link pmd_link = { }; static int is_kni_initialized; -static int eth_kni_logtype; +RTE_LOG_REGISTER(eth_kni_logtype, pmd.net.kni, NOTICE); #define PMD_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, eth_kni_logtype, \ @@ -78,11 +79,13 @@ eth_kni_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) struct pmd_queue *kni_q = q; struct rte_kni *kni = kni_q->internals->kni; uint16_t nb_pkts; + int i; nb_pkts = rte_kni_rx_burst(kni, bufs, nb_bufs); + for (i = 0; i < nb_pkts; i++) + bufs[i]->port = kni_q->internals->port_id; kni_q->rx.pkts += nb_pkts; - kni_q->rx.err_pkts += nb_bufs - nb_pkts; return nb_pkts; } @@ -97,7 +100,6 @@ eth_kni_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) nb_pkts = rte_kni_tx_burst(kni, bufs, nb_bufs); kni_q->tx.pkts += nb_pkts; - kni_q->tx.err_pkts += nb_bufs - nb_pkts; return nb_pkts; } @@ -126,7 +128,7 @@ eth_kni_start(struct rte_eth_dev *dev) const char *name = dev->device->name + 4; /* remove net_ */ mb_pool = internals->rx_queues[0].mb_pool; - snprintf(conf.name, RTE_KNI_NAMESIZE, "%s", name); + strlcpy(conf.name, name, RTE_KNI_NAMESIZE); conf.force_bind = 0; conf.group_id = port_id; conf.mbuf_size = @@ -158,6 +160,8 @@ eth_kni_dev_start(struct rte_eth_dev *dev) } if (internals->no_request_thread == 0) { + internals->stop_thread = 0; + ret = rte_ctrl_thread_create(&internals->thread, "kni_handle_req", NULL, kni_handle_request, internals); @@ -173,13 +177,13 @@ eth_kni_dev_start(struct rte_eth_dev *dev) return 0; } -static void +static int eth_kni_dev_stop(struct rte_eth_dev *dev) { struct pmd_internals *internals = dev->data->dev_private; int ret; - if (internals->no_request_thread == 0) { + if (internals->no_request_thread == 0 && internals->stop_thread == 0) { internals->stop_thread = 1; ret = pthread_cancel(internals->thread); @@ -189,11 +193,35 @@ eth_kni_dev_stop(struct rte_eth_dev *dev) ret = pthread_join(internals->thread, NULL); if (ret) PMD_LOG(ERR, "Can't join the thread"); - - internals->stop_thread = 0; } dev->data->dev_link.link_status = 0; + dev->data->dev_started = 0; + + return 0; +} + +static int +eth_kni_close(struct rte_eth_dev *eth_dev) +{ + struct pmd_internals *internals; + int ret; + + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + + ret = eth_kni_dev_stop(eth_dev); + + /* mac_addrs must not be freed alone because part of dev_private */ + eth_dev->data->mac_addrs = NULL; + + internals = eth_dev->data->dev_private; + ret = rte_kni_release(internals->kni); + if (ret) + PMD_LOG(WARNING, "Not able to release kni for %s", + eth_dev->data->name); + + return ret; } static int @@ -202,7 +230,7 @@ eth_kni_dev_configure(struct rte_eth_dev *dev __rte_unused) return 0; } -static void +static int eth_kni_dev_info(struct rte_eth_dev *dev __rte_unused, struct rte_eth_dev_info *dev_info) { @@ -211,6 +239,8 @@ eth_kni_dev_info(struct rte_eth_dev *dev __rte_unused, dev_info->max_rx_queues = KNI_MAX_QUEUE_PER_PORT; dev_info->max_tx_queues = KNI_MAX_QUEUE_PER_PORT; dev_info->min_rx_bufsize = 0; + + return 0; } static int @@ -269,7 +299,6 @@ eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) unsigned long rx_packets_total = 0, rx_bytes_total = 0; unsigned long tx_packets_total = 0, tx_bytes_total = 0; struct rte_eth_dev_data *data = dev->data; - unsigned long tx_packets_err_total = 0; unsigned int i, num_stats; struct pmd_queue *q; @@ -289,22 +318,19 @@ eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) q = data->tx_queues[i]; stats->q_opackets[i] = q->tx.pkts; stats->q_obytes[i] = q->tx.bytes; - stats->q_errors[i] = q->tx.err_pkts; tx_packets_total += stats->q_opackets[i]; tx_bytes_total += stats->q_obytes[i]; - tx_packets_err_total += stats->q_errors[i]; } stats->ipackets = rx_packets_total; stats->ibytes = rx_bytes_total; stats->opackets = tx_packets_total; stats->obytes = tx_bytes_total; - stats->oerrors = tx_packets_err_total; return 0; } -static void +static int eth_kni_stats_reset(struct rte_eth_dev *dev) { struct rte_eth_dev_data *data = dev->data; @@ -320,13 +346,15 @@ eth_kni_stats_reset(struct rte_eth_dev *dev) q = data->tx_queues[i]; q->tx.pkts = 0; q->tx.bytes = 0; - q->tx.err_pkts = 0; } + + return 0; } static const struct eth_dev_ops eth_kni_ops = { .dev_start = eth_kni_dev_start, .dev_stop = eth_kni_dev_stop, + .dev_close = eth_kni_close, .dev_configure = eth_kni_dev_configure, .dev_infos_get = eth_kni_dev_info, .rx_queue_setup = eth_kni_rx_queue_setup, @@ -356,13 +384,17 @@ eth_kni_create(struct rte_vdev_device *vdev, return NULL; internals = eth_dev->data->dev_private; + internals->port_id = eth_dev->data->port_id; data = eth_dev->data; data->nb_rx_queues = 1; data->nb_tx_queues = 1; data->dev_link = pmd_link; data->mac_addrs = &internals->eth_addr; + data->promiscuous = 1; + data->all_multicast = 1; + data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; - eth_random_addr(internals->eth_addr.addr_bytes); + rte_eth_random_addr(internals->eth_addr.addr_bytes); eth_dev->dev_ops = ð_kni_ops; @@ -456,29 +488,24 @@ static int eth_kni_remove(struct rte_vdev_device *vdev) { struct rte_eth_dev *eth_dev; - struct pmd_internals *internals; const char *name; + int ret; name = rte_vdev_device_name(vdev); PMD_LOG(INFO, "Un-Initializing eth_kni for %s", name); /* find the ethdev entry */ eth_dev = rte_eth_dev_allocated(name); - if (eth_dev == NULL) - return -1; - - /* mac_addrs must not be freed alone because part of dev_private */ - eth_dev->data->mac_addrs = NULL; - - if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return rte_eth_dev_release_port(eth_dev); - - eth_kni_dev_stop(eth_dev); - - internals = eth_dev->data->dev_private; - rte_kni_release(internals->kni); - - rte_eth_dev_release_port(eth_dev); + if (eth_dev != NULL) { + if (rte_eal_process_type() != RTE_PROC_PRIMARY) { + ret = eth_kni_dev_stop(eth_dev); + if (ret != 0) + return ret; + return rte_eth_dev_release_port(eth_dev); + } + eth_kni_close(eth_dev); + rte_eth_dev_release_port(eth_dev); + } is_kni_initialized--; if (is_kni_initialized == 0) @@ -494,10 +521,3 @@ static struct rte_vdev_driver eth_kni_drv = { RTE_PMD_REGISTER_VDEV(net_kni, eth_kni_drv); RTE_PMD_REGISTER_PARAM_STRING(net_kni, ETH_KNI_NO_REQUEST_THREAD_ARG "="); - -RTE_INIT(eth_kni_init_log) -{ - eth_kni_logtype = rte_log_register("pmd.net.kni"); - if (eth_kni_logtype >= 0) - rte_log_set_level(eth_kni_logtype, RTE_LOG_NOTICE); -}