X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2Fring%2Frte_eth_ring.c;h=a7048c7709c4692108e0a98a6c48dc6686171a46;hb=6dcee7cde83754c8e252a3bb02c314fcfc11ff9b;hp=9a31bcea1fd4a0f54ff4759e7bdb42a3290cf03f;hpb=4c28fb76855edeb03e5bf736dbbafd12cd84ac63;p=dpdk.git diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index 9a31bcea1f..a7048c7709 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -51,6 +51,11 @@ static const char *valid_arguments[] = { NULL }; +enum dev_action { + DEV_CREATE, + DEV_ATTACH +}; + struct ring_queue { struct rte_ring *rng; rte_atomic64_t rx_pkts; @@ -59,21 +64,23 @@ struct ring_queue { }; struct pmd_internals { - unsigned nb_rx_queues; - unsigned nb_tx_queues; + unsigned max_rx_queues; + unsigned max_tx_queues; struct ring_queue rx_ring_queues[RTE_PMD_RING_MAX_RX_RINGS]; struct ring_queue tx_ring_queues[RTE_PMD_RING_MAX_TX_RINGS]; struct ether_addr address; + enum dev_action action; }; static const char *drivername = "Rings PMD"; static struct rte_eth_link pmd_link = { - .link_speed = 10000, + .link_speed = ETH_SPEED_NUM_10G, .link_duplex = ETH_LINK_FULL_DUPLEX, - .link_status = 0 + .link_status = ETH_LINK_DOWN, + .link_autoneg = ETH_LINK_SPEED_AUTONEG }; static uint16_t @@ -113,32 +120,32 @@ eth_dev_configure(struct rte_eth_dev *dev __rte_unused) { return 0; } static int eth_dev_start(struct rte_eth_dev *dev) { - dev->data->dev_link.link_status = 1; + dev->data->dev_link.link_status = ETH_LINK_UP; return 0; } static void eth_dev_stop(struct rte_eth_dev *dev) { - dev->data->dev_link.link_status = 0; + dev->data->dev_link.link_status = ETH_LINK_DOWN; } static int eth_dev_set_link_down(struct rte_eth_dev *dev) { - dev->data->dev_link.link_status = 0; + dev->data->dev_link.link_status = ETH_LINK_DOWN; return 0; } static int eth_dev_set_link_up(struct rte_eth_dev *dev) { - dev->data->dev_link.link_status = 1; + dev->data->dev_link.link_status = ETH_LINK_UP; return 0; } static int -eth_rx_queue_setup(struct rte_eth_dev *dev,uint16_t rx_queue_id, +eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, uint16_t nb_rx_desc __rte_unused, unsigned int socket_id __rte_unused, const struct rte_eth_rxconf *rx_conf __rte_unused, @@ -169,36 +176,36 @@ eth_dev_info(struct rte_eth_dev *dev, dev_info->driver_name = drivername; dev_info->max_mac_addrs = 1; dev_info->max_rx_pktlen = (uint32_t)-1; - dev_info->max_rx_queues = (uint16_t)internals->nb_rx_queues; - dev_info->max_tx_queues = (uint16_t)internals->nb_tx_queues; + dev_info->max_rx_queues = (uint16_t)internals->max_rx_queues; + dev_info->max_tx_queues = (uint16_t)internals->max_tx_queues; dev_info->min_rx_bufsize = 0; dev_info->pci_dev = NULL; } static void -eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats) +eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) { unsigned i; unsigned long rx_total = 0, tx_total = 0, tx_err_total = 0; const struct pmd_internals *internal = dev->data->dev_private; for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS && - i < internal->nb_rx_queues; i++) { - igb_stats->q_ipackets[i] = internal->rx_ring_queues[i].rx_pkts.cnt; - rx_total += igb_stats->q_ipackets[i]; + i < dev->data->nb_rx_queues; i++) { + stats->q_ipackets[i] = internal->rx_ring_queues[i].rx_pkts.cnt; + rx_total += stats->q_ipackets[i]; } for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS && - i < internal->nb_tx_queues; i++) { - igb_stats->q_opackets[i] = internal->tx_ring_queues[i].tx_pkts.cnt; - igb_stats->q_errors[i] = internal->tx_ring_queues[i].err_pkts.cnt; - tx_total += igb_stats->q_opackets[i]; - tx_err_total += igb_stats->q_errors[i]; + i < dev->data->nb_tx_queues; i++) { + stats->q_opackets[i] = internal->tx_ring_queues[i].tx_pkts.cnt; + stats->q_errors[i] = internal->tx_ring_queues[i].err_pkts.cnt; + tx_total += stats->q_opackets[i]; + tx_err_total += stats->q_errors[i]; } - igb_stats->ipackets = rx_total; - igb_stats->opackets = tx_total; - igb_stats->oerrors = tx_err_total; + stats->ipackets = rx_total; + stats->opackets = tx_total; + stats->oerrors = tx_err_total; } static void @@ -206,9 +213,9 @@ eth_stats_reset(struct rte_eth_dev *dev) { unsigned i; struct pmd_internals *internal = dev->data->dev_private; - for (i = 0; i < internal->nb_rx_queues; i++) + for (i = 0; i < dev->data->nb_rx_queues; i++) internal->rx_ring_queues[i].rx_pkts.cnt = 0; - for (i = 0; i < internal->nb_tx_queues; i++) { + for (i = 0; i < dev->data->nb_tx_queues; i++) { internal->tx_ring_queues[i].tx_pkts.cnt = 0; internal->tx_ring_queues[i].err_pkts.cnt = 0; } @@ -252,33 +259,17 @@ static const struct eth_dev_ops ops = { .mac_addr_add = eth_mac_addr_add, }; -int -rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], - const unsigned nb_rx_queues, - struct rte_ring *const tx_queues[], - const unsigned nb_tx_queues, - const unsigned numa_node) +static int +do_eth_dev_ring_create(const char *name, + struct rte_ring * const rx_queues[], const unsigned nb_rx_queues, + struct rte_ring *const tx_queues[], const unsigned nb_tx_queues, + const unsigned numa_node, enum dev_action action) { struct rte_eth_dev_data *data = NULL; struct pmd_internals *internals = NULL; struct rte_eth_dev *eth_dev = NULL; - unsigned i; - /* do some parameter checking */ - if (rx_queues == NULL && nb_rx_queues > 0) { - rte_errno = EINVAL; - goto error; - } - if (tx_queues == NULL && nb_tx_queues > 0) { - rte_errno = EINVAL; - goto error; - } - if (nb_rx_queues > RTE_PMD_RING_MAX_RX_RINGS) { - rte_errno = EINVAL; - goto error; - } - RTE_LOG(INFO, PMD, "Creating rings-backed ethdev on numa socket %u\n", numa_node); @@ -291,15 +282,15 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], goto error; } - data->rx_queues = rte_zmalloc_socket(name, sizeof(void *) * nb_rx_queues, - 0, numa_node); + data->rx_queues = rte_zmalloc_socket(name, + sizeof(void *) * nb_rx_queues, 0, numa_node); if (data->rx_queues == NULL) { rte_errno = ENOMEM; goto error; } - data->tx_queues = rte_zmalloc_socket(name, sizeof(void *) * nb_tx_queues, - 0, numa_node); + data->tx_queues = rte_zmalloc_socket(name, + sizeof(void *) * nb_tx_queues, 0, numa_node); if (data->tx_queues == NULL) { rte_errno = ENOMEM; goto error; @@ -327,8 +318,9 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], /* NOTE: we'll replace the data element, of originally allocated eth_dev * so the rings are local per-process */ - internals->nb_rx_queues = nb_rx_queues; - internals->nb_tx_queues = nb_tx_queues; + internals->action = action; + internals->max_rx_queues = nb_rx_queues; + internals->max_tx_queues = nb_tx_queues; for (i = 0; i < nb_rx_queues; i++) { internals->rx_ring_queues[i].rng = rx_queues[i]; data->rx_queues[i] = &internals->rx_ring_queues[i]; @@ -349,10 +341,10 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], eth_dev->data = data; eth_dev->driver = NULL; eth_dev->dev_ops = &ops; - eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE; - eth_dev->data->kdrv = RTE_KDRV_NONE; - eth_dev->data->drv_name = drivername; - eth_dev->data->numa_node = numa_node; + data->dev_flags = RTE_ETH_DEV_DETACHABLE; + data->kdrv = RTE_KDRV_NONE; + data->drv_name = drivername; + data->numa_node = numa_node; TAILQ_INIT(&(eth_dev->link_intr_cbs)); @@ -373,6 +365,31 @@ error: return -1; } +int +rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], + const unsigned nb_rx_queues, + struct rte_ring *const tx_queues[], + const unsigned nb_tx_queues, + const unsigned numa_node) +{ + /* do some parameter checking */ + if (rx_queues == NULL && nb_rx_queues > 0) { + rte_errno = EINVAL; + return -1; + } + if (tx_queues == NULL && nb_tx_queues > 0) { + rte_errno = EINVAL; + return -1; + } + if (nb_rx_queues > RTE_PMD_RING_MAX_RX_RINGS) { + rte_errno = EINVAL; + return -1; + } + + return do_eth_dev_ring_create(name, rx_queues, nb_rx_queues, + tx_queues, nb_tx_queues, numa_node, DEV_ATTACH); +} + int rte_eth_from_ring(struct rte_ring *r) { @@ -380,11 +397,6 @@ rte_eth_from_ring(struct rte_ring *r) r->memzone ? r->memzone->socket_id : SOCKET_ID_ANY); } -enum dev_action{ - DEV_CREATE, - DEV_ATTACH -}; - static int eth_dev_ring_create(const char *name, const unsigned numa_node, enum dev_action action) @@ -408,7 +420,8 @@ eth_dev_ring_create(const char *name, const unsigned numa_node, return -1; } - if (rte_eth_from_rings(name, rxtx, num_rings, rxtx, num_rings, numa_node) < 0) + if (do_eth_dev_ring_create(name, rxtx, num_rings, rxtx, num_rings, + numa_node, action) < 0) return -1; return 0; @@ -570,6 +583,9 @@ static int rte_pmd_ring_devuninit(const char *name) { struct rte_eth_dev *eth_dev = NULL; + struct pmd_internals *internals = NULL; + struct ring_queue *r = NULL; + uint16_t i; RTE_LOG(INFO, PMD, "Un-Initializing pmd_ring for %s\n", name); @@ -582,7 +598,25 @@ rte_pmd_ring_devuninit(const char *name) return -ENODEV; eth_dev_stop(eth_dev); - rte_free(eth_dev->data->dev_private); + + if (eth_dev->data) { + internals = eth_dev->data->dev_private; + if (internals->action == DEV_CREATE) { + /* + * it is only necessary to delete the rings in rx_queues because + * they are the same used in tx_queues + */ + for (i = 0; i < eth_dev->data->nb_rx_queues; i++) { + r = eth_dev->data->rx_queues[i]; + rte_ring_free(r->rng); + } + } + + rte_free(eth_dev->data->rx_queues); + rte_free(eth_dev->data->tx_queues); + rte_free(eth_dev->data->dev_private); + } + rte_free(eth_dev->data); rte_eth_dev_release_port(eth_dev); @@ -590,10 +624,11 @@ rte_pmd_ring_devuninit(const char *name) } static struct rte_driver pmd_ring_drv = { - .name = "eth_ring", .type = PMD_VDEV, .init = rte_pmd_ring_devinit, .uninit = rte_pmd_ring_devuninit, }; -PMD_REGISTER_DRIVER(pmd_ring_drv); +PMD_REGISTER_DRIVER(pmd_ring_drv, eth_ring); +DRIVER_REGISTER_PARAM_STRING(eth_ring, + "nodeaction=[attach|detach]");